Merge branch 'master' into virtual_way_geometry

Author: easbar

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

@@ -244,15 +244,22 @@ public RoutingAlgorithmFactory getDecoratedAlgorithmFactory(RoutingAlgorithmFact
             map.setWeighting(getDefaultWeighting());
 
         boolean edgeBased = map.getBool(Parameters.Routing.EDGE_BASED, false);
-        String entriesStr = "";
+        List<String> entriesStrs = new ArrayList<>();
+        boolean weightingMatchesButNotEdgeBased = false;
         for (PrepareContractionHierarchies p : allPreparations) {
-            if (p.isEdgeBased() == edgeBased && p.getWeighting().matches(map))
+            boolean weightingMatches = p.getWeighting().matches(map);
+            if (p.isEdgeBased() == edgeBased && weightingMatches)
                 return p;
+            else if (weightingMatches)
+                weightingMatchesButNotEdgeBased = true;
 
-            entriesStr += p.getWeighting() + "|" + (p.isEdgeBased() ? "edge" : "node") + ", ";
+            entriesStrs.add(p.getWeighting() + "|" + (p.isEdgeBased() ? "edge" : "node"));
         }
 
-        throw new IllegalArgumentException("Cannot find CH RoutingAlgorithmFactory for weighting map " + map + " in entries " + entriesStr);
+        String hint = weightingMatchesButNotEdgeBased
+                ? " The '" + Parameters.Routing.EDGE_BASED + "' url parameter is missing or does not fit the weightings. Its value was: '" + edgeBased + "'"
+                : "";
+        throw new IllegalArgumentException("Cannot find CH RoutingAlgorithmFactory for weighting map " + map + " in entries: " + entriesStrs + "." + hint);
     }
 
     public int getPreparationThreads() {

core/src/main/java/com/graphhopper/storage/CHGraphImpl.java

@@ -423,18 +423,16 @@ public void debugPrint() {
             header += String.format(Locale.ROOT, formatShortcutExt, "S_ORIG_FIRST", "S_ORIG_LAST");
         }
         System.out.println(header);
-        IntsRef intsRef = new IntsRef(shortcutBytesForFlags / 4);
         for (int i = baseGraph.edgeCount; i < baseGraph.edgeCount + Math.min(shortcutCount, printMax); ++i) {
             long edgePointer = chEdgeAccess.toPointer(i);
-            chEdgeAccess.readFlags(edgePointer, intsRef);
             String edgeString = String.format(Locale.ROOT, formatShortcutsBase,
                     i,
                     chEdgeAccess.getNodeA(edgePointer),
                     chEdgeAccess.getNodeB(edgePointer),
                     chEdgeAccess.getLinkA(edgePointer),
                     chEdgeAccess.getLinkB(edgePointer),
                     chEdgeAccess.getDist(edgePointer),
-                    intsRef,
+                    chEdgeAccess.getShortcutFlags(edgePointer),
                     shortcuts.getInt(edgePointer + S_SKIP_EDGE1),
                     shortcuts.getInt(edgePointer + S_SKIP_EDGE2));
             if (edgeBased) {
@@ -751,19 +749,22 @@ public final boolean isShortcut() {
 
         @Override
         public final CHEdgeIteratorState setWeight(double weight) {
+            checkShortcut(true, "setWeight");
             chEdgeAccess.setShortcutWeight(edgePointer, weight);
             return this;
         }
 
         @Override
         public void setFlagsAndWeight(int flags, double weight) {
+            checkShortcut(true, "setFlagsAndWeight");
             chEdgeAccess.setAccessAndWeight(edgePointer, flags, weight);
             chFlags = flags;
             freshFlags = true;
         }
 
         @Override
         public final double getWeight() {
+            checkShortcut(true, "getWeight");
             return chEdgeAccess.getShortcutWeight(edgePointer);
         }