Created
November 20, 2019 22:32
-
-
Save karussell/84d29b3254a6c92a8122c5737ebdc2c8 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/core/src/main/java/com/graphhopper/GraphHopper.java b/core/src/main/java/com/graphhopper/GraphHopper.java | |
index 673b1880c..6207e5f26 100644 | |
--- a/core/src/main/java/com/graphhopper/GraphHopper.java | |
+++ b/core/src/main/java/com/graphhopper/GraphHopper.java | |
@@ -82,7 +82,7 @@ public class GraphHopper implements GraphHopperAPI { | |
private final String fileLockName = "gh.lock"; | |
private final Set<RoutingAlgorithmFactoryDecorator> algoDecorators = new LinkedHashSet<>(); | |
// utils | |
- private final TranslationMap trMap = new TranslationMap().doImport(); | |
+ private final TranslationMap trMap; | |
boolean removeZipped = true; | |
// for graph: | |
private GraphHopperStorage ghStorage; | |
@@ -129,6 +129,11 @@ public class GraphHopper implements GraphHopperAPI { | |
private PathDetailsBuilderFactory pathBuilderFactory = new PathDetailsBuilderFactory(); | |
public GraphHopper() { | |
+ this(new TranslationMap().doImport()); | |
+ } | |
+ | |
+ public GraphHopper(TranslationMap tr) { | |
+ trMap = tr; | |
chFactoryDecorator.setEnabled(true); | |
lmFactoryDecorator.setEnabled(false); | |
diff --git a/reader-osm/src/main/java/com/graphhopper/reader/osm/GraphHopperOSM.java b/reader-osm/src/main/java/com/graphhopper/reader/osm/GraphHopperOSM.java | |
index 0f985a597..8f61ed429 100644 | |
--- a/reader-osm/src/main/java/com/graphhopper/reader/osm/GraphHopperOSM.java | |
+++ b/reader-osm/src/main/java/com/graphhopper/reader/osm/GraphHopperOSM.java | |
@@ -21,8 +21,12 @@ import com.graphhopper.GraphHopper; | |
import com.graphhopper.json.geo.JsonFeatureCollection; | |
import com.graphhopper.reader.DataReader; | |
import com.graphhopper.routing.lm.PrepareLandmarks; | |
-import com.graphhopper.routing.util.spatialrules.*; | |
+import com.graphhopper.routing.util.spatialrules.DefaultSpatialRule; | |
+import com.graphhopper.routing.util.spatialrules.SpatialRule; | |
+import com.graphhopper.routing.util.spatialrules.SpatialRuleLookup; | |
+import com.graphhopper.routing.util.spatialrules.SpatialRuleLookupBuilder; | |
import com.graphhopper.storage.GraphHopperStorage; | |
+import com.graphhopper.util.TranslationMap; | |
import com.graphhopper.util.shapes.Polygon; | |
import java.util.List; | |
@@ -40,6 +44,11 @@ public class GraphHopperOSM extends GraphHopper { | |
this(null); | |
} | |
+ public GraphHopperOSM(TranslationMap tr, JsonFeatureCollection landmarkSplittingFeatureCollection) { | |
+ super(tr); | |
+ this.landmarkSplittingFeatureCollection = landmarkSplittingFeatureCollection; | |
+ } | |
+ | |
public GraphHopperOSM(JsonFeatureCollection landmarkSplittingFeatureCollection) { | |
super(); | |
this.landmarkSplittingFeatureCollection = landmarkSplittingFeatureCollection; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment