Changeset 8568 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-07-04T22:52:23+02:00 (10 years ago)

Author:

wiktorn

Message:

Basic WMTS support.

• added information about units and to_meter to EPSG projection definitions (needed for WMTS)
• added WMTSTileSource and WMTSLayer classes
• a bit of cleanup of AbstractTileSourceLayer and align so it will work properly with WMTS tile definitions
• added Imagery Preferences panel for WMTS and icon for button
• added removal of wms: / tms: / wmts: prefix, if user will paste them into the field
• CachedFile - added possibility to send custom headers with request
• added support for unit and to_meter in CustomProjection
• AbstractTMSTileSource cleanups (change of Coordinate to ICoordinate)
• moved JCSCachedTileLoaderJob.read() to Utils

Addresses: #10623

Tested with Polish WMTS service proivders, Walonnie needs still some debugging, as it is not working right now.

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• cache/JCSCachedTileLoaderJob.java (modified) (4 diffs)
• imagery/ImageryInfo.java (modified) (1 diff)
• imagery/WMTSTileSource.java (added)
• projection/CustomProjection.java (modified) (7 diffs)
• projection/Projection.java (modified) (1 diff)
• projection/proj/Proj.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.cache;
 
-import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -30 +28 @@
 import org.openstreetmap.josm.data.cache.ICachedLoaderListener.LoadResult;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -350 +349 @@
 
                 attributes.setResponseCode(responseCode(urlConn));
-                byte[] raw = read(urlConn);
+                byte[] raw = Utils.readBytesFromStream(urlConn.getInputStream());
 
                 if (isResponseLoadable(urlConn.getHeaderFields(), responseCode(urlConn), raw)) {
@@ -473 +472 @@
     }
 
-    private static byte[] read(URLConnection urlConn) throws IOException {
-        InputStream input = urlConn.getInputStream();
-        try {
-            ByteArrayOutputStream bout = new ByteArrayOutputStream(input.available());
-            byte[] buffer = new byte[2048];
-            boolean finished = false;
-            do {
-                int read = input.read(buffer);
-                if (read >= 0) {
-                    bout.write(buffer, 0, read);
-                } else {
-                    finished = true;
-                }
-            } while (!finished);
-            if (bout.size() == 0)
-                return null;
-            return bout.toByteArray();
-        } finally {
-            input.close();
-        }
-    }
-
     /**
      * TODO: move to JobFactory

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

@@ -56 +56 @@
         SCANEX("scanex"),
         /** A WMS endpoint entry only stores the WMS server info, without layer, which are chosen later by the user. **/
-        WMS_ENDPOINT("wms_endpoint");
+        WMS_ENDPOINT("wms_endpoint"),
+        /** WMTS stores GetCapabilities URL. Does not store any information about the layer **/
+        WMTS("wmts");
 
 

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -8 +8 @@
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -35 +36 @@
 public class CustomProjection extends AbstractProjection {
 
+    private final static Map<String, Double> UNITS_TO_METERS = getUnitsToMeters();
+    private final static double METER_PER_UNIT_DEGREE = 2 * Math.PI * 6370997 / 360;
+
     /**
      * pref String that defines the projection
@@ -45 +49 @@
     protected String cacheDir;
     protected Bounds bounds;
+    private double metersPerUnit = METER_PER_UNIT_DEGREE; // default to degrees
 
     /**
@@ -89 +94 @@
         wktext("wktext", false),  // ignored
         /** meters, US survey feet, etc. */
-        units("units", true),     // ignored
+        units("units", true),
         /** Don't use the /usr/share/proj/proj_def.dat defaults file */
         no_defs("no_defs", false),
         init("init", true),
+        to_meter("to_meter", true),
         // JOSM extensions, not present in PROJ.4
         wmssrs("wmssrs", true),
@@ -103 +109 @@
 
         /** Map of all parameters by key */
-        static final Map<String, Param> paramsByKey = new HashMap<>();
+        static final Map<String, Param> paramsByKey = new ConcurrentHashMap<>();
         static {
             for (Param p : Param.values()) {
@@ -198 +204 @@
             if (s != null) {
                 this.code = s;
+            }
+            s = parameters.get(Param.units.key);
+            if (s != null) {
+                this.metersPerUnit = UNITS_TO_METERS.get(s);
+            }
+            s = parameters.get(Param.to_meter.key);
+            if (s != null) {
+                this.metersPerUnit = parseDouble(s, Param.to_meter.key);
             }
         }
@@ -528 +542 @@
         return name != null ? name : tr("Custom Projection");
     }
+
+    @Override
+    public double getMetersPerUnit() {
+        return metersPerUnit;
+    }
+
+    private static Map<String, Double> getUnitsToMeters() {
+        Map<String, Double> ret = new ConcurrentHashMap<>();
+        ret.put("km", 1000d);
+        ret.put("m", 1d);
+        ret.put("dm", 1d/10);
+        ret.put("cm", 1d/100);
+        ret.put("mm", 1d/1000);
+        ret.put("kmi", 1852.0);
+        ret.put("in", 0.0254);
+        ret.put("ft", 0.3048);
+        ret.put("yd", 0.9144);
+        ret.put("mi", 1609.344);
+        ret.put("fathom", 1.8288);
+        ret.put("chain", 20.1168);
+        ret.put("link", 0.201168);
+        ret.put("us-in", 1d/39.37);
+        ret.put("us-ft", 0.304800609601219);
+        ret.put("us-yd", 0.914401828803658);
+        ret.put("us-ch", 20.11684023368047);
+        ret.put("us-mi", 1609.347218694437);
+        ret.put("ind-yd", 0.91439523);
+        ret.put("ind-ft", 0.30479841);
+        ret.put("ind-ch", 20.11669506);
+        ret.put("degree", METER_PER_UNIT_DEGREE);
+        return ret;
+    }
 }

trunk/src/org/openstreetmap/josm/data/projection/Projection.java

@@ -68 +68 @@
      */
     Bounds getWorldBoundsLatLon();
+
+    /**
+     * Get the number of meters per unit of this projection. This more
+     * defines the scale of the map, than real conversion of unit to meters
+     * as this value is more less correct only along great circles.
+     *
+     * Used by WMTS to properly scale tiles
+     * @return meters per unit of projection
+     *
+     */
+    double getMetersPerUnit();
 }

trunk/src/org/openstreetmap/josm/data/projection/proj/Proj.java

@@ -64 +64 @@
      */
     double[] invproject(double east, double north);
-
 }