major: pillarNode enabled storage; Path is now edgeId based; introduced PointList;

Author: Peter

nb-configuration.xml

@@ -16,7 +16,7 @@ You can copy and paste the single properties, into the pom.xml file and the IDE
 That way multiple projects can share the same settings (useful for formatting rules for example).
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>Oracle_JDK_1.6</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
         <org-netbeans-modules-whitelist.whitelist-oracle>false</org-netbeans-modules-whitelist.whitelist-oracle>
         <netbeans.compile.on.save>all</netbeans.compile.on.save>
     </properties>

pom.xml

@@ -10,9 +10,18 @@
     <packaging>jar</packaging>     
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <slf4j.version>1.7.2</slf4j.version>
+        <slf4j.version>1.7.2</slf4j.version>        
+        <netbeans.hint.license>apache20</netbeans.hint.license>        
     </properties>
-
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+            <comments>A business-friendly OSS license</comments>
+        </license>
+    </licenses>
+    
     <dependencies>
 
         <!-- Trove is LGPL and slightly big (~3MB) -->
@@ -79,7 +88,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                   <!-- <compilerArgument>-Xlint:unchecked</compilerArgument>
+                    <!-- <compilerArgument>-Xlint:unchecked</compilerArgument>
                     -->
                     <source>1.6</source>
                     <target>1.6</target>

src/main/java/com/graphhopper/GHResponse.java

@@ -15,8 +15,7 @@
  */
 package com.graphhopper;
 
-import com.graphhopper.util.shapes.GHPoint;
-import java.util.List;
+import com.graphhopper.util.PointList;
 
 /**
  * Wrapper to simplify output of GraphHopper.
@@ -25,12 +24,12 @@
  */
 public class GHResponse {
 
-    private final List<GHPoint> list;
+    private final PointList list;
     private double distance;
     private long time;
     private String debugInfo = "";
 
-    public GHResponse(List<GHPoint> list) {
+    public GHResponse(PointList list) {
         this.list = list;
     }
 
@@ -56,7 +55,7 @@ public boolean found() {
         return !list.isEmpty();
     }
 
-    public List<GHPoint> points() {
+    public PointList points() {
         return list;
     }
 

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

@@ -33,11 +33,8 @@
 import com.graphhopper.util.DouglasPeucker;
 import com.graphhopper.util.Helper;
 import com.graphhopper.util.StopWatch;
-import com.graphhopper.util.shapes.GHPoint;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Main wrapper of the offline API for a simple and efficient usage.
@@ -55,6 +52,7 @@ public class GraphHopper implements GraphHopperAPI {
     private boolean memoryMapped;
     private boolean levelGraph;
     private String ghLocation = "";
+    private boolean simplify = true;
 
     public GraphHopper() {
     }
@@ -102,6 +100,11 @@ public GraphHopper levelGraph() {
         return this;
     }
 
+    public GraphHopper simplify(boolean doSimplify) {
+        this.simplify = doSimplify;
+        return this;
+    }
+
     public GraphHopper setGraphHopperLocation(String ghLocation) {
         if (ghLocation != null)
             this.ghLocation = ghLocation;
@@ -194,7 +197,7 @@ public GHResponse route(GHRequest request) {
         } else
             prepare = Helper.createAlgoPrepare(request.algorithm());
 
-        request.check();        
+        request.check();
         StopWatch sw = new StopWatch().start();
         int from = index.findID(request.from().lat, request.from().lon);
         int to = index.findID(request.to().lat, request.to().lon);
@@ -206,20 +209,12 @@ public GHResponse route(GHRequest request) {
         Path path = algo.calcPath(from, to);
         debug += " routing (" + algo.name() + "):" + sw.stop().getSeconds() + "s";
 
-        sw = new StopWatch().start();
-        path.simplify(new DouglasPeucker(graph).setMaxDist(request.minPathPrecision()));
-        debug += " simplify:" + sw.stop().getSeconds() + "s";
-
-        int nodes = path.nodes();
-        List<GHPoint> list = new ArrayList<GHPoint>(nodes);
-        if (path.found()) {
+        if (simplify) {
             sw = new StopWatch().start();
-            for (int i = 0; i < nodes; i++) {
-                list.add(new GHPoint(graph.getLatitude(path.node(i)), graph.getLongitude(path.node(i))));
-            }
-            debug += " createList:" + sw.stop().getSeconds() + "s";
+            path.simplify(new DouglasPeucker().setMaxDist(request.minPathPrecision()));
+            debug += " simplify:" + sw.stop().getSeconds() + "s";
         }
-        return new GHResponse(list).distance(path.distance()).time(path.time()).debugInfo(debug);
+        return new GHResponse(path.points()).distance(path.distance()).time(path.time()).debugInfo(debug);
     }
 
     private void initIndex(Directory dir) {

src/main/java/com/graphhopper/GraphHopperWeb.java

@@ -15,6 +15,7 @@
  */
 package com.graphhopper;
 
+import com.graphhopper.util.PointList;
 import com.graphhopper.util.StopWatch;
 import com.graphhopper.util.shapes.GHPoint;
 import java.io.DataInputStream;
@@ -86,11 +87,11 @@ public GHResponse route(GHRequest request) {
             float distance = is.readFloat();
             int time = is.readInt();
             int nodes = is.readInt();
-            List<GHPoint> list = new ArrayList<GHPoint>(nodes);
+            PointList list = new PointList(nodes);
             for (int i = 0; i < nodes; i++) {
                 float lat = is.readFloat();
                 float lon = is.readFloat();
-                list.add(new GHPoint(lat, lon));
+                list.add(lat, lon);
             }
             return new GHResponse(list).distance(distance).time(time);
         } catch (IOException ex) {

src/main/java/com/graphhopper/reader/OSMReaderHelper.java

@@ -19,10 +19,8 @@
 import com.graphhopper.storage.GraphStorage;
 import com.graphhopper.util.DistanceCalc;
 import com.graphhopper.util.EdgeIterator;
-import gnu.trove.list.TDoubleList;
-import gnu.trove.list.TIntList;
+import com.graphhopper.util.PointList;
 import gnu.trove.list.TLongList;
-import gnu.trove.list.array.TIntArrayList;
 import java.io.InputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,7 +30,6 @@
  */
 public abstract class OSMReaderHelper {
 
-    protected static final int FILLED = -2;
     private final Logger logger = LoggerFactory.getLogger(getClass());
     protected int counter = 0;
     protected int zeroCounter = 0;
@@ -56,29 +53,26 @@ public int getExpectedNodes() {
     public void preProcess(InputStream osmXml) {
     }
 
-    public boolean addNode(long osmId, double lat, double lon) {
-        return true;
-    }
+    public abstract boolean addNode(long osmId, double lat, double lon);
 
     public abstract int addEdge(TLongList nodes, int flags);
 
-    public int addEdge(TDoubleList latitudes, TDoubleList longitudes,
-            TIntList allNodes, int flags) {
-        int nodes = allNodes.size();
-        if (latitudes.size() != nodes || longitudes.size() != nodes)
-            throw new IllegalArgumentException("latitudes.size must be equals to longitudes.size and node list size " + nodes);
-
+    public int addEdge(int fromIndex, int toIndex, PointList pointList, int flags) {
         double towerNodeDistance = 0;
-        double prevLat = latitudes.get(0);
-        double prevLon = longitudes.get(0);
+        double prevLat = pointList.latitude(0);
+        double prevLon = pointList.longitude(0);
         double lat;
         double lon;
+        PointList pillarNodes = new PointList(pointList.size() - 2);
+        int nodes = pointList.size();
         for (int i = 1; i < nodes; i++) {
-            lat = latitudes.get(i);
-            lon = longitudes.get(i);
+            lat = pointList.latitude(i);
+            lon = pointList.longitude(i);
             towerNodeDistance += callback.calcDist(prevLat, prevLon, lat, lon);
             prevLat = lat;
             prevLon = lon;
+            if (nodes > 2 && i < nodes - 1)
+                pillarNodes.add(lat, lon);
         }
         if (towerNodeDistance == 0) {
             // As investigation shows often two paths should have crossed via one identical point 
@@ -88,13 +82,9 @@ public int addEdge(TDoubleList latitudes, TDoubleList longitudes,
             towerNodeDistance = 0.0001;
         }
 
-        int fromIndex = allNodes.get(0);
-        int toIndex = allNodes.get(nodes - 1);
         EdgeIterator iter = g.edge(fromIndex, toIndex, towerNodeDistance, flags);
-        if (nodes > 2) {
-            TIntList pillarNodes = allNodes.subList(1, nodes - 1);
+        if (nodes > 2)
             iter.pillarNodes(pillarNodes);
-        }
         return nodes;
     }