From 2c6d0d12ff2a92eefaaa007c861e889cf22fbead Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Wed, 11 Mar 2026 18:10:39 +0100 Subject: [PATCH] Update to MapStore 2025.02.xx --- mapstore/configs/localConfig.json | 411 ++++++++++++++++++++++-------- 1 file changed, 303 insertions(+), 108 deletions(-) diff --git a/mapstore/configs/localConfig.json b/mapstore/configs/localConfig.json index 2a693ab..81a850e 100644 --- a/mapstore/configs/localConfig.json +++ b/mapstore/configs/localConfig.json @@ -22,11 +22,11 @@ "header": { "height": 80, "url": "/header/", - "script": "https://cdn.jsdelivr.net/gh/georchestra/header@dist/header.js", "legacy": false, "logoUrl": "https://www.georchestra.org/public/georchestra-logo.svg", - "stylesheet": "", - "configFile": "" + "configFile": "", + "script": "https://cdn.jsdelivr.net/gh/georchestra/header@dist/header.js", + "stylesheet": "" }, "defaultMapOptions": { "cesium": { @@ -43,7 +43,7 @@ "floatingIdentifyDelay": 1000 }, "authenticationRules": [{ - "urlPattern": ".*geostore.*", + "urlPattern": ".*rest/geostore.*", "method": "bearer" }, { "urlPattern": ".*rest/config.*", @@ -55,7 +55,10 @@ {"name": "browser", "path": "browser"}, {"name": "geostorymode", "path": "geostory.mode"}, {"name": "featuregridmode", "path": "featuregrid.mode"}, - {"name": "printEnabled","path": "print.capabilities"}], + {"name": "printEnabled","path": "print.capabilities"}, + { "name": "resourceCanEdit", "path": "resources.initialSelectedResource.canEdit" }, + { "name": "resourceDetails", "path": "resources.initialSelectedResource.attributes.details" } + ], "projectionDefs": [{ "code": "EPSG:2154", "def": "+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs", @@ -284,7 +287,7 @@ "margin": 5, "label": false, "vertical": true - } + } } }, { @@ -354,7 +357,7 @@ } } }, "Login", - "OmniBar", "BurgerMenu", "Home", "Expander", + "OmniBar", "BurgerMenu", "Expander", "FeedbackMask", { "name": "Share", @@ -387,7 +390,12 @@ "GlobeViewSwitcher" ], "desktop": [ - "Header", "Easytheming", + { + "name": "Header", + "cfg": { + "containerPosition": "header" + } + }, "Easytheming", "Details", { "name": "Map", @@ -419,7 +427,7 @@ "cfg": { "docsUrl": "https://georchestra.readthedocs.io/" } - }, "AutoMapUpdate", "DrawerMenu", "Version", "Notifications", "BackgroundSelector", { + }, "AutoMapUpdate", "DrawerMenu", "Version", "Notifications", "BackgroundSelector", "Swipe", "SecurityPopup", { "name": "Annotations", "cfg": { "symbolsPath": "assets/symbols/", @@ -534,7 +542,13 @@ "FilterLayer", "AddGroup", "TOCItemsSettings", - "Tutorial", "MapFooter", { + "Tutorial", + { + "name": "MapFooter", + "cfg": { + "containerPosition": "footer" + } + }, { "name": "Measure", "cfg": { "defaultOptions": { @@ -656,15 +670,52 @@ } } }, - "OmniBar", "Login", "SidebarMenu", "Expander", "Undo", "Redo", "FullScreen", "GlobeViewSwitcher", "SearchServicesConfig", "WidgetsBuilder", "Widgets", + "OmniBar", "Login", "SidebarMenu", "Expander", "Undo", "Redo", "FullScreen", "GlobeViewSwitcher", "SearchServicesConfig", "WidgetsBuilder", + { + "name": "Widgets", + "cfg": { + "rowHeightGap": 35 + } + }, "WidgetsTray", "Timeline", "Playback", "FeedbackMask", "StyleEditor", - "DeleteMap", - "Save", - "SaveAs", + { + "name": "BrandNavbar", + "cfg": { + "logo": null, + "containerPosition": "header" + } + }, + { + "name": "ResourceDetails", + "cfg": { + "headerNodeSelector": null, + "disablePluginIf": "{!state('userrole')}", + "resourceType": "MAP" + } + }, + { + "name": "Save", + "cfg": { + "resourceType": "MAP" + } + }, + { + "name": "SaveAs", + "cfg": { + "resourceType": "MAP" + } + }, + { + "name": "DeleteResource", + "cfg": { + "resourceType": "MAP", + "redirectTo": "/" + } + }, "SearchByBookmark", "MapCatalog" ], @@ -749,7 +800,12 @@ } }, "AddGroup", - "MapFooter", + { + "name": "MapFooter", + "cfg": { + "containerPosition": "footer" + } + }, { "name": "Settings", "cfg": { @@ -792,70 +848,192 @@ }, "FeedbackMask" ], - "common": ["Easytheming"], + "common": [ + { + "name": "Header", + "cfg": { + "headerNodeSelector": null + } + }, + { + "name": "BrandNavbar", + "cfg": { + "logo": null, + "containerPosition": "header" + } + }, + "Login", + "ScrollTop", + "Notifications" + ], "maps": [ - "Login", - "HomeDescription", "Fork", - "MapSearch", + { "name": "ResourcesSearch" }, "CreateNewMap", - "FeaturedMaps", "ContentTabs", - "Easytheming", { - "name": "Header", + "name": "ResourcesGrid", "cfg": { - "page": "mapstore-home" + "id": "featured", + "titleId": "manager.featuredMaps", + "pageSize": 4, + "cardLayoutStyle": "grid", + "order": null, + "hideWithNoResults": true, + "defaultQuery": { + "f": "featured" + } } - }, - { - "name": "Maps", - "cfg": { - "mapsOptions": { - "start": 0, - "limit": 12 + }, + { + "name": "ResourcesGrid", + "cfg": { + "id": "catalog", + "titleId": "resources.contents.title", + "queryPage": true, + "menuItems": [{ + "labelId": "resourcesCatalog.addResource", + "disableIf": "{!state('userrole')}", + "type": "dropdown", + "variant": "primary", + "size": "sm", + "responsive": true, + "noCaret": true, + "items": [ + { + "labelId": "resourcesCatalog.createMap", + "type": "link", + "href": "#/viewer/new" + }, + { + "labelId": "resourcesCatalog.createDashboard", + "type": "link", + "href": "#/dashboard/" + }, + { + "labelId": "resourcesCatalog.createGeoStory", + "type": "link", + "href": "#/geostory/newgeostory/" + }, + { + "labelId": "resourcesCatalog.createContext", + "type": "link", + "href": "#/context-creator/new" + } + ] + }] + } + }, + { + "name": "TagsManager" + }, + { + "name": "Favorites" + }, + { + "name": "ResourcesFiltersForm", + "cfg": { + "headerNodeSelector": null, + "resourcesGridId": "catalog" + } + }, + { + "name": "EditContext" + }, + { + "name": "DeleteResource" + }, + { + "name": "ResourceDetails", + "cfg": { + "headerNodeSelector":":has(geor-header)", + "enableFilters": true + } + },{ + "name": "Share", + "cfg": { + "draggable": false, + "advancedSettings": false, + "showAPI": false, + "embedOptions": { + "showTOCToggle": false + }, + "map": { + "embedOptions": { + "showTOCToggle": true + } + }, + "geostory": { + "embedOptions": { + "showTOCToggle": false, + "allowFullScreen": false }, - "fluid": true + "shareUrlRegex": "(h[^#]*)#\\/geostory\\/([^\\/]*)\\/([A-Za-z0-9]*)", + "shareUrlReplaceString": "$1geostory-embedded.html#/$3", + "advancedSettings": { + "hideInTab": "embed", + "homeButton": true, + "sectionId": true + } + }, + "dashboard": { + "shareUrlRegex": "(h[^#]*)#\\/dashboard\\/([A-Za-z0-9]*)", + "shareUrlReplaceString": "$1dashboard-embedded.html#/$2", + "embedOptions": { + "showTOCToggle": false, + "showConnectionsParamToggle": true + } } - }, - { - "name": "Dashboards", + } + }, + { + "name": "Footer", "cfg": { - "mapsOptions": { - "start": 0, - "limit": 12 - }, - "fluid": true + "hideMenuItems": true, + "customFooter": true, + "customFooterMessageId": "home.footerDescription" } - }, - { - "name": "GeoStories", + } + ], + "dashboard": [{ + "name": "Header", "cfg": { - "mapsOptions": { - "start": 0, - "limit": 12 - }, - "fluid": true + "containerPosition": "header", + "page": "msadmin" } }, { - "name": "Contexts", - "cfg": { - "mapsOptions": { - "start": 0, - "limit": 12 - }, - "fluid": true - } - }], - "dashboard": [ + "name": "BrandNavbar", + "cfg": { + "containerPosition": "header", + "logo": null + } + }, { - "name": "OmniBar", - "cfg": { - "containerPosition": "header", - "className": "navbar shadow navbar-home" - } + "name": "ResourceDetails", + "cfg": { + "headerNodeSelector":":has(geor-header)", + "resourceType": "DASHBOARD" + } + }, + { + "name": "Save", + "cfg": { + "resourceType": "DASHBOARD" + } + }, + { + "name": "SaveAs", + "cfg": { + "resourceType": "DASHBOARD" + } + }, + { + "name": "DeleteResource", + "cfg": { + "resourceType": "DASHBOARD", + "redirectTo": "/" + } }, "Details", - "Easytheming", "AddWidgetDashboard", "MapConnectionDashboard", { @@ -864,14 +1042,6 @@ "containerPosition": "columns" } }, - { - "name": "Home", - "override": { - "OmniBar": { - "priority": 5 - } - } - }, { "name": "Login", "override": { @@ -880,11 +1050,9 @@ } } }, - "Language", "NavMenu", - "DashboardSave", "DashboardSaveAs", - "DashboardExport", "DashboardImport", - "DeleteDashboard", - "Attribution", { + "DashboardExport", + "DashboardImport", + { "name": "Share", "cfg": { "showAPI": false, @@ -953,14 +1121,6 @@ { "name": "FeedbackMask" } ], "geostory": [ - "Easytheming", - { - "name": "OmniBar", - "cfg": { - "containerPosition": "header", - "className": "navbar shadow navbar-home" - } - }, { "name": "Tutorial", "cfg": { @@ -969,20 +1129,58 @@ "preset": "geostory_view_tutorial" } }, + + { + "name": "Header", + "cfg": { + "containerPosition": "header", + "logo": null, + "disablePluginIf": "{(state('router') && state('router').includes('/geostory/shared') && state('geostorymode') !== 'edit')}" + } + }, + { + "name": "BrandNavbar", + "cfg": { + "containerPosition": "header", + "logo": null, + "disablePluginIf": "{(state('router') && state('router').includes('/geostory/shared') && state('geostorymode') !== 'edit')}" + } + }, + { + "name": "ResourceDetails", + "cfg": { + "resourceType": "GEOSTORY", + "headerNodeSelector":":has(geor-header)", + "disablePluginIf": "{!state('userrole')}", + "containerPosition": "columns" + } + }, + { + "name": "Save", + "cfg": { + "resourceType": "GEOSTORY" + } + }, + { + "name": "SaveAs", + "cfg": { + "resourceType": "GEOSTORY" + } + }, + { + "name": "DeleteResource", + "cfg": { + "resourceType": "GEOSTORY", + "redirectTo": "/" + } + }, "Login", "BurgerMenu", - "Language", - "NavMenu", - "Attribution", - "Home", { "name": "GeoStory" }, - "GeoStorySave", - "GeoStorySaveAs", "GeoStoryImport", "GeoStoryExport", - "DeleteGeoStory", "MapEditor", "MediaEditor", { @@ -1055,9 +1253,7 @@ "className": "navbar shadow navbar-home" } }, "Login", "ContextManager"], - "notallowed": [ - "Easytheming", - { + "notallowed": [{ "name": "Header", "cfg": { "page": "msadmin" @@ -1073,31 +1269,21 @@ "NotAllowed" ], "context-creator": [ - "Easytheming", - { + { "name": "Header", - "cfg": { - "page": "msadmin" - } - }, - { - "name": "OmniBar", "cfg": { "containerPosition": "header", - "className": "navbar shadow navbar-home" + "page": "msadmin" } }, "Login", - "Language", - "NavMenu", - "Attribution", "Tutorial", { "name": "ContextCreator", "cfg": { "documentationBaseURL": "https://mapstore.geo-solutions.it/mapstore/docs/api/plugins", - "saveDestLocation": "/admin", - "backToPageDestRoute": "/admin" + "saveDestLocation": "/home", + "backToPageDestRoute": "/home" } }, "Notifications", @@ -1112,6 +1298,15 @@ ], "context": [ "Header", "Easytheming" + ], + "manager": [ + "Redirect", + "Manager", + "TagsManager", + "ContextManager", + "IPManager", + "Footer", + { "name": "About" } ] } }