Update app.py

app.py

@@ -1,9 +1,3 @@
-# -*- coding: utf-8 -*-
-"""
-Created on Thu Jun  8 03:39:02 2023
-
-@author: mritchey
-"""
 
 import pandas as pd
 import numpy as np
@@ -20,24 +14,35 @@ import duckdb
 st.set_page_config(layout="wide")
 
 
-@st.cache_resource
-def get_perimeters(refresh=False):
-    if refresh:
-        gdf_perimeters = gpd.read_file(
-            'https://opendata.arcgis.com/api/v3/datasets/5e72b1699bf74eefb3f3aff6f4ba5511_0/downloads/data?format=shp&spatialRefId=4326&where=1%3D1')  
-        gdf_perimeters = gdf_perimeters[['OBJECTID', 'poly_Incid', 'attr_Fir_7', 'poly_Creat',
-                                         'poly_DateC', 'poly_Polyg', 'poly_Acres', 'attr_Estim', 'geometry']].copy()
-        gdf_perimeters.columns = ['OBJECTID', 'Incident', 'DiscoveryDate', 'poly_Creat',
-                                  'LastUpdate', 'poly_Polyg', 'Size_acres', 'CurrentEstCost', 'geometry']
-        gdf_perimeters['Lat_centroid'] = gdf_perimeters.centroid.y
-        gdf_perimeters['Lon_centroid'] = gdf_perimeters.centroid.x
-        gdf_perimeters['DiscoveryDate'] = pd.to_datetime(
-            gdf_perimeters['DiscoveryDate'])
-
-    else:
-        gdf_perimeters = gpd.read_parquet(
-            "wildfire_perimeters.parquet").query("geometry==geometry")
-    return gdf_perimeters
+@st.cache_data
+def get_perimeters(start_date_str,end_date_str):
+  
+    gdf_perimeters = gpd.read_file(
+        'https://opendata.arcgis.com/api/v3/datasets/5e72b1699bf74eefb3f3aff6f4ba5511_0/downloads/data?format=shp&spatialRefId=4326&where=1%3D1')  
+    gdf_perimeters = gdf_perimeters[['OBJECTID', 'poly_Incid', 'attr_Fir_7', 'poly_Creat',
+                                     'poly_DateC', 'poly_Polyg', 'poly_Acres', 'attr_Estim', 'geometry']].copy()
+    gdf_perimeters.columns = ['OBJECTID', 'Incident', 'DiscoveryDate', 'poly_Creat',
+                              'LastUpdate', 'poly_Polyg', 'Size_acres', 'CurrentEstCost', 'geometry']
+    gdf_perimeters['Lat_centroid'] = gdf_perimeters.centroid.y
+    gdf_perimeters['Lon_centroid'] = gdf_perimeters.centroid.x
+    gdf_perimeters['DiscoveryDate'] = pd.to_datetime(
+        gdf_perimeters['DiscoveryDate'])
+
+    gdf_cut = gdf_perimeters.query(f"'{start_date_str}'<=DiscoveryDate<='{end_date_str}'")
+    gdf_cut['DiscoveryDate'] = gdf_cut['DiscoveryDate'].dt.strftime('%Y-%m-%d')
+    return gdf_cut
+
+@st.cache_data
+def get_perimeters_fast(start_date_str,end_date_str):
+    code = f"""
+        select * from 'wildfire_perimeters.parquet'
+            where DiscoveryDate>= '{start_date_str}' and DiscoveryDate<= '{end_date_str}' 
+    """
+    gdf_cut = duck_sql(code)
+    gdf_cut['geometry'] = [wkb.loads(bytes(i)) for i in gdf_cut.geometry]
+    gdf_cut = gpd.GeoDataFrame(gdf_cut)
+    gdf_cut['DiscoveryDate'] = gdf_cut['DiscoveryDate'].dt.strftime('%Y-%m-%d')
+    return gdf_cut
 
 
 def map_perimeters(_gdf_data, address):
@@ -82,8 +87,8 @@ def geocode(address):
     return lat, lon
 
 
-def extract_vertices(gdf):
-    g = [i for i in gdf.geometry]
+def extract_vertices(_gdf):
+    g = [i for i in _gdf.geometry]
     all_data = []
     for i in range(len(g)):
         try:
@@ -150,18 +155,10 @@ start_date_str, end_date_str = start_date.strftime(
 
 # Get Data: Modified for Speed
 if refresh:
-    gdf = get_perimeters(refresh)
-    gdf_cut = gdf.query(f"'{start_date_str}'<=DiscoveryDate<='{end_date_str}'")
+    gdf = get_perimeters(start_date_str,end_date_str,refresh)
+    
 else:
-    code = f"""
-        select * from 'wildfire_perimeters.parquet'
-            where DiscoveryDate>= '{start_date_str}' and DiscoveryDate<= '{end_date_str}' 
-    """
-    gdf_cut = duck_sql(code)
-    gdf_cut['geometry'] = [wkb.loads(bytes(i)) for i in gdf_cut.geometry]
-    gdf_cut = gpd.GeoDataFrame(gdf_cut)
-
-gdf_cut['DiscoveryDate'] = gdf_cut['DiscoveryDate'].dt.strftime('%Y-%m-%d')
+    gdf_cut = get_perimeters_fast(start_date_str,end_date_str)
 
 
 #Distance to Fire