Changeset 9620 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-01-24T23:10:56+01:00 (9 years ago)

Author:

wiktorn

Message:

Refactor structure of TMS based classes.

Move OsmMercator initialization to TMSTileSource and switch all TMS based TileSource so they extend TMSTileSource.

Now WMTSTileSource will not create OsmMercator object that it will not use anyhow.

AbstractTMSTileSource could be named now AbstractTileBasedTileSource, but I did not the name change, to maintain history.

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -38 +38 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource;
-import org.openstreetmap.gui.jmapviewer.tilesources.TMSTileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -56 +56 @@
  * @since 8526
  */
-public class WMTSTileSource extends TMSTileSource implements TemplatedTileSource {
+public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTileSource {
     private static final String PATTERN_HEADER  = "\\{header\\(([^,]+),([^}]+)\\)\\}";