Changeset 8637 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-08-02T23:08:56+02:00 (9 years ago)

Author:

Don-vip

Message:

update to latest JMapViewer

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• TemplatedWMSTileSource.java (modified) (1 diff)
• WMTSTileSource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

@@ -242 +242 @@
 
     @Override
-    public ICoordinate XYToLatLon(Point point, int zoom) {
-        return XYToLatLon(point.x, point.y, zoom);
-    }
-
-    @Override
-    public ICoordinate XYToLatLon(int x, int y, int zoom) {
+    public ICoordinate xyToLatLon(Point point, int zoom) {
+        return xyToLatLon(point.x, point.y, zoom);
+    }
+
+    @Override
+    public ICoordinate xyToLatLon(int x, int y, int zoom) {
         double scale = getDegreesPerTile(zoom) / getTileSize();
         Projection proj = Main.getProjection();

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -539 +539 @@
 
     @Override
-    public Coordinate XYToLatLon(Point point, int zoom) {
-        return XYToLatLon(point.x, point.y, zoom);
-    }
-
-    @Override
-    public Coordinate XYToLatLon(int x, int y, int zoom) {
+    public Coordinate xyToLatLon(Point point, int zoom) {
+        return xyToLatLon(point.x, point.y, zoom);
+    }
+
+    @Override
+    public Coordinate xyToLatLon(int x, int y, int zoom) {
         TileMatrix matrix = getTileMatrix(zoom);
         if (matrix == null) {