Changeset 16419 in osm for applications/editors/josm/plugins

Timestamp:

2009-07-09T23:41:51+02:00 (15 years ago)

Author:

guggis

Message:

updated for core r1758 after rework of projection handling and of editor layer access

Location:

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin

Files:

• JoinAreasAction.java (modified) (2 diffs)
• JumpToAction.java (modified) (2 diffs)
• SimplifyWayAction.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java

@@ -88 +88 @@
         }
 
+        @Override
         public boolean equals(Object other) {
             if (!(other instanceof RelationRole)) return false;
@@ -119 +120 @@
 
         LinkedList<Bounds> bounds = new LinkedList<Bounds>();
-        OsmDataLayer dataLayer = Main.main.editLayer();
+        OsmDataLayer dataLayer = Main.map.mapView.getEditLayer();
         for (DataSource ds : dataLayer.data.dataSources) {
             if (ds.bounds != null)

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java

@@ -20 +20 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -166 +167 @@
         double sizex = scale * Main.map.mapView.getWidth();
         double sizey = scale * Main.map.mapView.getHeight();
-        for (int zoom = 0; zoom <= 32; zoom++, sizex *= 2, sizey *= 2)
-            if (sizex > NavigatableComponent.world.east() || sizey > NavigatableComponent.world.north())
+        ProjectionBounds b = Main.proj.getWorldBounds();
+        for (int zoom = 0; zoom <= 32; zoom++, sizex *= 2, sizey *= 2) {                
+            if (sizex > b.max.east() || sizey > b.max.north())
                 return zoom;
+        }
         return 32;
     }

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java

@@ -40 +40 @@
         int ways = 0;
         LinkedList<Bounds> bounds = new LinkedList<Bounds>();
-        OsmDataLayer dataLayer = Main.main.editLayer();
+        OsmDataLayer dataLayer = Main.map.mapView.getEditLayer();
         for (DataSource ds : dataLayer.data.dataSources) {
             if (ds.bounds != null)