Process and Layer imagery/elevation

examples/layers/JSONLayers/Region.json

@@ -14,7 +14,7 @@
             "west": "-6880639.13669047",
             "east": "6215707.87640867",
             "south": "-2438398.99670629",
-            "north": "6637050.04559519"
+            "north": "8837050.04559519"
         },
         "transparent" : true,
         "featureInfoMimeType" : "",

src/Converter/convertToTile.js

@@ -11,6 +11,33 @@ import Cache from 'Core/Scheduler/Cache';
 
 const dimensions = new THREE.Vector2();
 
+function setTileFromTiledLayer(tile, tileLayer) {
+    tile.material.transparent = tileLayer.opacity < 1.0;
+    tile.material.opacity = tileLayer.opacity;
+
+    if (tileLayer.diffuse) {
+        tile.material.diffuse = tileLayer.diffuse;
+    }
+
+    if (__DEBUG__) {
+        tile.material.showOutline = tileLayer.showOutline || false;
+        tile.material.wireframe = tileLayer.wireframe || false;
+    }
+
+    if (tileLayer.isGlobeLayer) {
+        // Computes a point used for horizon culling.
+        // If the point is below the horizon,
+        // the tile is guaranteed to be below the horizon as well.
+        tile.horizonCullingPoint = tile.extent.center().as('EPSG:4978').xyz();
+        tile.extent.dimensions(dimensions).multiplyScalar(THREE.Math.DEG2RAD);
+
+        // alpha is maximum angle between two points of tile
+        const alpha = dimensions.length();
+        const h = Math.abs(1.0 / Math.cos(alpha * 0.5));
+        tile.horizonCullingPoint.setLength(h * tile.horizonCullingPoint.length());
+    }
+}
+
 export default {
     convert(requester, extent, layer) {
         const builder = layer.builder;
@@ -45,12 +72,14 @@ export default {
             };
         }
 
-        // build tile
+        // build tile mesh
         geometry._count++;
         const material = new LayeredMaterial(layer.materialOptions);
         const tile = new TileMesh(geometry, material, layer, extent, level);
-        // TODO semble ne pas etre necessaire
-        tile.layers.set(layer.threejsLayer);
+
+        // Commented because layer.threejsLayer is undefined;
+        // Fix me: conflict with object3d added in view.scene;
+        // tile.layers.set(layer.threejsLayer);
 
         if (parent && parent.isTileMesh) {
             // get parent extent transformation
@@ -62,9 +91,6 @@ export default {
 
         tile.position.copy(position);
         tile.quaternion.copy(quaternion);
-
-        tile.material.transparent = layer.opacity < 1.0;
-        tile.material.opacity = layer.opacity;
         tile.visible = false;
         tile.updateMatrix();
 
@@ -74,27 +100,7 @@ export default {
 
         tile.add(tile.obb);
 
-        if (layer.diffuse) {
-            tile.material.diffuse = layer.diffuse;
-        }
-
-        if (__DEBUG__) {
-            tile.material.showOutline = layer.showOutline || false;
-            tile.material.wireframe = layer.wireframe || false;
-        }
-
-        if (layer.isGlobeLayer) {
-            // Computes a point used for horizon culling.
-            // If the point is below the horizon,
-            // the tile is guaranteed to be below the horizon as well.
-            tile.horizonCullingPoint = tile.extent.center().as('EPSG:4978').xyz();
-            tile.extent.dimensions(dimensions).multiplyScalar(THREE.Math.DEG2RAD);
-
-            // alpha is maximum angle between two points of tile
-            const alpha = dimensions.length();
-            const h = Math.abs(1.0 / Math.cos(alpha * 0.5));
-            tile.horizonCullingPoint.setLength(h * tile.horizonCullingPoint.length());
-        }
+        setTileFromTiledLayer(tile, layer);
 
         return Promise.resolve(tile);
     },

src/Core/TileMesh.js

@@ -22,6 +22,14 @@ class TileMesh extends THREE.Mesh {
         this.layer = layer;
         this.extent = extent;
         this.level = level;
+        // 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 (!this.extent.zoom) {
+            this.extent.zoom = level;
+        }
+
         this.material.objectId = this.id;
 
         this.obb = this.geometry.OBB.clone();

src/Core/View.js

@@ -175,7 +175,7 @@ function _preprocessLayer(view, layer, provider, parentLayer) {
         _syncGeometryLayerVisibility(layer, view);
         // Find projection layer, this is projection destination
         layer.projection = view.referenceCrs;
-    } else if (layer.source.tileMatrixSet === 'PM') {
+    } else if (layer.source.tileMatrixSet === 'PM' || layer.source.projection == 'EPSG:3857') {
         layer.projection = 'EPSG:3857';
     } else {
         layer.projection = parentLayer.extent.crs();

src/Layer/LayerUpdateState.js

@@ -19,7 +19,7 @@ function LayerUpdateState() {
     this.errorCount = 0;
 }
 
-LayerUpdateState.prototype.canTryUpdate = function canTryUpdate(timestamp) {
+LayerUpdateState.prototype.canTryUpdate = function canTryUpdate(timestamp = Date.now()) {
     switch (this.state) {
         case UPDATE_STATE.IDLE: {
             return true;

src/Layer/TiledGeometryLayer.js

@@ -151,7 +151,7 @@ class TiledGeometryLayer extends GeometryLayer {
         // Prepare ColorLayer sequence order
         // In this moment, there is only one color layers sequence, because they are attached to tileLayer.
         // In future, the sequence must be returned by parent geometry layer.
-        context.ColorLayerSequenceOrder = ImageryLayers.getColorLayersIdOrderedBySequence(context.colorLayers);
+        this.colorLayersOrder = ImageryLayers.getColorLayersIdOrderedBySequence(context.colorLayers);
 
         let commonAncestor;
         for (const source of sources.values()) {

src/Process/FeatureProcessing.js

@@ -1,8 +1,7 @@
 import * as THREE from 'three';
 import LayerUpdateState from 'Layer/LayerUpdateState';
-import CancelledCommandException from 'Core/Scheduler/CancelledCommandException';
 import ObjectRemovalHelper from 'Process/ObjectRemovalHelper';
-
+import handlingError from 'Process/handlerNodeError';
 
 const vector = new THREE.Vector3();
 function applyOffset(obj, offset, quaternion, offsetAltitude = 0) {
@@ -72,9 +71,7 @@ export default {
             node.layerUpdateState[layer.id] = new LayerUpdateState();
         }
 
-        const ts = Date.now();
-
-        if (!node.layerUpdateState[layer.id].canTryUpdate(ts)) {
+        if (!node.layerUpdateState[layer.id].canTryUpdate()) {
             return;
         }
 
@@ -155,17 +152,6 @@ export default {
                 node.layerUpdateState[layer.id].failure(1, true);
             }
         },
-        (err) => {
-            if (err instanceof CancelledCommandException) {
-                node.layerUpdateState[layer.id].success();
-            } else if (err instanceof SyntaxError) {
-                node.layerUpdateState[layer.id].failure(0, true);
-            } else {
-                node.layerUpdateState[layer.id].failure(Date.now());
-                window.setTimeout(() => {
-                    context.view.notifyChange(layer, false);
-                }, node.layerUpdateState[layer.id].secondsUntilNextTry() * 1000);
-            }
-        });
+        err => handlingError(err, node, layer, node.level, context.view));
     },
 };