Upstream merge 2023-09-21

.github/workflows/cibuild.yml

@@ -166,9 +166,9 @@ jobs:
 
           if [ ${{ github.ref }} = 'refs/heads/master' ]; 
           then
-            mike deploy --branch $LOCAL_BRANCH --prefix en --title=$MASTER_BRANCH_VERSION --update-aliases v$MASTER_BRANCH_VERSION latest
+            mike deploy --branch $LOCAL_BRANCH --deploy-prefix en --title=$MASTER_BRANCH_VERSION --update-aliases v$MASTER_BRANCH_VERSION latest
           else
-            mike deploy --branch $LOCAL_BRANCH --prefix en dev-2.x
+            mike deploy --branch $LOCAL_BRANCH --deploy-prefix en dev-2.x
           fi
 
           # commit and push the GraphQL documentation if the schema file is newer than the 
@@ -218,7 +218,7 @@ jobs:
         run: mvn --batch-mode compile -DskipTests -P prettierSkip
 
   container-image:
-    if: github.repository_owner == 'opentripplanner' && github.event_name == 'push' && github.ref == 'refs/heads/dev-2.x'
+    if: github.repository_owner == 'opentripplanner' && github.event_name == 'push' && (github.ref == 'refs/heads/dev-2.x' || github.ref == 'refs/heads/master')
     runs-on: ubuntu-latest
     needs:
       - build-linux
@@ -244,7 +244,14 @@ jobs:
 
           version_with_snapshot=`mvn -q help:evaluate -Dexpression=project.version -q -DforceStdout`
           version=${version_with_snapshot/-SNAPSHOT/}
-          image_date=`date +%Y-%m-%dT%H-%M`
-          image_version="${version}_${image_date}"
+
+          image_version=${version}
+
+          ## if the Maven version contains SNAPSHOT, then add date to tag
+          if [[ $version_with_snapshot == *"SNAPSHOT"* ]]; then
+            image_date=`date +%Y-%m-%dT%H-%M`
+            image_version="${version}_${image_date}"
+            echo "Maven version ${version_with_snapshot} contains SNAPSHOT, adding date to container image tag"
+          fi
 
           mvn --batch-mode -P prettierSkip compile com.google.cloud.tools:jib-maven-plugin:build -Djib.to.tags=latest,$image_version

.gitignore

@@ -44,6 +44,8 @@ src/ext/resources/reportapi/report.csv
 
 streetGraph.obj
 graph.obj
+# IntelliJ creates these pid files when you attach the debugger to tests
+.attach_pid*
 
 smoke-tests/*.jar
 smoke-tests/**/*.obj

doc-templates/Configuration.md

@@ -146,7 +146,7 @@ text inserted is valid JSON (starts with `{` and ends with `}`).
 Variable substitution is performed on configuration file after the include file directive; Hence
 variable substitution is also performed on the text in the injected file.
 
-Here is an example including variable substitution, assuming version 2.3.0 of OTP:
+Here is an example including variable substitution, assuming version 2.4.0 of OTP:
 
 ```JSON
 // build-config.json
@@ -170,7 +170,7 @@ The result will look like this:
 {
       "transitFeeds": [
         {
-          "source": "netex-v2.3.0.obj"
+          "source": "netex-v2.4.0.obj"
         }
       ]
 } 

docs/Basic-Tutorial.md

@@ -18,9 +18,9 @@ JAR containing all other libraries needed for OTP to work, and is available from
 repository. You will be able to go
 to [the OTP directory at Maven Central](https://repo1.maven.org/maven2/org/opentripplanner/otp/),
 navigate to
-the [directory of releases](https://repo1.maven.org/maven2/org/opentripplanner/otp/2.3.0/),
+the [directory of releases](https://repo1.maven.org/maven2/org/opentripplanner/otp/2.4.0/),
 and download
-the [file with `shaded.jar` suffix](https://repo1.maven.org/maven2/org/opentripplanner/otp/2.3.0/otp-2.3.0-shaded.jar)
+the [file with `shaded.jar` suffix](https://repo1.maven.org/maven2/org/opentripplanner/otp/2.4.0/otp-2.4.0-shaded.jar)
 .
 
 You may also want to get your own copy of the OTP source code
@@ -127,7 +127,7 @@ below and in other tutorials.
 The simplest way to use OTP is to build a graph in a single step and start a server immediately,
 without saving it to disk. The command to do so is:
 
-    $ java -Xmx2G -jar otp-2.3.0-shaded.jar --build --serve /home/username/otp
+    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --build --serve /home/username/otp
 
 where `/home/username/otp` should be the directory where you put your configuration and input files.
 
@@ -151,13 +151,13 @@ build a graph from street and transit data then save it to a file using the `--b
 command line parameters together. If for example your current working directory (`.`) contains the
 input files and the OTP JAR file, you can use this command:
 
-    $ java -Xmx2G -jar otp-2.3.0-shaded.jar --build --save .
+    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --build --save .
 
 This will produce a file called `graph.obj` in the same directory as the inputs. The server can then
 be started later using the `--load` parameter, and will read this file instead of building the graph
 from scratch:
 
-    $ java -Xmx2G -jar otp-2.3.0-shaded.jar --load .
+    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --load .
 
 Another reason to perform these two phases separately is that the building process loads the entire
 GTFS and OSM data sets into memory, so can require significantly more memory than just running a
@@ -174,16 +174,16 @@ graph once, and then layer transit data on top of the streets to make the final
 Again assuming the input files and OTP JAR file are in the current working directory, you can build
 a street graph with OSM and elevation data only (ignoring transit input files) with this command:
 
-    $ java -Xmx2G -jar otp-2.3.0-shaded.jar --buildStreet .
+    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --buildStreet .
 
 Then, to build a graph layering transit data on top of the saved street graph (built using the
 previous command):
 
-    $ java -Xmx2G -jar otp-2.3.0-shaded.jar --loadStreet --save .
+    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --loadStreet --save .
 
 Finally, the server can be started using the `--load` parameter:
 
-    $ java -Xmx2G -jar otp-2.3.0-shaded.jar --load .
+    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --load .
 
 ## Command Line Switches
 

docs/BuildConfiguration.md

@@ -20,8 +20,6 @@ Sections follow that describe particular settings in more depth.
 | Config Parameter                                                         |     Type    | Summary                                                                                                                                                        |  Req./Opt. | Default Value                     | Since |
 |--------------------------------------------------------------------------|:-----------:|----------------------------------------------------------------------------------------------------------------------------------------------------------------|:----------:|-----------------------------------|:-----:|
 | [areaVisibility](#areaVisibility)                                        |  `boolean`  | Perform visibility calculations.                                                                                                                               | *Optional* | `false`                           |  1.5  |
-| banDiscouragedBiking                                                     |  `boolean`  | Should biking be allowed on OSM ways tagged with `bicycle=discouraged`                                                                                         | *Optional* | `false`                           |  2.0  |
-| banDiscouragedWalking                                                    |  `boolean`  | Should walking be allowed on OSM ways tagged with `foot=discouraged`                                                                                           | *Optional* | `false`                           |  2.0  |
 | [buildReportDir](#buildReportDir)                                        |    `uri`    | URI to the directory where the graph build report should be written to.                                                                                        | *Optional* |                                   |  2.0  |
 | [configVersion](#configVersion)                                          |   `string`  | Deployment version of the *build-config.json*.                                                                                                                 | *Optional* |                                   |  2.1  |
 | [dataImportReport](#dataImportReport)                                    |  `boolean`  | Generate nice HTML report of Graph errors/warnings                                                                                                             | *Optional* | `false`                           |  2.0  |