Releases/v4.1

.gitignore

@@ -27,6 +27,8 @@ android/libs/graphhopper-*-android.jar
 !/core/src/test/resources/com/graphhopper/reader/osm/*.pbf
 *.dem
 *.log
+core/TODO*.txt
+core/files/dem*
 /logs
 srtmprovider/
 cgiarprovider/

.travis.yml

@@ -12,10 +12,10 @@ env:
 matrix:
   include:
     - jdk: openjdk8
-    - env: JDK='OpenJDK 16'
-      install: . ./install-jdk.sh -F 16 -C --url 'https://api.adoptopenjdk.net/v3/binary/latest/16/ga/linux/x64/jdk/hotspot/normal/adoptopenjdk'
     - env: JDK='OpenJDK 17'
-      install: . ./install-jdk.sh -F 17 -C --url 'https://api.adoptopenjdk.net/v3/binary/latest/17/ea/linux/x64/jdk/hotspot/normal/adoptopenjdk'
+      install: . ./install-jdk.sh -F 17 -C
+    - env: JDK='OpenJDK 18'
+      install: . ./install-jdk.sh -F ea -C
 
 # avoid default dependency command for maven, 'true' means 'return true' and continue
 install: true

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,4 @@
+- [ ] I have clearly marked my changes with comments '// ORS-GH MOD START' and '// ORS-GH MOD END'
+- [ ] I have written a short in-line comment for code changes explaining why the change is required
+- [ ] I have tested the latest version of **openrouteservice** `development` branch against the .jar build of this PR
+- [ ] I have adjusted failing tests in **openrouteservice** API tests

core/pom.xml

@@ -5,7 +5,7 @@
 
     <artifactId>graphhopper-core</artifactId>
     <name>GraphHopper Core</name>
-    <version>4.0</version>
+    <version>4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <description>
         GraphHopper is a fast and memory efficient Java road routing engine
@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>4.0</version>
+        <version>4.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -70,6 +70,19 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>ch.poole</groupId>
+            <artifactId>ConditionalRestrictionParser</artifactId>
+            <!-- TODO ORS: where is this defined? <version>${crparser.version}</version> -->
+            <version>0.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.poole</groupId>
+            <artifactId>OpeningHoursParser</artifactId>
+            <!-- TODO ORS: where is this defined? <version>${ohparser.version}</version> -->
+            <version>0.25.0</version>
+        </dependency>
+
         <!-- for using CGIAR: elevation data importing via tif files-->
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
@@ -93,14 +106,27 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>log4j-over-slf4j</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
+            <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j</artifactId>
+            <type>pom</type>
+            <version>2.17.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>us.dustinj.timezonemap</groupId>
+            <artifactId>timezonemap</artifactId>
+            <version>4.5</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -146,6 +172,14 @@
                     <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
 
         <!-- make version available at runtime via version file -->
@@ -170,4 +204,4 @@
             </resource>
         </resources>
     </build>
-</project>
+</project>

core/src/main/java/com/graphhopper/GraphHopper.java

@@ -40,6 +40,7 @@
 import com.graphhopper.routing.util.countryrules.CountryRuleFactory;
 import com.graphhopper.routing.util.parsers.DefaultTagParserFactory;
 import com.graphhopper.routing.util.parsers.TagParserFactory;
+import com.graphhopper.routing.weighting.TimeDependentAccessWeighting;
 import com.graphhopper.routing.weighting.Weighting;
 import com.graphhopper.routing.weighting.custom.CustomProfile;
 import com.graphhopper.routing.weighting.custom.CustomWeighting;
@@ -51,8 +52,10 @@
 import com.graphhopper.util.Parameters.Landmark;
 import com.graphhopper.util.Parameters.Routing;
 import com.graphhopper.util.details.PathDetailsBuilderFactory;
+import com.graphhopper.util.shapes.BBox;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import us.dustinj.timezonemap.TimeZoneMap;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -79,7 +82,9 @@
  */
 public class GraphHopper {
     private final Logger logger = LoggerFactory.getLogger(getClass());
-    private final Map<String, Profile> profilesByName = new LinkedHashMap<>();
+// ORS-GH MOD START change access private -> protected
+    protected final Map<String, Profile> profilesByName = new LinkedHashMap<>();
+// ORS-GH MOD END
     private final String fileLockName = "gh.lock";
     // utils
     private final TranslationMap trMap = new TranslationMap().doImport();
@@ -125,6 +130,24 @@ public class GraphHopper {
     private TagParserFactory tagParserFactory = new DefaultTagParserFactory();
     private PathDetailsBuilderFactory pathBuilderFactory = new PathDetailsBuilderFactory();
 
+    // ORS-GH MOD START
+    protected PathProcessorFactory pathProcessorFactory = PathProcessorFactory.DEFAULT;
+    protected WeightingFactory weightingFactory;
+    protected GraphStorageFactory graphStorageFactory;
+
+    public void setPathProcessorFactory(PathProcessorFactory newFactory) {
+        this.pathProcessorFactory = newFactory;
+    }
+
+    public void setWeightingFactory(WeightingFactory weightingFactory) {
+        this.weightingFactory = weightingFactory;
+    }
+
+    public void setGraphStorageFactory(GraphStorageFactory graphStorageFactory) {
+        this.graphStorageFactory = graphStorageFactory;
+    }
+    // ORS-GH MOD END
+
     public EncodingManager.Builder getEncodingManagerBuilder() {
         return emBuilder;
     }
@@ -283,6 +306,18 @@ public GraphHopper setElevation(boolean includeElevation) {
         return this;
     }
 
+    // ORS-GH MOD START
+    // CALT
+    @Deprecated
+    public boolean isSimplifyResponse() {
+        return getRouterConfig().isSimplifyResponse();
+    }
+
+    public boolean isFullyLoaded() {
+        return fullyLoaded;
+    }
+    // ORS-GH MOD END
+
     /**
      * Sets the distance distance between elevation samples on long edges
      */
@@ -694,7 +729,7 @@ protected void importOSM() {
         AreaIndex<CustomArea> areaIndex = new AreaIndex<>(customAreas);
 
         logger.info("start creating graph from " + osmFile);
-        OSMReader reader = new OSMReader(ghStorage).setFile(_getOSMFile()).
+        OSMReader reader = createOSMReader().setFile(_getOSMFile()).
                 setAreaIndex(areaIndex).
                 setElevationProvider(eleProvider).
                 setWorkerThreads(dataReaderWorkerThreads).
@@ -715,6 +750,12 @@ protected void importOSM() {
             ghStorage.getProperties().put("datareader.data.date", f.format(reader.getDataDate()));
     }
 
+    // ORS-GH MOD START add method for overriding
+    protected  OSMReader createOSMReader() {
+        return new OSMReader(ghStorage);
+    }
+    // ORS-GH MOD END
+
     private List<CustomArea> readCustomAreas() {
         ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.registerModule(new JtsModule());
@@ -783,7 +824,14 @@ public boolean load(String graphHopperFolder) {
         }
 
         GHDirectory dir = new GHDirectory(ghLocation, dataAccessType);
-        ghStorage = new GraphHopperStorage(dir, encodingManager, hasElevation(), encodingManager.needsTurnCostsSupport(), defaultSegmentSize);
+
+        // ORS-GH MOD START use storage factory in ORSGraphHopper
+        if (graphStorageFactory != null) {
+            ghStorage = graphStorageFactory.createStorage(dir, this);
+        } else {
+            ghStorage = new GraphHopperStorage(dir, encodingManager, hasElevation(), encodingManager.needsTurnCostsSupport(), defaultSegmentSize);
+        }
+        // ORS-GH MOD END
         checkProfilesConsistency();
 
         if (lmPreparationHandler.isEnabled())
@@ -799,6 +847,10 @@ public boolean load(String graphHopperFolder) {
 
         ghStorage.addCHGraphs(chConfigs);
 
+// ORS-GH MOD START add preparation hook
+        loadORS();
+// ORS-GH MOD START
+
         if (!new File(graphHopperFolder).exists())
             return false;
 
@@ -825,6 +877,10 @@ public boolean load(String graphHopperFolder) {
         }
     }
 
+// ORS-GH MOD START add preparation hook
+    protected void loadORS() {}
+// ORS-GH MOD START
+
     private void checkProfilesConsistency() {
         EncodingManager encodingManager = getEncodingManager();
         for (Profile profile : profilesByName.values()) {
@@ -892,7 +948,9 @@ public final CHPreparationHandler getCHPreparationHandler() {
         return chPreparationHandler;
     }
 
-    private void initCHPreparationHandler() {
+// ORS-GH MOD START change access private -> protected
+    protected void initCHPreparationHandler() {
+// ORS-GH MOD END
         if (chPreparationHandler.hasCHConfigs()) {
             return;
         }
@@ -978,8 +1036,13 @@ protected void postProcessing(boolean closeEarly) {
         } else {
             prepareCH(closeEarly);
         }
+// ORS-GH MOD START add post processing hook
+        postProcessingHook(closeEarly);
     }
 
+    protected void postProcessingHook(boolean closeEarly) {}
+// ORS-GH MOD END
+
     protected void importPublicTransit() {
     }
 
@@ -1019,6 +1082,23 @@ protected WeightingFactory createWeightingFactory() {
         return new DefaultWeightingFactory(ghStorage, getEncodingManager());
     }
 
+    // ORS-GH MOD START - additional method
+    /**
+     * Potentially wraps the specified weighting into a TimeDependentAccessWeighting.
+     */
+    public Weighting createTimeDependentAccessWeighting(Weighting weighting, String algo) {
+        FlagEncoder flagEncoder = weighting.getFlagEncoder();
+        if (encodingManager.hasEncodedValue(EncodingManager.getKey(flagEncoder, ConditionalEdges.ACCESS)) && isAlgorithmTimeDependent(algo))
+            return new TimeDependentAccessWeighting(weighting, ghStorage, flagEncoder);
+        else
+            return weighting;
+    }
+    // ORS-GH MOD END
+
+    private boolean isAlgorithmTimeDependent(String algo) {
+        return ("td_dijkstra".equals(algo) || "td_astar".equals(algo)) ? true : false;
+    }
+
     public GHResponse route(GHRequest request) {
         return createRouter().route(request);
     }
@@ -1082,11 +1162,15 @@ private boolean isCHPrepared() {
         return "true".equals(ghStorage.getProperties().get(CH.PREPARE + "done"));
     }
 
-    private String getProfileVersion(String profile) {
+// ORS-GH MOD START change access private -> protected
+    protected String getProfileVersion(String profile) {
+// ORS-GH MOD END
         return ghStorage.getProperties().get("graph.profiles." + profile + ".version");
     }
 
-    private void setProfileVersion(String profile, int version) {
+// ORS-GH MOD START change access private -> protected
+    protected void setProfileVersion(String profile, int version) {
+// ORS-GH MOD END
         ghStorage.getProperties().put("graph.profiles." + profile + ".version", version);
     }
 
@@ -1223,4 +1307,4 @@ public boolean getFullyLoaded() {
     public RouterConfig getRouterConfig() {
         return routerConfig;
     }
-}
+}

core/src/main/java/com/graphhopper/coll/GHLongArrayList.java

@@ -0,0 +1,49 @@
+/*
+ *  Licensed to GraphHopper GmbH under one or more contributor
+ *  license agreements. See the NOTICE file distributed with this work for
+ *  additional information regarding copyright ownership.
+ *
+ *  GraphHopper GmbH licenses this file to you under the Apache License,
+ *  Version 2.0 (the "License"); you may not use this file except in
+ *  compliance with the License. You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package com.graphhopper.coll;
+
+import com.carrotsearch.hppc.LongArrayList;
+
+/**
+ * @author Andrzej Oles
+ */
+public class GHLongArrayList extends LongArrayList {
+    public GHLongArrayList() {
+        super(10);
+    }
+
+    public GHLongArrayList(int capacity) {
+        super(capacity);
+    }
+
+    public GHLongArrayList(GHLongArrayList list) {
+        super(list);
+    }
+
+    public final GHLongArrayList reverse() {
+        final long[] buffer = this.buffer;
+        long tmp;
+        for (int start = 0, end = size() - 1; start < end; start++, end--) {
+            // swap the values
+            tmp = buffer[start];
+            buffer[start] = buffer[end];
+            buffer[end] = tmp;
+        }
+        return this;
+    }
+}