From f6072519e525a6f993fd210f2a7562b54d1299b4 Mon Sep 17 00:00:00 2001
From: David <perssond9@gmail.com>
Date: Wed, 2 Oct 2024 08:35:51 +0200
Subject: [PATCH] feat: add utility function for localization to controls to
 shorten key lookup statement

---
 src/controls/measure.js  | 32 ++++++++++++++++++--------------
 src/controls/sharemap.js | 10 +++++++---
 src/style/drawstyles.js  |  4 ++--
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/controls/measure.js b/src/controls/measure.js
index 39e37aa7d..69b958198 100644
--- a/src/controls/measure.js
+++ b/src/controls/measure.js
@@ -73,6 +73,10 @@ const Measure = function Measure({
   const source = new VectorSource();
   const modify = new Modify({ source, style: modifyStyle });
 
+  function localize(key) {
+    return localization.getStringByKeys({ targetParentKey: 'measure', targetKey: key });
+  }
+
   function styleFunction(feature, segments, drawType, tip) {
     const styleScale = feature.get('styleScale') || 1;
     const labelStyle = drawStyles.getLabelStyle(styleScale);
@@ -191,7 +195,7 @@ const Measure = function Measure({
     const styleScale = feature.get('styleScale') || 1;
     const featureStyle = drawStyles.getLabelStyle(styleScale);
     feature.setStyle(featureStyle);
-    feature.getStyle().getText().setText(localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'fetchingElevation' }));
+    feature.getStyle().getText().setText(localize('fetchingElevation'));
 
     fetch(url).then(response => response.json({
       cache: false
@@ -234,8 +238,8 @@ const Measure = function Measure({
   }
 
   function createRadiusModal(feature) {
-    const title = localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'bufferModalTitle' });
-    const ok = localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'bufferModalOkButton' });
+    const title = localize('bufferModalTitle');
+    const ok = localize('bufferModalOkButton');
     const content = `<div>
                       <input type="number" id="bufferradius">
                       <button id="bufferradiusBtn">${ok}</button>
@@ -344,7 +348,7 @@ const Measure = function Measure({
   function addInteraction() {
     const drawType = type || 'LineString';
     const activeTip = '';
-    const idleTip = localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'startMeasureTooltip' });
+    const idleTip = localize('startMeasureTooltip');
     let tip = idleTip;
     measure = new Draw({
       source,
@@ -691,7 +695,7 @@ const Measure = function Measure({
             addNode();
           },
           icon: '#ic_add_24px',
-          tooltipText: localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'addNodeTooltip' }),
+          tooltipText: localize('addNodeTooltip'),
           tooltipPlacement: 'east'
         });
         buttons.push(addNodeButton);
@@ -710,7 +714,7 @@ const Measure = function Measure({
             measure.getOverlay().changed();
           },
           icon: '#ic_linear_scale_24px',
-          tooltipText: localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'showSectionsTooltip' }),
+          tooltipText: localize('showSectionsTooltip'),
           tooltipPlacement: 'east'
         });
         buttons.push(showSegmentLabelButton);
@@ -751,7 +755,7 @@ const Measure = function Measure({
             toggleMeasure();
           },
           icon: '#ic_straighten_24px',
-          tooltipText: localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'mainButtonTooltip' }),
+          tooltipText: localize('mainButtonTooltip'),
           tooltipPlacement: 'east'
         });
         buttons.push(measureButton);
@@ -765,7 +769,7 @@ const Measure = function Measure({
             },
             data: { tool: 'length' },
             icon: '#ic_timeline_24px',
-            tooltipText: localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'lengthTooltip' }),
+            tooltipText: localize('lengthTooltip'),
             tooltipPlacement: 'east'
           });
           buttons.push(lengthToolButton);
@@ -781,7 +785,7 @@ const Measure = function Measure({
             },
             data: { tool: 'area' },
             icon: '#o_polygon_24px',
-            tooltipText: localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'areaTooltip' }),
+            tooltipText: localize('areaTooltip'),
             tooltipPlacement: 'east'
           });
           buttons.push(areaToolButton);
@@ -796,7 +800,7 @@ const Measure = function Measure({
             },
             data: { tool: 'elevation' },
             icon: '#ic_height_24px',
-            tooltipText: localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'elevationTooltip' }),
+            tooltipText: localize('elevationTooltip'),
             tooltipPlacement: 'east'
           });
           buttons.push(elevationToolButton);
@@ -811,7 +815,7 @@ const Measure = function Measure({
             },
             data: { tool: 'buffer' },
             icon: '#ic_adjust_24px',
-            tooltipText: localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'bufferTooltip' }),
+            tooltipText: localize('bufferTooltip'),
             tooltipPlacement: 'east'
           });
           buttons.push(bufferToolButton);
@@ -837,7 +841,7 @@ const Measure = function Measure({
               undoLastPoint();
             },
             icon: '#ic_undo_24px',
-            tooltipText: localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'undoTooltip' }),
+            tooltipText: localize('undoTooltip'),
             tooltipPlacement: 'east'
           });
           buttons.push(undoButton);
@@ -849,7 +853,7 @@ const Measure = function Measure({
               viewer.removeOverlays(overlayArray);
             },
             icon: '#ic_delete_24px',
-            tooltipText: localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'clearTooltip' }),
+            tooltipText: localize('clearTooltip'),
             tooltipPlacement: 'east'
           });
           buttons.push(clearButton);
@@ -864,7 +868,7 @@ const Measure = function Measure({
               toggleSnap();
             },
             icon: '#fa-magnet',
-            tooltipText: localization.getStringByKeys({ targetParentKey: 'measure', targetKey: 'snapTooltip' }),
+            tooltipText: localize('snapTooltip'),
             tooltipPlacement: 'east'
           });
           buttons.push(toggleSnapButton);
diff --git a/src/controls/sharemap.js b/src/controls/sharemap.js
index b76eedb95..8d516e44d 100644
--- a/src/controls/sharemap.js
+++ b/src/controls/sharemap.js
@@ -10,9 +10,13 @@ const ShareMap = function ShareMap(options = {}) {
     localization
   } = options;
 
+  function localize(key) {
+    return localization.getStringByKeys({ targetParentKey: 'sharemap', targetKey: key });
+  }
+
   const {
     icon = '#ic_screen_share_outline_24px',
-    title = localization.getStringByKeys({ targetParentKey: 'sharemap', targetKey: 'title' }),
+    title = localize('title'),
     storeMethod,
     serviceEndpoint
   } = options;
@@ -22,7 +26,7 @@ const ShareMap = function ShareMap(options = {}) {
   let modal;
 
   const createContent = function createContent() { // Kopiera och klistra in länken för att dela kartan.
-    const shareMapInstruction = localization.getStringByKeys({ targetParentKey: 'sharemap', targetKey: 'shareMapInstruction' });
+    const shareMapInstruction = localize('shareMapInstruction');
     return `<div class="o-share-link"><input type="text"></div><i>${shareMapInstruction}</i>`;
   };
 
@@ -52,7 +56,7 @@ const ShareMap = function ShareMap(options = {}) {
         click() {
           mapMenu.close();
           modal = Modal({
-            title: localization.getStringByKeys({ targetParentKey: 'sharemap', targetKey: 'linkToMap' }),
+            title: localize('linkToMap'),
             content: createContent(),
             target
           });
diff --git a/src/style/drawstyles.js b/src/style/drawstyles.js
index ac47208a2..c84fe4313 100644
--- a/src/style/drawstyles.js
+++ b/src/style/drawstyles.js
@@ -317,7 +317,7 @@ const tipStyle = new Style({
   })
 });
 
-function modifyStyle(loc) {
+function modifyStyle(localization) {
   return new Style({
     image: new CircleStyle({
       radius: 5,
@@ -329,7 +329,7 @@ function modifyStyle(loc) {
       })
     }),
     text: new Text({
-      text: loc.getStringByKeys({ targetParentKey: 'drawStyles', targetKey: 'modifyTooltip' }),
+      text: localization.getStringByKeys({ targetParentKey: 'drawStyles', targetKey: 'modifyTooltip' }),
       font: '12px Calibri,sans-serif',
       fill: new Fill({
         color: 'rgba(255, 255, 255, 1)'