Changeset 16290 in osm for applications/editors/josm/plugins/routing/src/com

Timestamp:

2009-07-03T12:34:14+02:00 (15 years ago)

Author:

stoecker

Message:

adapted plugins to JOSm 1722, UtilsPlugin still has a problem

Location:

applications/editors/josm/plugins/routing/src/com/innovant/josm

Files:

• jrt/core/RoutingGraph.java (modified) (1 diff)
• jrt/osm/OsmEdge.java (modified) (2 diffs)
• plugin/routing/RoutingLayer.java (modified) (4 diffs)
• plugin/routing/actions/MoveRouteNodeAction.java (modified) (1 diff)
• plugin/routing/actions/RemoveRouteNodeAction.java (modified) (1 diff)
• plugin/routing/gui/RoutingDialog.java (modified) (2 diffs)

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

@@ -160 +160 @@
      */
     private void addEdge(Way way,Node from, Node to) {
-        double length = from.coor.greatCircleDistance(to.coor);
+        double length = from.getCoor().greatCircleDistance(to.getCoor());
 
         OsmEdge edge = new OsmEdge(way, from, to);

applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/osm/OsmEdge.java

@@ -69 +69 @@
         this.from = from;
         this.to = to;
-        this.length = from.coor.greatCircleDistance(to.coor);
+        this.length = from.getCoor().greatCircleDistance(to.getCoor());
       }
 
@@ -80 +80 @@
 
   public EastNorth fromEastNorth() {
-      return this.from.eastNorth;
+      return this.from.getEastNorth();
   }
 
   public EastNorth toEastNorth() {
-      return this.to.eastNorth;
+      return this.to.getEastNorth();
   }
 

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

@@ -139 +139 @@
                 if (n.deleted || n.incomplete) continue;
 
-                Point P = Main.map.mapView.getPoint(n.eastNorth);
+                Point P = Main.map.mapView.getPoint(n.getEastNorth());
                 double dist = p.distanceSq(P);
                 if (dist < NavigatableComponent.snapDistance) {
@@ -275 +275 @@
         // paint start icon
         Node node = nodes.get(0);
-        Point screen = mv.getPoint(node.eastNorth);
+        Point screen = mv.getPoint(node.getEastNorth());
         startIcon.paintIcon(mv, g, screen.x - startIcon.getIconWidth()/2,
                 screen.y - startIcon.getIconHeight());
@@ -282 +282 @@
         for(int index = 1; index < nodes.size() - 1; ++index) {
             node = nodes.get(index);
-            screen = mv.getPoint(node.eastNorth);
+            screen = mv.getPoint(node.getEastNorth());
             middleIcon.paintIcon(mv, g, screen.x - startIcon.getIconWidth()/2,
                     screen.y - middleIcon.getIconHeight());
@@ -289 +289 @@
         if(nodes.size() > 1) {
             node = nodes.get(nodes.size() - 1);
-            screen = mv.getPoint(node.eastNorth);
+            screen = mv.getPoint(node.getEastNorth());
             endIcon.paintIcon(mv, g, screen.x - startIcon.getIconWidth()/2,
                     screen.y - endIcon.getIconHeight());

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

@@ -113 +113 @@
                 for (int i=0;i<nl.size();i++) {
                     Node node = nl.get(i);
-                    double d = Main.map.mapView.getPoint(node.eastNorth).distanceSq(e.getPoint());
+                    double d = Main.map.mapView.getPoint(node.getEastNorth()).distanceSq(e.getPoint());
                     if (d < dmax) {
                         dmax = d;

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

@@ -102 +102 @@
                 for (int i=0;i<nl.size();i++) {
                     Node node = nl.get(i);
-                    double d = Main.map.mapView.getPoint(node.eastNorth).distanceSq(e.getPoint());
+                    double d = Main.map.mapView.getPoint(node.getEastNorth()).distanceSq(e.getPoint());
                     if (d < dmax) {
                         dmax = d;

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.coor.toDisplayString()+"]");
+        model.addElement(n.id+" ["+n.getCoor().toDisplayString()+"]");
     }
 
@@ -134 +134 @@
      */
     public void insertNode(int index, Node n) {
-        model.insertElementAt(n.id+" ["+n.coor.toDisplayString()+"]", index);
+        model.insertElementAt(n.id+" ["+n.getCoor().toDisplayString()+"]", index);
     }