refactor(core): add zoom to each extent of tile

iTowns · Mar 11, 2019 · 23bad33 · 23bad33
1 parent 4a4166f
commit 23bad33
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Converter/convertToTile.js b/src/Converter/convertToTile.js
@@ -97,6 +97,14 @@ export default {
             tile.setBBoxZ(parent.obb.z.min, parent.obb.z.max);
         }
 
+        // Set equivalent tiled extent zoom
+        // Is used to set zoom for each texture fetched with no tiled extent
+        // It's more simple to set zoom here instead of reverse ingeneer
+        // Removable with a table pixel/extent.size
+        if (!tile.extent.zoom) {
+            tile.extent.zoom = level;
+        }
+
         tile.add(tile.obb);
 
         setTileFromTiledLayer(tile, layer);

diff --git a/src/Process/LayeredMaterialNodeProcessing.js b/src/Process/LayeredMaterialNodeProcessing.js
@@ -11,14 +11,7 @@ function getSourceExtent(node, extent, targetLevel) {
     if (extent.isTiledCrs()) {
         return extent.extentParent(targetLevel);
     } else {
-        const parent = node.findAncestorFromLevel(targetLevel);
-        if (parent.extent) {
-            // Needed to initNodeElevationTextureFromParent, insertSignificantValuesFromParent,
-            // isColorLayerDownscaled
-            // Must be removed
-            parent.extent.zoom = parent.level;
-        }
-        return parent.extent;
+        return node.findAncestorFromLevel(targetLevel).extent;
     }
 }