Changeset 12669 in josm for trunk/src/org/openstreetmap/josm/gui/layer
- Timestamp:
- 2017-08-27T00:17:49+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/layer
- Files:
-
- 3 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 -
trunk/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java
r12630 r12669 11 11 import org.openstreetmap.josm.data.ProjectionBounds; 12 12 import org.openstreetmap.josm.data.coor.EastNorth; 13 import org.openstreetmap.josm.data.imagery.CoordinateConversion; 13 14 import org.openstreetmap.josm.data.projection.Projection; 14 15 import org.openstreetmap.josm.data.projection.Projections; … … 95 96 this.anchor = null; 96 97 this.maxZoomReached = false; 98 } 99 100 private EastNorth tileToEastNorth(int x, int y, int z) { 101 return CoordinateConversion.projToEn(source.tileXYtoProjected(x, y, z)); 97 102 } 98 103 … … 118 123 Projection projCurrent = Main.getProjection(); 119 124 Projection projServer = Projections.getProjectionByCode(source.getServerCRS()); 120 EastNorth en00Server = new EastNorth(source.tileXYtoProjected(xtile, ytile, zoom));121 EastNorth en11Server = new EastNorth(source.tileXYtoProjected(xtile + 1, ytile + 1, zoom));125 EastNorth en00Server = tileToEastNorth(xtile, ytile, zoom); 126 EastNorth en11Server = tileToEastNorth(xtile + 1, ytile + 1, zoom); 122 127 ProjectionBounds pbServer = new ProjectionBounds(en00Server); 123 128 pbServer.extend(en11Server); -
trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
r11961 r12669 17 17 import org.openstreetmap.josm.data.coor.EastNorth; 18 18 import org.openstreetmap.josm.data.coor.LatLon; 19 import org.openstreetmap.josm.data.imagery.CoordinateConversion; 19 20 import org.openstreetmap.josm.data.projection.Projecting; 20 21 import org.openstreetmap.josm.data.projection.ShiftedProjecting; … … 46 47 47 48 private MapViewPoint pos(ICoordinate ll) { 48 return mapView.getState().getPointFor( new LatLon(ll)).add(settings.getDisplacement());49 return mapView.getState().getPointFor(CoordinateConversion.coorToLL(ll)).add(settings.getDisplacement()); 49 50 } 50 51 51 52 private MapViewPoint pos(IProjected p) { 52 return mapView.getState().getPointFor( new EastNorth(p)).add(settings.getDisplacement());53 return mapView.getState().getPointFor(CoordinateConversion.projToEn(p)).add(settings.getDisplacement()); 53 54 } 54 55 … … 60 61 */ 61 62 public IProjected shiftDisplayToServer(EastNorth en) { 62 return en.subtract(settings.getDisplacement()).toProjected();63 return CoordinateConversion.enToProj(en.subtract(settings.getDisplacement())); 63 64 } 64 65 … … 102 103 if (requiresReprojection()) { 103 104 LatLon ll = getProjecting().eastNorth2latlonClamped(mapView.getEastNorth(sx, sy)); 104 return tileSource.latLonToTileXY( ll.toCoordinate(), zoom);105 return tileSource.latLonToTileXY(CoordinateConversion.llToCoor(ll), zoom); 105 106 } else { 106 107 IProjected p = shiftDisplayToServer(mapView.getEastNorth(sx, sy)); … … 165 166 LatLon topLeft = mapView.getLatLon(0, 0); 166 167 LatLon botRight = mapView.getLatLon(mapView.getWidth(), mapView.getHeight()); 167 t1 = tileSource.latLonToTileXY( topLeft.toCoordinate(), zoom);168 t2 = tileSource.latLonToTileXY( botRight.toCoordinate(), zoom);168 t1 = tileSource.latLonToTileXY(CoordinateConversion.llToCoor(topLeft), zoom); 169 t2 = tileSource.latLonToTileXY(CoordinateConversion.llToCoor(botRight), zoom); 169 170 } else { 170 171 EastNorth topLeftEN = mapView.getEastNorth(0, 0); 171 172 EastNorth botRightEN = mapView.getEastNorth(mapView.getWidth(), mapView.getHeight()); 172 t1 = tileSource.projectedToTileXY( topLeftEN.toProjected(), zoom);173 t2 = tileSource.projectedToTileXY( botRightEN.toProjected(), zoom);173 t1 = tileSource.projectedToTileXY(CoordinateConversion.enToProj(topLeftEN), zoom); 174 t2 = tileSource.projectedToTileXY(CoordinateConversion.enToProj(botRightEN), zoom); 174 175 } 175 176 int screenPixels = mapView.getWidth()*mapView.getHeight();
Note:
See TracChangeset
for help on using the changeset viewer.