refactor(Style): supp collection.style and delete notion of style.parent

iTowns · Dec 13, 2023 · 40f83b3 · 40f83b3
1 parent 5f22009
commit 40f83b3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 35 deletions.
diff --git a/src/Core/Feature.js b/src/Core/Feature.js
@@ -424,7 +424,7 @@ export class FeatureCollection extends THREE.Object3D {
     /**
      * Updates the global transform of the object and its descendants.
      *
-     * @param {booolean}  force   The force
+     * @param {boolean}  force   The force
      */
     updateMatrixWorld(force) {
         super.updateMatrixWorld(force);
@@ -498,12 +498,4 @@ export class FeatureCollection extends THREE.Object3D {
         this.features.push(ref);
         return ref;
     }
-
-    setParentStyle(style) {
-        if (style) {
-            this.features.forEach((f) => {
-                f.style.parent = style;
-            });
-        }
-    }
 }
diff --git a/src/Core/Style.js b/src/Core/Style.js
@@ -146,13 +146,7 @@ function defineStyleProperty(style, category, name, value, defaultValue) {
         name,
         {
             enumerable: true,
-            get: () => {
-                if (property === undefined) {
-                    return style.parent[category][name] || defaultValue;
-                } else {
-                    return property;
-                }
-            },
+            get: () => property ?? defaultValue,
             set: (v) => {
                 property = v;
             },
@@ -548,24 +542,13 @@ class Style {
      * @param {StyleOptions} [params={}] An object that contain any properties
      * (order, zoom, fill, stroke, point, text or/and icon)
      * and sub properties of a Style (@see {@link StyleOptions}).
-     * @param {Style} [parent] The parent style, that is looked onto if a value
-     * is missing.
      * @constructor
      */
-    constructor(params = {}, parent) {
+    constructor(params = {}) {
         this.isStyle = true;
 
         this.order = params.order || 0;
 
-        this.parent = parent || {
-            zoom: {},
-            fill: {},
-            stroke: {},
-            point: {},
-            text: {},
-            icon: {},
-        };
-
         params.zoom = params.zoom || {};
         params.fill = params.fill || {};
         params.stroke = params.stroke || {};

diff --git a/src/Source/FileSource.js b/src/Source/FileSource.js
@@ -175,10 +175,6 @@ class FileSource extends Source {
                     this.extent.applyMatrix4(data.matrixWorld);
                 }
             }
-
-            if (data.isFeatureCollection) {
-                data.setParentStyle(options.out.style);
-            }
         });
     }
 

diff --git a/src/Source/VectorTilesSource.js b/src/Source/VectorTilesSource.js
@@ -138,9 +138,6 @@ class VectorTilesSource extends TMSSource {
                 console.warn('With VectorTilesSource and FeatureGeometryLayer, the accurate option is always false');
                 options.out.accurate = false;
             }
-            const keys = Object.keys(this.styles);
-
-            keys.forEach((k) => { this.styles[k].parent = options.out.style; });
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -175,10 +175,6 @@ class FileSource extends Source { @@
                         this.extent.applyMatrix4(data.matrixWorld);
                     }
                 }
-                if (data.isFeatureCollection) {
-                    data.setParentStyle(options.out.style);
-                }
             });
         }
@@ Expand Down @@