Changeset 8526 in josm for trunk/src/org/openstreetmap/josm/data/coor

Timestamp:

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

Author:

wiktorn

Message:

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

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 #11459)
• WMS layer now uses JCS Caching (closes: #7363)
• 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: #11572, closes: #7682, addresses: #5454)
• implemented precaching imagery along GPX track for AbstractTileSourceLayer, so now it work for both - WMS and TMS (closes: #9154)
• implemented common righ-click menu on map view, as well on layer list (closes #3591)
• 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

File:

• trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -17 +17 @@
 import java.util.Locale;
 
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -188 +189 @@
     }
 
+    public LatLon(ICoordinate coor) {
+        this(coor.getLat(), coor.getLon());
+    }
+
+
     /**
      * Returns the latitude, i.e., the north-south position in degrees.
@@ -434 +440 @@
         return true;
     }
+
+    public ICoordinate toCoordinate() {
+        return new org.openstreetmap.gui.jmapviewer.Coordinate(lat(), lon());
+    }
 }