From 67b10d83bd8f4789d128ec59fe2fc392eea80e47 Mon Sep 17 00:00:00 2001 From: Jonathan Cooper Date: Tue, 6 Feb 2024 14:11:51 +0000 Subject: [PATCH 1/2] feature: rounded decimal places of point or polygon in MonitoringFacility editor: emc-44 --- web/less/editor.less | 7 +++++++ web/src/editor/src/geometryMap/GeometryView.js | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/web/less/editor.less b/web/less/editor.less index 1e77d6732..2d331c286 100644 --- a/web/less/editor.less +++ b/web/less/editor.less @@ -275,6 +275,13 @@ font-size: 0.9em; } } + + // Hide the leaflet 'save' button as it is never used: https://stackoverflow.com/questions/51360283/how-to-remove-save-option-from-leaflet-draw-api-delete-button + .leaflet-draw-actions li:first-child a[title="Save changes"] { + visibility: hidden; + width: 0; + padding: 0; + } } .editor-buttons { diff --git a/web/src/editor/src/geometryMap/GeometryView.js b/web/src/editor/src/geometryMap/GeometryView.js index 141902daf..5bfbef285 100644 --- a/web/src/editor/src/geometryMap/GeometryView.js +++ b/web/src/editor/src/geometryMap/GeometryView.js @@ -71,9 +71,15 @@ export default ObjectInputView.extend({ this.map.addControl(this.drawControl) baseMaps.Map.addTo(this.map) + const rounding = function (key, val){ + if (typeof val === 'number') + return val.toFixed(5) + return val + } + this.listenTo(this.map, L.Draw.Event.CREATED, function (event) { const layer = event.layer - const geoJson = JSON.stringify(layer.toGeoJSON()) + const geoJson = JSON.stringify(layer.toGeoJSON(), rounding) this.model.setGeometry(geoJson) this.drawButtons = false this.map.removeControl(this.drawControl) From 3e6a08201bb4edcdf1c2896f842c0d4f8113b85f Mon Sep 17 00:00:00 2001 From: Jonathan Cooper Date: Tue, 6 Feb 2024 14:21:55 +0000 Subject: [PATCH 2/2] feature: fixed coding standard missing spaces adding geometry shape: emc-44 --- web/src/editor/src/geometryMap/GeometryView.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/src/editor/src/geometryMap/GeometryView.js b/web/src/editor/src/geometryMap/GeometryView.js index 5bfbef285..05fc900ab 100644 --- a/web/src/editor/src/geometryMap/GeometryView.js +++ b/web/src/editor/src/geometryMap/GeometryView.js @@ -71,9 +71,8 @@ export default ObjectInputView.extend({ this.map.addControl(this.drawControl) baseMaps.Map.addTo(this.map) - const rounding = function (key, val){ - if (typeof val === 'number') - return val.toFixed(5) + const rounding = function (key, val) { + if (typeof val === 'number') { return val.toFixed(5) } return val }