Ignore:
Timestamp:
2017-08-27T00:17:49+02:00 (8 years ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

    r12630 r12669  
    8080import org.openstreetmap.josm.data.coor.EastNorth;
    8181import org.openstreetmap.josm.data.coor.LatLon;
     82import org.openstreetmap.josm.data.imagery.CoordinateConversion;
    8283import org.openstreetmap.josm.data.imagery.ImageryInfo;
    8384import org.openstreetmap.josm.data.imagery.OffsetBookmark;
     
    11351136
    11361137    private ICoordinate getShiftedCoord(EastNorth en) {
    1137         return getShiftedLatLon(en).toCoordinate();
     1138        return CoordinateConversion.llToCoor(getShiftedLatLon(en));
    11381139    }
    11391140
     
    12841285            return new TileSet();
    12851286        TileXY t1, t2;
     1287        IProjected topLeftUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMin());
     1288        IProjected botRightUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMax());
    12861289        if (coordinateConverter.requiresReprojection()) {
    12871290            Projection projServer = Projections.getProjectionByCode(tileSource.getServerCRS());
    12881291            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));
    12911294            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);
    12941297        } else {
    1295             IProjected topLeftUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMin());
    1296             IProjected botRightUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMax());
    12971298            t1 = tileSource.projectedToTileXY(topLeftUnshifted, zoom);
    12981299            t2 = tileSource.projectedToTileXY(botRightUnshifted, zoom);
     
    17451746        for (LatLon point: points) {
    17461747            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);
    17481749            TileXY maxTile = tileSource.latLonToTileXY(point.lat() + bufferY, point.lon() + bufferX, currentZoomLevel);
    17491750
Note: See TracChangeset for help on using the changeset viewer.