Fix #2188 Update CesiumJS version (#2191)

allyoucanmap · web-flow · commit 9e136aa8b1cd · 2025-10-28T17:58:13.000+01:00
diff --git a/geonode_mapstore_client/client/js/utils/AppUtils.js b/geonode_mapstore_client/client/js/utils/AppUtils.js
@@ -151,15 +151,6 @@ function setupLocale(locale) {
         .then((localeDataMod) => {
             const localeData = localeDataMod.default;
             addLocaleData([...localeData]);
-            if (!global.Intl) {
-                return import('intl')
-                    .then((intlMod) => {
-                        global.Intl = intlMod.default;
-                        return import(`intl/locale-data/jsonp/${locale}.js`).then(() => {
-                            return locale;
-                        });
-                    });
-            }
             // setup locale for moment
             moment.locale(locale);
             return locale;
diff --git a/geonode_mapstore_client/client/themes/geonode/less/_base.less b/geonode_mapstore_client/client/themes/geonode/less/_base.less
@@ -261,4 +261,10 @@ div.chart-color-class-modal {
             white-space: nowrap;
         }
     }
+}
+
+.page-viewer {
+    footer {
+        z-index: 10;
+    }
 }
diff --git a/geonode_mapstore_client/client/themes/geonode/less/ms-theme.less b/geonode_mapstore_client/client/themes/geonode/less/ms-theme.less
@@ -417,4 +417,12 @@ div#mapstore-globalspinner {
     .divider {
         margin: 0.25rem 0;
     }
+}
+
+#navigationBar .mapToolbar {
+    margin-bottom: 6px;
+}
+
+#mapstore-map-footer #mapstore-mouseposition {
+    height: auto;
 }
diff --git a/geonode_mapstore_client/static/mapstore/configs/localConfig.json b/geonode_mapstore_client/static/mapstore/configs/localConfig.json
@@ -31,7 +31,7 @@
                 "md": 420
             },
             "bottom": {
-                "sm": 30
+                "sm": 0
             }
         }
     },
@@ -180,7 +180,10 @@
                 }
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Notifications"
@@ -246,7 +249,10 @@
                 }
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Timeline"
@@ -326,7 +332,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Notifications"
@@ -409,7 +418,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "TOC",
@@ -753,7 +765,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Measure"
@@ -1349,7 +1364,10 @@
                 "name": "ScaleBox"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Notifications"
@@ -1409,7 +1427,10 @@
                 }
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Map",
@@ -1649,7 +1670,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Measure"
@@ -2918,7 +2942,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "TOC",
@@ -3047,7 +3074,10 @@
                 "name": "Expander"
             },
             {
-                "name": "MapFooter"
+                "name": "MapFooter",
+                "cfg": {
+                    "containerPosition": "footer"
+                }
             },
             {
                 "name": "Legend"
diff --git a/geonode_mapstore_client/static/mapstore/configs/pluginsConfig.json b/geonode_mapstore_client/static/mapstore/configs/pluginsConfig.json
@@ -109,7 +109,10 @@
     {
       "name": "MapFooter",
       "mandatory": true,
-      "hidden": true
+      "hidden": true,
+      "defaultConfig": {
+        "containerPosition": "footer"
+      }
     },
     {
       "name": "Widgets",

Original file line number	Diff line number	Diff line change
`@@ -261,4 +261,10 @@ div.chart-color-class-modal {`
`261`	`261`	`white-space: nowrap;`
`262`	`262`	`}`
`263`	`263`	`}`
	`264`	`+}`
	`265`	`+`
	`266`	`+.page-viewer {`
	`267`	`+ footer {`
	`268`	`+ z-index: 10;`
	`269`	`+ }`
`264`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -417,4 +417,12 @@ div#mapstore-globalspinner {`
`417`	`417`	`.divider {`
`418`	`418`	`margin: 0.25rem 0;`
`419`	`419`	`}`
	`420`	`+}`
	`421`	`+`
	`422`	`+#navigationBar .mapToolbar {`
	`423`	`+ margin-bottom: 6px;`
	`424`	`+}`
	`425`	`+`
	`426`	`+#mapstore-map-footer #mapstore-mouseposition {`
	`427`	`+ height: auto;`
`420`	`428`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`"md": 420`
`32`	`32`	`},`
`33`	`33`	`"bottom": {`
`34`		`- "sm": 30`
	`34`	`+ "sm": 0`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`},`
`@@ -180,7 +180,10 @@`
`180`	`180`	`}`
`181`	`181`	`},`
`182`	`182`	`{`
`183`		`- "name": "MapFooter"`
	`183`	`+ "name": "MapFooter",`
	`184`	`+ "cfg": {`
	`185`	`+ "containerPosition": "footer"`
	`186`	`+ }`
`184`	`187`	`},`
`185`	`188`	`{`
`186`	`189`	`"name": "Notifications"`
`@@ -246,7 +249,10 @@`
`246`	`249`	`}`
`247`	`250`	`},`
`248`	`251`	`{`
`249`		`- "name": "MapFooter"`
	`252`	`+ "name": "MapFooter",`
	`253`	`+ "cfg": {`
	`254`	`+ "containerPosition": "footer"`
	`255`	`+ }`
`250`	`256`	`},`
`251`	`257`	`{`
`252`	`258`	`"name": "Timeline"`
`@@ -326,7 +332,10 @@`
`326`	`332`	`"name": "Expander"`
`327`	`333`	`},`
`328`	`334`	`{`
`329`		`- "name": "MapFooter"`
	`335`	`+ "name": "MapFooter",`
	`336`	`+ "cfg": {`
	`337`	`+ "containerPosition": "footer"`
	`338`	`+ }`
`330`	`339`	`},`
`331`	`340`	`{`
`332`	`341`	`"name": "Notifications"`
`@@ -409,7 +418,10 @@`
`409`	`418`	`"name": "Expander"`
`410`	`419`	`},`
`411`	`420`	`{`
`412`		`- "name": "MapFooter"`
	`421`	`+ "name": "MapFooter",`
	`422`	`+ "cfg": {`
	`423`	`+ "containerPosition": "footer"`
	`424`	`+ }`
`413`	`425`	`},`
`414`	`426`	`{`
`415`	`427`	`"name": "TOC",`
`@@ -753,7 +765,10 @@`
`753`	`765`	`"name": "Expander"`
`754`	`766`	`},`
`755`	`767`	`{`
`756`		`- "name": "MapFooter"`
	`768`	`+ "name": "MapFooter",`
	`769`	`+ "cfg": {`
	`770`	`+ "containerPosition": "footer"`
	`771`	`+ }`
`757`	`772`	`},`
`758`	`773`	`{`
`759`	`774`	`"name": "Measure"`
`@@ -1349,7 +1364,10 @@`
`1349`	`1364`	`"name": "ScaleBox"`
`1350`	`1365`	`},`
`1351`	`1366`	`{`
`1352`		`- "name": "MapFooter"`
	`1367`	`+ "name": "MapFooter",`
	`1368`	`+ "cfg": {`
	`1369`	`+ "containerPosition": "footer"`
	`1370`	`+ }`
`1353`	`1371`	`},`
`1354`	`1372`	`{`
`1355`	`1373`	`"name": "Notifications"`
`@@ -1409,7 +1427,10 @@`
`1409`	`1427`	`}`
`1410`	`1428`	`},`
`1411`	`1429`	`{`
`1412`		`- "name": "MapFooter"`
	`1430`	`+ "name": "MapFooter",`
	`1431`	`+ "cfg": {`
	`1432`	`+ "containerPosition": "footer"`
	`1433`	`+ }`
`1413`	`1434`	`},`
`1414`	`1435`	`{`
`1415`	`1436`	`"name": "Map",`
`@@ -1649,7 +1670,10 @@`
`1649`	`1670`	`"name": "Expander"`
`1650`	`1671`	`},`
`1651`	`1672`	`{`
`1652`		`- "name": "MapFooter"`
	`1673`	`+ "name": "MapFooter",`
	`1674`	`+ "cfg": {`
	`1675`	`+ "containerPosition": "footer"`
	`1676`	`+ }`
`1653`	`1677`	`},`
`1654`	`1678`	`{`
`1655`	`1679`	`"name": "Measure"`
`@@ -2918,7 +2942,10 @@`
`2918`	`2942`	`"name": "Expander"`
`2919`	`2943`	`},`
`2920`	`2944`	`{`
`2921`		`- "name": "MapFooter"`
	`2945`	`+ "name": "MapFooter",`
	`2946`	`+ "cfg": {`
	`2947`	`+ "containerPosition": "footer"`
	`2948`	`+ }`
`2922`	`2949`	`},`
`2923`	`2950`	`{`
`2924`	`2951`	`"name": "TOC",`
`@@ -3047,7 +3074,10 @@`
`3047`	`3074`	`"name": "Expander"`
`3048`	`3075`	`},`
`3049`	`3076`	`{`
`3050`		`- "name": "MapFooter"`
	`3077`	`+ "name": "MapFooter",`
	`3078`	`+ "cfg": {`
	`3079`	`+ "containerPosition": "footer"`
	`3080`	`+ }`
`3051`	`3081`	`},`
`3052`	`3082`	`{`
`3053`	`3083`	`"name": "Legend"`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,10 @@`
`109`	`109`	`{`
`110`	`110`	`"name": "MapFooter",`
`111`	`111`	`"mandatory": true,`
`112`		`- "hidden": true`
	`112`	`+ "hidden": true,`
	`113`	`+ "defaultConfig": {`
	`114`	`+ "containerPosition": "footer"`
	`115`	`+ }`
`113`	`116`	`},`
`114`	`117`	`{`
`115`	`118`	`"name": "Widgets",`