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

Timestamp:

2015-07-04T22:52:23+02:00 (9 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.

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -14 +14 @@
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
@@ -1337 +1338 @@
         return hasExtension(file.getName(), extensions);
     }
+
+    /**
+     * Reads the input stream and closes the stream at the end of processing (regardless if an exception was thrown)
+     *
+     * @param stream
+     * @return byte array of data in input stream
+     * @throws IOException
+     */
+    public static byte[] readBytesFromStream(InputStream stream) throws IOException {
+        try {
+            ByteArrayOutputStream bout = new ByteArrayOutputStream(stream.available());
+            byte[] buffer = new byte[2048];
+            boolean finished = false;
+            do {
+                int read = stream.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 {
+            stream.close();
+        }
+    }
 }