merged master, moving to 0.5.0

Author: Peter

android/app/build.gradle

@@ -35,7 +35,7 @@ configurations.all {
  **/
 
 dependencies {
-    compile(group: 'com.graphhopper', name: 'graphhopper', version: '0.5.0-RC1') {
+    compile(group: 'com.graphhopper', name: 'graphhopper', version: '0.5.0') {
        exclude group: 'com.google.protobuf', module: 'protobuf-java'
        exclude group: 'org.openstreetmap.osmosis', module: 'osmosis-osm-binary'
        exclude group: 'org.apache.xmlgraphics', module: 'xmlgraphics-commons'

android/app/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.graphhopper</groupId>
     <artifactId>graphhopper-android</artifactId>
-    <version>0.5.0-RC1</version>
+    <version>0.5.0</version>
     <name>GraphHopper Android</name>
     <packaging>apk</packaging>    
     <organization>
@@ -16,7 +16,7 @@
         <relativePath>../..</relativePath>
         <groupId>com.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>    	
-        <version>0.5.0-RC1</version>
+        <version>0.5.0</version>
     </parent>
     <properties>
         <mapsforge.version>0.5.1</mapsforge.version>

core/files/map-sidewalk-no.osm.gz

@@ -3,7 +3,7 @@ cd $HOME/..
 
 destination=src/main/resources/com/graphhopper/util/
 
-translations="en_US SKIP ar bg ca cs_CZ de_DE el es fa fil fi fr gl he hsb hu_HU it ja lt_LT ne nl pl_PL pt_BR pt_PT ro ru si sk sv_SE tr uk vi_VI zh_CN"
+translations="en_US SKIP ar ast bg ca cs_CZ da_DK de_DE el es fa fil fi fr gl he hsb hu_HU it ja lt_LT ne nl pl_PL pt_BR pt_PT ro ru si sk sv_SE tr uk vi_VI zh_CN"
 file=$1
 
 # You can execute the following

core/files/update-translations.sh

@@ -6,7 +6,7 @@
     <groupId>com.graphhopper</groupId>
     <artifactId>graphhopper</artifactId>
     <name>GraphHopper</name>
-    <version>0.5.0-RC1</version>
+    <version>0.5.0</version>
     <packaging>jar</packaging> 
     <description>
         GraphHopper is a fast and memory efficient Java road routing engine 
@@ -15,7 +15,7 @@
     <parent>
         <groupId>com.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>    	
-        <version>0.5.0-RC1</version>
+        <version>0.5.0</version>
     </parent>
 
     <properties>  
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>xmlgraphics-commons</artifactId>
-            <version>1.5</version>
+            <version>2.0.1</version>
         </dependency>
 
         <dependency>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.openstreetmap.osmosis</groupId>
             <artifactId>osmosis-osm-binary</artifactId>
-            <version>0.43.1</version>
+            <version>0.44.1</version>
         </dependency>
 
         <dependency>

core/pom.xml

@@ -60,8 +60,8 @@ public GHRequest( int size )
 
     /**
      * Set routing request from specified startPlace (fromLat, fromLon) to endPlace (toLat, toLon)
-     * with a preferred start and end heading.
-     * Headings are north based azimuth (clockwise) in (0, 360) or NaN for equal preference.
+     * with a preferred start and end heading. Headings are north based azimuth (clockwise) in (0,
+     * 360) or NaN for equal preference.
      */
     public GHRequest( double fromLat, double fromLon, double toLat, double toLon,
                       double startHeading, double endHeading )
@@ -77,10 +77,9 @@ public GHRequest( double fromLat, double fromLon, double toLat, double toLon )
         this(new GHPoint(fromLat, fromLon), new GHPoint(toLat, toLon));
     }
 
-
     /**
-     * Set routing request from specified startPlace to endPlace with a preferred start and end heading.
-     * Headings are north based azimuth (clockwise) in (0, 360) or NaN for equal preference
+     * Set routing request from specified startPlace to endPlace with a preferred start and end
+     * heading. Headings are north based azimuth (clockwise) in (0, 360) or NaN for equal preference
      */
     public GHRequest( GHPoint startPlace, GHPoint endPlace, double startHeading, double endHeading )
     {
@@ -106,19 +105,19 @@ public GHRequest( GHPoint startPlace, GHPoint endPlace )
         this(startPlace, endPlace, Double.NaN, Double.NaN);
     }
 
-
     /**
      * Set routing request
-     *
-     * @param points          List of stopover points in order: start, 1st stop, 2nd stop, ..., end
-     * @param favoredHeadings List of favored headings for starting (start point) and arrival (via and end points)
-     *                        Headings are north based azimuth (clockwise) in (0, 360) or NaN for equal preference
+     * <p>
+     * @param points List of stopover points in order: start, 1st stop, 2nd stop, ..., end
+     * @param favoredHeadings List of favored headings for starting (start point) and arrival (via
+     * and end points) Headings are north based azimuth (clockwise) in (0, 360) or NaN for equal
+     * preference
      */
     public GHRequest( List<GHPoint> points, List<Double> favoredHeadings )
     {
         if (points.size() != favoredHeadings.size())
-            throw new IllegalArgumentException("Size of headings (" + favoredHeadings.size() +
-                    ") must match size of points (" + points.size() + ")");
+            throw new IllegalArgumentException("Size of headings (" + favoredHeadings.size()
+                    + ") must match size of points (" + points.size() + ")");
 
         for (Double heading : favoredHeadings)
         {
@@ -130,7 +129,7 @@ public GHRequest( List<GHPoint> points, List<Double> favoredHeadings )
 
     /**
      * Set routing request
-     *
+     * <p>
      * @param points List of stopover points in order: start, 1st stop, 2nd stop, ..., end
      */
     public GHRequest( List<GHPoint> points )
@@ -140,19 +139,18 @@ public GHRequest( List<GHPoint> points )
 
     /**
      * Add stopover point to routing request.
-     *
-     * @param point          geographical position (see GHPoint)
+     * <p>
+     * @param point geographical position (see GHPoint)
      * @param favoredHeading north based azimuth (clockwise) in (0, 360) or NaN for equal preference
      */
-    public GHRequest addPoint( GHPoint point, Double favoredHeading )
+    public GHRequest addPoint( GHPoint point, double favoredHeading )
     {
         if (point == null)
             throw new IllegalArgumentException("point cannot be null");
 
-
         if (!possibleToAdd)
             throw new IllegalStateException("Please call empty constructor if you intent to use "
-                    + "more than two places via addPlace method.");
+                    + "more than two places via addPoint method.");
 
         points.add(point);
         validateAzimuthValue(favoredHeading);
@@ -162,7 +160,7 @@ public GHRequest addPoint( GHPoint point, Double favoredHeading )
 
     /**
      * Add stopover point to routing request.
-     *
+     * <p>
      * @param point geographical position (see GHPoint)
      */
     public GHRequest addPoint( GHPoint point )
@@ -185,19 +183,16 @@ public double getFavoredHeading( int i )
     public boolean hasFavoredHeading( int i )
     {
         if (i >= favoredHeadings.size())
-            throw new IndexOutOfBoundsException("Index: " + i + " too large for list of size " + favoredHeadings.size());
+            return false;
 
         return !Double.isNaN(favoredHeadings.get(i));
     }
 
-    // validate Azimuth entry
-    private void validateAzimuthValue( Double heading )
+    private void validateAzimuthValue( double heading )
     {
-        // heading must be in (0, 360) oder Nan
+        // heading must be in (0, 360) oder NaN
         if (!Double.isNaN(heading) && ((Double.compare(heading, 360) > 0) || (Double.compare(heading, 0) < 0)))
-        {
             throw new IllegalArgumentException("Heading " + heading + " must be in range (0,360) or NaN");
-        }
     }
 
     public List<GHPoint> getPoints()

core/src/main/java/com/graphhopper/GHRequest.java

@@ -748,7 +748,7 @@ public boolean load( String graphHopperFolder )
         if (chEnabled)
         {
             initCHAlgoFactories();
-            ghStorage = new GraphHopperStorage(algoFactories.keySet(), dir, encodingManager, hasElevation(), ext);
+            ghStorage = new GraphHopperStorage(new ArrayList<Weighting>(algoFactories.keySet()), dir, encodingManager, hasElevation(), ext);
         } else
             ghStorage = new GraphHopperStorage(dir, encodingManager, hasElevation(), ext);
 
@@ -851,9 +851,7 @@ protected void postProcessing()
 
         initLocationIndex();
         if (chEnabled)
-        {
             createCHPreparations();
-        }
 
         if (!isPrepared())
             prepare();

core/src/main/java/com/graphhopper/GraphHopper.java

@@ -407,11 +407,11 @@ public boolean enforceHeading( int nodeId, double favoredHeading, boolean incomi
 
             if (Math.abs(delta) > 1.74) // penalize if a turn of more than 100°
             {
-                edge.setVirtualEdgePreference(true, false);
+                edge.setVirtualEdgePreference(true);
                 modifiedEdges.add(edge);
                 //also apply to opposite edge for reverse routing
                 VirtualEdgeIteratorState reverseEdge = virtualEdges.get(virtNodeIDintern * 4 + getPosOfReverseEdge(edgePos));
-                reverseEdge.setVirtualEdgePreference(true, true);
+                reverseEdge.setVirtualEdgePreference(true);
                 modifiedEdges.add(reverseEdge);
                 enforcementOccured = true;
             }
@@ -435,9 +435,9 @@ public boolean enforceHeadingByEdgeId( int nodeId, int edgeId, boolean incoming
 
         VirtualEdgeIteratorState incomingEdge = (VirtualEdgeIteratorState) getEdgeIteratorState(edgeId, nodeId);
         VirtualEdgeIteratorState reverseEdge = (VirtualEdgeIteratorState) getEdgeIteratorState(edgeId, incomingEdge.getBaseNode());
-        incomingEdge.setVirtualEdgePreference(true, !incoming);
+        incomingEdge.setVirtualEdgePreference(true);
         modifiedEdges.add(incomingEdge);
-        reverseEdge.setVirtualEdgePreference(true, incoming);
+        reverseEdge.setVirtualEdgePreference(true);
         modifiedEdges.add(reverseEdge);
         return true;
     }
@@ -449,10 +449,8 @@ public void clearUnfavoredStatus()
     {
         for (VirtualEdgeIteratorState edge : modifiedEdges)
         {
-            edge.setVirtualEdgePreference(false, false);
-            edge.setVirtualEdgePreference(false, true);
+            edge.setVirtualEdgePreference(false);
         }
-
     }
 
     @Override

core/src/main/java/com/graphhopper/routing/QueryGraph.java

@@ -35,7 +35,6 @@ public class VirtualEdgeIteratorState implements EdgeIteratorState, CHEdgeIterat
     private final int adjNode;
     private final int originalTraversalKey;
     // indication if edges are dispreferred as start/stop edge 
-    private boolean unfavoredReverseEdge;
     private boolean unfavored;
 
     public VirtualEdgeIteratorState( int originalTraversalKey, int edgeId, int baseNode, int adjNode, double distance, long flags, String name, PointList pointList )
@@ -149,27 +148,18 @@ public EdgeIteratorState setName( String name )
     public boolean getBoolean( int key, boolean reverse, boolean _default )
     {
         if (key == EdgeIteratorState.K_UNFAVORED_EDGE)
-        {
-            if (reverse)
-                return unfavoredReverseEdge;
-            else
-                return unfavored;
-        }
+            return unfavored;
+
         // for non-existent keys return default
         return _default;
     }
 
     /**
      * This method sets edge to unfavored status for routing from or to the start/stop points.
-     * <p>
-     * @param reverse indicates if forward or backward direction is affected
      */
-    public void setVirtualEdgePreference( boolean unfavored, boolean reverse )
+    public void setVirtualEdgePreference( boolean unfavored )
     {
-        if (reverse)
-            unfavoredReverseEdge = unfavored;
-        else
-            this.unfavored = unfavored;
+        this.unfavored = unfavored;
     }
 
     @Override

core/src/main/java/com/graphhopper/routing/VirtualEdgeIteratorState.java

@@ -115,6 +115,7 @@ protected AbstractFlagEncoder( int speedBits, double speedFactor, int maxTurnCos
 
         acceptedRailways.add("tram");
         acceptedRailways.add("abandoned");
+        acceptedRailways.add("abandoned_tram");        
         acceptedRailways.add("disused");
 
         // http://wiki.openstreetmap.org/wiki/Demolished_Railway