Merge pull request NASAWorldWind#61 from robmilton/fixMapboxTilingProblems

Address Mapbox Tiling

Author: wcmatthysen

src/config/worldwind.layers.xml

@@ -42,4 +42,7 @@
     <Layer className="gov.nasa.worldwind.layers.WorldMapLayer"/>
     <Layer className="gov.nasa.worldwind.layers.ScalebarLayer"/>
     <Layer className="gov.nasa.worldwind.layers.CompassLayer"/>
+    <Layer className="gov.nasa.worldwind.layers.Earth.MapboxLayer" actuate="onRequest">
+        <Property name="AccessToken" value="access token here"/>
+    </Layer>
 </LayerList>

src/gov/nasa/worldwind/layers/Earth/MapboxLayer.java

@@ -0,0 +1,45 @@
+package gov.nasa.worldwind.layers.Earth;
+
+import gov.nasa.worldwind.layers.mercator.BasicMercatorTiledImageLayer;
+import gov.nasa.worldwind.layers.mercator.MercatorTileUrlBuilder;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class MapboxLayer extends BasicMercatorTiledImageLayer {
+
+    public MapboxLayer()
+    {
+        super("mb", "Earth/Mapbox", 19, 256, false, ".png", new URLBuilder());
+        MapboxLayer.this.setDetailHint(0.3);
+    }
+
+    private static class URLBuilder extends MercatorTileUrlBuilder
+    {
+        private String accessToken;
+
+        @Override
+        protected URL getMercatorURL(int x, int y, int z) throws MalformedURLException
+        {
+            String urlPostfix = (this.accessToken != null) ? "?access_token=" + this.accessToken : "";
+            return new URL("https://api.mapbox.com/styles/v1/mapbox/streets-v11/tiles/256/" + z + "/" + x + "/" + y + urlPostfix);
+        }
+    }
+
+    public void setAccessToken(String apiKey)
+    {
+        URLBuilder urlBuilder = (URLBuilder)getURLBuilder();
+        urlBuilder.accessToken = apiKey;
+    }
+
+    public String getAccessToken()
+    {
+        URLBuilder urlBuilder = (URLBuilder)getURLBuilder();
+        return urlBuilder.accessToken;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Mapbox";
+    }
+}

src/gov/nasa/worldwind/layers/TiledImageLayer.java

@@ -483,7 +483,7 @@ protected double getDetailFactor()
     {
         return this.detailHintOrigin + this.getDetailHint();
     }
-
+    
     protected boolean needToSplit(DrawContext dc, Sector sector, Level level)
     {
         // Compute the height in meters of a texel from the specified level. Take care to convert from the radians to

src/gov/nasa/worldwind/layers/mercator/BasicMercatorTiledImageLayer.java

@@ -97,15 +97,7 @@ protected MercatorTileUrlBuilder getURLBuilder()
         MercatorTileUrlBuilder urlBuilder = (MercatorTileUrlBuilder)value;
         return urlBuilder;
     }
-
-    @Override
-    protected boolean needToSplit(DrawContext dc, Sector sector, Level level)
-    {
-        double texelSize = level.getTexelSize() * dc.getGlobe().getRadius();
-        double pixelSize = dc.getView().computePixelSizeAtDistance(sector.distanceTo(dc, dc.getView().getEyePoint()));
-        return texelSize > pixelSize * this.getDetailFactor();
-    }
-
+    
     @Override
     protected DownloadPostProcessor createDownloadPostProcessor(TextureTile tile)
     {
@@ -143,15 +135,11 @@ protected BufferedImage transformPixels()
             if (image != null)
             {
                 int type = image.getType();
-                if (type == BufferedImage.TYPE_CUSTOM)
-                {
-                    type = BufferedImage.TYPE_INT_RGB;
-                }
-                else if (type == BufferedImage.TYPE_BYTE_INDEXED)
+                if (type != BufferedImage.TYPE_INT_RGB)
                 {
                     type = BufferedImage.TYPE_INT_ARGB;
                 }
-
+                
                 BufferedImage trans = new BufferedImage(image.getWidth(), image.getHeight(), type);
                 double miny = ((MercatorSector) tile.getSector()).getMinLatPercent();
                 double maxy = ((MercatorSector) tile.getSector()).getMaxLatPercent();