Pull in upstream

.github/workflows/build.yml

@@ -2,33 +2,33 @@ name: Build and Test
 on: push
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ 21, 22-ea  ]
+        java-version: [ 25, 26-ea ]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java-version }}
           distribution: temurin
       - name: Cache Maven artifacts
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Cache node
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: web-bundle/node
           key: ${{ runner.os }}-node-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os}}-node-
       - name: Cache node_modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: web-bundle/node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('**/pom.xml', '**/package.json') }}

.github/workflows/publish-github-packages.yml

@@ -9,32 +9,32 @@ on:
 jobs:
   publish:
     if: github.repository_owner == 'graphhopper'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
       - name: Cache Maven artifacts
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Cache node
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: web-bundle/node
           key: ${{ runner.os }}-node-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os}}-node-
       - name: Cache node_modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: web-bundle/node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('**/pom.xml', '**/package.json') }}

.github/workflows/publish-maven-central.yml

@@ -8,10 +8,10 @@ on:
 jobs:
   maven-central-publish:
     if: github.repository_owner == 'graphhopper'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
@@ -23,21 +23,21 @@ jobs:
           gpg-passphrase: GPG_PASSPHRASE
 
       - name: Cache Maven artifacts
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Cache node
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: web-bundle/node
           key: ${{ runner.os }}-node-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os}}-node-
       - name: Cache node_modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: web-bundle/node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('**/pom.xml', '**/package.json') }}
@@ -53,6 +53,6 @@ jobs:
           mvn -B versions:set -DnewVersion=$GITHUB_REF_NAME -DgenerateBackupPoms=false
           mvn deploy -P release -DskipTests=true -Dpgp.secretkey=keyring:id=0E2FBADB -B
         env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

.github/workflows/trigger-benchmarks.yml

@@ -3,7 +3,7 @@ on: push
 jobs:
   trigger_measurement:
     if: github.repository_owner == 'graphhopper'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     environment: benchmarks
     steps:
       - name: trigger

.gitignore

@@ -42,4 +42,5 @@ local.properties
 **/node_modules
 .DS_Store
 /graph-cache
-package-lock.json
+package-lock.json
+.vscode/

CHANGELOG.md

@@ -1,5 +1,43 @@
-### 9.0 [not yet released]
-
+### 12.0 [not yet released]
+
+- weightings are now expected to return whole numbers, the built-in weightings (most importantly CustomWeighting) now return x10 their previous value (#3297) 
+- the default value for `graph.elevation.clear` changed to false as is much better when the cached tiles can be reused
+- artificial tag way_distance does no longer include the elevation => renamed to way_distance_2d
+- new edge.getDistance_mm/setDistance_mm methods for exact millimeter distances; distance accumulation now uses exact long arithmetic instead of lossy double summation (#3286)
+- OSMReader no longer sets the artificial speed_from_duration tag but instead uses duration_in_seconds, when the duration tag is present (#3266)
+- country rules were moved into parsers and are now enabled by default
+- speeds generated from highway class now respects country-specific default speed limits, but the max_speed encoded value is now required; see #3249
+
+### 11.0 [14 Oct 2025]
+
+- country-dependent toll rules are now always enabled. in the absence of explicit tags or special toll rules we use Toll.NO instead of Toll.MISSING #3111
+- max_weight_except: changed NONE to MISSING
+- the list of restrictions for BIKE returned from OSMRoadAccessParser.toOSMRestrictions is again `[bicycle, vehicle, access]` and not `[bicycle, access]` like before #2981
+- road_access now contains value of highest transportation mode for CAR, i.e. access=private, motorcar=yes will now return YES and not PRIVATE
+- car.json by default avoids private roads
+- maxspeed<5 is ignored, maxspeed=none is ignored with some exceptions, maxspeed parsing and related constants were renamed #3077
+- improved performance by sorting graph during import, #3177
+- trunk roads in Austria are no longer considered to be toll roads by default
+
+### 10.0 [5 Nov 2024]
+
+- The config-example.yml uses a non-empty snap_preventions default array: [tunnel, bridge and ferry] for the /route endpoint
+- the default u-turn time is now 0, the default u-turn weight is still infinite 
+- turn restriction support for restrictions with overlapping and/or multiple via-edges/ways, #3030
+- constructor of BaseGraph.Builder uses byte instead of integer count.
+- KeyValue is now KValue as it holds the value only. Note, the two parameter constructor uses one value for the forward and one for the backward direction (and no longer "key, value")
+- sac_scale priority handling for bicycles moved to the bike custom models
+
+### 9.0 [23 Apr 2024]
+
+- max_slope is now a signed decimal, see #2955
+- move sac_scale handling out of foot_access parser and made foot safer via lowering to sac_scale<2, same for hike sac_scale<5
+- removed shortest+fastest weightings, #2938
+- u_turn_costs information is no longer stored in profile. Use the TurnCostsConfig instead
+- the custom models do no longer include the speed, access and priority encoded values only implicitly, see docs/migration/config-migration-08-09.md
+- conditional access restriction tags are no longer considered from vehicle tag parsers and instead a car_temporal_access encoded value (similarly for bike + foot) can be used in a custom model. This fixes #2477. More details are accessible via path details named according to the OSM tags e.g. for access:conditional it is "access_conditional" (i.e. converted from OSM access:conditional). See #2863 and #2965.
+- replaced (Vehicle)EncodedValueFactory and (Vehicle)TagParserFactory with ImportRegistry, #2935
+- encoded values used in custom models are added automatically, no need to add them to graph.encoded_values anymore, #2935
 - removed the ability to sort the graph (graph.do_sort) due to incomplete support, #2919
 - minor changes for import hooks, #2917
 - removed wheelchair vehicle and related parsers, with currently no complete replacement as it needs to be redone properly with a custom model

CONTRIBUTORS.md

@@ -11,6 +11,7 @@ Here is an overview:
  * Anvoker, fixes like #1614 and helped with JUnit 5 migration #1632 
  * b3nn0, Android improvements
  * baumboi, path detail and landmark improvements
+ * baybatu, improved error for EncodingManager
  * boldtrn, one of the core developers with motorcycle knowledge :)
  * bt90, fixes like #2786
  * cgarreau, increase of routing success rate via subnetwork cleanup
@@ -19,6 +20,7 @@ Here is an overview:
  * ChristophKaser, agrees to the project's CLA, improved Android compatibility #1207
  * Christoph Lingg, elevation smoothing #2772
  * chucre, add special JSON output format, see #41
+ * ctriley, added busway support
  * daisy1754, fixed usage of graphhopper.sh script
  * dardin88, instructions improved
  * dewos, web API bug fixes
@@ -40,11 +42,15 @@ Here is an overview:
  * highsource, more efficient geometry update, UI fixes
  * hoofstephan, bug fix   
  * IsNull, improvements like #708
+ * IldarKhayrutdinov, use cache on different machines
+ * james-willis, improved isochrones triangulation robustness
  * Janekdererste, GUI for public transit
  * jansoe, many improvements regarding A* algorithm, forcing direction, roundabouts etc
  * jansonhanson, general host config
+ * jessLryan, max elevation can now be negative
  * joe-akeem, improvements like #2158
  * JohannesPelzer, improved GPX information and various other things
+ * karololszacki, introduce `navigation_mode` option for Profiles to easily set which Voice Guidance distances to use
  * karussell, one of the core developers
  * khuebner, initial turn costs support
  * kodonnell, adding support for CH and other algorithms (#60) and penalizing inner-link U-turns (#88)
@@ -58,14 +64,18 @@ Here is an overview:
  * michaz, one of the core developers
  * mprins, improvements for travis CI and regarding JDK9 #806
  * msbarry, fixes like #1733
+ * nakaner, documentation
  * naser13, fixes like #1923
  * njanakiev, fixes like #1560
  * NopMap, massive improvements regarding OSM, parsing and encoding, route relations
  * ocampana, initial implementation for instructions
  * oflebbe, work on iOS port and issues like #2060
  * OlafFlebbeBosch, improvements like #2730
+ * osamaalmaani, added missing config option for graph.encoded_values in the config-example.yml file
  * oschlueter, fixes like #1185
  * otbutz, added multiple EncodedValues
+ * PabloaRuiz, pt_BR 1i8n improvements
+ * pantsleftinwash, speed parsing improvements
  * PGWelch, shapefile reader #874
  * rafaelstelles, fix deserializer web-api
  * rajanski, script to do routing via PostGIS
@@ -83,8 +93,12 @@ Here is an overview:
  * Svantulden, improved documentation and nearest API
  * taulinger, hopefully more to come 
  * thehereward, code cleanups like #620
+ * tyrasd, improved toll road handling in Austria #3190
+ * Vectorial1024, country-specific speed limit issues like #3244, #3248
  * vvikas, ideas for many to many improvements and #616
  * zstadler, multiple fixes and car4wd
+ * binora, fix mode in navigation response converter
+ * jwltrr, fixed pillar node limits
 
 ## Translations
 

NOTICE.md

@@ -2,28 +2,31 @@
 
 GraphHopper licensed under the Apache license, Version 2.0
 
-Copyright 2012 - 2022 GraphHopper GmbH
+Copyright 2012 - 2026 GraphHopper GmbH
 
 The core module includes the following additional software:
 
  * slf4j.org - SLF4J distributed under the MIT license. 
  * com.carrotsearch:hppc (Apache license)
- * SparseArray from the Android project (Apache license)
  * Snippets regarding mmap, vint/vlong and compression from Lucene (Apache license)
  * XMLGraphics-Commons for CGIAR elevation files (Apache License)
- * Apache Commons Lang - we copied the implementation of the Levenshtein Distance (Apache License)
- * Apache Commons Collections - we copied parts of the BinaryHeap (Apache License)
+ * libwebp from Google for PMTiles (BSD-3-Clause license)
+ * com.github.usefulness:webp-imageio for PMTiles (Apache license)
+ * Apache Commons Lang - we copied the implementation of the Levenshtein Distance - see com.graphhopper.apache.commons.lang3 (Apache License)
+ * Apache Commons Collections - we copied parts of the BinaryHeap - see com.graphhopper.apache.commons.collections (Apache License)
  * java-string-similarity - we copied the implementation of JaroWinkler (MIT license)
  * Jackson (Apache License)
- * org.locationtech:jts (EDL), see #1039
+ * org.locationtech:jts (EDL)
  * AngleCalc.atan2 from Jim Shima, 1999 (public domain)
  * janino compiler (BSD-3-Clause license)
- * protobuf - New BSD license
- * OSM-binary - LGPL license
+ * osm-legal-default-speeds-jvm (BSD-3-Clause license)
+ * kotlin stdlib (Apache License)
+ * protobuf from Google - (BSD-3-Clause license)
+ * OSM-binary - (LGPL license)
  * Osmosis - public domain, see their github under package/copying.txt
 
 reader-gtfs:
- 
+
  * some files from com.conveyal:gtfs-lib (BSD 2-clause license)
  * com.google.transit:gtfs-realtime-bindings (Apache license)
  * com.google.guava:guava (Apache license)
@@ -43,8 +46,7 @@ web:
 
  * org.eclipse.jetty:jetty-server (Apache License)
  * Dropwizard and dependencies (Apache license)
- * no.ecc:java-vector-tile (Apache license)
- * some images from mapbox https://www.mapbox.com/maki/, BSD License, see core/files
+ * classes in no.ecc are a copy of no.ecc.vectortile:java-vector-tile, see #2698 (Apache license)
 
 ## Data