Changeset 16290 in osm for applications/editors/josm/plugins/editgpx/src/org/openstreetmap

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/editgpx/src/org/openstreetmap/josm/plugins/editgpx

Files:

• EditGpxLayer.java (modified) (3 diffs)
• EditGpxMode.java (modified) (1 diff)

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java

@@ -113 +113 @@
             for(Node n: dataSet.nodes) {
                 if (!n.deleted) {
-                    LatLon c = n.coor;
-                    Point pnt = Main.map.mapView.getPoint(Main.proj.latlon2eastNorth(c));
+                    Point pnt = Main.map.mapView.getPoint(n.getEastNorth());
                     g.drawOval(pnt.x - 2, pnt.y - 2, 4, 4);
                 }
@@ -166 +165 @@
                 doneNodes.add(n);
 
-                WayPoint wpt = new WayPoint(n.coor);
+                WayPoint wpt = new WayPoint(n.getCoor());
                 if (anonTime) {
                     wpt.attr.put("time", "1970-01-01T00:00:00");
@@ -184 +183 @@
             Date tstamp = n.getTimestamp();
 
-            WayPoint wpt = new WayPoint(n.coor);
+            WayPoint wpt = new WayPoint(n.getCoor());
             if (anonTime) {
                 wpt.attr.put("time", "1970-01-01T00:00:00");

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java

@@ -64 +64 @@
             Point pointReleased = e.getPoint();
 
-            //prepare vars
-            EastNorth en;
-            double scale = Main.map.mapView.getScale();
-            EastNorth center = Main.map.mapView.getCenter(); //Center n/e coordinate of the desired screen center.
-            int width = Main.map.mapView.getWidth();
-            int height = Main.map.mapView.getHeight();
             Rectangle r = createRect(pointReleased, pointPressed);
 
             //go through nodes and mark the ones in the selection rect as deleted
             for (Node n: dataSet.nodes) {
-                en = n.eastNorth;
-                //calculate point on screen from node n
-                double x = (en.east()-center.east())/scale + width/2;
-                double y = (center.north()-en.north())/scale + height/2;
-                Point p = new Point((int)x,(int)y);
+                Point p = Main.map.mapView.getPoint(n.getEastNorth());
                 if (r.contains(p)) {
                     n.deleted = true; //only set as deleted. this makes reset to beginning possible