Re-did the whole organization!

pages/05_GOES_NBR.py

@@ -11,79 +11,52 @@ class Map(geemap.Map):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.add_North_Complex_data()
-        self.add_Dixie_data()
-        self.add_Cameron_Peak_data()
-        self.add_August_Complex_data()
-        
-        
+        self.add_ee_data()
+                
 
-    def add_North_Complex_data(map_widget): #self
-        # Create a bounding box geometry
-        NorthComplexBB = ee.Geometry.BBox(-121.616097, 39.426723, -120.668526, 40.030845)
+    def add_ee_data(self): #self
 
-        PREgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date('2020-08-15', '2020-08-16')).mean()
-        POSTgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date('2020-09-15', '2020-09-16')).mean()
-        preNBR = PREgoesCMI.select(['CMI_C03','CMI_C06']).normalizedDifference(['CMI_C03', 'CMI_C06']).toFloat().rename('NBR');
-        postNBR = POSTgoesCMI.select(['CMI_C03','CMI_C06']).normalizedDifference(['CMI_C03', 'CMI_C06']).toFloat().rename('NBR');
-        dNBR = preNBR.subtract(postNBR).select('NBR')
-        dNBRclipped = dNBR.clip(NorthComplexBB)
-        #self.addLayer(dNBRclipped, dNBRvisParams, "GOES dNBR")
-        map_widget.addLayer(dNBR, dNBRvisParams, "GOES dNBR - North Complex")
+        def calcNBR(preStart, preStop, postStart, postStop, bbox):
+            PREgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date(preStart, preStop)).mean()
+            POSTgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date(postStart, postStop)).mean()
+            preNBR = PREgoesCMI.select(['CMI_C03','CMI_C06']).normalizedDifference(['CMI_C03', 'CMI_C06']).toFloat().rename('NBR');
+            postNBR = POSTgoesCMI.select(['CMI_C03','CMI_C06']).normalizedDifference(['CMI_C03', 'CMI_C06']).toFloat().rename('NBR');
+            dNBR = preNBR.subtract(postNBR).select('NBR')
+            dNBRclipped = dNBR.clip(bbox)
+            return dNBRclipped
+        
+        NorthComplexBB = ee.Geometry.BBox(-121.616097, 39.426723, -120.668526, 40.030845) 
+        self.north = calcNBR('2020-08-15', '2020-08-16','2020-09-15', '2020-09-16', NorthComplexBB)
 
-    def add_Dixie_data(map_widget):
-        # Create a bounding box geometry
         DixieBB = ee.Geometry.BBox(-121.680467, 39.759303, -120.065477, 40.873387)
+        self.dixie = calcNBR('2021-07-12', '2021-07-13','2021-09-15', '2021-09-16', DixieBB)
 
-        PREgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date('2021-07-12', '2021-07-13')).mean()
-        POSTgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date('2021-09-15', '2021-09-16')).mean()
-        preNBR = PREgoesCMI.select(['CMI_C03','CMI_C06']).normalizedDifference(['CMI_C03', 'CMI_C06']).toFloat().rename('NBR');
-        postNBR = POSTgoesCMI.select(['CMI_C03','CMI_C06']).normalizedDifference(['CMI_C03', 'CMI_C06']).toFloat().rename('NBR');
-        dNBR = preNBR.subtract(postNBR).select('NBR')
-        dNBRclipped = dNBR.clip(DixieBB)
-        #self.addLayer(dNBRclipped, dNBRvisParams, "GOES dNBR")
-        map_widget.addLayer(dNBR, dNBRvisParams, "GOES dNBR - Dixie")
-
-    def add_Cameron_Peak_data(map_widget):
-        # Create a bounding box geometry
         CamPeakBB = ee.Geometry.BBox(-106.014784, 40.377907, -105.116651, 40.822094)
+        self.campeak = calcNBR('2020-08-12', '2020-08-13','2020-09-12', '2020-09-13', CamPeakBB)
 
-        PREgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date('2020-08-12', '2020-08-13')).mean()
-        POSTgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date('2020-09-12', '2020-09-13')).mean()
-        preNBR = PREgoesCMI.select(['CMI_C03','CMI_C06']).normalizedDifference(['CMI_C03', 'CMI_C06']).toFloat().rename('NBR');
-        postNBR = POSTgoesCMI.select(['CMI_C03','CMI_C06']).normalizedDifference(['CMI_C03', 'CMI_C06']).toFloat().rename('NBR');
-        dNBR = preNBR.subtract(postNBR).select('NBR')
-        dNBRclipped = dNBR.clip(CamPeakBB)
-        #self.addLayer(dNBRclipped, dNBRvisParams, "GOES dNBR")
-        map_widget.addLayer(dNBR, dNBRvisParams, "GOES dNBR - Cameron Peak")
-
-    def add_August_Complex_data(map_widget):
-        # Create a bounding box geometry
         AugustComplexBB = ee.Geometry.BBox(-123.668726, 39.337654, -122.355860, 40.498304)
-        PREgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date('2020-08-15', '2020-08-16')).mean()
-        POSTgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date('2020-11-15', '2020-11-16')).mean()
-        preNBR = PREgoesCMI.select(['CMI_C03','CMI_C06']).normalizedDifference(['CMI_C03', 'CMI_C06']).toFloat().rename('NBR');
-        postNBR = POSTgoesCMI.select(['CMI_C03','CMI_C06']).normalizedDifference(['CMI_C03', 'CMI_C06']).toFloat().rename('NBR');
-        dNBR = preNBR.subtract(postNBR).select('NBR')
-        dNBRclipped = dNBR.clip(AugustComplexBB)
-        #self.addLayer(dNBRclipped, dNBRvisParams, "GOES dNBR")
-        map_widget.addLayer(dNBR, dNBRvisParams, "GOES dNBR - August Complex")
+        self.august = calcNBR('2020-08-15', '2020-08-16','2020-11-15', '2020-11-16', AugustComplexBB)
+
+        self.vis_params = dNBRvisParams
+
+        # Add default layer
+        self.addLayer(
+            self.north,dNBRvisParams, 'North Complex GOES NBR',  True,)
+
 
 @solara.component
 def Page():
+    map_instance = Map(element_id="map")
     def update_map(selected_fire):
             map_instance.clear_layers() 
             if selected_fire == "North Complex":
-                add_North_Complex_data(map_widget)
+                map_instance.addLayer(map_instance.north, map_instance.vis_params, 'North Complex GOES NBR', True)
             elif selected_fire == "Dixie":
-                add_Dixie_data(map_widget)
+                map_instance.addLayer(map_instance.dixie, map_instance.vis_params, 'Dixie Complex GOES NBR', True)
             elif selected_fire == "Cameron Peak":
-                add_Cameron_Peak_data(map_widget)
+                map_instance.addLayer(map_instance.campeak, map_instance.vis_params, 'Cameron Peak GOES NBR', True)
             elif selected_fire == "August Complex":
-                add_August_Complex_data(map_widget)
-                
-    def SelectFire(value):
-        #selected_fire.value = value
-        update_map(value)
+                map_instance.addLayer(map_instance.august, map_instance.vis_params, 'August Complex GOES NBR', True)
 
     with solara.Column(style={"min-width": "500px"}):
         map_widget = Map.element(
@@ -91,8 +64,7 @@ def Page():
             zoom=4,
             height="600px",
         )
-        map_instance = Map(widget=map_widget)
         
-    solara.Select(label="Wildfire Case Study", value=selected_fire, values=fireList, on_value = SelectFire)
+    solara.Select(label="Wildfire Case Study", value=selected_fire, values=fireList, on_value = update_map)
     solara.Markdown(f"**Selected**: {selected_fire.value}")