review dataset legend

GeoNode · Jan 15, 2025 · f5aed83 · f5aed83
1 parent 3155cb1
commit f5aed83
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
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
@@ -221,7 +221,9 @@ export const resourceToLayerConfig = (resource) => {
             ...(dimensions.length > 0 && ({ dimensions })),
             extendedParams,
             ...(fields && { fields }),
-            serverType: sourcetype === 'LOCAL' || wmsUrl.includes('/geoserver/') ? ServerTypes.GEOSERVER : ServerTypes.NO_VENDOR
+            ...(sourcetype === 'REMOTE' && !wmsUrl.includes('/geoserver/') && {
+                serverType: ServerTypes.NO_VENDOR
+            })
         };
     }
 };