Subject: [PATCH] 23113.core
---
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java b/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java
a
|
b
|
|
8 | 8 | import java.util.Locale; |
9 | 9 | |
10 | 10 | import org.openstreetmap.gui.jmapviewer.Projected; |
11 | | import org.openstreetmap.gui.jmapviewer.Tile; |
12 | 11 | import org.openstreetmap.gui.jmapviewer.TileXY; |
13 | 12 | import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate; |
14 | 13 | import org.openstreetmap.gui.jmapviewer.interfaces.IProjected; |
… |
… |
|
103 | 102 | } |
104 | 103 | } |
105 | 104 | |
106 | | @Override |
107 | | public ICoordinate tileXYToLatLon(Tile tile) { |
108 | | return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom()); |
109 | | } |
110 | | |
111 | | @Override |
112 | | public ICoordinate tileXYToLatLon(TileXY xy, int zoom) { |
113 | | return tileXYToLatLon(xy.getXIndex(), xy.getYIndex(), zoom); |
114 | | } |
115 | | |
116 | 105 | @Override |
117 | 106 | public ICoordinate tileXYToLatLon(int x, int y, int zoom) { |
118 | 107 | return CoordinateConversion.llToCoor(tileProjection.eastNorth2latlon(getTileEastNorth(x, y, zoom))); |
… |
… |
|
132 | 121 | return eastNorthToTileXY(enPoint, zoom); |
133 | 122 | } |
134 | 123 | |
135 | | @Override |
136 | | public TileXY latLonToTileXY(ICoordinate point, int zoom) { |
137 | | return latLonToTileXY(point.getLat(), point.getLon(), zoom); |
138 | | } |
139 | | |
140 | 124 | @Override |
141 | 125 | public int getTileXMax(int zoom) { |
142 | 126 | return tileXMax[zoom]; |
… |
… |
|
167 | 151 | ); |
168 | 152 | } |
169 | 153 | |
170 | | @Override |
171 | | public Point latLonToXY(ICoordinate point, int zoom) { |
172 | | return latLonToXY(point.getLat(), point.getLon(), zoom); |
173 | | } |
174 | | |
175 | | @Override |
176 | | public ICoordinate xyToLatLon(Point point, int zoom) { |
177 | | return xyToLatLon(point.x, point.y, zoom); |
178 | | } |
179 | | |
180 | 154 | @Override |
181 | 155 | public ICoordinate xyToLatLon(int x, int y, int zoom) { |
182 | 156 | double scale = getDegreesPerTile(zoom) / getTileSize(); |
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
a
|
b
|
|
928 | 928 | throw new UnsupportedOperationException("Not implemented"); |
929 | 929 | } |
930 | 930 | |
931 | | @Override |
932 | | public ICoordinate tileXYToLatLon(Tile tile) { |
933 | | return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom()); |
934 | | } |
935 | | |
936 | | @Override |
937 | | public ICoordinate tileXYToLatLon(TileXY xy, int zoom) { |
938 | | return tileXYToLatLon(xy.getXIndex(), xy.getYIndex(), zoom); |
939 | | } |
940 | | |
941 | 931 | @Override |
942 | 932 | public ICoordinate tileXYToLatLon(int x, int y, int zoom) { |
943 | 933 | TileMatrix matrix = getTileMatrix(zoom); |
… |
… |
|
964 | 954 | ); |
965 | 955 | } |
966 | 956 | |
967 | | @Override |
968 | | public TileXY latLonToTileXY(ICoordinate point, int zoom) { |
969 | | return latLonToTileXY(point.getLat(), point.getLon(), zoom); |
970 | | } |
971 | | |
972 | 957 | @Override |
973 | 958 | public int getTileXMax(int zoom) { |
974 | 959 | return getTileXMax(zoom, tileProjection); |
… |
… |
|
993 | 978 | ); |
994 | 979 | } |
995 | 980 | |
996 | | @Override |
997 | | public Point latLonToXY(ICoordinate point, int zoom) { |
998 | | return latLonToXY(point.getLat(), point.getLon(), zoom); |
999 | | } |
1000 | | |
1001 | | @Override |
1002 | | public Coordinate xyToLatLon(Point point, int zoom) { |
1003 | | return xyToLatLon(point.x, point.y, zoom); |
1004 | | } |
1005 | | |
1006 | 981 | @Override |
1007 | 982 | public Coordinate xyToLatLon(int x, int y, int zoom) { |
1008 | 983 | TileMatrix matrix = getTileMatrix(zoom); |