feat: compare new edge filter against original storage-based one

Author: aoles

ors-engine/src/main/java/org/heigit/ors/config/profile/BuildProperties.java

@@ -102,6 +102,12 @@ public void initExtStorages() {
                 continue;
             }
             ExtendedStorageName extendedStorageName = ExtendedStorageName.getEnum(key);
+
+            // FIXME: debug code
+            if (extendedStorageName == ExtendedStorageName.WHEELCHAIR) {
+                handleWheelchair();
+            }
+
             switch (extendedStorageName) {
                 case HEAVY_VEHICLE -> handleHeavyVehicle(storage);
                 case OSM_ID -> handleOsmId();
@@ -111,7 +117,7 @@ public void initExtStorages() {
                 case TOLLWAYS -> handleTollways();
                 case HILL_INDEX -> handleHillIndex();
                 case TRAIL_DIFFICULTY -> handleTrailDifficulty();
-                case WHEELCHAIR -> handleWheelchair();
+                //case WHEELCHAIR -> handleWheelchair();
                 default -> {
                     storage.initialize(extendedStorageName);
                     this.extStorages.put(key, storage);

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

@@ -30,8 +30,10 @@ public class WheelchairEdgeFilter implements EdgeFilter {
     private final WheelchairAttributesEncodedValues encodedValues;
     private WheelchairAttributes attributes;
     private WheelchairParameters params;
+    private WheelchairEdgeFilterOld oldFilter;
 
-    public WheelchairEdgeFilter(WheelchairParameters params, GraphHopperStorage graphStorage) {
+    public WheelchairEdgeFilter(WheelchairParameters params, GraphHopperStorage graphStorage) throws Exception {
+        oldFilter = new WheelchairEdgeFilterOld(params, graphStorage);
         encodedValues = new WheelchairAttributesEncodedValues(graphStorage.getEncodingManager());
         this.params = params;
         if (this.params == null) {
@@ -42,13 +44,14 @@ public WheelchairEdgeFilter(WheelchairParameters params, GraphHopperStorage grap
 
     @Override
     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"));
-        return !attributes.hasValues() || !(
+        boolean newValue = !attributes.hasValues() || !(
                 checkSurfaceType()
                         || checkSmoothnessType()
                         || checkTrackType()
@@ -58,6 +61,10 @@ public boolean accept(EdgeIteratorState iter) {
                         || checkSurfaceQualityKnown()
                         || checkUnsuitable()
         );
+        if (oldValue != newValue) {
+            LOGGER.warn("New wheelchair edge filter value " + newValue + " differs from old filter value " + oldValue + " for edge " + iter.getEdge());
+        }
+        return newValue;
     }
 
     private boolean checkSurfaceType() {

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

@@ -0,0 +1,98 @@
+/*  This file is part of Openrouteservice.
+ *
+ *  Openrouteservice is free software; you can redistribute it and/or modify it under the terms of the
+ *  GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+
+ *  This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU Lesser General Public License for more details.
+
+ *  You should have received a copy of the GNU Lesser General Public License along with this library;
+ *  if not, see <https://www.gnu.org/licenses/>.
+ */
+package org.heigit.ors.routing.graphhopper.extensions.edgefilters;
+
+import com.graphhopper.routing.util.EdgeFilter;
+import com.graphhopper.storage.GraphHopperStorage;
+import com.graphhopper.util.EdgeIteratorState;
+import org.apache.log4j.Logger;
+import org.heigit.ors.routing.graphhopper.extensions.WheelchairAttributes;
+import org.heigit.ors.routing.graphhopper.extensions.storages.GraphStorageUtils;
+import org.heigit.ors.routing.graphhopper.extensions.storages.WheelchairAttributesGraphStorage;
+import org.heigit.ors.routing.parameters.WheelchairParameters;
+
+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;
+    private WheelchairParameters params;
+
+    public WheelchairEdgeFilterOld(WheelchairParameters params, GraphHopperStorage graphStorage) throws Exception {
+        storage = GraphStorageUtils.getGraphExtension(graphStorage, WheelchairAttributesGraphStorage.class);
+        if (storage == null)
+            throw new Exception("ExtendedGraphStorage for wheelchair attributes was not found.");
+        this.params = params;
+        if (this.params == null) {
+            this.params = new WheelchairParameters();
+        }
+        attributes = new WheelchairAttributes();
+        buffer = new byte[WheelchairAttributesGraphStorage.BYTE_COUNT];
+    }
+
+    @Override
+    public boolean accept(EdgeIteratorState iter) {
+        storage.getEdgeValues(iter.getEdge(), attributes, buffer);
+        LOGGER.debug("edge: " + iter + (attributes.hasValues() ? " suitable: " + attributes.isSuitable() + " surfaceQualityKnown: " + attributes.isSurfaceQualityKnown() : " no wheelchair attributes"));
+        return !attributes.hasValues() || !(
+                checkSurfaceType()
+                        || checkSmoothnessType()
+                        || checkTrackType()
+                        || checkMaximumIncline()
+                        || checkMaximumSlopedKerb()
+                        || checkMinimumWidth()
+                        || checkSurfaceQualityKnown()
+                        || checkUnsuitable()
+        );
+    }
+
+    private boolean checkSurfaceType() {
+        return params.getSurfaceType() > 0
+                && params.getSurfaceType() < attributes.getSurfaceType();
+    }
+
+    private boolean checkSmoothnessType() {
+        return params.getSmoothnessType() > 0
+                && params.getSmoothnessType() < attributes.getSmoothnessType();
+    }
+
+    private boolean checkTrackType() {
+        return params.getTrackType() > 0 && attributes.getTrackType() != 0
+                && params.getTrackType() <= attributes.getTrackType();
+    }
+
+    private boolean checkMaximumIncline() {
+        return params.getMaximumIncline() > (Float.MAX_VALUE * -1.0f)
+                && params.getMaximumIncline() < attributes.getIncline();
+    }
+
+    private boolean checkMaximumSlopedKerb() {
+        return params.getMaximumSlopedKerb() >= 0.0
+                && params.getMaximumSlopedKerb() * 100.0 < attributes.getSlopedKerbHeight();// Stored in storage in cm
+    }
+
+    private boolean checkMinimumWidth() {
+        return params.getMinimumWidth() > 0.0
+                && attributes.getWidth() > 0.0 // if the attribute value is 0, this signifies that no data is available
+                && params.getMinimumWidth() * 100.0 > attributes.getWidth(); // stored in storage in cm
+    }
+
+    private boolean checkSurfaceQualityKnown() {
+        return params.isRequireSurfaceQualityKnown() && !attributes.isSurfaceQualityKnown();
+    }
+
+    private boolean checkUnsuitable() {
+        return !params.allowUnsuitable() && !attributes.isSuitable();
+    }
+}