Changeset 12669 in josm for trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java

Timestamp:

2017-08-27T00:17:49+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - remove dependence on JMapViewer for package data.coor (only useful for imagery)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.imagery.CoordinateConversion;
 import org.openstreetmap.josm.data.projection.Projecting;
 import org.openstreetmap.josm.data.projection.ShiftedProjecting;
@@ -46 +47 @@
 
     private MapViewPoint pos(ICoordinate ll) {
-        return mapView.getState().getPointFor(new LatLon(ll)).add(settings.getDisplacement());
+        return mapView.getState().getPointFor(CoordinateConversion.coorToLL(ll)).add(settings.getDisplacement());
     }
 
     private MapViewPoint pos(IProjected p) {
-        return mapView.getState().getPointFor(new EastNorth(p)).add(settings.getDisplacement());
+        return mapView.getState().getPointFor(CoordinateConversion.projToEn(p)).add(settings.getDisplacement());
     }
 
@@ -60 +61 @@
      */
     public IProjected shiftDisplayToServer(EastNorth en) {
-        return en.subtract(settings.getDisplacement()).toProjected();
+        return CoordinateConversion.enToProj(en.subtract(settings.getDisplacement()));
     }
 
@@ -102 +103 @@
         if (requiresReprojection()) {
             LatLon ll = getProjecting().eastNorth2latlonClamped(mapView.getEastNorth(sx, sy));
-            return tileSource.latLonToTileXY(ll.toCoordinate(), zoom);
+            return tileSource.latLonToTileXY(CoordinateConversion.llToCoor(ll), zoom);
         } else {
             IProjected p = shiftDisplayToServer(mapView.getEastNorth(sx, sy));
@@ -165 +166 @@
             LatLon topLeft = mapView.getLatLon(0, 0);
             LatLon botRight = mapView.getLatLon(mapView.getWidth(), mapView.getHeight());
-            t1 = tileSource.latLonToTileXY(topLeft.toCoordinate(), zoom);
-            t2 = tileSource.latLonToTileXY(botRight.toCoordinate(), zoom);
+            t1 = tileSource.latLonToTileXY(CoordinateConversion.llToCoor(topLeft), zoom);
+            t2 = tileSource.latLonToTileXY(CoordinateConversion.llToCoor(botRight), zoom);
         } else {
             EastNorth topLeftEN = mapView.getEastNorth(0, 0);
             EastNorth botRightEN = mapView.getEastNorth(mapView.getWidth(), mapView.getHeight());
-            t1 = tileSource.projectedToTileXY(topLeftEN.toProjected(), zoom);
-            t2 = tileSource.projectedToTileXY(botRightEN.toProjected(), zoom);
+            t1 = tileSource.projectedToTileXY(CoordinateConversion.enToProj(topLeftEN), zoom);
+            t2 = tileSource.projectedToTileXY(CoordinateConversion.enToProj(botRightEN), zoom);
         }
         int screenPixels = mapView.getWidth()*mapView.getHeight();