very primitive (working) port of the wheelchair attributes to encoded values

Author: jarinox

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/WheelchairAttributes.java

@@ -206,4 +206,39 @@ public WheelchairAttributes copy() {
         at.suitable = this.suitable;
         return at;
     }
+
+    public String difference(WheelchairAttributes other) {
+        String diff = "";
+        if(other.getSlopedKerbHeight() != getSlopedKerbHeight())
+            diff += "kerbHeight: " + getSlopedKerbHeight() + " vs "  + other.getSlopedKerbHeight() + "\n";
+
+        if(other.getIncline() != getIncline())
+            diff += "incline: " + getIncline() + " vs " + other.getIncline() + "\n";
+
+        if(other.getWidth() != getWidth())
+            diff += "width: " + getWidth() + " vs " + other.getWidth() + "\n";
+
+        if(other.getTrackType() != getTrackType())
+            diff += "trackType: " + getTrackType() + " vs " + other.getTrackType() + "\n";
+
+        if(other.getSide() != getSide())
+            diff += "side: " + getSide() + " vs " + other.getSide() + "\n";
+
+        if(other.getSmoothnessType() != getSmoothnessType())
+            diff += "smoothness: " + getSmoothnessType() + " vs " + other.getSmoothnessType() + "\n";
+
+        if(other.getSurfaceType() != getSurfaceType())
+            diff += "surfaceType: " + getSurfaceType() + " vs " + other.getSurfaceType() + "\n";
+
+        if(other.isSuitable() != isSuitable())
+            diff += "suitable: " + isSuitable() + " vs " + other.isSuitable() + "\n";
+
+        if(other.isSurfaceQualityKnown() != isSurfaceQualityKnown())
+            diff += "surfaceQualityKnown: " + isSurfaceQualityKnown() + " vs " + other.isSurfaceQualityKnown() + "\n";
+
+        if(other.hasAttributes != hasAttributes)
+            diff += "hasAttributes: " + hasAttributes + " vs " + other.hasAttributes + "\n";
+
+        return diff;
+    }
 }

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/edgefilters/WheelchairEdgeFilter.java

@@ -46,10 +46,7 @@ public WheelchairEdgeFilter(WheelchairParameters params, GraphHopperStorage grap
     public boolean accept(EdgeIteratorState iter) {
         boolean oldValue = oldFilter.accept(iter);
         attributes = encodedValues.getAttributes(iter.getFlags());
-        int num = encodedValues.osmWayIdEnc.getInt(false, iter.getFlags());
-        if (num == 76911875){
-            LOGGER.error("stop here");
-        }
+
         LOGGER.debug("edge: " + iter + (attributes.hasValues() ? " suitable: " + attributes.isSuitable() + " surfaceQualityKnown: " + attributes.isSurfaceQualityKnown() : " no wheelchair attributes"));
         boolean newValue = !attributes.hasValues() || !(
                 checkSurfaceType()
@@ -62,7 +59,7 @@ public boolean accept(EdgeIteratorState iter) {
                         || checkUnsuitable()
         );
         if (oldValue != newValue) {
-            LOGGER.warn("New wheelchair edge filter value " + newValue + " differs from old filter value " + oldValue + " for edge " + iter.getEdge());
+            LOGGER.warn(attributes.difference(this.oldFilter.attributes));
         }
         return newValue;
     }

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/edgefilters/WheelchairEdgeFilterOld.java

@@ -26,7 +26,7 @@ public class WheelchairEdgeFilterOld implements EdgeFilter {
     private static final Logger LOGGER = Logger.getLogger(WheelchairEdgeFilterOld.class.getName());
     private final byte[] buffer;
     private final WheelchairAttributesGraphStorage storage;
-    private final WheelchairAttributes attributes;
+    public final WheelchairAttributes attributes;
     private WheelchairParameters params;
 
     public WheelchairEdgeFilterOld(WheelchairParameters params, GraphHopperStorage graphStorage) throws Exception {

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/util/WheelchairAttributesEncodedValues.java

@@ -51,9 +51,18 @@ public WheelchairAttributesEncodedValues(EncodingManager encodingManager) {
 
     public WheelchairAttributes getAttributes(IntsRef edgeFlags) {
         WheelchairAttributes attrs = new WheelchairAttributes();
-        attrs.setSurfaceType(surfaceEncoder.getInt(false, edgeFlags));
-        attrs.setSmoothnessType(smoothnessEncoder.getInt(false, edgeFlags));
-        attrs.setTrackType(trackTypeEncoder.getInt(false, edgeFlags));
+        int surface = surfaceEncoder.getInt(false, edgeFlags) - 1;
+        if(surface > -1)
+            attrs.setSurfaceType(surface);
+
+        int smoothness = smoothnessEncoder.getInt(false, edgeFlags) - 1;
+        if(smoothness > -1)
+            attrs.setSmoothnessType(smoothness);
+
+        int  trackType = trackTypeEncoder.getInt(false, edgeFlags) - 1;
+        if(trackType > -1)
+            attrs.setTrackType(trackType);
+
         attrs.setSuitable(suitableEncoder.getBool(false, edgeFlags));
         attrs.setSide(sideEncoder.getEnum(false, edgeFlags));
         attrs.setSurfaceQualityKnown(surfaceQualityKnownEncoder.getBool(false, edgeFlags));
@@ -63,13 +72,13 @@ public WheelchairAttributes getAttributes(IntsRef edgeFlags) {
             attrs.setIncline(incline); // incline is converts to int in WheelchairAttributes, weird that the method takes a double...
         }
 
-        int width = widthEncoder.getInt(false, edgeFlags);
-        if (width > 0) {
+        int width = widthEncoder.getInt(false, edgeFlags) - 1;
+        if (width > 0) { // no idea why we also exclude 0 here, but this was already the previous behavior and changing it to -1 breaks it
             attrs.setWidth(width);
         }
 
-        int kerb = kerbEncoder.getInt(false, edgeFlags);
-        if (kerb > 0) {
+        int kerb = kerbEncoder.getInt(false, edgeFlags) - 1;
+        if (kerb > -1) {
             attrs.setSlopedKerbHeight(kerb);
         }