update app.py

app.py

@@ -493,12 +493,6 @@ if shape_type.lower() == "point":
         index=0,
         help="Choose 'Point' for exact point calculation, or a kernel size for area averaging."
     )
-    
-    # Initialize column names in session state
-    if 'lat_col' not in st.session_state:
-        st.session_state.lat_col = None
-    if 'lon_col' not in st.session_state:
-        st.session_state.lon_col = None
 elif shape_type.lower() == "polygon":
     include_boundary = st.checkbox(
         "Include Boundary Pixels",
@@ -515,42 +509,49 @@ if file_upload is not None:
             # Read the CSV file
             locations_df = pd.read_csv(file_upload)
             
-            # Get numeric columns for coordinate selection
-            numeric_cols = locations_df.select_dtypes(include=['number']).columns.tolist()
+            # Show the first few rows to help user identify columns
+            st.write("Preview of your uploaded data (first 5 rows):")
+            st.dataframe(locations_df.head())
             
-            if numeric_cols:
-                # Let user select latitude and longitude columns
-                col1, col2 = st.columns(2)
-                with col1:
-                    st.session_state.lat_col = st.selectbox(
-                        "Select Latitude Column",
-                        options=numeric_cols,
-                        index=numeric_cols.index(st.session_state.lat_col) if st.session_state.lat_col in numeric_cols else 0,
-                        key="lat_col_select"
-                    )
-                with col2:
-                    st.session_state.lon_col = st.selectbox(
-                        "Select Longitude Column",
-                        options=numeric_cols,
-                        index=numeric_cols.index(st.session_state.lon_col) if st.session_state.lon_col in numeric_cols else 0,
-                        key="lon_col_select"
-                    )
-                
-                # Update the dataframe with selected columns
-                if st.session_state.lat_col and st.session_state.lon_col:
-                    locations_df = locations_df.rename(columns={
-                        st.session_state.lat_col: 'latitude',
-                        st.session_state.lon_col: 'longitude'
-                    })
-            else:
-                st.error("No numeric columns found in the CSV file for coordinates.")
-                locations_df = pd.DataFrame()
+            # Let user input their column names
+            col1, col2 = st.columns(2)
+            with col1:
+                lat_col = st.text_input(
+                    "Enter the exact name of your Latitude column",
+                    value="latitude",
+                    help="Case-sensitive column name from your CSV file"
+                )
+            with col2:
+                lon_col = st.text_input(
+                    "Enter the exact name of your Longitude column",
+                    value="longitude",
+                    help="Case-sensitive column name from your CSV file"
+                )
+            
+            # Validate the columns exist
+            if lat_col not in locations_df.columns or lon_col not in locations_df.columns:
+                st.error(f"Error: Could not find columns '{lat_col}' and/or '{lon_col}' in your file. Available columns are: {', '.join(locations_df.columns)}")
+                st.stop()
+            
+            # Rename the columns to standard names for processing
+            locations_df = locations_df.rename(columns={
+                lat_col: 'latitude',
+                lon_col: 'longitude'
+            })
+            
+            # Check for valid numeric data
+            if not pd.api.types.is_numeric_dtype(locations_df['latitude']) or not pd.api.types.is_numeric_dtype(locations_df['longitude']):
+                st.error("Error: Latitude and Longitude columns must contain numeric values")
+                st.stop()
                 
         elif file_upload.name.endswith('.geojson'):
             locations_df = gpd.read_file(file_upload)
             if 'geometry' in locations_df.columns:
                 locations_df['latitude'] = locations_df['geometry'].y
                 locations_df['longitude'] = locations_df['geometry'].x
+            else:
+                st.error("GeoJSON file doesn't contain geometry column")
+                st.stop()
         elif file_upload.name.endswith('.kml'):
             kml_string = file_upload.read().decode('utf-8')
             try:
@@ -575,11 +576,8 @@ if file_upload is not None:
             except Exception as e:
                 st.error(f"Error parsing KML file: {str(e)}")
         
-        # Display map for points
+        # Display map for points if we have valid data
         if not locations_df.empty and 'latitude' in locations_df.columns and 'longitude' in locations_df.columns:
-            st.write("Preview of Uploaded Points Data:")
-            st.dataframe(locations_df.head())
-            
             m = leafmap.Map(center=[locations_df['latitude'].mean(), locations_df['longitude'].mean()], zoom=10)
             for _, row in locations_df.iterrows():
                 latitude = row['latitude']
@@ -595,6 +593,9 @@ if file_upload is not None:
             st.error("CSV upload not supported for polygons. Please upload a GeoJSON or KML file.")
         elif file_upload.name.endswith('.geojson'):
             locations_df = gpd.read_file(file_upload)
+            if 'geometry' not in locations_df.columns:
+                st.error("GeoJSON file doesn't contain geometry column")
+                st.stop()
         elif file_upload.name.endswith('.kml'):
             kml_string = file_upload.read().decode('utf-8')
             try:
@@ -617,11 +618,8 @@ if file_upload is not None:
             except Exception as e:
                 st.error(f"Error parsing KML file: {str(e)}")
         
-        # Display map for polygons
+        # Display map for polygons if we have valid data
         if not locations_df.empty and 'geometry' in locations_df.columns:
-            st.write("Preview of Uploaded Polygons Data:")
-            st.dataframe(locations_df.head())
-            
             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)
@@ -672,4 +670,4 @@ if st.button(f"Calculate {custom_formula}"):
             except Exception as e:
                 st.error(f"An error occurred during processing: {str(e)}")
     else:
-        st.warning("Please upload a file to proceed.")
+        st.warning("Please upload a valid file to proceed.")