ORS modifications

Author: takb

.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/

api/src/main/java/com/graphhopper/GHRequest.java

@@ -26,6 +26,11 @@
 import java.util.List;
 import java.util.Locale;
 
+// ORS-GH MOD START
+// further imports
+import com.graphhopper.util.PMap;
+// ORS-GH MOD END
+
 /**
  * Request object to perform routing with GraphHopper.
  *
@@ -47,6 +52,11 @@ public class GHRequest {
     private Locale locale = Locale.US;
     private CustomModel customModel;
 
+    // ORS-GH MOD START
+    // add class member
+    private double[] maxSearchDistances;
+    // ORS-GH MOD END
+
     public GHRequest() {
         this(5);
     }
@@ -276,4 +286,24 @@ public String toString() {
 
         return res;
     }
+
+    // ORS-GH MOD START
+    private PMap additionalHints;
+    public void  setAdditionalHints (PMap hints) {
+        this.additionalHints = hints;
+    }
+    public PMap getAdditionalHints() {
+        return this.additionalHints;
+    }
+
+    // Modification by Maxim Rylov: Added getMaxSearchDistances method.
+    public double[] getMaxSearchDistances() {
+        return maxSearchDistances;
+    }
+
+    // Modification by Maxim Rylov: Added setMaxSearchDistances method.
+    public void setMaxSearchDistance(double[] distances) {
+        maxSearchDistances = distances;
+    }
+    // ORS-GH MOD END
 }

api/src/main/java/com/graphhopper/GHResponse.java

@@ -34,6 +34,19 @@ public class GHResponse {
     private final List<ResponsePath> responsePaths = new ArrayList<>(5);
     private String debugInfo = "";
 
+    // ORS-GH MOD START - additional field used for extra info processing
+    private final List<Object> objects = new ArrayList<>(1);
+
+    public GHResponse addReturnObject(Object obj) {
+        this.objects.add(obj);
+        return this;
+    }
+
+    public List<Object> getReturnObjects() {
+        return objects;
+    }
+    // ORS-GH MOD END
+
     public GHResponse() {
     }
 

api/src/main/java/com/graphhopper/util/Parameters.java

@@ -36,6 +36,10 @@ public static final class Algorithms {
          * Unidirectional Dijkstra (not for CH)
          */
         public static final String DIJKSTRA = "dijkstra";
+        /**
+         * Unidirectional time-dependent Dijkstra
+         */
+        public static final String TD_DIJKSTRA = "td_dijkstra";
         /**
          * one to many Dijkstra (not yet for edge based #394, not yet for CH)
          */
@@ -44,6 +48,10 @@ public static final class Algorithms {
          * Unidirectional A* (not for CH)
          */
         public static final String ASTAR = "astar";
+        /**
+         * Unidirectional time-dependent A* (not for CH)
+         */
+        public static final String TD_ASTAR = "td_astar";
         /**
          * Bidirectional A*
          */
@@ -131,6 +139,10 @@ public static final class Routing {
          * a rectangle lat1,lon1,lat2,lon2
          */
         public static final String BLOCK_AREA = "block_area";
+        /**
+         * time-dependent routing requires compatible algorithm and weighting
+         */
+        public static final String TIME_DEPENDENT = "time_dependent";
     }
 
     /**

core/pom.xml

@@ -54,6 +54,19 @@
             <artifactId>jts-core</artifactId>
             <version>1.15.1</version>
         </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>
@@ -91,6 +104,18 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.graphhopper</groupId>
+            <artifactId>graphhopper-api</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>us.dustinj.timezonemap</groupId>
+            <artifactId>timezonemap</artifactId>
+            <version>3.2</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -136,6 +161,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 -->
@@ -160,4 +193,4 @@
             </resource>
         </resources>
     </build>
-</project>
+</project>