From 630d8fa31a2344494c7bc94ae75e041bf7b2db9a Mon Sep 17 00:00:00 2001 From: braimbault Date: Wed, 15 May 2024 14:55:53 +0200 Subject: [PATCH 1/5] fix: unclear 'show no data' --- src/layers/Layer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layers/Layer.js b/src/layers/Layer.js index cd7a3112..693701e6 100644 --- a/src/layers/Layer.js +++ b/src/layers/Layer.js @@ -343,7 +343,7 @@ class Layer extends Evented { const { properties } = feature const content = (hoverLabel || label).replace( /\{ *([\w_-]+) *\}/g, - (str, key) => properties[key] || '' + (str, key) => properties[key] || (key === 'value' ? 'no data' : '') ) this._map.showLabel(content, evt.lngLat) From ab414d60a2d2508f5f2c8fa6ebb97d3d80b75737 Mon Sep 17 00:00:00 2001 From: braimbault Date: Thu, 16 May 2024 02:01:22 +0200 Subject: [PATCH 2/5] fix: format --- src/layers/Layer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/layers/Layer.js b/src/layers/Layer.js index 693701e6..d7345706 100644 --- a/src/layers/Layer.js +++ b/src/layers/Layer.js @@ -343,7 +343,8 @@ class Layer extends Evented { const { properties } = feature const content = (hoverLabel || label).replace( /\{ *([\w_-]+) *\}/g, - (str, key) => properties[key] || (key === 'value' ? 'no data' : '') + (str, key) => + properties[key] || (key === 'value' ? 'no data' : '') ) this._map.showLabel(content, evt.lngLat) From 1229c48a472a66de2c3480fa8f83ecd38fc05822 Mon Sep 17 00:00:00 2001 From: braimbault Date: Mon, 3 Jun 2024 17:09:03 +0200 Subject: [PATCH 3/5] fix: capitalize No data --- src/layers/Layer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layers/Layer.js b/src/layers/Layer.js index d7345706..1c89b9f2 100644 --- a/src/layers/Layer.js +++ b/src/layers/Layer.js @@ -344,7 +344,7 @@ class Layer extends Evented { const content = (hoverLabel || label).replace( /\{ *([\w_-]+) *\}/g, (str, key) => - properties[key] || (key === 'value' ? 'no data' : '') + properties[key] || (key === 'value' ? 'No data' : '') ) this._map.showLabel(content, evt.lngLat) From c20840261940d8cd5047d4855725edc48d1513f6 Mon Sep 17 00:00:00 2001 From: braimbault Date: Tue, 4 Jun 2024 14:41:46 +0200 Subject: [PATCH 4/5] fix: handle translation --- src/controls/controlsLocale.js | 1 + src/layers/Layer.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/controls/controlsLocale.js b/src/controls/controlsLocale.js index b384010a..39b6c6ac 100644 --- a/src/controls/controlsLocale.js +++ b/src/controls/controlsLocale.js @@ -1,6 +1,7 @@ const controlsLocale = { 'SearchControl.SearchForPlace': 'Search for place or address', 'FitBoundsControl.ZoomToContent': 'Zoom to content', + 'HoverLabel.NoData': 'No data', 'MeasureControl.MeasureDistancesAndAreas': 'Measure distances and areas', 'MeasureControl.ClickStartMeasurement': 'Click where you want to start the measurement', diff --git a/src/layers/Layer.js b/src/layers/Layer.js index 1c89b9f2..490097c9 100644 --- a/src/layers/Layer.js +++ b/src/layers/Layer.js @@ -36,6 +36,8 @@ class Layer extends Evented { const layers = this.getLayers() const beforeId = map.getBeforeLayerId() + this.locale = mapgl._getUIString.bind(mapgl) + if (images) { try { await addImages(mapgl, images) @@ -344,7 +346,8 @@ class Layer extends Evented { const content = (hoverLabel || label).replace( /\{ *([\w_-]+) *\}/g, (str, key) => - properties[key] || (key === 'value' ? 'No data' : '') + properties[key] || + (key === 'value' ? this.locale('HoverLabel.NoData') : '') ) this._map.showLabel(content, evt.lngLat) From 15b5e3b58c667a4e70ad55ffe687432be9d23080 Mon Sep 17 00:00:00 2001 From: braimbault Date: Tue, 4 Jun 2024 15:41:16 +0200 Subject: [PATCH 5/5] chore: include _getUIString in mockMapGL --- jest.stub.js | 1 + 1 file changed, 1 insertion(+) diff --git a/jest.stub.js b/jest.stub.js index 6638ccf7..63f64c0a 100644 --- a/jest.stub.js +++ b/jest.stub.js @@ -6,6 +6,7 @@ global.mockMapGL = { getLayer: jest.fn(), getSource: jest.fn(), setFeatureState: jest.fn(), + _getUIString: jest.fn(), } global.mockMap = {