wip

Author: jarinox

ors-api/src/test/resources/application-test.yml

@@ -50,7 +50,7 @@ ors:
           logie_roads: true
     profiles:
       driving-car:
-        enabled: true
+        enabled: false
         encoder_name: driving-car
         build:
           encoder_options:
@@ -107,7 +107,7 @@ ors:
               core:
                 active_landmarks: 6
       driving-hgv:
-        enabled: true
+        enabled: false
         encoder_name: driving-hgv
         build:
           maximum_speed_lower_bound: 75
@@ -164,7 +164,7 @@ ors:
               core:
                 active_landmarks: 6
       cycling-regular:
-        enabled: true
+        enabled: false
         encoder_name: cycling-regular
         build:
           encoder_options:
@@ -191,7 +191,7 @@ ors:
               core:
                 active_landmarks: 6
       cycling-mountain:
-        enabled: true
+        enabled: false
         encoder_name: cycling-mountain
         build:
           encoder_options:
@@ -207,7 +207,7 @@ ors:
         service:
           maximum_snapping_radius: 10
       cycling-road:
-        enabled: true
+        enabled: false
         encoder_name: cycling-road
         build:
           encoder_options:
@@ -221,7 +221,7 @@ ors:
             HillIndex:
             TrailDifficulty:
       cycling-electric:
-        enabled: true
+        enabled: false
         encoder_name: cycling-electric
         build:
           encoder_options:
@@ -235,7 +235,7 @@ ors:
             HillIndex:
             TrailDifficulty:
       foot-walking:
-        enabled: true
+        enabled: false
         encoder_name: foot-walking
         build:
           interpolate_bridges_and_tunnels: false
@@ -256,7 +256,7 @@ ors:
             HillIndex:
             TrailDifficulty:
       foot-hiking:
-        enabled: true
+        enabled: false
         encoder_name: foot-hiking
         build:
           encoder_options:
@@ -291,7 +291,7 @@ ors:
         service:
           maximum_snapping_radius: 50
       public-transport:
-        enabled: true
+        enabled: false
         encoder_name: public-transport
         build:
           encoder_options:
@@ -301,7 +301,7 @@ ors:
         service:
           maximum_visited_nodes: 15000
       driving-car-no-preparations:
-        enabled: true
+        enabled: false
         encoder_name: driving-car
         build:
           encoder_options:

ors-config.yml

@@ -9,6 +9,8 @@ ors:
         source_file: ors-api/src/test/files/heidelberg.test.pbf
     profiles:
       driving-car:
+        enabled: false
+      wheelchair:
         enabled: true
 
 ################################################################################

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

@@ -43,6 +43,10 @@ public WheelchairEdgeFilter(WheelchairParameters params, GraphHopperStorage grap
     @Override
     public boolean accept(EdgeIteratorState 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() || !(
                 checkSurfaceType()

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

@@ -15,6 +15,7 @@ public class WheelchairAttributesEncodedValues {
     BooleanEncodedValue suitableEncoder;
     EnumEncodedValue<WheelchairAttributes.Side> sideEncoder;
     BooleanEncodedValue surfaceQualityKnownEncoder;
+    public IntEncodedValue osmWayIdEnc;
 
     public WheelchairAttributesEncodedValues(EncodingManager encodingManager) {
         if(encodingManager.hasEncodedValue(WheelchairSurface.KEY))
@@ -43,6 +44,9 @@ public WheelchairAttributesEncodedValues(EncodingManager encodingManager) {
 
         if(encodingManager.hasEncodedValue(WheelchairSurfaceQualityKnown.KEY))
             surfaceQualityKnownEncoder = encodingManager.getBooleanEncodedValue(WheelchairSurfaceQualityKnown.KEY);
+
+        if(encodingManager.hasEncodedValue(OsmWayId.KEY))
+            osmWayIdEnc = encodingManager.getIntEncodedValue(OsmWayId.KEY);
     }
 
     public WheelchairAttributes getAttributes(IntsRef edgeFlags) {

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/util/parsers/wheelchair/WheelchairBaseParser.java

@@ -197,9 +197,9 @@ protected int selectIntValueForSidewalkSide(ReaderWay way, int center, int left,
         if (way.hasTag(KEY_ORS_SIDEWALK_SIDE)) {
             String side = way.getTag(KEY_ORS_SIDEWALK_SIDE);
             if (side.equals(SW_VAL_LEFT)) {
-                return combine.applyAsInt(center, left);
+                return left > -1 ? left : center;
             } else if (side.equals(SW_VAL_RIGHT)) {
-                return combine.applyAsInt(center, right);
+                return right > -1 ? right : center;
             }
         } else if (hasLeftSidewalk || hasRightSidewalk) {
             return combine.applyAsInt(center, combine.applyAsInt(left, right));
@@ -291,9 +291,9 @@ protected boolean selectBooleanValueForSidewalkSide(ReaderWay way, boolean cente
         if (way.hasTag(KEY_ORS_SIDEWALK_SIDE)) {
             String side = way.getTag(KEY_ORS_SIDEWALK_SIDE);
             if (side.equals(SW_VAL_LEFT)) {
-                return center && left;
+                return center || left;
             } else if (side.equals(SW_VAL_RIGHT)) {
-                return center && right;
+                return center || right;
             }
         } else if (hasLeftSidewalk || hasRightSidewalk) {
             return center && left && right;

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/util/parsers/wheelchair/WheelchairSurfaceQualityKnownParser.java

@@ -20,11 +20,11 @@ public WheelchairSurfaceQualityKnownParser(){
     public IntsRef handleWayTags(IntsRef edgeFlags, ReaderWay way, boolean ferry, IntsRef relationFlags) {
         beforeHandleWayTags(way);
 
-        boolean separateFootway = isSeparateFootway(way);
+        /*boolean separateFootway = isSeparateFootway(way);
         if(!separateFootway) {
             ((BooleanEncodedValue) encoder).setBool(false, edgeFlags, false);
             return edgeFlags;
-        }
+        }*/
 
         boolean center = false;
 
@@ -47,24 +47,9 @@ public IntsRef handleWayTags(IntsRef edgeFlags, ReaderWay way, boolean ferry, In
                 right = true;
         }
 
-        center = getSidedBoolean(way, center, left, right);
+        center = selectBooleanValueForSidewalkSide(way, center, left, right);
 
         ((SimpleBooleanEncodedValue) encoder).setBool(false, edgeFlags, center);
         return edgeFlags;
     }
-
-    boolean getSidedBoolean(ReaderWay way, boolean center, boolean left, boolean right){
-        if (way.hasTag(KEY_ORS_SIDEWALK_SIDE)) {
-            String side = way.getTag(KEY_ORS_SIDEWALK_SIDE);
-            if (side.equals(SW_VAL_LEFT)) {
-                return left;
-            } else if (side.equals(SW_VAL_RIGHT)) {
-                return right;
-            }
-        } else if(hasRightSidewalk || hasLeftSidewalk) {
-            return left && right && center;
-        }
-
-        return center;
-    }
 }

ors-engine/src/test/java/org/heigit/ors/routing/graphhopper/extensions/util/parsers/WheelchairParserTest.java

@@ -199,8 +199,7 @@ void TestProcessWayWithMultipleValues() {
         assertEquals(3, rightAttrs.getSlopedKerbHeight());
 
         WheelchairAttributes attrs = parseForSide(way, "both");
-        //assertFalse(attrs.isSurfaceQualityKnown());
-        //assertFalse(attrs.isSuitable());
+        assertFalse(attrs.isSurfaceQualityKnown());
 
         assertEquals(wheelchairAttributesAsString(correctWheelchairAttributes), wheelchairAttributesAsString(attrs));
     }
@@ -254,6 +253,25 @@ void TestAttachKerbHeightOnlyToCrossing() {
         assertEquals(-1, attrs.getSlopedKerbHeight());
     }
 
+    @Test
+    void TestUseWorstKerbHeightTag() {
+        /* This test is new and fails, because an already previously existing issue
+        We will tackle this after the refactoring.
+
+        ReaderWay way = new ReaderWay(1);
+
+        way.setTag("footway", "crossing");
+        way.setTag("kerb:height", "0.03");
+        addNodeTag(way, "curb", "0.2 m", 1);
+
+        executeParsers(way);
+
+        WheelchairAttributesEncodedValues encValues = new WheelchairAttributesEncodedValues(em);
+        WheelchairAttributes attrs = encValues.getAttributes(intsRef);
+
+        assertEquals(20, attrs.getSlopedKerbHeight()); */
+    }
+
 
     private WheelchairAttributes parseForSide(ReaderWay way, String side){
         assert(side.equals("left") || side.equals("right") || side.equals("both"));