From 176570ee55ca278ceae85cf844ae34e7340d9539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Garc=C3=ADa?= Date: Wed, 7 Feb 2024 14:57:38 +0100 Subject: [PATCH] Map viewer / Remove Stamen background layers - no longer available --- .../user-interface-configuration.md | 6 ----- docs/manual/docs/help/map/index.md | 10 +------ .../tutorials/customui/search/defaultview.md | 12 +++------ .../components/common/map/mapService.js | 27 ------------------- .../viewer/owscontext/OwsContextService.js | 2 -- .../resources/catalog/locales/ca-admin.json | 4 +-- .../resources/catalog/locales/cs-admin.json | 4 +-- .../resources/catalog/locales/da-admin.json | 4 +-- .../resources/catalog/locales/de-admin.json | 4 +-- .../resources/catalog/locales/en-admin.json | 4 +-- .../resources/catalog/locales/es-admin.json | 4 +-- .../resources/catalog/locales/fi-admin.json | 4 +-- .../resources/catalog/locales/fr-admin.json | 4 +-- .../resources/catalog/locales/is-admin.json | 6 ++--- .../resources/catalog/locales/it-admin.json | 6 ++--- .../resources/catalog/locales/ko-admin.json | 10 +++---- .../resources/catalog/locales/nl-admin.json | 6 ++--- .../resources/catalog/locales/pt-admin.json | 6 ++--- .../resources/catalog/locales/ru-admin.json | 6 ++--- .../resources/catalog/locales/sk-admin.json | 6 ++--- .../resources/catalog/locales/sv-admin.json | 6 ++--- .../resources/catalog/locales/zh-admin.json | 6 ++--- .../data/data/resources/map/config-viewer.xml | 18 ------------- 23 files changed, 50 insertions(+), 115 deletions(-) diff --git a/docs/manual/docs/administrator-guide/configuring-the-catalog/user-interface-configuration.md b/docs/manual/docs/administrator-guide/configuring-the-catalog/user-interface-configuration.md index cc87db286e5..1734724599f 100644 --- a/docs/manual/docs/administrator-guide/configuring-the-catalog/user-interface-configuration.md +++ b/docs/manual/docs/administrator-guide/configuring-the-catalog/user-interface-configuration.md @@ -177,7 +177,6 @@ This section is for configuring the map shown when viewing a record. - **wmts**: generic WMTS layer, required properties: `name, url`. - **tms**: generic TMS layer, required property: `url`. - **osm**: OpenStreetMap default layer, no other property required. - - **stamen**: Stamen layers, required property: `name`. - **bing_aerial**: Bing Aerial background, required property: `key` containing the license key. ![](img/ui-settings-mapviewerlayers.png) @@ -189,11 +188,6 @@ All layers can also have some optional extra properties: Examples of layers: -This layer will use OpenStreetMap Stamen style, but only when the map is in `EPSG:3857`: - -``` json -{"type":"stamen","projectionList":["EPSG:3857"]} -``` This WMS layer will be shown but only when the map is on `EPSG:4326`: diff --git a/docs/manual/docs/help/map/index.md b/docs/manual/docs/help/map/index.md index 474b3fc0a37..d1a3fc38442 100644 --- a/docs/manual/docs/help/map/index.md +++ b/docs/manual/docs/help/map/index.md @@ -104,7 +104,7 @@ Use web mapping service: ![WMS Layers Style](img/add_wms_style.png) *Add WMS Layer style* -6. Locate the ``mapcolor9` layer style, and press **Add to map**. +6. Locate the ``mapcolor9`` layer style, and press **Add to map**. ### Add files @@ -126,14 +126,6 @@ Use **`KML`** files on the map. 3. Use these buttons to mange the layer order, and remove layers. -### Background map - -1. From the **Map** viewer, press **Manage layers** control - -2. Change the **Background map** from `OpenStreetMap` to `Stamen Watercolor`. - - ![Basemap](img/manage_basemap.png) - *Manage basemap* ## Legend diff --git a/docs/manual/docs/tutorials/customui/search/defaultview.md b/docs/manual/docs/tutorials/customui/search/defaultview.md index 6d9de9e456c..9a25b024f1d 100644 --- a/docs/manual/docs/tutorials/customui/search/defaultview.md +++ b/docs/manual/docs/tutorials/customui/search/defaultview.md @@ -13,17 +13,13 @@ Read instructions about [default view customization](../../../customizing-applic - Propose to sort only by change date and title. -- Use Stamen layer source for search map background. - - Recenter search map on Seoul -- - - Change full map configuration +- Change full map configuration - : - play with initial extent - - change brackground layer list - - add WMS layers to the default map + - play with initial extent + - change brackground layer list + - add WMS layers to the default map - Change default location for map search diff --git a/web-ui/src/main/resources/catalog/components/common/map/mapService.js b/web-ui/src/main/resources/catalog/components/common/map/mapService.js index 9caacc5a25b..b54b66474ee 100644 --- a/web-ui/src/main/resources/catalog/components/common/map/mapService.js +++ b/web-ui/src/main/resources/catalog/components/common/map/mapService.js @@ -296,7 +296,6 @@ * Handled types are: * * `osm`: OSM, no other prop required * * `bing_aerial`: Bing Aerial background, required prop: `key` - * * `stamen`: Stamen layers, required prop: `name` * * `wms`: generic WMS layer, required props: `name`, `url` * * `wmts`: generic WMTS layer, required props: `name`, `url` * * `tms`: generic TMS layer, required prop: `url` @@ -387,21 +386,6 @@ ); break; - case "stamen": - //We make watercolor the default layer - var type = layerInfo.name ? layerInfo.name : "watercolor", - source = new ol.source.Stamen({ - layer: type - }); - source.set("type", type); - defer.resolve( - new ol.layer.Tile({ - source: source, - title: layerInfo.title || "Stamen" - }) - ); - break; - case "wmts": if (!layerInfo.name || !layerInfo.url) { $log.warn( @@ -2328,17 +2312,6 @@ }), title: title || "Bing Aerial" }); - case "stamen": - //We make watercolor the default layer - var type = opt && opt.name ? opt.name : "watercolor", - source = new ol.source.Stamen({ - layer: type - }); - source.set("type", type); - return new ol.layer.Tile({ - source: source, - title: title || "Stamen" - }); case "wmts": if (!opt.name || !opt.url) { diff --git a/web-ui/src/main/resources/catalog/components/viewer/owscontext/OwsContextService.js b/web-ui/src/main/resources/catalog/components/viewer/owscontext/OwsContextService.js index b8bf62324f7..549315dc095 100644 --- a/web-ui/src/main/resources/catalog/components/viewer/owscontext/OwsContextService.js +++ b/web-ui/src/main/resources/catalog/components/viewer/owscontext/OwsContextService.js @@ -559,8 +559,6 @@ name = "{type=osm}"; } else if (source instanceof ol.source.BingMaps) { name = "{type=bing_aerial}"; - } else if (source instanceof ol.source.Stamen) { - name = "{type=stamen,name=" + layer.getSource().get("type") + "}"; } else if (source instanceof ol.source.WMTS) { name = "{type=wmts,name=" + layer.get("name") + "}"; params.server = [ diff --git a/web-ui/src/main/resources/catalog/locales/ca-admin.json b/web-ui/src/main/resources/catalog/locales/ca-admin.json index c1b2467c8d6..86bbdb57d84 100644 --- a/web-ui/src/main/resources/catalog/locales/ca-admin.json +++ b/web-ui/src/main/resources/catalog/locales/ca-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "OBSOLET! Capa Base del Mapa", "ui-mapBackgroundLayer-help": "OBSOLET! Definir aquí la capa base a utilitzar per a mapes diferents al visor i al mapa de cerca.", "ui-map-viewer": "Configuració del Visor de Mapes", - "ui-map-viewer-help": "Aquesta configuració s'utilitza per al visor de mapes. Cada paràmetre és opcional. Primer s'aplica el context, després l'extensió i les capes. Els tipus suportats són: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "Aquesta configuració s'utilitza per al visor de mapes. Cada paràmetre és opcional. Primer s'aplica el context, després l'extensió i les capes. Els tipus suportats són: osm, bing_aerial, wmts, wms.", "ui-map-search": "Configuració del Mapa de Cerca", - "ui-map-search-help": "Aquesta configuració s'utilitza per al mapa de cerca. Cada paràmetre és opcional. Primer s'aplica el context, després l'extensió i les capes. Els tipus suportats són: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "Aquesta configuració s'utilitza per al mapa de cerca. Cada paràmetre és opcional. Primer s'aplica el context, després l'extensió i les capes. Els tipus suportats són: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Configuració de l'Editor de Mapes", "ui-map-editor-help": "Aquesta configuració s'utilitza per al editor de mapes (editor del requadre delimitador i geometria). Cada paràmetre és opcional. Primer s'aplica el context, després l'extensió i les capes. Els tipus suportats són: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", diff --git a/web-ui/src/main/resources/catalog/locales/cs-admin.json b/web-ui/src/main/resources/catalog/locales/cs-admin.json index 3952d65c3c4..0607d3ed1a5 100644 --- a/web-ui/src/main/resources/catalog/locales/cs-admin.json +++ b/web-ui/src/main/resources/catalog/locales/cs-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "ZASTARALÉ! Mapová vrstva pozadí ", "ui-mapBackgroundLayer-help": "ZASTARALÉ! Zde definujte vrstvu pozadí, která se použije pro jiné mapy, jako jsou prohlížeče a vyhledávací mapy.", "ui-map-viewer": "Konfigurace mapy prohlížeče", - "ui-map-viewer-help": "Tato konfigurace se používá pro prohlížeč map. Každý parametr je volitelný. Kontext je aplikován nejdříve, pak rozsah a vrstvy. Podporované typy jsou: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "Tato konfigurace se používá pro prohlížeč map. Každý parametr je volitelný. Kontext je aplikován nejdříve, pak rozsah a vrstvy. Podporované typy jsou: osm, bing_aerial, wmts, wms.", "ui-map-search": "Vyhledat konfiguraci mapy", - "ui-map-search-help": "Tato konfigurace se používá pro vyhledávací mapu. Každý parametr je volitelný. Kontext je aplikován nejdříve, pak rozsah a vrstvy. Podporované typy jsou: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "Tato konfigurace se používá pro vyhledávací mapu. Každý parametr je volitelný. Kontext je aplikován nejdříve, pak rozsah a vrstvy. Podporované typy jsou: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Konfigurace Editoru Map ", "ui-map-editor-help": "Tato konfigurace se používá pro editor map (ohraničovací rámeček a editor geometrie). Každý parametr je volitelný. Kontext je aplikován nejdříve, pak rozsah a vrstvy. Podporované typy jsou: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Konfigurace metadat náhledů mapy", diff --git a/web-ui/src/main/resources/catalog/locales/da-admin.json b/web-ui/src/main/resources/catalog/locales/da-admin.json index a85458c6b14..8d917bac1f2 100644 --- a/web-ui/src/main/resources/catalog/locales/da-admin.json +++ b/web-ui/src/main/resources/catalog/locales/da-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "TRUKKET TILBAGE! Baggrundskort", "ui-mapBackgroundLayer-help": "TRUKKET TILBAGE! Definer her det baggrundslag, der skal bruges til andre kort end visnings- og søgekort.", "ui-map-viewer": "Konfiguration af kort", - "ui-map-viewer-help": "Denne konfiguration bruges til visningskortet. Hver parameter er valgfri. Konteksten anvendes først, derefter omfanget og lagene. Understøttede typer er: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "Denne konfiguration bruges til visningskortet. Hver parameter er valgfri. Konteksten anvendes først, derefter omfanget og lagene. Understøttede typer er: osm, bing_aerial, wmts, wms.", "ui-map-search": "Søg Konfiguration af Kort", - "ui-map-search-help": "Denne konfiguration bruges til søgekortet. Hver parameter er valgfri. Konteksten anvendes først, derefter omfanget og lagene. Understøttede typer er: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "Denne konfiguration bruges til søgekortet. Hver parameter er valgfri. Konteksten anvendes først, derefter omfanget og lagene. Understøttede typer er: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Editor kort konfiguration", "ui-map-editor-help": "Denne konfiguration bruges til editor-kortene (geografiske omskreven firkant og geometri-editor). Hver parameter er valgfri. Konteksten anvendes først, derefter omfanget og lagene. Understøttede typer er: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata-thumbnail-kortkonfiguration", diff --git a/web-ui/src/main/resources/catalog/locales/de-admin.json b/web-ui/src/main/resources/catalog/locales/de-admin.json index d4e5b0cde29..ea39148b549 100644 --- a/web-ui/src/main/resources/catalog/locales/de-admin.json +++ b/web-ui/src/main/resources/catalog/locales/de-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "DEPRECATED! Kartenhintergrund", "ui-mapBackgroundLayer-help": "DEPRECATED! Definieren Sie hier die Hintergrundebene, die für andere Karten als Viewer- und Suchkarten verwendet werden soll.", "ui-map-viewer": "Viewer-Kartenkonfiguration", - "ui-map-viewer-help": "Diese Konfiguration wird für die Viewer-Karte verwendet. Jeder Parameter ist optional. Zuerst wird der Kontext angewendet, dann die Ausdehnung und die Ebenen. Unterstützte Typen sind: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "Diese Konfiguration wird für die Viewer-Karte verwendet. Jeder Parameter ist optional. Zuerst wird der Kontext angewendet, dann die Ausdehnung und die Ebenen. Unterstützte Typen sind: osm, bing_aerial, wmts, wms.", "ui-map-search": "Konfiguration Such-Karte", - "ui-map-search-help": "Diese Konfiguration wird für die Suchkarte verwendet. Jeder Parameter ist optional. Zuerst wird der Kontext angewendet, dann die Ausdehnung und die Kartenebenen. Unterstützte Typen sind: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "Diese Konfiguration wird für die Suchkarte verwendet. Jeder Parameter ist optional. Zuerst wird der Kontext angewendet, dann die Ausdehnung und die Kartenebenen. Unterstützte Typen sind: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Konfiguration Editor-Karte", "ui-map-editor-help": "Diese Konfiguration wird für die Editor-Karten (BoundingBox und Geometrieeditor) verwendet. Jeder Parameter ist optional. Zuerst wird der Kontext angewendet, dann die Ausdehnung und die Ebenen. Unterstützte Typen sind: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", diff --git a/web-ui/src/main/resources/catalog/locales/en-admin.json b/web-ui/src/main/resources/catalog/locales/en-admin.json index 6e94ab34340..f2c5fe118b7 100644 --- a/web-ui/src/main/resources/catalog/locales/en-admin.json +++ b/web-ui/src/main/resources/catalog/locales/en-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "DEPRECATED! Map Background Layer", "ui-mapBackgroundLayer-help": "DEPRECATED! Define here the background layer to use for maps other that viewer and search maps.", "ui-map-viewer": "Viewer Map Configuration", - "ui-map-viewer-help": "This configuration is used for the viewer map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "This configuration is used for the viewer map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, wmts, wms.", "ui-map-search": "Search Map Configuration", - "ui-map-search-help": "This configuration is used for the search map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "This configuration is used for the search map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Editor Maps Configuration", "ui-map-editor-help": "This configuration is used for the editor maps (bounding box and geometry editor). Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", diff --git a/web-ui/src/main/resources/catalog/locales/es-admin.json b/web-ui/src/main/resources/catalog/locales/es-admin.json index d8090f0aea8..a09958b9ee1 100644 --- a/web-ui/src/main/resources/catalog/locales/es-admin.json +++ b/web-ui/src/main/resources/catalog/locales/es-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "¡OBSOLETO! Capa Base", "ui-mapBackgroundLayer-help": "¡OBSOLETO! Define aquí la capa base a usar en mapas que no sean el visor y el mapa de búsqueda", "ui-map-viewer": "Configuración del Visor del Mapa", - "ui-map-viewer-help": "Esta configuración se usa en el visor del mapa. Cada parámetros es opcional. El contexto se aplica primero, luego la extensión y las capas. Los tipos soportados son: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "Esta configuración se usa en el visor del mapa. Cada parámetros es opcional. El contexto se aplica primero, luego la extensión y las capas. Los tipos soportados son: osm, bing_aerial, wmts, wms.", "ui-map-search": "Configuración del Mapa de Búsqueda", - "ui-map-search-help": "Esta configuracion se usa en el mapa de búsqueda. Cada parámetro es opcional. El contexto se aplica primero, luego la extensión y las capas. Los tipos soportados son: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "Esta configuracion se usa en el mapa de búsqueda. Cada parámetro es opcional. El contexto se aplica primero, luego la extensión y las capas. Los tipos soportados son: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Configuración del Mapa del Editor", "ui-map-editor-help": "Esta configuración se usa en el mapa del editor (cuadro delimitador y editor de geometrías). Cada parámetros es opcional. El contexto se aplica primero, luego la extensión y las capas. Los tipos soportados son: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", diff --git a/web-ui/src/main/resources/catalog/locales/fi-admin.json b/web-ui/src/main/resources/catalog/locales/fi-admin.json index f77bb7c3d82..e1aac84ce5f 100644 --- a/web-ui/src/main/resources/catalog/locales/fi-admin.json +++ b/web-ui/src/main/resources/catalog/locales/fi-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "DEPRECATED! Map Background Layer", "ui-mapBackgroundLayer-help": "DEPRECATED! Define here the background layer to use for maps other that viewer and search maps.", "ui-map-viewer": "Viewer Map Configuration", - "ui-map-viewer-help": "This configuration is used for the viewer map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "This configuration is used for the viewer map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, wmts, wms.", "ui-map-search": "Search Map Configuration", - "ui-map-search-help": "This configuration is used for the search map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "This configuration is used for the search map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Editor Maps Configuration", "ui-map-editor-help": "This configuration is used for the editor maps (bounding box and geometry editor). Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", diff --git a/web-ui/src/main/resources/catalog/locales/fr-admin.json b/web-ui/src/main/resources/catalog/locales/fr-admin.json index 3e674b7c439..255bf561de1 100644 --- a/web-ui/src/main/resources/catalog/locales/fr-admin.json +++ b/web-ui/src/main/resources/catalog/locales/fr-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "DEPRECATED! Map Background Layer", "ui-mapBackgroundLayer-help": "DEPRECATED! Define here the background layer to use for maps other that viewer and search maps.", "ui-map-viewer": "Configuration de la carte du visualiseur", - "ui-map-viewer-help": "Cette configuration est utilisée pour la carte du visualiseur. Tous les paramètres sont optionnels. Le contexte est appliqué en premier, suivi de l'étendue et des couches. Les types de couche acceptés sont : osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "Cette configuration est utilisée pour la carte du visualiseur. Tous les paramètres sont optionnels. Le contexte est appliqué en premier, suivi de l'étendue et des couches. Les types de couche acceptés sont : osm, bing_aerial, wmts, wms.", "ui-map-search": "Configuration de la carte de recherche", - "ui-map-search-help": "Cette configuration est utilisée pour la carte de recherche. Tous les paramètres sont optionnels. Le contexte est appliqué en premier, suivi de l'étendue et des couches. Les types de couche acceptés sont : osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "Cette configuration est utilisée pour la carte de recherche. Tous les paramètres sont optionnels. Le contexte est appliqué en premier, suivi de l'étendue et des couches. Les types de couche acceptés sont : osm, bing_aerial, wmts, wms.", "ui-map-editor": "Configuration des cartes de l'éditeur", "ui-map-editor-help": "Cette configuration est utilisée pour les cartes de l'éditeur (définition de l'emprise). Tous les paramètres sont optionnels. Le contexte est appliqué en premier, suivi de l'étendue et des couches. Les types de couche acceptés sont : osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Configuration de la carte pour les aperçus", diff --git a/web-ui/src/main/resources/catalog/locales/is-admin.json b/web-ui/src/main/resources/catalog/locales/is-admin.json index 2ff2ae2f01a..f3bdc52ba30 100644 --- a/web-ui/src/main/resources/catalog/locales/is-admin.json +++ b/web-ui/src/main/resources/catalog/locales/is-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "ÚRELT! Bakgrunnslag korts", "ui-mapBackgroundLayer-help": "DEPRECATED! Define here the background layer to use for maps other that viewer and search maps.", "ui-map-viewer": "Stilling fyrir Kortasjá", - "ui-map-viewer-help": "Þessi stilling er notuð fyrir skoðarakortið. Hver breyta er valfrjáls. Samhengið er sett in fyrst, síðan umfangið og lögin. Studdar gerðir eru: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "Þessi stilling er notuð fyrir skoðarakortið. Hver breyta er valfrjáls. Samhengið er sett in fyrst, síðan umfangið og lögin. Studdar gerðir eru: osm, bing_aerial, wmts, wms.", "ui-map-search": "Stilling fyrir leit á korti", - "ui-map-search-help": "Þessi stilling er notuð fyrir leitarkortið. Hver breyta er valfrjáls. Samhengið er sett in fyrst, síðan umfangið og lögin. Studdar gerðir eru: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "Þessi stilling er notuð fyrir leitarkortið. Hver breyta er valfrjáls. Samhengið er sett in fyrst, síðan umfangið og lögin. Studdar gerðir eru: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Stilling til að breyta korti", "ui-map-editor-help": "Þessi stilling er notuð fyrir ritstjórakortin (bounding box og geometry editor). Hver breyta er valfrjáls. Samhengið er sett inn fyrst, síðan umfangið og lögin. Studdar gerðir eru: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", @@ -1484,4 +1484,4 @@ "fieldTooShort": "The value is too short", "fieldEmailNotValid": "A valid email address is required", "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?" -} \ No newline at end of file +} diff --git a/web-ui/src/main/resources/catalog/locales/it-admin.json b/web-ui/src/main/resources/catalog/locales/it-admin.json index 7d80c9d5c5e..b19aff87d90 100644 --- a/web-ui/src/main/resources/catalog/locales/it-admin.json +++ b/web-ui/src/main/resources/catalog/locales/it-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "DEPRECATED! Map Background Layer", "ui-mapBackgroundLayer-help": "DEPRECATED! Define here the background layer to use for maps other that viewer and search maps.", "ui-map-viewer": "Configurazione della mappa del visualizzatore", - "ui-map-viewer-help": "Questa configurazione è utilizzata per la mappa del visualizzatore. Ogni parametro è opzionale Per primo viene impostato il contesto, quindi l'estensione e gli strati. I tipi supportati sono: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "Questa configurazione è utilizzata per la mappa del visualizzatore. Ogni parametro è opzionale Per primo viene impostato il contesto, quindi l'estensione e gli strati. I tipi supportati sono: osm, bing_aerial, wmts, wms.", "ui-map-search": "Configurazione della mappa di ricerca", - "ui-map-search-help": "Questa configurazione è utilizzata per la mappa di ricerca. Ogni parametro è opzionale Per primo viene impostato il contesto, quindi l'estensione e gli strati. I tipi supportati sono: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "Questa configurazione è utilizzata per la mappa di ricerca. Ogni parametro è opzionale Per primo viene impostato il contesto, quindi l'estensione e gli strati. I tipi supportati sono: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Configurazione mappe dell'editor", "ui-map-editor-help": "Questa configurazione è utilizzata per le mappe dell'editor (BBOX ed editor delle geometrie). Ogni parametro è opzionale Per primo viene impostato il contesto, quindi l'estensione e gli strati. I tipi supportati sono: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", @@ -1484,4 +1484,4 @@ "fieldTooShort": "The value is too short", "fieldEmailNotValid": "A valid email address is required", "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?" -} \ No newline at end of file +} diff --git a/web-ui/src/main/resources/catalog/locales/ko-admin.json b/web-ui/src/main/resources/catalog/locales/ko-admin.json index f93be23b645..18edd375ae5 100644 --- a/web-ui/src/main/resources/catalog/locales/ko-admin.json +++ b/web-ui/src/main/resources/catalog/locales/ko-admin.json @@ -1197,13 +1197,13 @@ "ui-mapBackgroundLayer": "사용되지 않음! 지도 배경 레이어", "ui-mapBackgroundLayer-help": "사용되지 않음! 해당 뷰어 및 검색 지도에 사용할 배경지도를 정의합니다.", "ui-map-viewer": "지도 뷰어 설정", - "ui-map-viewer-help": "이 설정은 지도 뷰어에 사용되며, 모든 파라미터는 선택사항입니다. 컨텍스트가 먼저 적용된 후에 범위와 레이어가 적용됩니다. 지원되는 유형은 다음과 같습니다: OSM, Bing Aerial, Stamen, WMTS, WMS.", + "ui-map-viewer-help": "이 설정은 지도 뷰어에 사용되며, 모든 파라미터는 선택사항입니다. 컨텍스트가 먼저 적용된 후에 범위와 레이어가 적용됩니다. 지원되는 유형은 다음과 같습니다: OSM, Bing Aerial, WMTS, WMS.", "ui-map-search": "지도 검색 설정", - "ui-map-search-help": "이 설정은 지도 검색에 사용되며, 모든 파라미터는 선택사항입니다. 컨텍스트가 먼저 제공된 후에 범위와 레이어가 적용됩니다. 지원되는 유형은 다음과 같습니다: OSM, Bing Aerial, Stamen, WMTS, WMS.", + "ui-map-search-help": "이 설정은 지도 검색에 사용되며, 모든 파라미터는 선택사항입니다. 컨텍스트가 먼저 제공된 후에 범위와 레이어가 적용됩니다. 지원되는 유형은 다음과 같습니다: OSM, Bing Aerial, WMTS, WMS.", "ui-map-editor": "지도 편집기 설정", - "ui-map-editor-help": "이 설정은 지도 편집기(범위와 지오메트리 편집기)에 사용되며, 모든 파라미터는 선택사항입니다. 컨텍스트가 먼저 제공된 후에 범위와 레이어가 적용됩니다. 지원되는 유형은 다음과 같습니다: OSM, Bing Aerial, Stamen, WMTS, WMS.", + "ui-map-editor-help": "이 설정은 지도 편집기(범위와 지오메트리 편집기)에 사용되며, 모든 파라미터는 선택사항입니다. 컨텍스트가 먼저 제공된 후에 범위와 레이어가 적용됩니다. 지원되는 유형은 다음과 같습니다: OSM, Bing Aerial, WMTS, WMS.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", - "ui-map-thumbnail-help": "This configuration is used for the metadata editor map to generate thumbnails. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-thumbnail-help": "This configuration is used for the metadata editor map to generate thumbnails. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, wmts, wms.", "mapConfigContext": "컨텍스트 파일 (XML) 경로", "mapConfigContext-help": "URL to the map context file which can contain the variable lang, for 3 letters language code, between '{' and '}'", "mapConfigExtent": "현재 투영법으로 표현 된 범위", @@ -1484,4 +1484,4 @@ "fieldTooShort": "The value is too short", "fieldEmailNotValid": "A valid email address is required", "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?" -} \ No newline at end of file +} diff --git a/web-ui/src/main/resources/catalog/locales/nl-admin.json b/web-ui/src/main/resources/catalog/locales/nl-admin.json index 44758c699e5..84bce262d50 100644 --- a/web-ui/src/main/resources/catalog/locales/nl-admin.json +++ b/web-ui/src/main/resources/catalog/locales/nl-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "Verouderd! Kaart achtergrond lagen", "ui-mapBackgroundLayer-help": "VEROUDERD! Definieer hier de achtergrondlaag die moet worden gebruikt voor andere kaarten dan viewer en zoekkaarten.", "ui-map-viewer": "Kaart configuratie kaart pagina", - "ui-map-viewer-help": "Deze configuratie wordt gebruikt voor de viewerkaart. Elke parameter is optioneel. De context wordt eerst toegepast, daarna de geografische afbakening en kaartlagen. Ondersteunde typen zijn: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "Deze configuratie wordt gebruikt voor de viewerkaart. Elke parameter is optioneel. De context wordt eerst toegepast, daarna de geografische afbakening en kaartlagen. Ondersteunde typen zijn: osm, bing_aerial, wmts, wms.", "ui-map-search": "Kaart configuratie minimap zoek pagina", - "ui-map-search-help": "Deze configuratie wordt gebruikt voor de zoekkaart. Elke parameter is optioneel. De context wordt eerst toegepast, daarna de geografische afbakening en kaartlagen. Ondersteunde typen zijn: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "Deze configuratie wordt gebruikt voor de zoekkaart. Elke parameter is optioneel. De context wordt eerst toegepast, daarna de geografische afbakening en kaartlagen. Ondersteunde typen zijn: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Kaart configuratie editor", "ui-map-editor-help": "Deze configuratie wordt gebruikt voor de editor-kaarten (begrenzingsvak en geometrie-editor). Elke parameter is optioneel. De context wordt eerst toegepast, daarna de geografische afbakening en kaartlagen. Ondersteunde typen zijn: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Kaart Configuratie", @@ -1484,4 +1484,4 @@ "fieldTooShort": "The value is too short", "fieldEmailNotValid": "A valid email address is required", "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?" -} \ No newline at end of file +} diff --git a/web-ui/src/main/resources/catalog/locales/pt-admin.json b/web-ui/src/main/resources/catalog/locales/pt-admin.json index 5373cb22307..3d9465bee9a 100644 --- a/web-ui/src/main/resources/catalog/locales/pt-admin.json +++ b/web-ui/src/main/resources/catalog/locales/pt-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "DESCONTINUADA! Capa de fundo do mapa", "ui-mapBackgroundLayer-help": "DESCONTINUADA! Defina aqui a camada de fundo a ser usada para mapas que não sejam o visualizador e os mapas de busca.", "ui-map-viewer": "Configuração do visualizador de mapa", - "ui-map-viewer-help": "Essa configuração é usada para o visualizador de mapa. Cada parâmetro é opcional. O contexto é aplicado primeiro, então a extensão e as camadas. Os tipos suportados são: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "Essa configuração é usada para o visualizador de mapa. Cada parâmetro é opcional. O contexto é aplicado primeiro, então a extensão e as camadas. Os tipos suportados são: osm, bing_aerial, wmts, wms.", "ui-map-search": "Configuração do Mapa de Busca", - "ui-map-search-help": "Essa configuração é usada para o mapa de Busca. Cada parâmetro é opcional. O contexto é aplicado primeiro, então a extensão e as camadas. Os tipos suportados são: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "Essa configuração é usada para o mapa de Busca. Cada parâmetro é opcional. O contexto é aplicado primeiro, então a extensão e as camadas. Os tipos suportados são: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Configuração do Editor de Mapas", "ui-map-editor-help": "Essa configuração é usada para os editores de mapas (caixa delimitadora e editor de geometria). Cada parâmetro é opcional. O contexto é aplicado primeiro, então a extensão e as camadas. Os tipos suportados são: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", @@ -1484,4 +1484,4 @@ "fieldTooShort": "The value is too short", "fieldEmailNotValid": "A valid email address is required", "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?" -} \ No newline at end of file +} diff --git a/web-ui/src/main/resources/catalog/locales/ru-admin.json b/web-ui/src/main/resources/catalog/locales/ru-admin.json index e8fbae02867..0ef7a0c72e5 100644 --- a/web-ui/src/main/resources/catalog/locales/ru-admin.json +++ b/web-ui/src/main/resources/catalog/locales/ru-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "DEPRECATED! Map Background Layer", "ui-mapBackgroundLayer-help": "DEPRECATED! Define here the background layer to use for maps other that viewer and search maps.", "ui-map-viewer": "Viewer Map Configuration", - "ui-map-viewer-help": "This configuration is used for the viewer map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "This configuration is used for the viewer map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, wmts, wms.", "ui-map-search": "Search Map Configuration", - "ui-map-search-help": "This configuration is used for the search map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "This configuration is used for the search map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Editor Maps Configuration", "ui-map-editor-help": "This configuration is used for the editor maps (bounding box and geometry editor). Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", @@ -1484,4 +1484,4 @@ "fieldTooShort": "The value is too short", "fieldEmailNotValid": "A valid email address is required", "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?" -} \ No newline at end of file +} diff --git a/web-ui/src/main/resources/catalog/locales/sk-admin.json b/web-ui/src/main/resources/catalog/locales/sk-admin.json index 35a2d8f04c5..262d100ef52 100644 --- a/web-ui/src/main/resources/catalog/locales/sk-admin.json +++ b/web-ui/src/main/resources/catalog/locales/sk-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "DEPRECATED! Map Background Layer", "ui-mapBackgroundLayer-help": "DEPRECATED! Define here the background layer to use for maps other that viewer and search maps.", "ui-map-viewer": "Viewer Map Configuration", - "ui-map-viewer-help": "This configuration is used for the viewer map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "This configuration is used for the viewer map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, wmts, wms.", "ui-map-search": "Search Map Configuration", - "ui-map-search-help": "This configuration is used for the search map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "This configuration is used for the search map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Editor Maps Configuration", "ui-map-editor-help": "This configuration is used for the editor maps (bounding box and geometry editor). Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", @@ -1484,4 +1484,4 @@ "fieldTooShort": "The value is too short", "fieldEmailNotValid": "A valid email address is required", "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?" -} \ No newline at end of file +} diff --git a/web-ui/src/main/resources/catalog/locales/sv-admin.json b/web-ui/src/main/resources/catalog/locales/sv-admin.json index 25595c80f97..fc8a5dfc267 100644 --- a/web-ui/src/main/resources/catalog/locales/sv-admin.json +++ b/web-ui/src/main/resources/catalog/locales/sv-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "UR BRUK! Kartans bakgrundslager", "ui-mapBackgroundLayer-help": "UR BRUK! Definiera här bakgrundsskiktet som ska användas för andra kartor än kartvisaren och sök-kartan.", "ui-map-viewer": "Konfigurera kartvisaren", - "ui-map-viewer-help": "Den här är konfigurationen för kartvisaren. Varje parameter är valfri. Kontexten tillämpas först, sedan omfattningen och lagren. Stödda typer är: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "Den här är konfigurationen för kartvisaren. Varje parameter är valfri. Kontexten tillämpas först, sedan omfattningen och lagren. Stödda typer är: osm, bing_aerial, wmts, wms.", "ui-map-search": "Konfigurera sök-kartan", - "ui-map-search-help": "Det här är konfigurationen för sökkartan. Varje parameter är valfri. Kontexten tillämpas först, sedan omfattningen och lagren. Stödda typer är: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "Det här är konfigurationen för sökkartan. Varje parameter är valfri. Kontexten tillämpas först, sedan omfattningen och lagren. Stödda typer är: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Konfigurera redigeringskartan", "ui-map-editor-help": "Det här är konfigurationen för redaktörskartorna (begränsningsrutan och geometriedigeraren). Varje parameter är valfri. Kontexten tillämpas först, sedan omfattningen och lagren. Stödda typer är: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", @@ -1484,4 +1484,4 @@ "fieldTooShort": "Värdet är för kort", "fieldEmailNotValid": "En giltig emailadress krävs", "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?" -} \ No newline at end of file +} diff --git a/web-ui/src/main/resources/catalog/locales/zh-admin.json b/web-ui/src/main/resources/catalog/locales/zh-admin.json index 8bf50f7fb0d..097bad5c42c 100644 --- a/web-ui/src/main/resources/catalog/locales/zh-admin.json +++ b/web-ui/src/main/resources/catalog/locales/zh-admin.json @@ -1197,9 +1197,9 @@ "ui-mapBackgroundLayer": "DEPRECATED! Map Background Layer", "ui-mapBackgroundLayer-help": "DEPRECATED! Define here the background layer to use for maps other that viewer and search maps.", "ui-map-viewer": "Viewer Map Configuration", - "ui-map-viewer-help": "This configuration is used for the viewer map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-viewer-help": "This configuration is used for the viewer map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, wmts, wms.", "ui-map-search": "Search Map Configuration", - "ui-map-search-help": "This configuration is used for the search map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", + "ui-map-search-help": "This configuration is used for the search map. Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, wmts, wms.", "ui-map-editor": "Editor Maps Configuration", "ui-map-editor-help": "This configuration is used for the editor maps (bounding box and geometry editor). Every parameter is optional. The context is applied first, then the extent and layers. Supported types are: osm, bing_aerial, stamen, wmts, wms.", "ui-map-thumbnail": "Metadata Thumbnail Map Configuration", @@ -1484,4 +1484,4 @@ "fieldTooShort": "The value is too short", "fieldEmailNotValid": "A valid email address is required", "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?" -} \ No newline at end of file +} diff --git a/web/src/main/webapp/WEB-INF/data/data/resources/map/config-viewer.xml b/web/src/main/webapp/WEB-INF/data/data/resources/map/config-viewer.xml index 5e5a6f96cc7..8b41ab425bf 100644 --- a/web/src/main/webapp/WEB-INF/data/data/resources/map/config-viewer.xml +++ b/web/src/main/webapp/WEB-INF/data/data/resources/map/config-viewer.xml @@ -24,24 +24,6 @@ opacity="1"> Bing Aerial --> - - -