Changeset 29629 in osm for applications/editors/josm/plugins/routing

Timestamp:

2013-06-06T13:01:27+02:00 (12 years ago)

Author:

donvip

Message:

[josm_routing] fix #josm8768 - NPE

File:

• applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java (modified) (3 diffs)

applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java

@@ -38 +38 @@
 import org.jgrapht.graph.DirectedWeightedMultigraph;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -241 +242 @@
          */
         private void addEdge(Way way,Node from, Node to) {
-                double length = from.getCoor().greatCircleDistance(to.getCoor());
+            LatLon fromLL = from.getCoor();
+            LatLon toLL = from.getCoor();
+            if (fromLL == null || toLL == null) {
+                return;
+            }
+                double length = fromLL.greatCircleDistance(toLL);
 
                 OsmEdge edge = new OsmEdge(way, from, to);
@@ -252 +258 @@
                                 + "(from node " + from.getId() + " to node "
                                 + to.getId() + ") has weight: " + weight);
-                //((GraphDelegator<Node,OsmEdge>) graph).setEdgeWeight(edge, weight);
                 ((DirectedWeightedMultigraph<Node,OsmEdge>)graph).setEdgeWeight(edge, weight);
         }