Add tile origin attribute to level set.

Author: EMaksymenko

worldwind/src/main/java/gov/nasa/worldwind/globe/BasicTessellator.java

@@ -16,6 +16,7 @@
 import java.util.List;
 
 import gov.nasa.worldwind.draw.BasicDrawableTerrain;
+import gov.nasa.worldwind.geom.Location;
 import gov.nasa.worldwind.geom.Range;
 import gov.nasa.worldwind.geom.Sector;
 import gov.nasa.worldwind.geom.Vec3;
@@ -32,7 +33,7 @@
 public class BasicTessellator implements Tessellator, TileFactory {
 
     // ~0.6 meter resolution
-    protected LevelSet levelSet = new LevelSet(new Sector().setFullSphere(), 90, 20, 32, 32);
+    protected LevelSet levelSet = new LevelSet(new Sector().setFullSphere(), new Location(-90, -180), 90, 20, 32, 32);
 
     protected double detailControl = 80;
 

worldwind/src/main/java/gov/nasa/worldwind/layer/LayerFactory.java

@@ -22,6 +22,7 @@
 import java.util.concurrent.RejectedExecutionException;
 
 import gov.nasa.worldwind.WorldWind;
+import gov.nasa.worldwind.geom.Location;
 import gov.nasa.worldwind.geom.Sector;
 import gov.nasa.worldwind.ogc.WmsLayerConfig;
 import gov.nasa.worldwind.ogc.WmsTileFactory;
@@ -670,7 +671,7 @@ protected LevelSet createWmtsLevelSet(WmtsLayer wmtsLayer, CompatibleTileMatrixS
         }
         int imageSize = tileMatrixSet.getTileMatrices().get(0).getTileHeight();
 
-        return new LevelSet(boundingBox, 90.0, compatibleTileMatrixSet.tileMatrices.size(), imageSize, imageSize);
+        return new LevelSet(boundingBox, new Location(-90, -180), 90, compatibleTileMatrixSet.tileMatrices.size(), imageSize, imageSize);
     }
 
     protected String buildWmtsKvpTemplate(String kvpServiceAddress, String layer, String format, String styleIdentifier, String tileMatrixSet) {

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

@@ -1,6 +1,7 @@
 package gov.nasa.worldwind.layer.mercator;
 
 import gov.nasa.worldwind.WorldWind;
+import gov.nasa.worldwind.geom.Location;
 import gov.nasa.worldwind.geom.Sector;
 import gov.nasa.worldwind.layer.RenderableLayer;
 import gov.nasa.worldwind.render.ImageOptions;
@@ -23,7 +24,7 @@ public MercatorTiledImageLayer(String name, int numLevels, int firstLevelOffset,
 
         MercatorTiledSurfaceImage surfaceImage = new MercatorTiledSurfaceImage();
         surfaceImage.setLevelSet(new LevelSet(
-                MercatorSector.fromDegrees(-1.0, 1.0, - FULL_SPHERE / 2, FULL_SPHERE / 2),
+                MercatorSector.fromDegrees(-1.0, 1.0, - FULL_SPHERE / 2, FULL_SPHERE / 2), new Location(-90, -180),
                 FULL_SPHERE / (1 << firstLevelOffset), numLevels - firstLevelOffset, tileSize, tileSize));
         surfaceImage.setTileFactory(this);
         if(!overlay) {

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

@@ -5,6 +5,7 @@
 
 package gov.nasa.worldwind.util;
 
+import gov.nasa.worldwind.geom.Location;
 import gov.nasa.worldwind.geom.Sector;
 
 /**
@@ -18,6 +19,11 @@ public class LevelSet {
      */
     public final Sector sector = new Sector();
 
+    /**
+     * Tile origin for this level set
+     */
+    public final Location tileOrigin = new Location();
+
     /**
      * The geographic width and height in degrees of tiles in the first level (lowest resolution) of this level set.
      */
@@ -55,6 +61,7 @@ public LevelSet() {
      * Constructs a level set with specified parameters.
      *
      * @param sector          the sector spanned by this level set
+     * @param tileOrigin      the origin for this level set
      * @param firstLevelDelta the geographic width and height in degrees of tiles in the first level (lowest resolution)
      *                        of the level set
      * @param numLevels       the number of levels in the level set
@@ -67,12 +74,17 @@ public LevelSet() {
      *
      * @throws IllegalArgumentException If any argument is null, or if any dimension is zero
      */
-    public LevelSet(Sector sector, double firstLevelDelta, int numLevels, int tileWidth, int tileHeight) {
+    public LevelSet(Sector sector, Location tileOrigin, double firstLevelDelta, int numLevels, int tileWidth, int tileHeight) {
         if (sector == null) {
             throw new IllegalArgumentException(
                 Logger.logMessage(Logger.ERROR, "LevelSet", "constructor", "missingSector"));
         }
 
+        if (tileOrigin == null) {
+            throw new IllegalArgumentException(
+                    Logger.logMessage(Logger.ERROR, "LevelSet", "constructor", "missingTileOrigin"));
+        }
+
         if (firstLevelDelta <= 0) {
             throw new IllegalArgumentException(
                 Logger.logMessage(Logger.ERROR, "LevelSet", "constructor", "invalidTileDelta"));
@@ -89,6 +101,7 @@ public LevelSet(Sector sector, double firstLevelDelta, int numLevels, int tileWi
         }
 
         this.sector.set(sector);
+        this.tileOrigin.set(tileOrigin);
         this.firstLevelDelta = firstLevelDelta;
         this.tileWidth = tileWidth;
         this.tileHeight = tileHeight;
@@ -116,6 +129,11 @@ public LevelSet(LevelSetConfig config) {
                 Logger.logMessage(Logger.ERROR, "LevelSet", "constructor", "missingSector"));
         }
 
+        if (config.tileOrigin == null) {
+            throw new IllegalArgumentException(
+                    Logger.logMessage(Logger.ERROR, "LevelSet", "constructor", "missingTileOrigin"));
+        }
+
         if (config.firstLevelDelta <= 0) {
             throw new IllegalArgumentException(
                 Logger.logMessage(Logger.ERROR, "LevelSet", "constructor", "invalidTileDelta"));
@@ -132,6 +150,7 @@ public LevelSet(LevelSetConfig config) {
         }
 
         this.sector.set(config.sector);
+        this.tileOrigin.set(config.tileOrigin);
         this.firstLevelDelta = config.firstLevelDelta;
         this.tileWidth = config.tileWidth;
         this.tileHeight = config.tileHeight;
@@ -141,8 +160,7 @@ public LevelSet(LevelSetConfig config) {
 
     protected void assembleLevels() {
         for (int i = 0, len = this.levels.length; i < len; i++) {
-            double n = Math.pow(2, i);
-            double delta = firstLevelDelta / n;
+            double delta = firstLevelDelta / (1 << i);
             this.levels[i] = new Level(this, i, delta);
         }
     }

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

@@ -5,6 +5,7 @@
 
 package gov.nasa.worldwind.util;
 
+import gov.nasa.worldwind.geom.Location;
 import gov.nasa.worldwind.geom.Sector;
 
 /**
@@ -18,6 +19,11 @@ public class LevelSetConfig {
      */
     public final Sector sector = new Sector().setFullSphere();
 
+    /**
+     * Tile origin for level set
+     */
+    public final Location tileOrigin = new Location(-90, -180);
+
     /**
      * The geographic width and height in degrees of tiles in the first level (lowest resolution) of the level set.
      */

worldwind/src/test/java/gov/nasa/worldwind/globe/BasicTerrainTest.java

@@ -14,6 +14,7 @@
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import gov.nasa.worldwind.WorldWind;
+import gov.nasa.worldwind.geom.Location;
 import gov.nasa.worldwind.geom.Sector;
 import gov.nasa.worldwind.geom.Vec3;
 import gov.nasa.worldwind.util.LevelSet;
@@ -81,7 +82,7 @@ public void setUp() {
         this.terrain = new BasicTerrain();
 
         // Add a terrain tile used to the mocked terrain
-        LevelSet levelSet = new LevelSet(new Sector().setFullSphere(), 1.0, 1, 5, 5); // tiles with 5x5 vertices
+        LevelSet levelSet = new LevelSet(new Sector().setFullSphere(), new Location(-90, -180), 1.0, 1, 5, 5); // tiles with 5x5 vertices
         TerrainTile tile = new TerrainTile(new Sector(0, 0, 1, 1), levelSet.firstLevel(), 90, 180);
         ((BasicTerrain) this.terrain).addTile(tile);