Changeset 12669 in josm for trunk/src/org/openstreetmap/josm/gui/layer

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)

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (4 diffs)
• imagery/ReprojectionTile.java (modified) (3 diffs)
• imagery/TileCoordinateConverter.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -80 +80 @@
 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.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
@@ -1135 +1136 @@
 
     private ICoordinate getShiftedCoord(EastNorth en) {
-        return getShiftedLatLon(en).toCoordinate();
+        return CoordinateConversion.llToCoor(getShiftedLatLon(en));
     }
 
@@ -1284 +1285 @@
             return new TileSet();
         TileXY t1, t2;
+        IProjected topLeftUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMin());
+        IProjected botRightUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMax());
         if (coordinateConverter.requiresReprojection()) {
             Projection projServer = Projections.getProjectionByCode(tileSource.getServerCRS());
             ProjectionBounds projBounds = new ProjectionBounds(
-                    new EastNorth(coordinateConverter.shiftDisplayToServer(bounds.getMin())),
-                    new EastNorth(coordinateConverter.shiftDisplayToServer(bounds.getMax())));
+                    CoordinateConversion.projToEn(topLeftUnshifted),
+                    CoordinateConversion.projToEn(botRightUnshifted));
             ProjectionBounds bbox = projServer.getEastNorthBoundsBox(projBounds, Main.getProjection());
-            t1 = tileSource.projectedToTileXY(bbox.getMin().toProjected(), zoom);
-            t2 = tileSource.projectedToTileXY(bbox.getMax().toProjected(), zoom);
+            t1 = tileSource.projectedToTileXY(CoordinateConversion.enToProj(bbox.getMin()), zoom);
+            t2 = tileSource.projectedToTileXY(CoordinateConversion.enToProj(bbox.getMax()), zoom);
         } else {
-            IProjected topLeftUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMin());
-            IProjected botRightUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMax());
             t1 = tileSource.projectedToTileXY(topLeftUnshifted, zoom);
             t2 = tileSource.projectedToTileXY(botRightUnshifted, zoom);
@@ -1745 +1746 @@
         for (LatLon point: points) {
             TileXY minTile = tileSource.latLonToTileXY(point.lat() - bufferY, point.lon() - bufferX, currentZoomLevel);
-            TileXY curTile = tileSource.latLonToTileXY(point.toCoordinate(), currentZoomLevel);
+            TileXY curTile = tileSource.latLonToTileXY(CoordinateConversion.llToCoor(point), currentZoomLevel);
             TileXY maxTile = tileSource.latLonToTileXY(point.lat() + bufferY, point.lon() + bufferX, currentZoomLevel);
 

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

@@ -11 +11 @@
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.imagery.CoordinateConversion;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
@@ -95 +96 @@
         this.anchor = null;
         this.maxZoomReached = false;
+    }
+
+    private EastNorth tileToEastNorth(int x, int y, int z) {
+        return CoordinateConversion.projToEn(source.tileXYtoProjected(x, y, z));
     }
 
@@ -118 +123 @@
         Projection projCurrent = Main.getProjection();
         Projection projServer = Projections.getProjectionByCode(source.getServerCRS());
-        EastNorth en00Server = new EastNorth(source.tileXYtoProjected(xtile, ytile, zoom));
-        EastNorth en11Server = new EastNorth(source.tileXYtoProjected(xtile + 1, ytile + 1, zoom));
+        EastNorth en00Server = tileToEastNorth(xtile, ytile, zoom);
+        EastNorth en11Server = tileToEastNorth(xtile + 1, ytile + 1, zoom);
         ProjectionBounds pbServer = new ProjectionBounds(en00Server);
         pbServer.extend(en11Server);

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();