Changeset 31574 in osm for applications/editors/josm/plugins/ElevationProfile

Timestamp:

2015-09-21T02:22:29+02:00 (9 years ago)

Author:

donvip

Message:

[josm_elevationprofile] update to JOSM 8772

Location:

applications/editors/josm/plugins/ElevationProfile

Files:

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

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="8526"/>
+    <property name="plugin.main.version" value="8772"/>
     
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -15 +15 @@
 import org.openstreetmap.gui.jmapviewer.Tile;
 import org.openstreetmap.gui.jmapviewer.TileController;
+import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
@@ -87 +88 @@
                                 } else {
                                         // give some consolation...
-                                        Point topLeft = mv.getPoint(
-                                                        new LatLon(tileSource.tileYToLat(y, ELE_ZOOM_LEVEL),
-                                                                        tileSource.tileXToLon(x, ELE_ZOOM_LEVEL)));
+                                        Point topLeft = mv.getPoint(new LatLon(tileSource.tileXYToLatLon(x, y, ELE_ZOOM_LEVEL)));
                                         t.paint(g, topLeft.x, topLeft.y);
                                 }
@@ -170 +169 @@
                                 return;
 
-                        x0 = (int)tileSource.lonToTileX(topLeft.lon(),  zoom);
-                        y0 = (int)tileSource.latToTileY(topLeft.lat(),  zoom);
-                        x1 = (int)tileSource.lonToTileX(botRight.lon(), zoom);
-                        y1 = (int)tileSource.latToTileY(botRight.lat(), zoom);
+                        TileXY p0 = tileSource.latLonToTileXY(topLeft.lat(), topLeft.lon(), zoom);
+                        TileXY p1 = tileSource.latLonToTileXY(botRight.lat(), botRight.lon(), zoom);
+
+                        x0 = p0.getXIndex();
+                        y0 = p0.getYIndex();
+                        x1 = p1.getXIndex();
+                        y1 = p1.getYIndex();
                         if (x0 > x1) {
                                 int tmp = x0;

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

@@ -126 +126 @@
          */
         private Bounds tile2Bounds(final int x, final int y, final int zoom) {
-                Bounds bb = new Bounds(
-                                new LatLon(source.tileYToLat(y, zoom), source.tileXToLon(x, zoom)),
-                                new LatLon(source.tileYToLat(y + 1, zoom), source.tileXToLon(x + 1, zoom)));
-
-                return bb;
+                return new Bounds(
+                                new LatLon(source.tileXYToLatLon(x, y, zoom)),
+                                new LatLon(source.tileXYToLatLon(x + 1, y + 1, zoom)));
         }
 

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

@@ -14 +14 @@
     public ElevationGridTileSource(String name) {
         super(new TileSourceInfo(name, "", "eg"));
-    }
-
-    @Override
-    public TileUpdate getTileUpdate() {
-        return TileUpdate.None;
     }