Changeset 31301 in osm for applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java

Timestamp:

2015-06-24T20:57:27+02:00 (9 years ago)

Author:

wiktorn

Message:

Introduce WMS layer based on TMS. (closes: #josm11255)

HEADS UP: After this patch you need to manually remove JAX-B generated file/class: org/w3/_2001/xmlschema/Adapter1.java to compile the tree again.

• create AbstractTileSourceLayer based on TMSLayer as a base for TMS, WMS and (future) WMTS layers, (addresses #josm11459)
• WMS layer now uses JCS Caching (closes: #josm7363)
• introduce new conversion methods in TileSource, that convert both X and Y (lat and lon) in one call. This is necessary for other than PseudoMercator projections
  • introduce TileXY class that represents X and Y indexes of tile in tile matrix/space
  • mark old conversion methods as deprecated
  • refactor JMapViewer and JOSM to new methods
  • change use of Coordinate class to ICoordinate where appropiate
• extract CachedAttributionBingAerialTileSource to separate file
• create TemplatedWMSTileSource that provides the WMS Layer with square (according to current projection) tiles (closes: #josm11572, closes: #josm7682, addresses: #josm5454)
• implemented precaching imagery along GPX track for AbstractTileSourceLayer, so now it work for both - WMS and TMS (closes: #josm9154)
• implemented common righ-click menu on map view, as well on layer list (closes #josm3591)
• create separate build commands for JMapViewer classes to easily spot, when josm classes are used within JMapViewer
• remove unnecessary classes of previous WMS implementation - GeorefImage, wms-cache.xsd (and JAXB task from build), WMSCache, WMSRequest, WMSGrabber, HTMLGrabber, WMSException

After this patch you need to manually remove JAX-B generated file/class: org/w3/_2001/xmlschema/Adapter1.java

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java (modified) (3 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java

@@ -33 +33 @@
 
     /** tile size of the displayed tiles */
-    private int tileSize = OsmMercator.DEFAUL_TILE_SIZE;
+    private int tileSize = OsmMercator.DEFAUL_TILE_SIZE; // FIXME: set to -1 for next release
 
     /** mapping <header key, metadata key> */
@@ -116 +116 @@
     /**
      * Request tile size of this tile source
-     * @return tile size provided by this tile source
+     * @return tile size provided by this tile source, or -1 when default value should be used
      */
     public int getTileSize() {
@@ -127 +127 @@
      */
     public void setTileSize(int tileSize) {
-        if (tileSize <= 0) {
+        if (tileSize == 0 || tileSize < -1) {
             throw new AssertionError("Invalid tile size: " + tileSize);
         }