Changeset 25935 in osm for applications/editors

Timestamp:

2011-05-02T20:54:39+02:00 (13 years ago)

Author:

jttt

Message:

Adapt to latest josm

Location:

applications/editors/josm/plugins/wms-turbo-challenge2

Files:

• build.xml (modified) (1 diff)
• src/wmsturbochallenge/FakeMapView.java (modified) (5 diffs)

applications/editors/josm/plugins/wms-turbo-challenge2/build.xml

@@ -66 +66 @@
                 <attribute name="Plugin-Icon" value="images/wmsracer.png"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/WMS_Racer"/>
-                <attribute name="Plugin-Mainversion" value="3835"/>
+                <attribute name="Plugin-Mainversion" value="4065"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/FakeMapView.java

@@ -43 +43 @@
         ProjectionBounds parent_bounds = parent.getProjectionBounds();
         max_east_west =
-            parent_bounds.max.east() - parent_bounds.min.east();
+            parent_bounds.maxEast - parent_bounds.minEast;
     }
 
@@ -49 +49 @@
         view_bounds = bounds;
 
-        if (bounds.max.east() - bounds.min.east() > max_east_west) {
-            max_east_west = bounds.max.east() - bounds.min.east();
+        if (bounds.maxEast - bounds.minEast > max_east_west) {
+            max_east_west = bounds.maxEast - bounds.minEast;
 
             /* We need to set the parent MapView's bounds (i.e.
@@ -75 +75 @@
                 parent.getProjectionBounds();
             max_east_west =
-                new_bounds.max.east() - new_bounds.min.east();
+                new_bounds.maxEast - new_bounds.minEast;
         }
 
-        Point vmin = getPoint(bounds.min);
-        Point vmax = getPoint(bounds.max);
+        Point vmin = getPoint(bounds.getMin());
+        Point vmax = getPoint(bounds.getMax());
         int w = vmax.x + 1;
         int h = vmin.y + 1;
@@ -105 +105 @@
 
     public Point getPoint(EastNorth p) {
-        double x = p.east() - view_bounds.min.east();
-        double y = view_bounds.max.north() - p.north();
+        double x = p.east() - view_bounds.minEast;
+        double y = view_bounds.maxNorth - p.north();
         x /= this.scale;
         y /= this.scale;
@@ -115 +115 @@
     public EastNorth getEastNorth(int x, int y) {
         return new EastNorth(
-            view_bounds.min.east() + x * this.scale,
-            view_bounds.min.north() - y * this.scale);
+            view_bounds.minEast + x * this.scale,
+            view_bounds.minNorth - y * this.scale);
     }