#1907: Legend filtering for GeoServer WMS layers (#1934)

--------- Co-authored-by: allyoucanmap <[email protected]>
GeoNode · Jan 15, 2025 · 15cb0ee · 15cb0ee
1 parent 33cfaee
commit 15cb0ee
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/geonode_mapstore_client/client/MapStore2 b/geonode_mapstore_client/client/MapStore2
diff --git a/geonode_mapstore_client/client/js/plugins/Legend.jsx b/geonode_mapstore_client/client/js/plugins/Legend.jsx
@@ -31,7 +31,10 @@ function Legend({
     currentZoomLvl,
     scales,
     language,
-    currentLocale
+    currentLocale,
+    projection,
+    mapSize,
+    mapBbox
 }) {
 
     const [expandLegend, setExpandLegend] = useState(false);
@@ -54,7 +57,10 @@ function Legend({
                 <TOC
                     map={{
                         layers: layers.map(applyVersionParamToLegend),
-                        groups: []
+                        groups: [],
+                        bbox: mapBbox,
+                        size: mapSize,
+                        projection
                     }}
                     theme="legend"
                     config={{
@@ -97,7 +103,10 @@ const ConnectedLegend = connect(
             map && map.mapOptions && map.mapOptions.view && map.mapOptions.view.DPI || null
         ),
         language: isLocalizedLayerStylesEnabled ? currentLocaleLanguage : null,
-        currentLocale
+        currentLocale,
+        projection: map?.projection || 'EPSG:3857',
+        mapSize: map?.size,
+        mapBbox: map?.bbox
     })),
     {
         onUpdateNode: updateNode

diff --git a/geonode_mapstore_client/client/js/utils/ResourceUtils.js b/geonode_mapstore_client/client/js/utils/ResourceUtils.js
@@ -14,7 +14,7 @@ import { getConfigProp, convertFromLegacy, normalizeConfig } from '@mapstore/fra
 import { getGeoNodeLocalConfig, parseDevHostname } from '@js/utils/APIUtils';
 import { ProcessTypes, ProcessStatus } from '@js/utils/ResourceServiceUtils';
 import { uniqBy, orderBy, isString, isObject } from 'lodash';
-import { excludeGoogleBackground, extractTileMatrixFromSources } from '@mapstore/framework/utils/LayersUtils';
+import { excludeGoogleBackground, extractTileMatrixFromSources, ServerTypes } from '@mapstore/framework/utils/LayersUtils';
 import { determineResourceType } from '@js/utils/FileUtils';
 import { isImageServerUrl } from '@mapstore/framework/utils/ArcGISUtils';
 
@@ -117,7 +117,8 @@ export const resourceToLayerConfig = (resource) => {
         has_time: hasTime,
         default_style: defaultStyle,
         ptype,
-        subtype
+        subtype,
+        sourcetype
     } = resource;
 
     const bbox = getExtentFromResource(resource);
@@ -219,7 +220,10 @@ export const resourceToLayerConfig = (resource) => {
             ...(params && { params }),
             ...(dimensions.length > 0 && ({ dimensions })),
             extendedParams,
-            ...(fields && { fields })
+            ...(fields && { fields }),
+            ...(sourcetype === 'REMOTE' && !wmsUrl.includes('/geoserver/') && {
+                serverType: ServerTypes.NO_VENDOR
+            })
         };
     }
 };

diff --git a/geonode_mapstore_client/client/package.json b/geonode_mapstore_client/client/package.json
@@ -26,7 +26,7 @@
   "author": "GeoSolutions",
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@mapstore/project": "git+https://github.com/geosolutions-it/mapstore-project.git#2024.02.xx",
+    "@mapstore/project": "git+https://github.com/geosolutions-it/mapstore-project.git#master",
     "dotenv": "10.0.0",
     "jsdoc": "4.0.0"
   },