Changeset 17544 in osm for applications

Timestamp:

2009-09-09T00:13:46+02:00 (15 years ago)

Author:

guggis

Message:

Updating to JOSM r2082

Location:

applications/editors/josm/plugins/routing

Files:

• build.xml (modified) (1 diff)
• src/com/innovant/josm/jrt/core/RoutingGraph.java (modified) (3 diffs)
• src/com/innovant/josm/plugin/routing/RoutingLayer.java (modified) (1 diff)
• src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java (modified) (2 diffs)

applications/editors/josm/plugins/routing/build.xml

@@ -44 +44 @@
                 <attribute name="Plugin-Description" value="Provides routing capabilities."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/>
-                <attribute name="Plugin-Mainversion" value="2012"/>
+                <attribute name="Plugin-Mainversion" value="2082"/>
                 <attribute name="Plugin-Stage" value="50"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>

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

@@ -131 +131 @@
         // iterate all ways and segments for all nodes:
         for (Way way : data.ways) {
-            if (way != null && !way.deleted && this.isvalidWay(way)) {
+            if (way != null && !way.isDeleted() && this.isvalidWay(way)) {
                 Node from = null;
                 for (Node to : way.getNodes()) {
                     // Ignore the node if deleted
-                    if (!to.deleted) {
+                    if (!to.isDeleted()) {
                         graph.addVertex(to);
                         if (from != null) {
@@ -168 +168 @@
         double weight = getWeight(way, length);
         setWeight(edge, length);
-        logger.debug("edge for way " + way.id
-                     + "(from node " + from.id + " to node "
-                     + to.id + ") has weight: " + weight);
+        logger.debug("edge for way " + way.getId()
+                     + "(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);
@@ -279 +279 @@
 
         for (Node node : nodes) {
-            logger.debug(node.id);
+            logger.debug(node.getId());
         }
         logger.debug("-----------------------------------");

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java

@@ -134 +134 @@
         double minDist = 0;
         for (Way w : dataLayer.data.ways) {
-            if (w.deleted || w.incomplete || w.get("highway")==null) continue;
+            if (w.isDeleted() || w.incomplete || w.get("highway")==null) continue;
             for (Node n : w.getNodes()) {
-                if (n.deleted || n.incomplete) continue;
+                if (n.isDeleted() || n.incomplete) continue;
 
                 Point P = Main.map.mapView.getPoint(n);

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java

@@ -125 +125 @@
      */
     public void addNode(Node n) {
-        model.addElement(n.id+" ["+n.getCoor().toDisplayString()+"]");
+        model.addElement(n.getId()+" ["+n.getCoor().toDisplayString()+"]");
     }
 
@@ -134 +134 @@
      */
     public void insertNode(int index, Node n) {
-        model.insertElementAt(n.id+" ["+n.getCoor().toDisplayString()+"]", index);
+        model.insertElementAt(n.getId()+" ["+n.getCoor().toDisplayString()+"]", index);
     }