Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2…

…023-11-02
ibi-group · Nov 2, 2023 · 741091b · 741091b
2 parents 1b9505a + 56b1910
commit 741091b
Show file tree

Hide file tree

Showing 111 changed files with 2,539 additions and 1,333 deletions.
diff --git a/.github/ISSUE_TEMPLATE/roadmap_epic.md b/.github/ISSUE_TEMPLATE/roadmap_epic.md
@@ -7,15 +7,15 @@ assignees: ''
 
 ---
 
-### Describe expected behavior:
+### Describe expected behavior
 - What: <!-- Clearly state what the desired changes or new features could look like. -->
 - Why: <!-- Clearly state the effect/outcome of this change. -->
 - When: <!-- Provide a timeline or timeframe for when these changes should be implemented, preferably on a quarterly basis (e.g., Y24 Q3). -->
 
 ### Linked issue(s)
-<!-- Add a checkbox by typing “- [] ”. Then, link to an issue by typing “#” and searching for the issue by text or issue number, or create a new issue.  -->
+<!-- Add a checkbox by typing “- [ ] ”. Then, link to an issue by typing “#” and searching for the issue by text or issue number, or create a new issue.  -->
 
-### OTP PO Discussion meeting details:
+### OTP PO Discussion meeting details
 - Date: <!-- Specify the date when the discussion meeting took place. -->
 - Link(s): <!-- Provide a link or location where the discussion notes or details can be found. This could be a meeting link or another document. -->
 

diff --git a/docs/Basic-Tutorial.md b/docs/Basic-Tutorial.md
@@ -139,10 +139,11 @@ with your local OpenTripPlanner instance.
 
 This map-based user interface is in fact sending HTTP GET requests to the OTP server running on your
 local machine. It can be informative to watch the HTTP requests and responses being generated using
-the developer tools in your web browser. OTP's built-in web server will run by default on ports 8080
-and 8081 for HTTP and HTTPS respectively. If by any chance some other software is already using one
-or both of those port numbers, you can specify different port numbers with switches
-like `--port 8801 --securePort 8802`.
+the developer tools in your web browser. OTP's built-in web server will run by default on port 8080.
+If by any chance some other software is already using that port number, you can specify a different
+port number with a switch
+`--port 8801`.
+
 
 ## Saving a Graph
 

diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -23,6 +23,16 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Import Occupancy Status from GTFS-RT Vehicle Positions [#5372](https://github.com/opentripplanner/OpenTripPlanner/pull/5372)
 - Add Roadmap epic template [#5413](https://github.com/opentripplanner/OpenTripPlanner/pull/5413)
 - Allow multiple zones in an unscheduled flex trip [#5376](https://github.com/opentripplanner/OpenTripPlanner/pull/5376)
+- Filter out null, empty and blank elements when mapping feed-scoped ids [#5428](https://github.com/opentripplanner/OpenTripPlanner/pull/5428)
+- Validate stop id in Transit leg reference [#5440](https://github.com/opentripplanner/OpenTripPlanner/pull/5440)
+- Add available types and spaces to `VehicleRentalStation` [#5425](https://github.com/opentripplanner/OpenTripPlanner/pull/5425)
+- Make vehicleRentalStation query optionally accept id without feed [#5411](https://github.com/opentripplanner/OpenTripPlanner/pull/5411)
+- Add stricter validation for flex areas [#5457](https://github.com/opentripplanner/OpenTripPlanner/pull/5457)
+- Remove HTTPS handling and its documentation [#5439](https://github.com/opentripplanner/OpenTripPlanner/pull/5439)
+- Add support for DSJ in transit leg reference [#5455](https://github.com/opentripplanner/OpenTripPlanner/pull/5455)
+- Ignore negative travel-times in Raptor [#5443](https://github.com/opentripplanner/OpenTripPlanner/pull/5443)
+- Fix sort order bug in optimized transfers [#5446](https://github.com/opentripplanner/OpenTripPlanner/pull/5446)
+- Siri file loader [#5460](https://github.com/opentripplanner/OpenTripPlanner/pull/5460)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.4.0 (2023-09-13)

diff --git a/docs/Configuration.md b/docs/Configuration.md
diff --git a/docs/Developers-Guide.md b/docs/Developers-Guide.md
@@ -134,11 +134,11 @@ how OTP is used or configured should include changes to the documentation alongs
 modifications.
 
 The documentation files are in Markdown format and are in the `/docs` directory under the root of
-the project. On every push to the master branch the documentation will be rebuilt and deployed as
-static pages to our subdomain of [ReadTheDocs](http://opentripplanner.readthedocs.org/). MkDocs is a
-Python program and should run on any major platform. See http://www.mkdocs.org/ for information on
-how to install it and how to generate a live local preview of the documentation while you're working
-on writing it.
+the project. On every push to the `dev-2.x` branch the documentation will be rebuilt and deployed as
+static pages to our subdomain of [Github Pages](https://github.com/opentripplanner/docs). 
+MkDocs is a Python program and should run on any major platform. 
+See [http://www.mkdocs.org/](http://www.mkdocs.org/) for information on how to install it and 
+how to generate a live local preview of the documentation while you're writing it.
 
 In short:
 
@@ -149,11 +149,11 @@ $ mkdocs serve
 
 The OTP GTFS GraphQL API documentation is available online at 
 
-https://docs.opentripplanner.org/api/dev-2.x/graphql-gtfs/
+[https://docs.opentripplanner.org/api/dev-2.x/graphql-gtfs/](https://docs.opentripplanner.org/api/dev-2.x/graphql-gtfs/)
 
 You can also use the interactive GraphQL API client that is built into every instance at
 
-http://localhost:8080/graphiql
+[http://localhost:8080/graphiql](http://localhost:8080/graphiql)
 
 ### Debug layers
 

diff --git a/docs/Preparing-OSM.md b/docs/Preparing-OSM.md
@@ -16,14 +16,11 @@ package. [Osmium-Tool](https://wiki.openstreetmap.org/wiki/Osmium) is a personal
 extremely fast but only straightforward to install on Linux and MacOS platforms. Below are some
 example crop commands for these different tools:
 
-**
-Osmosis:** `osmosis --rb input.osm.pbf --bounding-box left=4.34 right=5.84 bottom=43.10 top=43.97 --wb cropped.osm.pbf`
+**Osmosis:** `osmosis --rb input.osm.pbf --bounding-box left=4.34 right=5.84 bottom=43.10 top=43.97 --wb cropped.osm.pbf`
 
-**
-OsmConvert:** `osmconvert input.osm.pbf -b=-77.255859375,38.77764022307335,-76.81365966796875,39.02345139405933 --complete-ways -o=cropped.osm.pbf`
+**OsmConvert:** `osmconvert input.osm.pbf -b=-77.255859375,38.77764022307335,-76.81365966796875,39.02345139405933 --complete-ways -o=cropped.osm.pbf`
 
-**
-Osmium:** `osmium extract --strategy complete_ways --bbox 2.25,48.81,2.42,48.91 input.osm.pbf -o cropped.osm.pbf`
+**Osmium:** `osmium extract --strategy complete_ways --bbox 2.25,48.81,2.42,48.91 input.osm.pbf -o cropped.osm.pbf`
 
 The latter two commands expect bounding boxes to be specified in the
 format `min_lon,min_lat,max_lon,max_lat`. We frequently find bounding boxes using the
@@ -50,8 +47,6 @@ will also work on Windows as it's a multi-platform Java application. OSMFilter c
 format files so we rarely use it. Below are some example commands for retaining only OSM data useful
 for accessibility analysis. Here are some example commands:
 
-**
-Osmosis:** `osmosis --rb input.osm.pbf --tf reject-ways building=* --tf reject-ways waterway=* --tf reject-ways landuse=* --tf reject-ways natural=* --used-node --wb filtered.osm.pbf`
+**Osmosis:** `osmosis --rb input.osm.pbf --tf reject-ways building=* --tf reject-ways waterway=* --tf reject-ways landuse=* --tf reject-ways natural=* --used-node --wb filtered.osm.pbf`
 
-**
-Osmium-Tool:** `osmium tags-filter input.osm.pbf w/highway wa/public_transport=platform wa/railway=platform w/park_ride=yes r/type=restriction r/type=route -o filtered.osm.pbf -f pbf,add_metadata=false`
+**Osmium-Tool:** `osmium tags-filter input.osm.pbf w/highway wa/public_transport=platform wa/railway=platform w/park_ride=yes r/type=restriction r/type=route -o filtered.osm.pbf -f pbf,add_metadata=false`
diff --git a/docs/Security.md b/docs/Security.md
diff --git a/docs/sandbox/SiriUpdater.md b/docs/sandbox/SiriUpdater.md
@@ -37,12 +37,27 @@ To enable the SIRI updater you need to add it to the updaters section of the `ro
 | previewInterval                |    `duration`   | TODO                                                                                                   | *Optional* |               |  2.0  |
 | requestorRef                   |     `string`    | The requester reference.                                                                               | *Optional* |               |  2.0  |
 | timeout                        |    `duration`   | The HTTP timeout to download the updates.                                                              | *Optional* | `"PT15S"`     |  2.0  |
-| url                            |     `string`    | The URL to send the HTTP requests to.                                                                  | *Required* |               |  2.0  |
+| [url](#u__8__url)              |     `string`    | The URL to send the HTTP requests to.                                                                  | *Required* |               |  2.0  |
 | [headers](#u__8__headers)      | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted.                             | *Optional* |               |  2.3  |
 
 
 ##### Parameter details
 
+<h4 id="u__8__url">url</h4>
+
+**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required`   
+**Path:** /updaters/[8] 
+
+The URL to send the HTTP requests to.
+
+Use the file protocol to set a directory for reading updates from a directory. The file
+loader will look for xml files: '*.xml' in the configured directory. The files are
+renamed by the loader when processed:
+
+&nbsp;&nbsp;&nbsp; _a.xml_ &nbsp; ➞ &nbsp; _a.xml.inProgress_ &nbsp; ➞ &nbsp; _a.xml.ok_ &nbsp; or &nbsp; _a.xml.failed_
+
+
+
 <h4 id="u__8__headers">headers</h4>
 
 **Since version:** `2.3` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional`   
@@ -87,7 +102,7 @@ HTTP headers to add to the request. Any header key, value can be inserted.
 | frequency                       |    `duration`   | How often the updates should be retrieved.                                                             | *Optional* | `"PT1M"`      |  2.0  |
 | requestorRef                    |     `string`    | The requester reference.                                                                               | *Optional* |               |  2.0  |
 | timeout                         |    `duration`   | The HTTP timeout to download the updates.                                                              | *Optional* | `"PT15S"`     |  2.0  |
-| url                             |     `string`    | The URL to send the HTTP requests to.                                                                  | *Required* |               |  2.0  |
+| [url](#u__9__url)               |     `string`    | The URL to send the HTTP requests to. Supports http/https and file protocol.                           | *Required* |               |  2.0  |
 | [headers](#u__9__headers)       | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted.                             | *Optional* |               |  2.3  |
 
 
@@ -104,6 +119,22 @@ Normally the planned departure time is used, so setting this to 10s will cause t
 SX-message to be included in trip-results 10 seconds before the the planned departure
 time.
 
+<h4 id="u__9__url">url</h4>
+
+**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required`   
+**Path:** /updaters/[9] 
+
+The URL to send the HTTP requests to. Supports http/https and file protocol.
+
+
+Use the file protocol to set a directory for reading updates from a directory. The file
+loader will look for xml files: '*.xml' in the configured directory. The files are
+renamed by the loader when processed:
+
+&nbsp;&nbsp;&nbsp; _a.xml_ &nbsp; ➞ &nbsp; _a.xml.inProgress_ &nbsp; ➞ &nbsp; _a.xml.ok_ &nbsp; or &nbsp; _a.xml.failed_
+
+
+
 <h4 id="u__9__headers">headers</h4>
 
 **Since version:** `2.3` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional`   

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -60,7 +60,6 @@ nav:
     - System Requirements and Suggestions: 'System-Requirements.md'
     - Preparing OSM Data: 'Preparing-OSM.md'
     - Netex and SIRI: 'Netex-Norway.md'
-    - Security: 'Security.md'
     - Troubleshooting: 'Troubleshooting-Routing.md'
     - Comparing OTP2 to OTP1: 'Version-Comparison.md'
 - APIs:

diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
 
 
     <properties>
-        <otp.serialization.version.id>122</otp.serialization.version.id>
+        <otp.serialization.version.id>123</otp.serialization.version.id>
         <!-- Lib versions - keep list sorted on property name -->
         <geotools.version>30.0</geotools.version>
         <google.dagger.version>2.48.1</google.dagger.version>
@@ -69,7 +69,7 @@
         <lucene.version>9.8.0</lucene.version>
         <slf4j.version>2.0.9</slf4j.version>
         <netex-java-model.version>2.0.14</netex-java-model.version>
-        <siri-java-model.version>1.22</siri-java-model.version>
+        <siri-java-model.version>1.25</siri-java-model.version>
         <jaxb-runtime.version>3.0.2</jaxb-runtime.version>
         <!-- Other properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -247,7 +247,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.2.1</version>
                 <dependencies>
                     <dependency>
                         <groupId>me.fabriciorby</groupId>
@@ -329,7 +329,7 @@
                   but we need the Maven project version as well, so we perform substitution. -->
                 <groupId>io.github.git-commit-id</groupId>
                 <artifactId>git-commit-id-maven-plugin</artifactId>
-                <version>6.0.0</version>
+                <version>7.0.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -721,7 +721,7 @@
         <dependency>
             <groupId>org.entur.gbfs</groupId>
             <artifactId>gbfs-java-model</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.11</version>
         </dependency>
 
         <!-- TESTING -->
@@ -913,7 +913,7 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java</artifactId>
-            <version>21.2</version>
+            <version>21.3</version>
         </dependency>
         <dependency>
             <groupId>com.graphql-java</groupId>

diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FareModelForTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FareModelForTest.java
@@ -1,14 +1,13 @@
 package org.opentripplanner.ext.fares.impl;
 
-import static org.opentripplanner.transit.model._data.TransitModelForTest.FEED_ID;
-import static org.opentripplanner.transit.model._data.TransitModelForTest.OTHER_AGENCY;
 import static org.opentripplanner.transit.model._data.TransitModelForTest.OTHER_FEED_AGENCY;
 import static org.opentripplanner.transit.model._data.TransitModelForTest.id;
 
 import org.opentripplanner.ext.fares.model.FareAttribute;
 import org.opentripplanner.ext.fares.model.FareRuleSet;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
+import org.opentripplanner.transit.model.basic.Money;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.Route;
@@ -57,15 +56,13 @@ public class FareModelForTest {
     .build();
   static FareAttribute TEN_DOLLARS = FareAttribute
     .of(id("airport-to-city-center"))
-    .setCurrencyType("USD")
-    .setPrice(10)
+    .setPrice(Money.usDollars(10))
     .setTransfers(0)
     .build();
 
   static FareAttribute OTHER_FEED_ATTRIBUTE = FareAttribute
     .of(FeedScopedId.ofNullable("F2", "other-feed-attribute"))
-    .setCurrencyType("USD")
-    .setPrice(10)
+    .setPrice(Money.usDollars(10))
     .setTransfers(1)
     .setAgency(OTHER_FEED_AGENCY.getId())
     .build();