Ignore:
Timestamp:
2017-08-27T00:17:49+02:00 (3 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:
3 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
  • trunk/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java

    r12630 r12669  
    1111import org.openstreetmap.josm.data.ProjectionBounds;
    1212import org.openstreetmap.josm.data.coor.EastNorth;
     13import org.openstreetmap.josm.data.imagery.CoordinateConversion;
    1314import org.openstreetmap.josm.data.projection.Projection;
    1415import org.openstreetmap.josm.data.projection.Projections;
     
    9596        this.anchor = null;
    9697        this.maxZoomReached = false;
     98    }
     99
     100    private EastNorth tileToEastNorth(int x, int y, int z) {
     101        return CoordinateConversion.projToEn(source.tileXYtoProjected(x, y, z));
    97102    }
    98103
     
    118123        Projection projCurrent = Main.getProjection();
    119124        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);
    122127        ProjectionBounds pbServer = new ProjectionBounds(en00Server);
    123128        pbServer.extend(en11Server);
  • trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java

    r11961 r12669  
    1717import org.openstreetmap.josm.data.coor.EastNorth;
    1818import org.openstreetmap.josm.data.coor.LatLon;
     19import org.openstreetmap.josm.data.imagery.CoordinateConversion;
    1920import org.openstreetmap.josm.data.projection.Projecting;
    2021import org.openstreetmap.josm.data.projection.ShiftedProjecting;
     
    4647
    4748    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());
    4950    }
    5051
    5152    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());
    5354    }
    5455
     
    6061     */
    6162    public IProjected shiftDisplayToServer(EastNorth en) {
    62         return en.subtract(settings.getDisplacement()).toProjected();
     63        return CoordinateConversion.enToProj(en.subtract(settings.getDisplacement()));
    6364    }
    6465
     
    102103        if (requiresReprojection()) {
    103104            LatLon ll = getProjecting().eastNorth2latlonClamped(mapView.getEastNorth(sx, sy));
    104             return tileSource.latLonToTileXY(ll.toCoordinate(), zoom);
     105            return tileSource.latLonToTileXY(CoordinateConversion.llToCoor(ll), zoom);
    105106        } else {
    106107            IProjected p = shiftDisplayToServer(mapView.getEastNorth(sx, sy));
     
    165166            LatLon topLeft = mapView.getLatLon(0, 0);
    166167            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);
    169170        } else {
    170171            EastNorth topLeftEN = mapView.getEastNorth(0, 0);
    171172            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);
    174175        }
    175176        int screenPixels = mapView.getWidth()*mapView.getHeight();
Note: See TracChangeset for help on using the changeset viewer.