Merge remote-tracking branch 'origin' into feature/control-panel

RENCI · May 20, 2024 · d3a8793 · d3a8793
2 parents a005013 + 6984857
commit d3a8793
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/components/map/default-layers.js b/src/components/map/default-layers.js
@@ -162,7 +162,8 @@ export const DefaultLayers = () => {
     return (
         <>
         {defaultModelLayers
-            .filter(({state }) => state.visible)
+            .filter(({state}) => state.visible)
+            .reverse()
             .map((layer, index) => {
                 const pieces = layer.id.split('-');
                 const type = pieces[pieces.length-1];
@@ -171,21 +172,16 @@ export const DefaultLayers = () => {
                     //console.log("obsData: " + JSON.stringify(obsData, null, 2));
                     return (
                         <GeoJSON
-                            key = {index}
-                            data = {obsData}
-                            pointToLayer = {obsPointToLayer}
-                            onEachFeature = {onEachObsFeature}
+                            key={`${index}-${layer.id}`}
+                            data={obsData}
+                            pointToLayer={obsPointToLayer}
+                            onEachFeature={onEachObsFeature}
                         />
                     );
                 } else {
                     return (
                         <WMSTileLayer
-                            key = {index}
-                            /* eventHandlers={{
-                                click: () => {
-                                console.log('marker clicked')
-                                },
-                            }} */
+                            key={`${index}-${layer.id}`}
                             url={gs_wms_url}
                             layers={layer.layers}
                             params={{