From 5b5b6e342762e9ee015df9d38b42b21962aca18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Prunayre?= Date: Mon, 6 May 2024 13:32:04 +0200 Subject: [PATCH] Map / Add scale. (#7967) * Map / Add scale. * Update gn_map_default.less --- .../catalog/components/viewer/ViewerDirective.js | 4 ++++ web-ui/src/main/resources/catalog/js/CatController.js | 3 ++- web-ui/src/main/resources/catalog/locales/en-v4.json | 1 + .../catalog/views/default/less/gn_map_default.less | 11 ++++++++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/web-ui/src/main/resources/catalog/components/viewer/ViewerDirective.js b/web-ui/src/main/resources/catalog/components/viewer/ViewerDirective.js index 2c980c5baa98..3c45168e492b 100644 --- a/web-ui/src/main/resources/catalog/components/viewer/ViewerDirective.js +++ b/web-ui/src/main/resources/catalog/components/viewer/ViewerDirective.js @@ -496,6 +496,10 @@ setTimeout(function () { scope.map.updateSize(); }, 300); + + if (gnViewerSettings.mapConfig.disabledTools.scaleLine === false) { + scope.map.addControl(new ol.control.ScaleLine()); + } } }; } diff --git a/web-ui/src/main/resources/catalog/js/CatController.js b/web-ui/src/main/resources/catalog/js/CatController.js index 974d772ffb06..e08a07cae1f5 100644 --- a/web-ui/src/main/resources/catalog/js/CatController.js +++ b/web-ui/src/main/resources/catalog/js/CatController.js @@ -827,7 +827,8 @@ graticule: false, mousePosition: true, syncAllLayers: false, - drawVector: false + drawVector: false, + scaleLine: false }, defaultTool: "layers", defaultToolAfterMapLoad: "layers", diff --git a/web-ui/src/main/resources/catalog/locales/en-v4.json b/web-ui/src/main/resources/catalog/locales/en-v4.json index 9be366bb1790..c1cb282d849c 100644 --- a/web-ui/src/main/resources/catalog/locales/en-v4.json +++ b/web-ui/src/main/resources/catalog/locales/en-v4.json @@ -414,6 +414,7 @@ "application/vnd.geo+json": "GeoJSON", "application/json": "JSON", "shape-zip": "ESRI Shapefile", + "scaleLineTool": "Map scale", "text/xml; subtype=gml/2.1.2": "GML 2.1.2", "text/xml; subtype=gml/3.1.1": "GML 3.1.1", "text/xml; subtype=gml/3.2": "GML 3.2", diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_map_default.less b/web-ui/src/main/resources/catalog/views/default/less/gn_map_default.less index b407d7c683e5..3fff351c769c 100644 --- a/web-ui/src/main/resources/catalog/views/default/less/gn_map_default.less +++ b/web-ui/src/main/resources/catalog/views/default/less/gn_map_default.less @@ -37,8 +37,8 @@ } .ol-attribution { .gn-attribution(); - bottom: 1em; left: 1em; + bottom: 1em; button { background-color: @brand-primary; } @@ -48,6 +48,15 @@ } } + .ol-scale-line { + bottom: 1em; + left: 180px; + @media screen and (max-height: 768px) { + left: auto; + right: 180px; + } + } + .panel-tools { .panel-heading { background-color: transparent;