Update pages/05_GOES_NBR.py

pages/05_GOES_NBR.py

@@ -35,36 +35,36 @@ class Map(geemap.Map):
             elif selector.value == "August Complex":
                 self.find_layer('August Complex GOES NBR').visible = True
         '''
-    north_complex_bb = ee.Geometry.BBox(-121.616097, 39.426723, -120.668526, 40.030845)
-    dixie_bb = ee.Geometry.BBox(-121.680467, 39.759303, -120.065477, 40.873387)
-    cam_peak_bb = ee.Geometry.BBox(-106.014784, 40.377907, -105.116651, 40.822094)
-    aug_complex_bb = ee.Geometry.BBox(-123.668726, 39.337654, -122.355860, 40.498304)
-    
-    def calc_nbr(pre_start, pre_stop, post_start, post_stop, bbox):
-            PREgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date(pre_start, pre_stop)).mean()
-            POSTgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date(post_start, post_stop)).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
-
-    def add_ee_data(self):
-        
         north_complex_bb = ee.Geometry.BBox(-121.616097, 39.426723, -120.668526, 40.030845)
         dixie_bb = ee.Geometry.BBox(-121.680467, 39.759303, -120.065477, 40.873387)
         cam_peak_bb = ee.Geometry.BBox(-106.014784, 40.377907, -105.116651, 40.822094)
         aug_complex_bb = ee.Geometry.BBox(-123.668726, 39.337654, -122.355860, 40.498304)
-
-        north_complex = self.calc_nbr('2020-08-15', '2020-08-16', '2020-09-15', '2020-09-16', north_complex_bb)
-        dixie = self.calc_nbr('2021-07-12', '2021-07-13', '2021-09-15', '2021-09-16', dixie_bb)
-        cam_peak = self.calc_nbr('2020-08-12', '2020-08-13', '2020-09-12', '2020-09-13', cam_peak_bb)
-        aug_complex = self.calc_nbr('2020-08-15', '2020-08-16', '2020-11-10', '2020-11-11', aug_complex_bb)
         
-        self.addLayer(north_complex, dNBRvisParams, 'North Complex GOES NBR', True)
-        self.addLayer(dixie, dNBRvisParams, 'Dixie Complex GOES NBR', False)
-        self.addLayer(cam_peak, dNBRvisParams, 'Cameron Peak GOES NBR', False)
-        self.addLayer(aug_complex, dNBRvisParams, 'August Complex GOES NBR', False)
+        def calc_nbr(pre_start, pre_stop, post_start, post_stop, bbox):
+                PREgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date(pre_start, pre_stop)).mean()
+                POSTgoesCMI = ee.ImageCollection('NOAA/GOES/17/MCMIPF').filter(ee.Filter.date(post_start, post_stop)).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
+    
+        def add_ee_data(self):
+            
+            north_complex_bb = ee.Geometry.BBox(-121.616097, 39.426723, -120.668526, 40.030845)
+            dixie_bb = ee.Geometry.BBox(-121.680467, 39.759303, -120.065477, 40.873387)
+            cam_peak_bb = ee.Geometry.BBox(-106.014784, 40.377907, -105.116651, 40.822094)
+            aug_complex_bb = ee.Geometry.BBox(-123.668726, 39.337654, -122.355860, 40.498304)
+    
+            north_complex = self.calc_nbr('2020-08-15', '2020-08-16', '2020-09-15', '2020-09-16', north_complex_bb)
+            dixie = self.calc_nbr('2021-07-12', '2021-07-13', '2021-09-15', '2021-09-16', dixie_bb)
+            cam_peak = self.calc_nbr('2020-08-12', '2020-08-13', '2020-09-12', '2020-09-13', cam_peak_bb)
+            aug_complex = self.calc_nbr('2020-08-15', '2020-08-16', '2020-11-10', '2020-11-11', aug_complex_bb)
+            
+            self.addLayer(north_complex, dNBRvisParams, 'North Complex GOES NBR', True)
+            self.addLayer(dixie, dNBRvisParams, 'Dixie Complex GOES NBR', False)
+            self.addLayer(cam_peak, dNBRvisParams, 'Cameron Peak GOES NBR', False)
+            self.addLayer(aug_complex, dNBRvisParams, 'August Complex GOES NBR', False)
 
 '''
 def calc_nbr(pre_start, pre_stop, post_start, post_stop, bbox):