Merge remote-tracking branch 'origin/feature/mercator' into feature/geopackage

# Conflicts:
#	worldwind/src/main/java/gov/nasa/worldwind/layer/mercator/MercatorImageTile.java
#	worldwind/src/main/java/gov/nasa/worldwind/layer/mercator/MercatorSector.java
#	worldwind/src/main/java/gov/nasa/worldwind/layer/mercator/MercatorTiledImageLayer.java
#	worldwind/src/main/java/gov/nasa/worldwind/render/ImageRetriever.java
#	worldwind/src/main/java/gov/nasa/worldwind/render/ImageSource.java

Author: EMaksymenko

worldwind/src/main/java/gov/nasa/worldwind/layer/mercator/MercatorImageTile.java

@@ -5,15 +5,15 @@
 import java.util.Collection;
 
 import gov.nasa.worldwind.geom.Location;
-import gov.nasa.worldwind.render.ImageSource;
 import gov.nasa.worldwind.render.ImageTile;
+import gov.nasa.worldwind.util.DownloadPostprocessor;
 import gov.nasa.worldwind.util.Level;
 import gov.nasa.worldwind.util.LevelSet;
 import gov.nasa.worldwind.util.Logger;
 import gov.nasa.worldwind.util.Tile;
 import gov.nasa.worldwind.util.TileFactory;
 
-class MercatorImageTile extends ImageTile implements ImageSource.Transformer {
+class MercatorImageTile extends ImageTile implements DownloadPostprocessor<Bitmap> {
 
     /**
      * Constructs a tile with a specified sector, level, row and column.
@@ -125,22 +125,24 @@ public Tile[] subdivide(TileFactory tileFactory) {
     }
 
     @Override
-    public Bitmap transform(Bitmap bitmap) {
+    public Bitmap process(Bitmap resource) {
         // Re-project mercator tile to equirectangular
-        Bitmap trans = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), bitmap.getConfig());
+        int[] pixels = new int[resource.getWidth() * resource.getHeight()];
+        int[] result = new int[resource.getWidth() * resource.getHeight()];
+        resource.getPixels(pixels, 0, resource.getWidth(), 0, 0, resource.getWidth(), resource.getHeight());
         double miny = ((MercatorSector) sector).minLatPercent();
         double maxy = ((MercatorSector) sector).maxLatPercent();
-        for (int y = 0; y < bitmap.getHeight(); y++) {
-            double sy = 1.0 - y / (double) (bitmap.getHeight() - 1);
+        for (int y = 0; y < resource.getHeight(); y++) {
+            double sy = 1.0 - y / (double) (resource.getHeight() - 1);
             double lat = sy * (sector.maxLatitude() - sector.minLatitude()) + sector.minLatitude();
             double dy = 1.0 - (MercatorSector.gudermannianInverse(lat) - miny) / (maxy - miny);
             dy = Math.max(0.0, Math.min(1.0, dy));
-            int iy = (int) (dy * (bitmap.getHeight() - 1));
-            for (int x = 0; x < bitmap.getWidth(); x++) {
-                trans.setPixel(x, y, bitmap.getPixel(x, iy));
+            int iy = (int) (dy * (resource.getHeight() - 1));
+            for (int x = 0; x < resource.getWidth(); x++) {
+                result[x + y * resource.getWidth()] = pixels[x + iy * resource.getWidth()];
             }
         }
-        return trans;
+        return Bitmap.createBitmap(result, resource.getWidth(), resource.getHeight(), resource.getConfig());
     }
 
 }

worldwind/src/main/java/gov/nasa/worldwind/render/ImageRetriever.java

@@ -16,6 +16,7 @@
 import java.net.URLConnection;
 
 import gov.nasa.worldwind.WorldWind;
+import gov.nasa.worldwind.util.DownloadPostprocessor;
 import gov.nasa.worldwind.util.Logger;
 import gov.nasa.worldwind.util.Retriever;
 import gov.nasa.worldwind.util.WWUtil;
@@ -72,7 +73,7 @@ protected Bitmap decodeImage(ImageSource imageSource, ImageOptions imageOptions)
         }
 
         if (imageSource.isUrl()) {
-            return this.decodeUrl(imageSource.asUrl(), imageOptions, imageSource.transformer);
+            return this.decodeUrl(imageSource.asUrl(), imageOptions, imageSource.postprocessor);
         }
 
         return this.decodeUnrecognized(imageSource);
@@ -88,7 +89,7 @@ protected Bitmap decodeFilePath(String pathName, ImageOptions imageOptions) {
         return BitmapFactory.decodeFile(pathName, factoryOptions);
     }
 
-    protected Bitmap decodeUrl(String urlString, ImageOptions imageOptions, ImageSource.Transformer transformer) throws IOException {
+    protected Bitmap decodeUrl(String urlString, ImageOptions imageOptions, DownloadPostprocessor<Bitmap> postprocessor) throws IOException {
         // TODO establish a file caching service for remote resources
         // TODO retry absent resources, they are currently handled but suppressed entirely after the first failure
         // TODO configurable connect and read timeouts
@@ -105,8 +106,8 @@ protected Bitmap decodeUrl(String urlString, ImageOptions imageOptions, ImageSou
             Bitmap bitmap = BitmapFactory.decodeStream(stream, null, factoryOptions);
 
             // Apply bitmap transformation if required
-            if (transformer != null && bitmap != null) {
-                bitmap = transformer.transform(bitmap);
+            if (postprocessor != null && bitmap != null) {
+                bitmap = postprocessor.process(bitmap);
             }
 
             return bitmap;

worldwind/src/main/java/gov/nasa/worldwind/render/ImageSource.java

@@ -12,6 +12,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 
+import gov.nasa.worldwind.util.DownloadPostprocessor;
 import gov.nasa.worldwind.util.Logger;
 import gov.nasa.worldwind.util.WWUtil;
 
@@ -50,18 +51,6 @@ public interface BitmapFactory {
         Bitmap createBitmap();
     }
 
-    /**
-     * Interface for remote image source post-transformation
-     */
-    public interface Transformer {
-        /**
-         * Transforms image according to specified algorithm implementation
-         * @param bitmap original bitmap
-         * @return transformed bitmap
-         */
-        Bitmap transform(Bitmap bitmap);
-    }
-
     protected static final HashMap<Object, BitmapFactory> lineStippleFactories = new HashMap<>();
 
     protected static final int TYPE_UNRECOGNIZED = 0;
@@ -80,7 +69,7 @@ public interface Transformer {
 
     protected Object source;
 
-    protected Transformer transformer;
+    protected DownloadPostprocessor<Bitmap> postprocessor;
 
     protected ImageSource() {
     }
@@ -192,15 +181,15 @@ public static ImageSource fromUrl(String urlString) {
      * application's manifest must include the permissions that allow network connections.
      *
      * @param urlString complete URL string
-     * @param transformer implementation of image post-transformation routine
+     * @param postprocessor implementation of image post-transformation routine
      *
      * @return the new image source
      *
      * @throws IllegalArgumentException If the URL string is null
      */
-    public static ImageSource fromUrl(String urlString, Transformer transformer) {
+    public static ImageSource fromUrl(String urlString, DownloadPostprocessor<Bitmap> postprocessor) {
         ImageSource imageSource = fromUrl(urlString);
-        imageSource.transformer = transformer;
+        imageSource.postprocessor = postprocessor;
         return imageSource;
     }
 

worldwind/src/main/java/gov/nasa/worldwind/util/DownloadPostprocessor.java

@@ -0,0 +1,14 @@
+package gov.nasa.worldwind.util;
+
+/**
+ * Interface for resource download post-processing
+ */
+public interface DownloadPostprocessor<T> {
+    /**
+     * Process resource according to specified algorithm implementation
+     *
+     * @param resource original resource
+     * @return processed resource
+     */
+    T process(T resource);
+}