Changeset 12669 in josm for trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
- Timestamp:
- 2017-08-27T00:17:49+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
r12630 r12669 80 80 import org.openstreetmap.josm.data.coor.EastNorth; 81 81 import org.openstreetmap.josm.data.coor.LatLon; 82 import org.openstreetmap.josm.data.imagery.CoordinateConversion; 82 83 import org.openstreetmap.josm.data.imagery.ImageryInfo; 83 84 import org.openstreetmap.josm.data.imagery.OffsetBookmark; … … 1135 1136 1136 1137 private ICoordinate getShiftedCoord(EastNorth en) { 1137 return getShiftedLatLon(en) .toCoordinate();1138 return CoordinateConversion.llToCoor(getShiftedLatLon(en)); 1138 1139 } 1139 1140 … … 1284 1285 return new TileSet(); 1285 1286 TileXY t1, t2; 1287 IProjected topLeftUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMin()); 1288 IProjected botRightUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMax()); 1286 1289 if (coordinateConverter.requiresReprojection()) { 1287 1290 Projection projServer = Projections.getProjectionByCode(tileSource.getServerCRS()); 1288 1291 ProjectionBounds projBounds = new ProjectionBounds( 1289 new EastNorth(coordinateConverter.shiftDisplayToServer(bounds.getMin())),1290 new EastNorth(coordinateConverter.shiftDisplayToServer(bounds.getMax())));1292 CoordinateConversion.projToEn(topLeftUnshifted), 1293 CoordinateConversion.projToEn(botRightUnshifted)); 1291 1294 ProjectionBounds bbox = projServer.getEastNorthBoundsBox(projBounds, Main.getProjection()); 1292 t1 = tileSource.projectedToTileXY(bbox.getMin() .toProjected(), zoom);1293 t2 = tileSource.projectedToTileXY(bbox.getMax() .toProjected(), zoom);1295 t1 = tileSource.projectedToTileXY(CoordinateConversion.enToProj(bbox.getMin()), zoom); 1296 t2 = tileSource.projectedToTileXY(CoordinateConversion.enToProj(bbox.getMax()), zoom); 1294 1297 } else { 1295 IProjected topLeftUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMin());1296 IProjected botRightUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMax());1297 1298 t1 = tileSource.projectedToTileXY(topLeftUnshifted, zoom); 1298 1299 t2 = tileSource.projectedToTileXY(botRightUnshifted, zoom); … … 1745 1746 for (LatLon point: points) { 1746 1747 TileXY minTile = tileSource.latLonToTileXY(point.lat() - bufferY, point.lon() - bufferX, currentZoomLevel); 1747 TileXY curTile = tileSource.latLonToTileXY( point.toCoordinate(), currentZoomLevel);1748 TileXY curTile = tileSource.latLonToTileXY(CoordinateConversion.llToCoor(point), currentZoomLevel); 1748 1749 TileXY maxTile = tileSource.latLonToTileXY(point.lat() + bufferY, point.lon() + bufferX, currentZoomLevel); 1749 1750
Note:
See TracChangeset
for help on using the changeset viewer.