Changeset 16860 in osm for applications/editors/josm/plugins/wmsplugin

Timestamp:

2009-08-04T21:28:40+02:00 (16 years ago)

Author:

stoecker

Message:

fixed zoom level display bug

Location:

applications/editors/josm/plugins/wmsplugin

Files:

• build.xml (modified) (1 diff)
• src/wmsplugin/WMSLayer.java (modified) (3 diffs)

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

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/WMSPlugin"/>
-                <attribute name="Plugin-Mainversion" value="1893"/>
+                <attribute name="Plugin-Mainversion" value="1908"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
                 <attribute name="de_Plugin-Link" value="http://wiki.openstreetmap.org/wiki/DE:JOSM/Plugins/WMSPlugin"/>

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

@@ -80 +80 @@
         WMSGrabber.getProjection(baseURL, true);
         mv = Main.map.mapView;
+        resolution = mv.getDist100PixelText();
         pixelPerDegree = getPPD();
 
@@ -107 +108 @@
     @Override public Icon getIcon() {
         return icon;
-    }
-
-    public String scale(){
-        LatLon ll1 = mv.getLatLon(0,0);
-        LatLon ll2 = mv.getLatLon(100,0);
-        double dist = ll1.greatCircleDistance(ll2);
-        return dist > 1000 ? (Math.round(dist/100)/10.0)+" km" : Math.round(dist*10)/10+" m";
     }
 
@@ -242 +236 @@
         public void actionPerformed(ActionEvent ev) {
             initializeImages();
-            resolution = scale();
+            resolution = mv.getDist100PixelText();
             pixelPerDegree = getPPD();
             mv.repaint();