Changeset 8637 in josm for trunk/src/org


Ignore:
Timestamp:
2015-08-02T23:08:56+02:00 (5 years ago)
Author:
Don-vip
Message:

update to latest JMapViewer

Location:
trunk/src/org/openstreetmap/josm/data/imagery
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

    r8626 r8637  
    242242
    243243    @Override
    244     public ICoordinate XYToLatLon(Point point, int zoom) {
    245         return XYToLatLon(point.x, point.y, zoom);
    246     }
    247 
    248     @Override
    249     public ICoordinate XYToLatLon(int x, int y, int zoom) {
     244    public ICoordinate xyToLatLon(Point point, int zoom) {
     245        return xyToLatLon(point.x, point.y, zoom);
     246    }
     247
     248    @Override
     249    public ICoordinate xyToLatLon(int x, int y, int zoom) {
    250250        double scale = getDegreesPerTile(zoom) / getTileSize();
    251251        Projection proj = Main.getProjection();
  • trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

    r8635 r8637  
    539539
    540540    @Override
    541     public Coordinate XYToLatLon(Point point, int zoom) {
    542         return XYToLatLon(point.x, point.y, zoom);
    543     }
    544 
    545     @Override
    546     public Coordinate XYToLatLon(int x, int y, int zoom) {
     541    public Coordinate xyToLatLon(Point point, int zoom) {
     542        return xyToLatLon(point.x, point.y, zoom);
     543    }
     544
     545    @Override
     546    public Coordinate xyToLatLon(int x, int y, int zoom) {
    547547        TileMatrix matrix = getTileMatrix(zoom);
    548548        if (matrix == null) {
Note: See TracChangeset for help on using the changeset viewer.