Update app.py

app.py

@@ -86,7 +86,7 @@ def process_buildings(input_gdf, sensitive_sites_gdf, default_building_height_m,
     
     return buffers, intersected_sites, intersection_desc
 
-def get_max_extent(*gdfs):
+def get_max_extent(*gdfs): # takes in unlimited number of gdfs and calculates max/min xy extents
     minx = min(gdf.total_bounds[0] for gdf in gdfs)
     miny = min(gdf.total_bounds[1] for gdf in gdfs)
     maxx = max(gdf.total_bounds[2] for gdf in gdfs)
@@ -95,9 +95,9 @@ def get_max_extent(*gdfs):
     return minx, miny, maxx, maxy
 
 def create_plot(filename, extent, *gdfs): # takes in unlimited number of gdfs
-    fig, ax = plt.subplots(figsize=(6, 4)) #Sets image size by width & height (in inches)
+    fig, ax = plt.subplots(figsize=(5, 3)) #Sets image size by width & height (in inches)
     
-    colors = ['tan', 'mistyrose', 'mediumseagreen', 'thistle', 'orange', 'yellow'] # Extend/improve this list as needed
+    colors = ['tan', 'mediumseagreen', 'thistle', 'lightcoral', 'brown', 'yellow'] # Extend/improve this list as needed
 
     for idx, gdf in enumerate(gdfs):
         gdf.plot(ax=ax, color=colors[idx % len(colors)]) # Cycle through colors
@@ -136,9 +136,11 @@ def ss_intersect(geojson1, ss_geoselect, multiplier_factor, default_building_hei
     if intersected_sites:
         intersected_sites_gdf = pd.concat(intersected_sites, ignore_index=True)
         intersected_sites_gdf = intersected_sites_gdf.to_crs("EPSG:4326")
-        intersected_sites_gdf.to_file("intersected_sensitive_sites.geojson", driver='GeoJSON')
-    else:
+    else: #if there aren't any intersections, return an empty geojson
+        intersected_sites_gdf = gpd.read_file("files/No_intersecting_buildings.geojson")
         print("No buildings are in the vicinity of any sensitive sites.")
+    
+    intersected_sites_gdf.to_file("intersected_sensitive_sites.geojson", driver='GeoJSON')
 
     # Perform the union operation if there is more than one buffer
     if len(buffers) > 1:
@@ -158,10 +160,10 @@ def ss_intersect(geojson1, ss_geoselect, multiplier_factor, default_building_hei
     lots_url = "https://services5.arcgis.com/GfwWNkhOj9bNBqoJ/arcgis/rest/services/MAPPLUTO/FeatureServer/0" # Access MapPLUTO # Eventually should be a checkbox
     lots_gdf = get_gdf_from_feature_layer(lots_url)
 
-    # Create and save the plot
-    create_plot('output_image.png', extent, lots_gdf, buffer_union_gdf, intersected_sites_gdf, input_gdf)
+    # Create and save the plot - which is the output image
+    create_plot('output_image.png', extent, lots_gdf, sensitive_sites_gdf, buffer_union_gdf, intersected_sites_gdf, input_gdf)
             
-    # Return the image
+    # Return the image, geojson files, and text description
     return 'output_image.png', "building_buffers.geojson", "buffer_union.geojson", intersection_desc