update

pages/4_Test.py

@@ -55,62 +55,38 @@ if uploaded_geojson:
     map_choices.append("Uploaded GeoJSON")
 
 selected_map_1 = st.selectbox("Select data for Map 1", map_choices)
-selected_map_2 = st.selectbox("Select data for Map 2", map_choices)
-# Load the dataset to determine available columns
-import geopandas as gpd
-
-if selected_map_1 == "Uploaded GeoJSON":
-    gdf_1 = gpd.GeoDataFrame.from_features(uploaded_geojson)
-elif selected_map_1 == "Original Map 1":
-    gdf_1 = gpd.read_file(map_1)
-elif selected_map_1 == "Original Map 2":
-    gdf_1 = gpd.read_file(map_2)
-else:
-    gdf_1 = gpd.read_file(map_3)
-
-if selected_map_2 == "Uploaded GeoJSON":
-    gdf_2 = gpd.GeoDataFrame.from_features(uploaded_geojson)
-gdf_1.crs = "EPSG:4326"
-gdf_2.crs = "EPSG:4326"
-
-elif selected_map_2 == "Original Map 1":
-    gdf_2 = gpd.read_file(map_1)
-elif selected_map_2 == "Original Map 2":
-    gdf_2 = gpd.read_file(map_2)
-else:
-    gdf_2 = gpd.read_file(map_3)
-
-# Extract column names excluding 'geometry'
-available_columns_1 = [col for col in gdf_1.columns if col != 'geometry']
-available_columns_2 = [col for col in gdf_2.columns if col != 'geometry']
-
-selected_column_1 = st.selectbox("Select column for Map 1 visualization", available_columns_1)
-selected_column_2 = st.selectbox("Select column for Map 2 visualization", available_columns_2)
+selected_map_2 = st.selectbox(
+available_columns = ['geo.name', 'count', 'geometry']
+selected_column_1 = st.selectbox("Select column for Map 1 visualization", available_columns, index=1)
+selected_column_2 = st.selectbox("Select column for Map 2 visualization", available_columns, index=1)
+"Select data for Map 2", map_choices)
+
+# Integrate with leafmap.foliumap to display the selected map dataset
 row1_col1, row1_col2 = st.columns([1, 1])
 
 # Display Map 1
 with row1_col1:
     m1 = leafmap.Map(center=[51.50, -0.1], zoom=10)
     if selected_map_1 == "Uploaded GeoJSON":
-        m1.add_data(gdf_1, column=selected_column_1)
+        m1.add_data(uploaded_geojson)
     elif selected_map_1 == "Original Map 1":
-        m1.add_data(map_1, column=selected_column_1)
+        m1.add_data(map_1)
     elif selected_map_1 == "Original Map 2":
-        m1.add_data(map_2, column=selected_column_1)
+        m1.add_data(map_2)
     else:
-        m1.add_data(map_3, column=selected_column_1)
+        m1.add_data(map_3)
 
 # Display Map 2
 with row1_col2:
     m2 = leafmap.Map(center=[51.50, -0.1], zoom=10)
     if selected_map_2 == "Uploaded GeoJSON":
-        m2.add_data(gdf_2, column=selected_column_2)
+        m2.add_data(uploaded_geojson)
     elif selected_map_2 == "Original Map 1":
-        m2.add_data(map_1, column=selected_column_2)
+        m2.add_data(map_1)
     elif selected_map_2 == "Original Map 2":
-        m2.add_data(map_2, column=selected_column_2)
+        m2.add_data(map_2)
     else:
-        m2.add_data(map_3, column=selected_column_2)
+        m2.add_data(map_3)
 
 # Additional map configurations and display
 longitude = -0.1