Merge pull request graphhopper#62 from graphhopper/improvesurface

improve bike and car speeds via surface

Author: Peter

core/src/main/java/com/graphhopper/reader/OSMElement.java

@@ -151,25 +151,35 @@ public void setTag(String name, String value) {
 
     /**
      * Chaeck that the object has a given tag with a given value.
-     *
-     * @param name
-     * @param value
-     * @return
      */
-    public boolean hasTag(String name, String value) {
+    public boolean hasTag(String key, String value) {
         if (tags == null)
             return false;
 
-        String val = tags.get(name);
+        String val = tags.get(key);
         return value.equals(val);
     }
 
     /**
-     * Check that a given tag has one of a list of values
-     *
-     * @param key
-     * @param values
-     * @return
+     * Check that a given tag has one of the specified values.
+     */
+    public boolean hasTag(String key, String... values) {
+        if (tags == null)
+            return false;
+
+        String osmValue = tags.get(key);
+        if (osmValue == null)
+            return false;
+
+        for (String val : values) {
+            if (val.equals(osmValue))
+                return true;
+        }
+        return false;
+    }
+
+    /**
+     * Check that a given tag has one of the specified values.
      */
     public final boolean hasTag(String key, Set<String> values) {
         if (tags == null)

core/src/main/java/com/graphhopper/routing/util/BikeFlagEncoder.java

@@ -19,6 +19,7 @@
 package com.graphhopper.routing.util;
 
 import com.graphhopper.reader.OSMWay;
+import com.graphhopper.util.Helper;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -52,12 +53,11 @@ public class BikeFlagEncoder extends AbstractFlagEncoder {
             add("residential");
         }
     };
-    private static final Map<String, Integer> SPEED = new BikeSpeed();
     private HashSet<String> intended = new HashSet<String>();
     private HashSet<String> oppositeLanes = new HashSet<String>();
 
     public BikeFlagEncoder() {
-        super(8, 2, SPEED.get("cycleway"), SPEED.get("road"));
+        super(8, 2, HIGHWAY_SPEED.get("cycleway"), HIGHWAY_SPEED.get("road"));
 
         // strict set, usually vehicle and agricultural/forestry are ignored by cyclists
         restrictions = new String[]{"bicycle", "access"};
@@ -75,14 +75,6 @@ public BikeFlagEncoder() {
         oppositeLanes.add("opposite_track");
     }
 
-    public int getSpeed(String string) {
-        // TODO use surface for speed!
-        Integer speed = SPEED.get(string);
-        if (speed == null)
-            throw new IllegalStateException("bike, no speed found for:" + string);
-        return speed;
-    }
-
     @Override public String toString() {
         return "BIKE";
     }
@@ -128,9 +120,8 @@ public int handleWayTags(int allowed, OSMWay way) {
         if ((allowed & ferryBit) == 0) {
             // http://wiki.openstreetmap.org/wiki/Cycleway
             // http://wiki.openstreetmap.org/wiki/Map_Features#Cycleway
-            String highwayValue = way.getTag("highway");
-            int speed = getSpeed(highwayValue);
-            if ((way.hasTag("oneway", oneways) || way.hasTag("junction","roundabout"))
+            int speed = getSpeed(way);
+            if ((way.hasTag("oneway", oneways) || way.hasTag("junction", "roundabout"))
                     && !way.hasTag("oneway:bicycle", "no")
                     && !way.hasTag("cycleway", oppositeLanes)) {
 
@@ -153,23 +144,65 @@ public boolean isSaveHighway(String highwayValue) {
         return saveHighwayTags.contains(highwayValue);
     }
 
-    private static class BikeSpeed extends HashMap<String, Integer> {
-
+    int getSpeed(OSMWay way) {
+        String s = way.getTag("surface");
+        if (!Helper.isEmpty(s)) {
+            Integer sInt = SURFACE_SPEED.get(s);
+            if (sInt != null)
+                return sInt;
+        }
+        String tt = way.getTag("tracktype");
+        if (!Helper.isEmpty(tt)) {
+            Integer tInt = TRACKTYPE_SPEED.get(tt);
+            if (tInt != null)
+                return tInt;
+        }
+        String highway = way.getTag("highway");
+        if (!Helper.isEmpty(tt)) {
+            Integer hwInt = HIGHWAY_SPEED.get(highway);
+            if (hwInt != null)
+                return hwInt;
+        }
+        return 10;
+    }
+    private static final Map<String, Integer> TRACKTYPE_SPEED = new HashMap<String, Integer>() {
         {
-            put("living_street", 5);
+            put("grade1", 16); // paved
+            put("grade2", 12); // now unpaved ...
+            put("grade3", 12);
+            put("grade4", 10);
+            put("grade5", 8); // like sand/grass            
+        }
+    };
+    private static final Map<String, Integer> SURFACE_SPEED = new HashMap<String, Integer>() {
+        {
+            put("asphalt", 18);
+            put("concrete", 18);
+            put("paved", 16);
+            put("unpaved", 12);
+            put("gravel", 12);
+            put("ground", 12);
+            put("dirt", 10);
+            put("paving_stones", 8);
+            put("grass", 8);
+        }
+    };
+    private static final Map<String, Integer> HIGHWAY_SPEED = new HashMap<String, Integer>() {
+        {
+            put("living_street", 6);
             put("bridleway", 10);
 
-            put("cycleway", 10);
+            put("cycleway", 14);
             put("path", 10);
             put("road", 10);
             put("track", 10);
 
-            put("trunk", 20);
-            put("primary", 20);
-            put("secondary", 20);
-            put("tertiary", 20);
+            put("trunk", 18);
+            put("primary", 18);
+            put("secondary", 18);
+            put("tertiary", 18);
             put("unclassified", 10);
             put("residential", 10);
         }
-    }
+    };
 }

core/src/main/java/com/graphhopper/routing/util/CarFlagEncoder.java

@@ -20,15 +20,15 @@
 
 import com.graphhopper.reader.OSMWay;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author Peter Karich
  */
 public class CarFlagEncoder extends AbstractFlagEncoder {
 
-    private static final Map<String, Integer> SPEED = new CarSpeed();
-
     public CarFlagEncoder() {
         super(0, 2, SPEED.get("secondary"), SPEED.get("motorway"));
         restrictions = new String[]{"motorcar", "motor_vehicle", "vehicle", "access"};
@@ -47,7 +47,7 @@ public boolean isService(int flags) {
         return getSpeedPart(flags) * factor == SPEED.get("service");
     }
 
-    public int getSpeed(String string) {
+    int getSpeed(String string) {
         Integer speed = SPEED.get(string);
         if (speed == null)
             throw new IllegalStateException("car, no speed found for:" + string);
@@ -93,6 +93,10 @@ public int handleWayTags(int allowed, OSMWay way) {
             if (maxspeed > 0 && speed > maxspeed)
                 speed = maxspeed;
 
+            // limit speed to max 30 km/h if bad surface
+            if (speed > 30 && way.hasTag("surface", BAD_SURFACE))
+                speed = 30;
+
             // usually used with a node, this does not work as intended
             // if( "toll_booth".equals( osmProperties.get( "barrier" ) ) )
             if (way.hasTag("oneway", oneways) || way.hasTag("junction", "roundabout")) {
@@ -114,14 +118,24 @@ public int handleWayTags(int allowed, OSMWay way) {
     @Override public String toString() {
         return "CAR";
     }
-
+    private static final Set<String> BAD_SURFACE = new HashSet<String>() {
+        {
+            add("cobblestone");
+            add("grass_paver");
+            add("gravel");
+            add("sand");
+            add("paving_stones");
+            add("dirt");
+            add("ground");
+            add("grass");
+        }
+    };
     /**
      * A map which associates string to speed. Get some impression:
      * http://www.itoworld.com/map/124#fullscreen
      * http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing/Maxspeed
      */
-    private static class CarSpeed extends HashMap<String, Integer> {
-
+    private static final Map<String, Integer> SPEED = new HashMap<String, Integer>() {
         {
             // autobahn
             put("motorway", 100);
@@ -148,5 +162,5 @@ private static class CarSpeed extends HashMap<String, Integer> {
             // forestry stuff
             put("track", 20);
         }
-    }
+    };
 }

core/src/test/java/com/graphhopper/reader/OSMElementTest.java

@@ -0,0 +1,37 @@
+/*
+ *  Licensed to Peter Karich under one or more contributor license
+ *  agreements. See the NOTICE file distributed with this work for
+ *  additional information regarding copyright ownership.
+ *
+ *  Peter Karich licenses this file to you under the Apache License,
+ *  Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the
+ *  License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package com.graphhopper.reader;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author Peter Karich
+ */
+public class OSMElementTest {
+
+    @Test
+    public void testHasTag() {
+        OSMElement instance = new OSMWay();
+        instance.setTag("surface", "something");
+        assertTrue(instance.hasTag("surface", "now", "something"));
+        assertFalse(instance.hasTag("surface", "now", "not"));
+    }
+}

core/src/test/java/com/graphhopper/routing/util/BikeFlagEncoderTest.java

@@ -18,6 +18,7 @@
  */
 package com.graphhopper.routing.util;
 
+import com.graphhopper.reader.OSMWay;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -32,6 +33,11 @@ public void testGetSpeed() {
         BikeFlagEncoder instance = new BikeFlagEncoder();
         int result = instance.flags(10, true);
         assertEquals(10, instance.getSpeed(result));
-        assertEquals(10, instance.getSpeed("cycleway"));
+        OSMWay way = new OSMWay();
+        way.setTag("highway", "road");
+        assertEquals(10, instance.getSpeed(way));
+
+        way.setTag("surface", "paved");
+        assertEquals(16, instance.getSpeed(way));
     }
 }