Merge graphhopper#2437

Author: aoles

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### 5.0 [not yet released]
 
+- use GraphHopper#setGraphHopperLocation before calling load() instead of GraphHopper#load(graphHopperLocation) (#2437)
 - barrier nodes at junctions are now ignored (#2433)
 - AbstractFlagEncoder#handleNodeTags was replaced by AbstractFlagEncoder#isBarrier (#2434)
 - consider heading when snapping coordinates to the road network, this is especially important for navigation (#2411)

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

@@ -46,7 +46,6 @@ public class CHPreparationHandler {
     // we first add the profiles and later read them to create the config objects (because they require
     // the actual Weightings)
     private final List<CHProfile> chProfiles = new ArrayList<>();
-    private final List<CHConfig> chConfigs = new ArrayList<>();
     private int preparationThreads;
     private ExecutorService threadPool;
 // ORS-GH MOD START change visibility private-> protected and allow overriding String constants
@@ -74,57 +73,7 @@ public void init(GraphHopperConfig ghConfig) {
     }
 
     public final boolean isEnabled() {
-        return !chProfiles.isEmpty() || !chConfigs.isEmpty() || !preparations.isEmpty();
-    }
-
-    /**
-     * Decouple CH profiles from PrepareContractionHierarchies as we need CH profiles for the
-     * graphstorage and the graphstorage for the preparation.
-     */
-    public CHPreparationHandler addCHConfig(CHConfig chConfig) {
-        chConfigs.add(chConfig);
-        return this;
-    }
-
-    public CHPreparationHandler addPreparation(PrepareContractionHierarchies pch) {
-        // we want to make sure that CH preparations are added in the same order as their corresponding profiles
-        if (preparations.size() >= chConfigs.size()) {
-            throw new IllegalStateException("You need to add the corresponding CH configs before adding preparations.");
-        }
-        CHConfig expectedConfig = chConfigs.get(preparations.size());
-        if (!pch.getCHConfig().equals(expectedConfig)) {
-            throw new IllegalArgumentException("CH config of preparation: " + pch + " needs to be identical to previously added CH config: " + expectedConfig);
-        }
-        preparations.add(pch);
-        return this;
-    }
-
-    public final boolean hasCHConfigs() {
-        return !chConfigs.isEmpty();
-    }
-
-    public List<CHConfig> getCHConfigs() {
-        return chConfigs;
-    }
-
-    public List<CHConfig> getNodeBasedCHConfigs() {
-        List<CHConfig> result = new ArrayList<>();
-        for (CHConfig chConfig : chConfigs) {
-            if (!chConfig.getTraversalMode().isEdgeBased()) {
-                result.add(chConfig);
-            }
-        }
-        return result;
-    }
-
-    public List<CHConfig> getEdgeBasedCHConfigs() {
-        List<CHConfig> result = new ArrayList<>();
-        for (CHConfig chConfig : chConfigs) {
-            if (chConfig.getTraversalMode().isEdgeBased()) {
-                result.add(chConfig);
-            }
-        }
-        return result;
+        return !chProfiles.isEmpty() || !preparations.isEmpty();
     }
 
     public CHPreparationHandler setCHProfiles(CHProfile... chProfiles) {
@@ -206,14 +155,11 @@ public void prepare(final StorableProperties properties, final boolean closeEarl
     }
 
     public void createPreparations(GraphHopperStorage ghStorage) {
-        if (!isEnabled() || !preparations.isEmpty())
-            return;
-        if (!hasCHConfigs())
-            throw new IllegalStateException("No CH profiles found");
-
+        if (!preparations.isEmpty())
+            throw new IllegalStateException("CH preparations were created already");
         LOGGER.info("Creating CH preparations, {}", getMemInfo());
-        for (CHConfig chConfig : chConfigs) {
-            addPreparation(createCHPreparation(ghStorage, chConfig));
+        for (CHConfig chConfig : ghStorage.getCHConfigs()) {
+            preparations.add(createCHPreparation(ghStorage, chConfig));
         }
     }
 

core/src/main/java/com/graphhopper/routing/ch/CHPreparationHandler.java

@@ -57,10 +57,7 @@ public class LMPreparationHandler {
     private int landmarkCount = 16;
 
     private final List<PrepareLandmarks> preparations = new ArrayList<>();
-    // we first add the profiles and later read them to create the config objects (because they require
-    // the actual Weightings)
     private final List<LMProfile> lmProfiles = new ArrayList<>();
-    private final List<LMConfig> lmConfigs = new ArrayList<>();
     private final Map<String, Double> maximumWeights = new HashMap<>();
     private int minNodes = -1;
     private final List<String> lmSuggestionsLocations = new ArrayList<>(5);
@@ -123,7 +120,7 @@ public int getLandmarks() {
     }
 
     public final boolean isEnabled() {
-        return !lmProfiles.isEmpty() || !lmConfigs.isEmpty() || !preparations.isEmpty();
+        return !lmProfiles.isEmpty() || !preparations.isEmpty();
     }
 
     public int getPreparationThreads() {
@@ -162,40 +159,10 @@ public List<LMProfile> getLMProfiles() {
         return lmProfiles;
     }
 
-    /**
-     * Decouple weightings from PrepareLandmarks as we need weightings for the graphstorage and the
-     * graphstorage for the preparation.
-     */
-    public LMPreparationHandler addLMConfig(LMConfig lmConfig) {
-        lmConfigs.add(lmConfig);
-        return this;
-    }
-
-    public LMPreparationHandler addPreparation(PrepareLandmarks plm) {
-        preparations.add(plm);
-        int lastIndex = preparations.size() - 1;
-        if (lastIndex >= lmConfigs.size())
-            throw new IllegalStateException("Cannot access profile for PrepareLandmarks with " + plm.getLMConfig()
-                    + ". Call add(LMConfig) before");
-
-        if (preparations.get(lastIndex).getLMConfig() != lmConfigs.get(lastIndex))
-            throw new IllegalArgumentException("LMConfig of PrepareLandmarks " + preparations.get(lastIndex).getLMConfig()
-                    + " needs to be identical to previously added " + lmConfigs.get(lastIndex));
-        return this;
-    }
-
-    public boolean hasLMProfiles() {
-        return !lmConfigs.isEmpty();
-    }
-
     public int size() {
         return preparations.size();
     }
 
-    public List<LMConfig> getLMConfigs() {
-        return lmConfigs;
-    }
-
     public List<PrepareLandmarks> getPreparations() {
         return preparations;
     }
@@ -222,13 +189,15 @@ public PrepareLandmarks getPreparation(String profile) {
      * @return true if the preparation data for at least one profile was calculated.
      * @see CHPreparationHandler#prepare(StorableProperties, boolean) for a very similar method
      */
-    public boolean loadOrDoWork(final StorableProperties properties, final boolean closeEarly) {
+    public boolean loadOrDoWork(List<LMConfig> lmConfigs, GraphHopperStorage ghStorage, LocationIndex locationIndex, final boolean closeEarly) {
+        createPreparations(lmConfigs, ghStorage, locationIndex);
         for (PrepareLandmarks prep : preparations) {
             // using the area index we separate certain areas from each other but we do not change the base graph for this
             // so that other algorithms still can route between these areas
             if (areaIndex != null)
                 prep.setAreaIndex(areaIndex);
         }
+        StorableProperties properties = ghStorage.getProperties();
         ExecutorCompletionService<String> completionService = new ExecutorCompletionService<>(threadPool);
         int counter = 0;
         final AtomicBoolean prepared = new AtomicBoolean(false);
@@ -269,12 +238,9 @@ public boolean loadOrDoWork(final StorableProperties properties, final boolean c
     /**
      * This method creates the landmark storages ready for landmark creation.
      */
-    public void createPreparations(GraphHopperStorage ghStorage, LocationIndex locationIndex) {
-        if (!isEnabled() || !preparations.isEmpty())
-            return;
-        if (lmConfigs.isEmpty())
-            throw new IllegalStateException("No landmark weightings found");
-
+    void createPreparations(List<LMConfig> lmConfigs, GraphHopperStorage ghStorage, LocationIndex locationIndex) {
+        if (!preparations.isEmpty())
+            throw new IllegalStateException("LM preparations were created already");
         LOGGER.info("Creating LM preparations, {}", getMemInfo());
         List<LandmarkSuggestion> lmSuggestions = new ArrayList<>(lmSuggestionsLocations.size());
         if (!lmSuggestionsLocations.isEmpty()) {
@@ -288,28 +254,34 @@ public void createPreparations(GraphHopperStorage ghStorage, LocationIndex locat
         }
 
 // ORS-GH MOD START abstract to a method in order to facilitate overriding
-        createPreparationsInternal(ghStorage, lmSuggestions);
+        createPreparationsInternal(ghStorage, lmConfigs, lmSuggestions);
     }
 
-    protected void createPreparationsInternal(GraphHopperStorage ghStorage, List<LandmarkSuggestion> lmSuggestions) {
+    protected void createPreparationsInternal(GraphHopperStorage ghStorage, List<LMConfig> lmConfigs, List<LandmarkSuggestion> lmSuggestions) {
 // ORS-GH MOD END
         for (LMConfig lmConfig : lmConfigs) {
             Double maximumWeight = maximumWeights.get(lmConfig.getName());
             if (maximumWeight == null)
                 throw new IllegalStateException("maximumWeight cannot be null. Default should be just negative. " +
                         "Couldn't find " + lmConfig.getName() + " in " + maximumWeights);
 
-            PrepareLandmarks tmpPrepareLM = new PrepareLandmarks(ghStorage.getDirectory(), ghStorage,
+            PrepareLandmarks prepareLandmarks = new PrepareLandmarks(ghStorage.getDirectory(), ghStorage,
                     lmConfig, landmarkCount).
                     setLandmarkSuggestions(lmSuggestions).
                     setMaximumWeight(maximumWeight).
                     setLogDetails(logDetails);
             if (minNodes > 1)
-                tmpPrepareLM.setMinimumNodes(minNodes);
-            addPreparation(tmpPrepareLM);
+                prepareLandmarks.setMinimumNodes(minNodes);
+            preparations.add(prepareLandmarks);
         }
     }
 
+    // ORS-GH MOD START for tests
+    public void createPreparations(List<LMConfig> lmConfigs, GraphHopperStorage ghStorage) {
+        createPreparations(lmConfigs, ghStorage, null);
+    }
+    // ORS-GH MOD END
+
     private JsonFeatureCollection loadLandmarkSplittingFeatureCollection(String splitAreaLocation) {
         ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.registerModule(new JtsModule());
@@ -331,10 +303,6 @@ private JsonFeatureCollection loadLandmarkSplittingFeatureCollection(String spli
     }
 
 // ORS-GH MOD START add methods
-    public List<Weighting> getWeightings() {
-        return lmConfigs.stream().map(lmConfig -> lmConfig.getWeighting()).collect(Collectors.toList());
-    }
-
     public Map<String, Double> getMaximumWeights() {
         return maximumWeights;
     }

core/src/main/java/com/graphhopper/routing/lm/LMPreparationHandler.java

@@ -16,8 +16,8 @@
  * suboptimal automatic landmark finding process.
  */
 public class LandmarkSuggestion {
-    private List<Integer> nodeIds;
-    private BBox box;
+    private final List<Integer> nodeIds;
+    private final BBox box;
 
     public LandmarkSuggestion(List<Integer> nodeIds, BBox box) {
         this.nodeIds = nodeIds;
@@ -36,10 +36,10 @@ public BBox getBox() {
      * The expected format is lon,lat per line where lines starting with characters will be ignored. You can create
      * such a file manually via geojson.io -> Save as CSV. Optionally add a second line with
      * <pre>#BBOX:minLat,minLon,maxLat,maxLon</pre>
-     *
+     * <p>
      * to specify an explicit bounding box. TODO: support GeoJSON instead.
      */
-    public static final LandmarkSuggestion readLandmarks(String file, LocationIndex locationIndex) throws IOException {
+    public static LandmarkSuggestion readLandmarks(String file, LocationIndex locationIndex) throws IOException {
         // landmarks should be suited for all vehicles
         EdgeFilter edgeFilter = EdgeFilter.ALL_EDGES;
         List<String> lines = Helper.readFile(file);

core/src/main/java/com/graphhopper/routing/lm/LandmarkSuggestion.java

@@ -159,9 +159,8 @@ protected CHEntry createCHEntry(CHConfig chConfig) {
      * @see #addCHGraph(CHConfig)
      */
     public GraphHopperStorage addCHGraphs(List<CHConfig> chConfigs) {
-        for (CHConfig chConfig : chConfigs) {
+        for (CHConfig chConfig : chConfigs)
             addCHGraph(chConfig);
-        }
         return this;
     }