#714: Project update to the latest MapStore 2024.02 (#715)

* Update ms to latest * version updated * pom updated * workflow update * add missing theme variables * fix build * ms service to stable * snapshot repo removed * config updated * Fixed dependencies * Fixed missing file copy * Update pom.xml * Use mapstore services 1.8-SNAPSHOT --------- Co-authored-by: Lorenzo Natali <[email protected]>
georchestra · Oct 22, 2024 · fe581a2 · fe581a2
1 parent 8a3b8a1
commit fe581a2
Show file tree

Hide file tree

Showing 18 changed files with 399 additions and 111 deletions.
diff --git a/.github/workflows/mapstore.yml b/.github/workflows/mapstore.yml
@@ -71,7 +71,7 @@ jobs:
       run: mkdir -p scratch && cp web/target/georchestra-mapstore*.deb scratch/georchestra-mapstore-${{ github.sha }}.deb
 
     - name: "publish deb as artifact"
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: georchestra-mapstore.deb
         path: scratch/georchestra-mapstore-${{ github.sha }}.deb
@@ -80,7 +80,7 @@ jobs:
       run: mkdir -p scratch && cp web/target/mapstore.war scratch/mapstore-${{ github.sha }}.war
 
     - name: "publish war as artifact"
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: mapstore.war
         path: scratch/mapstore-${{ github.sha }}.war

diff --git a/MapStore2 b/MapStore2
diff --git a/assets/css/font-awesome.min.css b/assets/css/font-awesome.min.css
diff --git a/configs/localConfig.json b/configs/localConfig.json
@@ -108,14 +108,6 @@
     }],
     "initialState": {
       "defaultState": {
-        "annotations": {
-          "config": {
-            "multiGeometry": true,
-            "validationErrors": {}
-          },
-          "format": "decimal",
-          "defaultTextAnnotation": "New"
-        },
         "catalog": {
           "default": {
             "newService": {
@@ -238,7 +230,8 @@
                     "group": "background",
                     "title": "Empty Background",
                     "fixed": true,
-                    "type": "empty"
+                    "type": "empty",
+                    "visibility": false
                 }]
               }
             }
@@ -315,11 +308,8 @@
             }, {
                 "name": "TOC",
                 "cfg": {
-                    "activateMetedataTool": false,
                     "activateMapTitle": false,
-                    "activateSortLayer": false,
-                    "activateLayerFilterTool": false,
-                    "activateQueryTool": false
+                    "activateSortLayer": false
                 }
             }, "AddGroup", {
                 "name": "TOCItemsSettings",
@@ -429,7 +419,9 @@
             }, "AutoMapUpdate", "DrawerMenu", "Version", "Notifications", "BackgroundSelector", {
               "name": "Annotations",
               "cfg": {
-                "symbolsPath": "assets/symbols/"
+                "symbolsPath": "assets/symbols/",
+                "format": "decimal",
+                "defaultTextAnnotation": "New"
               }
             },
             {
@@ -486,52 +478,55 @@
                   ]
               }
             }, {
-                "name": "TOC",
-                "cfg": {
-                    "activateMetedataTool": true,
-                    "metadataOptions": {
-                        "xmlNamespaces": {
-                            "gmd": "http://www.isotc211.org/2005/gmd",
-                            "srv": "http://www.isotc211.org/2005/srv",
-                            "gco": "http://www.isotc211.org/2005/gco",
-                            "gmx": "http://www.isotc211.org/2005/gmx",
-                            "gfc": "http://www.isotc211.org/2005/gfc",
-                            "gts": "http://www.isotc211.org/2005/gts",
-                            "gml": "http://www.opengis.net/gml"
-                        },
-                        "extractors": [{
+            "name": "MetadataInfo",
+            "cfg": {
+              "metadataOptions": {
+                "xmlNamespaces": {
+                  "gmd": "http://www.isotc211.org/2005/gmd",
+                  "srv": "http://www.isotc211.org/2005/srv",
+                  "gco": "http://www.isotc211.org/2005/gco",
+                  "gmx": "http://www.isotc211.org/2005/gmx",
+                  "gfc": "http://www.isotc211.org/2005/gfc",
+                  "gts": "http://www.isotc211.org/2005/gts",
+                  "gml": "http://www.opengis.net/gml"
+                },
+                "extractors": [
+                  {
+                    "properties": {
+                      "title": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString",
+                      "abstract": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:abstract/gco:CharacterString",
+                      "purpose": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:purpose/gco:CharacterString",
+                      "source": "/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:statement/gco:CharacterString",
+                      "createdDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='creation']]",
+                      "lastRevisionDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='revision']]",
+                      "pointsOfContact": {
+                        "xpath": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty",
+                        "properties": {
+                          "individualName": "gmd:individualName/gco:CharacterString",
+                          "organisationName": "gmd:organisationName/gco:CharacterString",
+                          "contactInfo": {
+                            "xpath": "gmd:contactInfo/gmd:CI_Contact",
                             "properties": {
-                                "title": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString",
-                                "abstract": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:abstract/gco:CharacterString",
-                                "purpose": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:purpose/gco:CharacterString",
-                                "source": "/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:statement/gco:CharacterString",
-                                "createdDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='creation']]",
-                                "lastRevisionDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='revision']]",
-                                "pointsOfContact": {
-                                    "xpath": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty",
-                                    "properties": {
-                                        "individualName": "gmd:individualName/gco:CharacterString",
-                                        "organisationName": "gmd:organisationName/gco:CharacterString",
-                                        "contactInfo": {
-                                            "xpath": "gmd:contactInfo/gmd:CI_Contact",
-                                            "properties": {
-                                                "phone": "gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString",
-                                                "deliveryPoints": "gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString",
-                                                "city": "gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString",
-                                                "postalCode": "gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString",
-                                                "country": "gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString",
-                                                "electronicMailAddress": "gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString",
-                                                "URL": "gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL",
-                                                "hoursOfService": "gmd:hoursOfService/gco:CharacterString"
-                                            }
-                                        },
-                                        "role": "gmd:role/gmd:CI_RoleCode/@codeListValue"
-                                    }
-                                }
+                              "phone": "gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString",
+                              "deliveryPoints": "gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString",
+                              "city": "gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString",
+                              "postalCode": "gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString",
+                              "country": "gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString",
+                              "electronicMailAddress": "gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString",
+                              "URL": "gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL",
+                              "hoursOfService": "gmd:hoursOfService/gco:CharacterString"
                             }
-                        }]
+                          },
+                          "role": "gmd:role/gmd:CI_RoleCode/@codeListValue"
+                        }
+                      }
                     }
-                }
+                  }
+                ]
+              }
+            }
+          }, {
+                "name": "TOC"
             },
             "FilterLayer",
             "AddGroup",
@@ -738,8 +733,6 @@
             "name": "TOC",
             "cfg": {
               "activateMapTitle": false,
-              "activateSettingsTool": false,
-              "activateMetedataTool": false,
               "activateRemoveLayer": false
             }
           },
@@ -840,17 +833,44 @@
             "fluid": true
           }
         }],
-      "dashboard": [{
-        "name": "OmniBar",
-        "cfg": {
-          "containerPosition": "header",
-          "className": "navbar shadow navbar-home"
-        }
-      }, "Login", "Language", "NavMenu",
+      "dashboard": [
+        {
+          "name": "OmniBar",
+          "cfg": {
+            "containerPosition": "header",
+            "className": "navbar shadow navbar-home"
+          }
+        }, 
+        "Details",
+        "AddWidgetDashboard",
+        "MapConnectionDashboard",
+        {
+          "name": "SidebarMenu",
+          "cfg": {
+            "containerPosition": "columns"
+          }
+        },
+        {
+          "name": "Home",
+          "override": {
+            "OmniBar": {
+              "priority": 5
+            }
+          }
+        },
+        {
+          "name": "Login",
+          "override": {
+            "OmniBar": {
+              "priority": 5
+            }
+          }
+        },
+        "Language", "NavMenu",
         "DashboardSave", "DashboardSaveAs",
         "DashboardExport", "DashboardImport",
         "DeleteDashboard",
-        "Attribution", "Home", {
+        "Attribution", {
         "name": "Share",
         "cfg": {
           "showAPI": false,
@@ -895,7 +915,7 @@
             },
             "containerPosition": "columns"
           }
-        }, "BurgerMenu", "Dashboard", "Notifications", {
+        }, "Dashboard", "Notifications", {
           "name": "Tutorial",
           "cfg": {
             "allowClicksThruHole": false,

diff --git a/configs/pluginsConfig.json b/configs/pluginsConfig.json
@@ -5,7 +5,6 @@
       "glyph": "1-map",
       "mandatory": true,
       "defaultConfig": {
-        "mapTypeOverride": "openlayers",
         "mapOptions": {
           "openlayers": {
             "interactions": {
@@ -59,7 +58,8 @@
         "FeatureEditor",
         "FilterLayer",
         "AddGroup",
-        "Swipe"
+        "Swipe",
+        "MetadataInfo"
       ],
       "autoEnableChildren": [
         "TOCItemsSettings",
@@ -213,7 +213,8 @@
       "title": "plugins.Home.title",
       "description": "plugins.Home.description",
       "dependencies": [
-        "OmniBar"
+        "OmniBar",
+        "SidebarMenu"
       ]
     },
     {
@@ -397,6 +398,9 @@
     {
       "name": "Swipe"
     },
+    {
+      "name": "MetadataInfo"
+    },
     {
       "name": "SearchByBookmark"
     },
@@ -485,9 +489,14 @@
       "denyUserSelection": true,
       "title": "plugins.Save.title",
       "description": "plugins.Save.description",
-      "dependencies": [
-        "SidebarMenu",
+      "children": [
         "SaveAs"
+      ],
+      "autoEnableChildren": [
+        "SaveAs"
+      ],
+      "dependencies": [
+        "SidebarMenu"
       ]
     },
     {

diff --git a/dashboard-embedded-template.html b/dashboard-embedded-template.html
@@ -96,7 +96,9 @@
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
         <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
-        <script async type="text/javascript" src="https://unpkg.com/[email protected]/es5.js" onload="checkBrowser()"></script>
+        <script src="https://unpkg.com/[email protected]/es5.js"
+            async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"
+            onload="checkBrowser()"></script>
         <script type="text/javascript">
             function checkBrowser() {
                 var browserInfo = bowser.getParser(window.navigator.userAgent);

diff --git a/embedded.html b/embedded.html
@@ -102,7 +102,6 @@
         </style>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
         <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
     </head>

diff --git a/embeddedTemplate.html b/embeddedTemplate.html
@@ -102,10 +102,11 @@
         </style>
         <link rel="preconnect" href="https://fonts.gstatic.com">
         <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
         <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
-        <script async type="text/javascript" src="https://unpkg.com/[email protected]/es5.js" onload="checkBrowser()"></script>
+        <script src="https://unpkg.com/[email protected]/es5.js"
+            async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"
+            onload="checkBrowser()"></script>
         <script type="text/javascript">
             function checkBrowser() {
                 var browserInfo = bowser.getParser(window.navigator.userAgent);

diff --git a/favicon.ico b/favicon.ico
diff --git a/geostory-embedded-template.html b/geostory-embedded-template.html
@@ -96,7 +96,9 @@
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans&display=swap" rel="stylesheet">
     <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
     <!--script src="https://maps.google.com/maps/api/js?v=3"></script-->
-    <script async type="text/javascript" src="https://unpkg.com/[email protected]/es5.js" onload="checkBrowser()"></script>
+    <script src="https://unpkg.com/[email protected]/es5.js"
+        async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"
+        onload="checkBrowser()"></script>
     <script type="text/javascript">
         function checkBrowser() {
             var browserInfo = bowser.getParser(window.navigator.userAgent);

diff --git a/index.html b/index.html
@@ -121,7 +121,6 @@
                 src: local('Noto Sans'), local('NotoSans-Regular'), url(assets/fonts/NotoSans.ttf) format('truetype');
             }
         </style>
-        <link rel="stylesheet" href="assets/css/font-awesome.min.css" />
         <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
         <!--script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script-->
         <!--<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=__API_KEY_MAPQUEST__"></script>-->

diff --git a/indexTemplate.html b/indexTemplate.html
@@ -121,9 +121,10 @@
                 src: local('Noto Sans'), local('NotoSans-Regular'), url(assets/fonts/NotoSans.ttf) format('truetype');
           }
       </style>
-      <link rel="stylesheet" href="assets/css/font-awesome.min.css" />
       <script src="assets/js/proj4.js"></script>
-      <script async type="text/javascript" src="assets/js/es5.js" onload="checkBrowser()"></script>
+      <script src="https://unpkg.com/[email protected]/es5.js"
+              async integrity="sha384-CWiXbo5RNu6nv9tiCWA2y1DQKjEQDDH+yFQga1FytuIZjOTcVr+4ojw2S2lShj/d" crossorigin="anonymous"
+              onload="checkBrowser()"></script>
       <script type="text/javascript">
           function checkBrowser() {
               var browserInfo = bowser.getParser(window.navigator.userAgent);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "georchestra",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "geOrchestra",
   "repository": "https://github.com/georchestra/mapstore2-georchestra",
   "main": "index.js",
@@ -65,8 +65,8 @@
     "expect": "1.20.1",
     "file-loader": "2.0.0",
     "glob": "7.1.1",
-    "html-loader": "0.5.1",
-    "html-webpack-plugin": "4.5.0",
+    "html-loader": "2.1.2",
+    "html-webpack-plugin": "5.2.0",
     "jsdoc-jsx": "0.1.0",
     "karma": "6.4.0",
     "karma-chrome-launcher": "3.1.1",
@@ -82,7 +82,7 @@
     "karma-webpack": "5.0.0",
     "less": "4.1.1",
     "less-loader": "8.0.0",
-    "markdownlint-cli": "0.32.2",
+    "markdownlint-cli": "0.34.0",
     "mini-css-extract-plugin": "1.3.9",
     "mkdirp": "0.5.1",
     "ncp": "2.0.0",
@@ -107,7 +107,7 @@
     "terser": "5.18.1",
     "url-loader": "0.5.7",
     "vusion-webfonts-generator": "0.4.1",
-    "webpack": "5.9.0",
+    "webpack": "5.54.0",
     "webpack-bundle-size-analyzer": "2.0.2",
     "webpack-cli": "4.10.0",
     "webpack-dev-server": "3.11.0"