Changeset 33551 in osm for applications/editors/josm

Timestamp:

2017-08-27T14:45:01+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12669

Location:

applications/editors/josm/plugins/ElevationProfile

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTile.java (modified) (2 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="[josm_elevationprofile]"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="11843"/>
+    <property name="plugin.main.version" value="12669"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridLayer.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.imagery.CoordinateConversion;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
@@ -85 +86 @@
                 } else {
                     // give some consolation...
-                    Point topLeft = mv.getPoint(new LatLon(tileSource.tileXYToLatLon(x, y, ELE_ZOOM_LEVEL)));
+                    Point topLeft = mv.getPoint(CoordinateConversion.coorToLL(tileSource.tileXYToLatLon(x, y, ELE_ZOOM_LEVEL)));
                     t.paint(g, topLeft.x, topLeft.y);
                 }

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTile.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.imagery.CoordinateConversion;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
@@ -128 +129 @@
     private Bounds tile2Bounds(final int x, final int y, final int zoom) {
         return new Bounds(
-                new LatLon(source.tileXYToLatLon(x, y, zoom)),
-                new LatLon(source.tileXYToLatLon(x + 1, y + 1, zoom)));
+                CoordinateConversion.coorToLL(source.tileXYToLatLon(x, y, zoom)),
+                CoordinateConversion.coorToLL(source.tileXYToLatLon(x + 1, y + 1, zoom)));
     }