Changeset 16290 in osm for applications/editors/josm/plugins/openstreetbugs/src

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

Files:

• api/DownloadAction.java (modified) (2 diffs)
• gui/OsbDialog.java (modified) (3 diffs)

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/DownloadAction.java

@@ -37 +37 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.tools.OsmUrlToBounds;
 import org.openstreetmap.josm.plugins.osb.ConfigKeys;
 import org.openstreetmap.josm.plugins.osb.api.util.HttpUtils;
@@ -48 +49 @@
         String uri = Main.pref.get(ConfigKeys.OSB_API_URI_DOWNLOAD);
 
+        int zoom = OsmUrlToBounds.getZoom(Main.map.mapView.getRealBounds());
         // check zoom level
-        if(Main.map.mapView.zoom() > 15 || Main.map.mapView.zoom() < 9) {
+        if(zoom > 15 || zoom < 9) {
             return;
         }

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java

@@ -75 +75 @@
 import org.openstreetmap.josm.plugins.osb.gui.action.OsbActionObserver;
 import org.openstreetmap.josm.plugins.osb.gui.action.PopupFactory;
+import org.openstreetmap.josm.tools.OsmUrlToBounds;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -118 +119 @@
 
             public void actionPerformed(ActionEvent e) {
+                int zoom = OsmUrlToBounds.getZoom(Main.map.mapView.getRealBounds());
                 // check zoom level
-                if (Main.map.mapView.zoom() > 15 || Main.map.mapView.zoom() < 9) {
+                if (zoom > 15 || zoom < 9) {
                     JOptionPane.showMessageDialog(Main.parent,
                             tr("The visible area is either too small or too big to download data from OpenStreetBugs"),
@@ -257 +259 @@
 
     public void zoomToNode(Node node) {
-        double scale = Main.map.mapView.getScale();
-        Main.map.mapView.zoomTo(node.getEastNorth(), scale);
+        Main.map.mapView.zoomTo(node.getEastNorth());
     }