Merge pull request #19 from RENCI/bugfix/layer-visibility

filter layers to only visible ones
RENCI · May 2, 2024 · 1f67ab2 · 1f67ab2
2 parents f4fc3be + 92b0b13
commit 1f67ab2
Showing 1 changed file with 37 additions and 35 deletions.
diff --git a/src/components/map/default-layers.js b/src/components/map/default-layers.js
@@ -142,41 +142,43 @@ export const DefaultLayers = () => {
 
     return (
         <>
-        {defaultModelLayers.map((layer, index) => {
-            const pieces = layer.id.split('-');
-            const type = pieces[pieces.length-1];
-            //console.log("type: " + JSON.stringify(type, null, 2))
-            if( type === "obs" && obsData !== "") {
-                //console.log("obsData: " + JSON.stringify(obsData, null, 2));
-                return (
-                    <GeoJSON
-                        key = {index}
-                        data = {obsData}
-                        pointToLayer = {obsPointToLayer}
-                        onEachFeature = {onEachObsFeature}
-                    />
-                );
-            }
-            else {
-                return (
-                    <WMSTileLayer
-                        key = {index}
-                        /* eventHandlers={{
-                            click: () => {
-                            console.log('marker clicked')
-                            },
-                        }} */
-                        url={gs_wms_url}
-                        layers={layer.layers}
-                        params={{
-                            format:"image/png",
-                            transparent: true,
-                        }}
-
-                    />
-                );
-            }
-        })};
+        {defaultModelLayers
+            .filter(({state }) => state.visible)
+            .map((layer, index) => {
+                const pieces = layer.id.split('-');
+                const type = pieces[pieces.length-1];
+                //console.log("type: " + JSON.stringify(type, null, 2))
+                if( type === "obs" && obsData !== "") {
+                    //console.log("obsData: " + JSON.stringify(obsData, null, 2));
+                    return (
+                        <GeoJSON
+                            key = {index}
+                            data = {obsData}
+                            pointToLayer = {obsPointToLayer}
+                            onEachFeature = {onEachObsFeature}
+                        />
+                    );
+                } else {
+                    return (
+                        <WMSTileLayer
+                            key = {index}
+                            /* eventHandlers={{
+                                click: () => {
+                                console.log('marker clicked')
+                                },
+                            }} */
+                            url={gs_wms_url}
+                            layers={layer.layers}
+                            params={{
+                                format:"image/png",
+                                transparent: true,
+                            }}
+
+                        />
+                    );
+                }
+            })
+        };
         </>
     );
 };