update app.py

app.py

@@ -152,116 +152,116 @@ shape_type = st.selectbox("Do you want to process 'Point' or 'Polygon' data?", [
 # Ask user to upload a file based on shape type (case-insensitive)
 file_upload = st.file_uploader(f"Upload your {shape_type} data (CSV, GeoJSON, KML)", type=["csv", "geojson", "kml"])
 
-# if file_upload is not None:
-#     # Read the user-uploaded file
-#     if shape_type.lower() == "point":
-#         # Handle different file types for Point data
-#         if file_upload.name.endswith('.csv'):
-#             locations_df = pd.read_csv(file_upload)
-#         elif file_upload.name.endswith('.geojson'):
-#             locations_df = gpd.read_file(file_upload)
-#         elif file_upload.name.endswith('.kml'):
-#             locations_df = gpd.read_file(file_upload)
-#         else:
-#             st.error("Unsupported file format. Please upload CSV, GeoJSON, or KML.")
-#             locations_df = pd.DataFrame()
-
-#         #  # Check if the file contains polygons when the user selected "Point"
-#         # if 'geometry' in locations_df.columns:
-#         #     # Check if the geometry type is Polygon or MultiPolygon
-#         #     if locations_df.geometry.geom_type.isin(['Polygon', 'MultiPolygon']).any():
-#         #         st.warning("The uploaded file contains polygon data. Please select 'Polygon' for processing.")
-#         #         st.stop()  # Stop further processing if polygons are detected
-
-#         # Processing the point data
-#         with st.spinner('Processing data...'):
-#             if locations_df is not None and not locations_df.empty:
-#                 # For GeoJSON data, the coordinates are in the geometry column
-#                 if 'geometry' in locations_df.columns:
-#                     # Extract latitude and longitude from the geometry column
-#                     locations_df['latitude'] = locations_df['geometry'].y
-#                     locations_df['longitude'] = locations_df['geometry'].x
-
-#                 # Ensure the necessary columns exist in the dataframe
-#                 if 'latitude' not in locations_df.columns or 'longitude' not in locations_df.columns:
-#                     st.error("Uploaded file is missing required 'latitude' or 'longitude' columns.")
-#                 else:
-#                     # Display a preview of the points data
-#                     st.write("Preview of the uploaded points data:")
-#                     st.dataframe(locations_df.head())
-
-#                     # Create a LeafMap object to display the points
-#                     m = leafmap.Map(center=[locations_df['latitude'].mean(), locations_df['longitude'].mean()], zoom=10)
-
-#                     # Add points to the map using a loop
-#                     for _, row in locations_df.iterrows():
-#                         latitude = row['latitude']
-#                         longitude = row['longitude']
+if file_upload is not None:
+    # Read the user-uploaded file
+    if shape_type.lower() == "point":
+        # Handle different file types for Point data
+        if file_upload.name.endswith('.csv'):
+            locations_df = pd.read_csv(file_upload)
+        elif file_upload.name.endswith('.geojson'):
+            locations_df = gpd.read_file(file_upload)
+        elif file_upload.name.endswith('.kml'):
+            locations_df = gpd.read_file(file_upload)
+        else:
+            st.error("Unsupported file format. Please upload CSV, GeoJSON, or KML.")
+            locations_df = pd.DataFrame()
+
+         # Check if the file contains polygons when the user selected "Point"
+        if 'geometry' in locations_df.columns:
+            # Check if the geometry type is Polygon or MultiPolygon
+            if locations_df.geometry.geom_type.isin(['Polygon', 'MultiPolygon']).any():
+                st.warning("The uploaded file contains polygon data. Please select 'Polygon' for processing.")
+                st.stop()  # Stop further processing if polygons are detected
+
+        # Processing the point data
+        with st.spinner('Processing data...'):
+            if locations_df is not None and not locations_df.empty:
+                # For GeoJSON data, the coordinates are in the geometry column
+                if 'geometry' in locations_df.columns:
+                    # Extract latitude and longitude from the geometry column
+                    locations_df['latitude'] = locations_df['geometry'].y
+                    locations_df['longitude'] = locations_df['geometry'].x
+
+                # Ensure the necessary columns exist in the dataframe
+                if 'latitude' not in locations_df.columns or 'longitude' not in locations_df.columns:
+                    st.error("Uploaded file is missing required 'latitude' or 'longitude' columns.")
+                else:
+                    # Display a preview of the points data
+                    st.write("Preview of the uploaded points data:")
+                    st.dataframe(locations_df.head())
+
+                    # Create a LeafMap object to display the points
+                    m = leafmap.Map(center=[locations_df['latitude'].mean(), locations_df['longitude'].mean()], zoom=10)
+
+                    # Add points to the map using a loop
+                    for _, row in locations_df.iterrows():
+                        latitude = row['latitude']
+                        longitude = row['longitude']
                         
-#                         # Check if latitude or longitude are NaN and skip if they are
-#                         if pd.isna(latitude) or pd.isna(longitude):
-#                             continue  # Skip this row and move to the next one
+                        # Check if latitude or longitude are NaN and skip if they are
+                        if pd.isna(latitude) or pd.isna(longitude):
+                            continue  # Skip this row and move to the next one
                         
-#                         m.add_marker(location=[latitude, longitude], popup=row.get('name', 'No Name'))
-
-#                     # Display map
-#                     st.write("Map of Uploaded Points:")
-#                     m.to_streamlit()
-
-#                     # Store the map in session_state
-#                     st.session_state.map_data = m
-
-#     elif shape_type.lower() == "polygon":
-#         # Handle different file types for Polygon data:
-#         if file_upload.name.endswith('.csv'):
-#             locations_df = pd.read_csv(file_upload)
-#         elif file_upload.name.endswith('.geojson'):
-#             locations_df = gpd.read_file(file_upload)
-#         elif file_upload.name.endswith('.kml'):
-#             locations_df = gpd.read_file(file_upload)
-#         else:
-#             st.error("Unsupported file format. Please upload CSV, GeoJSON, or KML.")
-#             locations_df = pd.DataFrame()
-
-#         # # Check if the file contains points when the user selected "Polygon"
-#         # if 'geometry' in locations_df.columns:
-#         #     # Check if the geometry type is Point or MultiPoint
-#         #     if locations_df.geometry.geom_type.isin(['Point', 'MultiPoint']).any():
-#         #         st.warning("The uploaded file contains point data. Please select 'Point' for processing.")
-#         #         st.stop()  # Stop further processing if point data is detected
-
-#         # Processing the polygon data
-#         with st.spinner('Processing data...'):
-#             if locations_df is not None and not locations_df.empty:
-#                 # Ensure the 'geometry' column exists in the dataframe
-#                 if 'geometry' not in locations_df.columns:
-#                     st.error("Uploaded file is missing required 'geometry' column.")
-#                 else:
-#                     # Display a preview of the polygons data
-#                     st.write("Preview of the uploaded polygons data:")
-#                     st.dataframe(locations_df.head())
-
-#                     # Create a LeafMap object to display the polygons
-#                     # Calculate the centroid of the polygons for the map center
-#                     centroid_lat = locations_df.geometry.centroid.y.mean()
-#                     centroid_lon = locations_df.geometry.centroid.x.mean()
-
-#                     m = leafmap.Map(center=[centroid_lat, centroid_lon], zoom=10)
-
-#                     # Add polygons to the map using a loop
-#                     for _, row in locations_df.iterrows():
-#                         polygon = row['geometry']
-#                         if polygon.is_valid:  # Check if polygon is valid
-#                             # Create a GeoDataFrame for this polygon
-#                             gdf = gpd.GeoDataFrame([row], geometry=[polygon], crs=locations_df.crs)
-#                             m.add_gdf(gdf=gdf, layer_name=row.get('name', 'Unnamed Polygon'))
-
-#                     # Display map
-#                     st.write("Map of Uploaded Polygons:")
-#                     m.to_streamlit()
-
-#                     # Store the map in session_state
-#                     st.session_state.map_data = m
+                        m.add_marker(location=[latitude, longitude], popup=row.get('name', 'No Name'))
+
+                    # Display map
+                    st.write("Map of Uploaded Points:")
+                    m.to_streamlit()
+
+                    # Store the map in session_state
+                    st.session_state.map_data = m
+
+    elif shape_type.lower() == "polygon":
+        # Handle different file types for Polygon data:
+        if file_upload.name.endswith('.csv'):
+            locations_df = pd.read_csv(file_upload)
+        elif file_upload.name.endswith('.geojson'):
+            locations_df = gpd.read_file(file_upload)
+        elif file_upload.name.endswith('.kml'):
+            locations_df = gpd.read_file(file_upload)
+        else:
+            st.error("Unsupported file format. Please upload CSV, GeoJSON, or KML.")
+            locations_df = pd.DataFrame()
+
+        # Check if the file contains points when the user selected "Polygon"
+        if 'geometry' in locations_df.columns:
+            # Check if the geometry type is Point or MultiPoint
+            if locations_df.geometry.geom_type.isin(['Point', 'MultiPoint']).any():
+                st.warning("The uploaded file contains point data. Please select 'Point' for processing.")
+                st.stop()  # Stop further processing if point data is detected
+
+        # Processing the polygon data
+        with st.spinner('Processing data...'):
+            if locations_df is not None and not locations_df.empty:
+                # Ensure the 'geometry' column exists in the dataframe
+                if 'geometry' not in locations_df.columns:
+                    st.error("Uploaded file is missing required 'geometry' column.")
+                else:
+                    # Display a preview of the polygons data
+                    st.write("Preview of the uploaded polygons data:")
+                    st.dataframe(locations_df.head())
+
+                    # Create a LeafMap object to display the polygons
+                    # Calculate the centroid of the polygons for the map center
+                    centroid_lat = locations_df.geometry.centroid.y.mean()
+                    centroid_lon = locations_df.geometry.centroid.x.mean()
+
+                    m = leafmap.Map(center=[centroid_lat, centroid_lon], zoom=10)
+
+                    # Add polygons to the map using a loop
+                    for _, row in locations_df.iterrows():
+                        polygon = row['geometry']
+                        if polygon.is_valid:  # Check if polygon is valid
+                            # Create a GeoDataFrame for this polygon
+                            gdf = gpd.GeoDataFrame([row], geometry=[polygon], crs=locations_df.crs)
+                            m.add_gdf(gdf=gdf, layer_name=row.get('name', 'Unnamed Polygon'))
+
+                    # Display map
+                    st.write("Map of Uploaded Polygons:")
+                    m.to_streamlit()
+
+                    # Store the map in session_state
+                    st.session_state.map_data = m
 
 
 # Date Input for Start and End Dates
@@ -593,16 +593,6 @@ if st.button(f"Calculate ({index_choice})"):
     if file_upload is not None:
         # Read the user-uploaded file
         if shape_type.lower() == "point":
-            if file_upload.name.endswith('.csv'):
-                locations_df = read_csv(file_upload)
-            elif file_upload.name.endswith('.geojson'):
-                locations_df = read_geojson(file_upload)
-            elif file_upload.name.endswith('.kml'):
-                locations_df = read_kml(file_upload)
-            else:
-                st.error("Unsupported file format. Please upload CSV, GeoJSON, or KML.")
-                locations_df = pd.DataFrame()
-            
             # Process results for the selected aggregation period
             results = process_aggregation(
                 locations_df,
@@ -638,11 +628,6 @@ if st.button(f"Calculate ({index_choice})"):
                 st.warning("No results were generated.")
         
         elif shape_type.lower() == "polygon":
-            if file_upload.name.endswith('.geojson'):
-                locations_df = read_geojson(file_upload)
-            else:
-                st.error("Please upload a valid GeoJSON file for polygons.")
-        
             # Process results for the selected aggregation period
             results = process_aggregation(
                 locations_df,