Merge pull request #2710 from DenverCoder544/publisher_tools_reactifi…

…cation_zoombar Publisher tools reactification zoombar
oskariorg · Oct 31, 2024 · 6663029 · 6663029
2 parents 54daedb + 71144ec
commit 6663029
Show file tree

Hide file tree

Showing 16 changed files with 82 additions and 59 deletions.
diff --git a/bundles/framework/publisher2/resources/locale/en.js b/bundles/framework/publisher2/resources/locale/en.js
@@ -66,7 +66,6 @@ Oskari.registerLocalization(
                 "tooltip": "Select available map tools. Check a placement in the map preview.",
                 "AnnouncementsPlugin": "Announcements",
                 "TimeseriesControlPlugin": "Time series player",
-                "Portti2Zoombar": "Zoom bar",
                 "ControlsPlugin": "Pan by mouse",
                 "SearchPlugin": "Place search",
                 "FeaturedataPlugin": "Feature data",

diff --git a/bundles/framework/publisher2/resources/locale/fi.js b/bundles/framework/publisher2/resources/locale/fi.js
@@ -66,7 +66,6 @@ Oskari.registerLocalization(
                 "tooltip": "Valitse kartalla käytettävissä olevat työkalut. Tarkista asettelu esikatselukartasta.",
                 "AnnouncementsPlugin": "Ilmoitukset",
                 "TimeseriesControlPlugin": "Aikasarjatoistin",
-                "Portti2Zoombar": "Mittakaavasäädin",
                 "ControlsPlugin": "Kartan liikuttaminen hiirellä raahaamalla",
                 "SearchPlugin": "Osoite- ja paikannimihaku",
                 "FeaturedataPlugin": "Kohdetietotaulukko",

diff --git a/bundles/framework/publisher2/resources/locale/fr.js b/bundles/framework/publisher2/resources/locale/fr.js
@@ -63,7 +63,6 @@ Oskari.registerLocalization(
                 "label": "Outils",
                 "tooltip": "Sélectionner les outils de carte accessibles. Consulter une mise en place dans la prévisualisation de carte.",
                 "TimeseriesControlPlugin": "Lecteur chronologique",
-                "Portti2Zoombar": "Barre de zoom",
                 "ControlsPlugin": "Panoramiser avec la souris",
                 "SearchPlugin": "Recherche de lieu",
                 "FeaturedataPlugin": "Données de fonctionnalité",

diff --git a/bundles/framework/publisher2/resources/locale/is.js b/bundles/framework/publisher2/resources/locale/is.js
@@ -50,7 +50,6 @@ Oskari.registerLocalization(
             "maptools": {
                 "label": "Tól",
                 "tooltip": "Velja tiltæk kortatól. Athugaðu staðsetningu við forskoðun korts.",
-                "Portti2Zoombar": "Þysjunarstika",
                 "ControlsPlugin": "Hliðra með mús",
                 "SearchPlugin": "Leit eftir stað",
                 "FeaturedataPlugin": "Fitjugögn",

diff --git a/bundles/framework/publisher2/resources/locale/ru.js b/bundles/framework/publisher2/resources/locale/ru.js
@@ -64,7 +64,6 @@ Oskari.registerLocalization(
                 "label": "Инструменты",
                 "tooltip": "Выберите доступные инструменты карты. Проверка размещения в окне предварительного просмотра карты.",
                 "TimeseriesControlPlugin": "Временные ряды",
-                "Portti2Zoombar": "Панель увеличения",
                 "ControlsPlugin": "Панорамирование мышью",
                 "SearchPlugin": "Поиск места",
                 "FeaturedataPlugin": "Данные объекта",

diff --git a/bundles/framework/publisher2/resources/locale/sv.js b/bundles/framework/publisher2/resources/locale/sv.js
@@ -66,7 +66,6 @@ Oskari.registerLocalization(
                 "tooltip": "Välj verktygen som visas på kartan. Du kan se deras placering på den förhandsvisade kartan.",
                 "AnnouncementsPlugin": "Aviseringar",
                 "TimeseriesControlPlugin": "Tidseriespelare",
-                "Portti2Zoombar": "Skalans glidreglage",
                 "ControlsPlugin": "Flytta kartvyn med musen",
                 "SearchPlugin": "Adress- och ortnamnssökning",
                 "FeaturedataPlugin": "Objektuppgifter",

diff --git a/bundles/framework/publisher2/tools/ZoombarTool.js b/bundles/framework/publisher2/tools/ZoombarTool.js
diff --git a/bundles/mapping/mapmodule/plugin/zoombar/publisher/ZoombarTool.js b/bundles/mapping/mapmodule/plugin/zoombar/publisher/ZoombarTool.js
@@ -0,0 +1,55 @@
+import { AbstractPublisherTool } from '../../../../../framework/publisher2/tools/AbstractPublisherTool';
+
+class ZoombarTool extends AbstractPublisherTool {
+    constructor (...args) {
+        super(...args);
+        this.index = 1;
+        this.group = 'additional';
+    };
+
+    /**
+    * Get tool object.
+    * @method getTool
+    *
+    * @returns {Object} tool description
+    */
+    getTool () {
+        return {
+            id: 'Oskari.mapframework.bundle.mapmodule.plugin.Portti2Zoombar',
+            title: Oskari.getMsg('MapModule', 'publisherTools.Zoombar.toolLabel'),
+            config: this.state.pluginConfig || {}
+        };
+    };
+
+    /**
+    * Get values.
+    * @method getValues
+    * @public
+    *
+    * @returns {Object} tool value object
+    */
+    getValues () {
+        if (!this.isEnabled()) {
+            return null;
+        }
+        return {
+            configuration: {
+                mapfull: {
+                    conf: {
+                        plugins: [{ id: this.getTool().id, config: this.getPlugin().getConfig() }]
+                    }
+                }
+            }
+        };
+    };
+}
+
+// Attach protocol to make this discoverable by Oskari publisher
+Oskari.clazz.defineES('Oskari.publisher.ZoombarTool',
+    ZoombarTool,
+    {
+        protocol: ['Oskari.mapframework.publisher.Tool']
+    }
+);
+
+export { ZoombarTool };
diff --git a/bundles/mapping/mapmodule/publisher/tools.js b/bundles/mapping/mapmodule/publisher/tools.js
@@ -6,5 +6,6 @@ import { ScaleBarTool } from '../plugin/scalebar/publisher/ScalebarTool';
 import { MyLocationTool } from '../plugin/mylocation/publisher/MyLocationTool';
 import { PanButtonsTool } from '../plugin/panbuttons/publisher/PanButtonsTool';
 import { IndexMapTool } from '../plugin/indexmap/publisher/IndexMapTool';
+import { ZoombarTool } from '../plugin/zoombar/publisher/ZoombarTool';
 
-export { LogoTool, ScaleBarTool, MyLocationTool, PanButtonsTool, IndexMapTool };
+export { LogoTool, ScaleBarTool, MyLocationTool, PanButtonsTool, IndexMapTool, ZoombarTool };
diff --git a/bundles/mapping/mapmodule/resources/locale/en.js b/bundles/mapping/mapmodule/resources/locale/en.js
@@ -180,7 +180,10 @@ Oskari.registerLocalization(
             },
             "IndexMapPlugin": {
                 "toolLabel": "Index map",
-            }
+            },
+            "Zoombar": {
+                "toolLabel": "Zoom bar"
+            },
         }
     }
 });
diff --git a/bundles/mapping/mapmodule/resources/locale/fi.js b/bundles/mapping/mapmodule/resources/locale/fi.js
@@ -180,6 +180,9 @@ Oskari.registerLocalization(
             },
             "IndexMapPlugin": {
                 "toolLabel": "Indeksikartta"
+            },
+            "Zoombar": {
+                "toolLabel": "Mittakaavasäädin"
             }
         }
     }

diff --git a/bundles/mapping/mapmodule/resources/locale/fr.js b/bundles/mapping/mapmodule/resources/locale/fr.js
@@ -148,7 +148,10 @@ Oskari.registerLocalization(
             },
             "IndexMapPlugin": {
                 "toolLabel": "Carte-index"
-            }
+            },
+            "Zoombar": {
+                "toolLabel": "Barre de zoom"
+            },
         }
     }
 });
diff --git a/bundles/mapping/mapmodule/resources/locale/is.js b/bundles/mapping/mapmodule/resources/locale/is.js
@@ -142,7 +142,10 @@ Oskari.registerLocalization(
             },
             "IndexMapPlugin": {
                 "toolLabel": "Index kort"
-            }
+            },
+            "Zoombar": {
+                "toolLabel": "Þysjunarstika"
+            },
         }
     }
 });
diff --git a/bundles/mapping/mapmodule/resources/locale/ru.js b/bundles/mapping/mapmodule/resources/locale/ru.js
@@ -141,7 +141,12 @@ Oskari.registerLocalization(
             "PanButtons": {
                 "toolLabel": "Инструмент панорамирования"
             },
-            "IndexMapPlugin": "Номенклатура карты",
+            "IndexMapPlugin": {
+                "toolLabel": "Номенклатура карты"
+            },
+            "Zoombar": {
+                "toolLabel": "Панель увеличения"
+            },
         }
     }
 });
diff --git a/bundles/mapping/mapmodule/resources/locale/sv.js b/bundles/mapping/mapmodule/resources/locale/sv.js
@@ -175,7 +175,10 @@ Oskari.registerLocalization(
             },
             "IndexMapPlugin": {
                 "toolLabel": "Indexkarta"
-            }
+            },
+            "Zoombar": {
+                "toolLabel": "Skalans glidreglage"
+            },
         }
     }
 });
diff --git a/packages/framework/bundle/publisher2/bundle.js b/packages/framework/bundle/publisher2/bundle.js
@@ -97,10 +97,6 @@ Oskari.clazz.define("Oskari.mapframework.bundle.publisher2.PublisherBundle", fun
             "type": "text/javascript",
             "src": "../../../../bundles/framework/publisher2/tools/ToolbarTool.js"
         },
-        {
-            "type": "text/javascript",
-            "src": "../../../../bundles/framework/publisher2/tools/ZoombarTool.js"
-        },
         {
             "type": "text/javascript",
             "src": "../../../../bundles/framework/publisher2/tools/SearchTool.js"