refactor(Layer): instanciate new Style at Layer instead of at examples

iTowns · Jul 11, 2023 · d26f29e · d26f29e
1 parent 08dbd3d
commit d26f29e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Layer/ColorLayer.js b/src/Layer/ColorLayer.js
@@ -1,7 +1,6 @@
 import RasterLayer from 'Layer/RasterLayer';
 import { updateLayeredMaterialNodeImagery } from 'Process/LayeredMaterialNodeProcessing';
 import { RasterColorTile } from 'Renderer/RasterTile';
-import Style from 'Core/Style';
 import { deprecatedColorLayerOptions } from 'Core/Deprecated/Undeprecator';
 
 /**
@@ -84,7 +83,7 @@ class ColorLayer extends RasterLayer {
         deprecatedColorLayerOptions(config);
         super(id, config);
         this.isColorLayer = true;
-        this.style = new Style(config.style);
+        this.style = config.style;
         this.defineLayerProperty('visible', true);
         this.defineLayerProperty('opacity', 1.0);
         this.defineLayerProperty('sequence', 0);

diff --git a/src/Layer/Layer.js b/src/Layer/Layer.js
@@ -3,6 +3,7 @@ import { STRATEGY_MIN_NETWORK_TRAFFIC } from 'Layer/LayerUpdateStrategy';
 import InfoLayer from 'Layer/InfoLayer';
 import Source from 'Source/Source';
 import Cache from 'Core/Scheduler/Cache';
+import Style from 'Core/Style';
 
 /**
  * @property {boolean} isLayer - Used to checkout whether this layer is a Layer.
@@ -92,6 +93,9 @@ class Layer extends THREE.EventDispatcher {
             throw new Error(`Layer ${id} needs Source`);
         }
         super();
+        if (config.style && !(config.style instanceof Style)) {
+            config.style = new Style(config.style);
+        }
         this.isLayer = true;
 
         Object.assign(this, config);