refactor(Style): supp getTextFromProperties() ad it's done with getContext()

ftoromanoff · ftoromanoff · commit 565dd630ed3c · 2023-12-13T15:57:51.000+01:00
diff --git a/src/Core/Label.js b/src/Core/Label.js
@@ -83,7 +83,7 @@ class Label extends THREE.Object3D {
 
         if (typeof content === 'string') {
             this.content = document.createElement('div');
-            this.content.textContent = content;
+            this.content.textContent = style.text.field;
         } else {
             this.content = content.cloneNode(true);
         }
diff --git a/src/Core/Style.js b/src/Core/Style.js
@@ -49,6 +49,8 @@ export function readExpression(property, ctx) {
             // In this proposal, metadata will be accessed in the callee by the
             // `context.properties` property.
             return property(ctx.properties, ctx);
+        } else if (typeof property === 'string' || property instanceof String) {
+            return property.replace(/\{(.+?)\}/g, (a, b) => (ctx.properties[b] || '')).trim();
         } else {
             return property;
         }
@@ -718,24 +720,6 @@ class Style {
         return new Style(style);
     }
 
-    /**
-     * Returns a string, associating `style.text.field` and properties to use to
-     * replace the keys in `style.text.field`.
-     *
-     * @param {FeatureContext} context The context linked to the feature
-     *
-     * @return {string|undefined} The formatted string if `style.text.field` is defined, nothing otherwise.
-     */
-    getTextFromProperties(context) {
-        if (!this.text.field) { return; }
-
-        if (this.text.field.expression) {
-            return readExpression(this.text.field, context);
-        } else {
-            return this.text.field.replace(/\{(.+?)\}/g, (a, b) => (context.properties()[b] || '')).trim();
-        }
-    }
-
     /**
      * set Style from (geojson-like) properties.
      * @param {Object} properties (geojson-like) properties.
diff --git a/src/Layer/LabelLayer.js b/src/Layer/LabelLayer.js
@@ -288,12 +288,6 @@ class LabelLayer extends GeometryLayer {
                         && !(this.style && this.style.icon && (this.style.icon.source || this.style.icon.key))) {
                         return;
                     }
-                } else if (geometryField) {
-                    content = new Style(g.properties.style).getTextFromProperties(context);
-                } else if (featureField) {
-                    content = new Style(f.style).getTextFromProperties(context);
-                } else if (layerField) {
-                    content = new Style(this.style).getTextFromProperties(context);
                 }
 
                 const style = Style.applyContext(context);
diff --git a/test/unit/label.js b/test/unit/label.js
@@ -50,20 +50,21 @@ describe('Label', function () {
     let label;
     let style;
     const c = new Coordinates('EPSG:4326');
+    const layerVT = {
+        type: 'symbol',
+        paint: {},
+        layout: {
+            'icon-image': 'icon',
+            'icon-size': 1,
+            'text-field': 'label',
+        },
+    };
     const sprites = {
         img: '',
         icon: { x: 0, y: 0, width: 10, height: 10 },
     };
 
     before('init style', function () {
-        const layerVT = {
-            type: 'symbol',
-            paint: {},
-            layout: {
-                'icon-image': 'icon',
-                'icon-size': 1,
-            },
-        };
         style = new Style(Style.setFromVectorTileLayer(layerVT, sprites));
     });
 
@@ -72,9 +73,14 @@ describe('Label', function () {
         assert.throws(() => { label = new Label('content'); });
     });
 
-    it('should correctly create Labels', function () {
-        assert.doesNotThrow(() => { label = new Label('', c); });
-        assert.doesNotThrow(() => { label = new Label(document.createElement('div'), c); });
+    describe('should correctly create Labels', function () {
+        it('with label from style', function () {
+            assert.doesNotThrow(() => { label = new Label('', c, style); });
+            assert.equal(label.content.textContent, layerVT.layout['text-field']);
+        });
+        it('from a DomElement', function () {
+            assert.doesNotThrow(() => { label = new Label(document.createElement('div'), c); });
+        });
     });
 
     it('should hide the DOM', function () {

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class Label extends THREE.Object3D {`
`83`	`83`
`84`	`84`	`if (typeof content === 'string') {`
`85`	`85`	`this.content = document.createElement('div');`
`86`		`- this.content.textContent = content;`
	`86`	`+ this.content.textContent = style.text.field;`
`87`	`87`	`} else {`
`88`	`88`	`this.content = content.cloneNode(true);`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -288,12 +288,6 @@ class LabelLayer extends GeometryLayer {`
`288`	`288`	`&& !(this.style && this.style.icon && (this.style.icon.source \|\| this.style.icon.key))) {`
`289`	`289`	`return;`
`290`	`290`	`}`
`291`		`- } else if (geometryField) {`
`292`		`- content = new Style(g.properties.style).getTextFromProperties(context);`
`293`		`- } else if (featureField) {`
`294`		`- content = new Style(f.style).getTextFromProperties(context);`
`295`		`- } else if (layerField) {`
`296`		`- content = new Style(this.style).getTextFromProperties(context);`
`297`	`291`	`}`
`298`	`292`
`299`	`293`	`const style = Style.applyContext(context);`