Skip to content

Commit a9bf855

Browse files
VillePihlavaVillePihlava
committed
Merge branch 'dev-2.x' of github.com:opentripplanner/OpenTripPlanner into clear-patterns-for-stop
2 parents 96a51f8 + 41cd46e commit a9bf855

1,202 files changed

Lines changed: 12643 additions & 6764 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.git-blame-ignore-revs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ beeac076c0b9f0a8aaa1424ef1d6df3a6fa8f6ab
3434

3535
# update prettier version
3636
34026d19232608f9e6a8841a7c6ac5e5c99abbd4
37+
38+
# rename constant variables
39+
2f2ecfcb2f1b0f7b8c5f8f3d91a59bb941023f8b

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,6 @@ graph.obj
4949

5050
# draw.io backup files
5151
*.svg.bkp
52+
53+
# EPSG files
54+
application/v??.?.??

‎application/pom.xml‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@
3535
</dependency>
3636
<dependency>
3737
<groupId>${project.groupId}</groupId>
38-
<artifactId>domain-core</artifactId>
38+
<artifactId>street</artifactId>
3939
<version>${project.version}</version>
4040
</dependency>
4141

4242

43+
4344
<!-- 3rd party dependencies -->
4445
<dependency>
4546
<groupId>net.sf.trove4j</groupId>
@@ -76,25 +77,6 @@
7677
<version>${google.dagger.version}</version>
7778
</dependency>
7879

79-
<!-- GEOTOOLS -->
80-
81-
<dependency>
82-
<groupId>org.geotools</groupId>
83-
<artifactId>gt-coverage</artifactId>
84-
</dependency>
85-
<dependency>
86-
<groupId>org.geotools</groupId>
87-
<artifactId>gt-geotiff</artifactId>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.geotools</groupId>
91-
<artifactId>gt-api</artifactId>
92-
</dependency>
93-
<dependency>
94-
<groupId>org.geotools</groupId>
95-
<artifactId>gt-geojson-core</artifactId>
96-
</dependency>
97-
9880
<!-- Lucene is used by the Debug Client Geocode API -->
9981
<dependency>
10082
<groupId>org.apache.lucene</groupId>
@@ -381,7 +363,7 @@
381363
<dependency>
382364
<groupId>com.azure</groupId>
383365
<artifactId>azure-messaging-servicebus</artifactId>
384-
<version>7.17.16</version>
366+
<version>7.17.17</version>
385367
</dependency>
386368
<dependency>
387369
<groupId>com.azure</groupId>
@@ -398,7 +380,7 @@
398380
<dependency>
399381
<groupId>org.opentripplanner</groupId>
400382
<artifactId>ojp-java-model</artifactId>
401-
<version>2.0.1</version>
383+
<version>2.0.7</version>
402384
</dependency>
403385

404386
<!-- create zip test files-->

‎application/src/client/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<link rel="icon" type="image/svg+xml" href="/img/otp-logo.svg" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>OTP Debug</title>
8-
<script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/01/2026-01-26T07:24/assets/index-DEh0vKp0.js"></script>
9-
<link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/01/2026-01-26T07:24/assets/index-CME2K3XJ.css">
8+
<script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/02/2026-02-19T14:48/assets/index-CDjUnxBF.js"></script>
9+
<link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/02/2026-02-19T14:48/assets/index-D5uMx42p.css">
1010
</head>
1111
<body>
1212
<div id="root"></div>

‎application/src/ext-test/java/org/opentripplanner/ext/edgenaming/CrosswalkNamerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
import org.junit.jupiter.params.provider.Arguments;
1616
import org.junit.jupiter.params.provider.MethodSource;
1717
import org.opentripplanner.core.model.i18n.I18NString;
18-
import org.opentripplanner.framework.geometry.WgsCoordinate;
1918
import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
2019
import org.opentripplanner.graph_builder.module.osm.OsmDatabase;
2120
import org.opentripplanner.graph_builder.module.osm.StreetEdgePair;
2221
import org.opentripplanner.graph_builder.services.osm.EdgeNamer;
2322
import org.opentripplanner.osm.model.OsmWay;
23+
import org.opentripplanner.street.geometry.WgsCoordinate;
2424
import org.opentripplanner.street.model.StreetTraversalPermission;
2525
import org.opentripplanner.street.model.edge.StreetEdge;
2626

‎application/src/ext-test/java/org/opentripplanner/ext/edgenaming/SidewalkNamerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
import java.util.List;
1111
import org.junit.jupiter.api.Test;
1212
import org.opentripplanner.core.model.i18n.I18NString;
13-
import org.opentripplanner.framework.geometry.WgsCoordinate;
1413
import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
1514
import org.opentripplanner.graph_builder.module.osm.OsmDatabase;
1615
import org.opentripplanner.graph_builder.module.osm.StreetEdgePair;
1716
import org.opentripplanner.graph_builder.services.osm.EdgeNamer;
1817
import org.opentripplanner.osm.model.OsmWay;
1918
import org.opentripplanner.osm.wayproperty.specifier.WayTestData;
19+
import org.opentripplanner.street.geometry.WgsCoordinate;
2020
import org.opentripplanner.street.model.StreetTraversalPermission;
2121
import org.opentripplanner.street.model.edge.StreetEdge;
2222
import org.opentripplanner.test.support.GeoJsonIo;

‎application/src/ext-test/java/org/opentripplanner/ext/edgenaming/StreetEdgeBuilderFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.opentripplanner.ext.edgenaming;
22

33
import java.util.Arrays;
4-
import org.opentripplanner.framework.geometry.GeometryUtils;
5-
import org.opentripplanner.framework.geometry.WgsCoordinate;
6-
import org.opentripplanner.street.model._data.StreetModelForTest;
4+
import org.opentripplanner.street.geometry.GeometryUtils;
5+
import org.opentripplanner.street.geometry.WgsCoordinate;
6+
import org.opentripplanner.street.model.StreetModelForTest;
77
import org.opentripplanner.street.model.edge.StreetEdgeBuilder;
88

99
/**

‎application/src/ext-test/java/org/opentripplanner/ext/emission/internal/itinerary/EmissionItineraryDecoratorTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
class EmissionItineraryDecoratorTest implements PlanTestConstants {
2525

26-
private static final int startTime = T11_09;
27-
private static final int endTime = T11_55;
26+
private static final int START_TIME = T11_09;
27+
private static final int END_TIME = T11_55;
2828

2929
// Apply route emissions
3030
private Itinerary bus;
@@ -48,25 +48,25 @@ void setUpItineraries() {
4848
var routeA = route("R1").build();
4949
var routeB = route("R2").build();
5050

51-
bus = newItinerary(A).bus(routeA, 21, startTime, endTime, B).build();
52-
busZeroEmission = newItinerary(A).bus(routeB, 22, startTime, endTime, B).build();
53-
rail = newItinerary(A).rail(3, startTime, endTime, B).build();
54-
car = newItinerary(A).drive(startTime, endTime, B).build();
55-
flex = newItinerary(A).flex(startTime, endTime, B).build();
51+
bus = newItinerary(A).bus(routeA, 21, START_TIME, END_TIME, B).build();
52+
busZeroEmission = newItinerary(A).bus(routeB, 22, START_TIME, END_TIME, B).build();
53+
rail = newItinerary(A).rail(3, START_TIME, END_TIME, B).build();
54+
car = newItinerary(A).drive(START_TIME, END_TIME, B).build();
55+
flex = newItinerary(A).flex(START_TIME, END_TIME, B).build();
5656

57-
int t0 = startTime;
57+
int t0 = START_TIME;
5858
combinedWithFlex = newItinerary(A)
5959
.drive(t0, t0 += 90, C)
6060
.rail(4, t0 += 90, t0 += 90, D)
6161
.bus(routeA, 20, t0, t0 += 90, E)
62-
.flex(t0 + 90, endTime, B)
62+
.flex(t0 + 90, END_TIME, B)
6363
.build();
6464

6565
combinedNoFlex = newItinerary(A)
6666
.drive(t0, t0 += 90, C)
6767
.rail(4, t0 += 90, t0 + 90, D)
6868
.bus(routeA, 20, t0, t0 += 90, E)
69-
.bus(routeB, 23, t0, endTime, B)
69+
.bus(routeB, 23, t0, END_TIME, B)
7070
.build();
7171

7272
var repository = new DefaultEmissionRepository();

‎application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/EmpiricalDelayTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99

1010
class EmpiricalDelayTest {
1111

12-
private static final int p50 = 10;
13-
private static final int p90 = 50;
12+
private static final int P50 = 10;
13+
private static final int P90 = 50;
1414

15-
private final EmpiricalDelay subject = new EmpiricalDelay(p50, p90);
15+
private final EmpiricalDelay subject = new EmpiricalDelay(P50, P90);
1616

1717
@Test
1818
void p50() {
19-
assertEquals(Duration.ofSeconds(p50), subject.p50());
19+
assertEquals(Duration.ofSeconds(P50), subject.p50());
2020
}
2121

2222
@Test
2323
void p90() {
24-
assertEquals(Duration.ofSeconds(p90), subject.p90());
24+
assertEquals(Duration.ofSeconds(P90), subject.p90());
2525
}
2626

2727
@Test

‎application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
import org.opentripplanner.core.model.id.FeedScopedId;
2323
import org.opentripplanner.ext.fares.model.FareModelForTest;
2424
import org.opentripplanner.ext.fares.model.FareRuleSet;
25-
import org.opentripplanner.framework.geometry.WgsCoordinate;
2625
import org.opentripplanner.model.plan.Itinerary;
2726
import org.opentripplanner.model.plan.Leg;
2827
import org.opentripplanner.model.plan.Place;
2928
import org.opentripplanner.model.plan.PlanTestConstants;
3029
import org.opentripplanner.routing.core.FareType;
30+
import org.opentripplanner.street.geometry.WgsCoordinate;
3131
import org.opentripplanner.transit.model.basic.Money;
3232
import org.opentripplanner.transit.model.basic.TransitMode;
3333
import org.opentripplanner.transit.model.network.Route;

0 commit comments

Comments
 (0)