Changeset 16687 in osm for applications

Timestamp:

2009-07-26T11:16:21+02:00 (15 years ago)

Author:

stoecker

Message:

fixes for newer JOSM

Location:

applications/editors/josm/plugins/utilsplugin

Files:

• build.xml (modified) (1 diff)
• src/UtilsPlugin/JumpToAction.java (modified) (4 diffs)

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

@@ -25 +25 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Several utilities that make your life easier: e.g. simplify way, join areas, jump to position."/>
-                <attribute name="Plugin-Mainversion" value="1815"/>
+                <attribute name="Plugin-Mainversion" value="1823"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

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

@@ -22 +22 @@
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
@@ -40 +40 @@
     private double zoomFactor = 0;
     public void showJumpToDialog() {
-        LatLon curPos=Main.proj.eastNorth2latlon(Main.map.mapView.getCenter());
+        MapView mv = Main.map.mapView;
+        LatLon curPos=mv.getProjection().eastNorth2latlon(mv.getCenter());
         lat.setText(java.lang.Double.toString(curPos.lat()));
         lon.setText(java.lang.Double.toString(curPos.lon()));
 
-        double dist = Main.map.mapView.getDist100Pixel();
+        double dist = mv.getDist100Pixel();
         zoomFactor = 1/dist;
 
@@ -115 +116 @@
         }
 
-        Main.map.mapView.zoomToFactor(Main.proj.latlon2eastNorth(ll), zoomFactor * zoomLvl);
+        mv.zoomToFactor(mv.getProjection().latlon2eastNorth(ll), zoomFactor * zoomLvl);
     }
 
@@ -165 +166 @@
      */
     public int getZoom(double scale) {
-        double sizex = scale * Main.map.mapView.getWidth();
-        double sizey = scale * Main.map.mapView.getHeight();
-        ProjectionBounds b = Main.proj.getWorldBounds();
+        MapView mv = Main.map.mapView;
+        double sizex = scale * mv.getWidth();
+        double sizey = scale * mv.getHeight();
+        ProjectionBounds b = mv.getMaxProjectionBounds();
         for (int zoom = 0; zoom <= 32; zoom++, sizex *= 2, sizey *= 2) {                
             if (sizex > b.max.east() || sizey > b.max.north())