update

pages/4_Test.py

@@ -1,4 +1,3 @@
-
 import streamlit as st
 import leafmap.foliumap as leafmap
 import leafmap.colormaps as cm
@@ -29,11 +28,9 @@ st.markdown(
     '''
 )
 
-# Adding a widget to allow users to upload GeoJSON files
 uploaded_file = st.file_uploader("Upload a GeoJSON file", type=["geojson"])
-
-# Variable to hold the uploaded GeoJSON data
 uploaded_geojson = None
+
 map_1 = "https://raw.githubusercontent.com/yunusserhat/data/main/data/boroughs_count_df_2022_dec.geojson"
 map_2 = "https://raw.githubusercontent.com/yunusserhat/data/main/data/mps_hate_2022_dec_count.geojson"
 map_3 = "https://raw.githubusercontent.com/yunusserhat/data/main/data/mps2022dec_count.geojson"
@@ -49,7 +46,6 @@ if uploaded_file:
     except json.JSONDecodeError:
         st.error("Failed to decode the uploaded file. Please ensure it's a valid GeoJSON format.")
 
-# Create a list of choices for the user to select from
 map_choices = ["Original Map 1", "Original Map 2", "Original Map 3"]
 if uploaded_geojson:
     map_choices.append("Uploaded GeoJSON")
@@ -61,45 +57,43 @@ 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)
 
-# 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(uploaded_geojson)
+        m1.add_data(uploaded_geojson, column=selected_column_1)
     elif selected_map_1 == "Original Map 1":
         m1.add_data(map_1, column=selected_column_1)
     elif selected_map_1 == "Original Map 2":
-        m1.add_data(map_2)
+        m1.add_data(map_2, column=selected_column_1)
     else:
-        m1.add_data(map_3)
+        m1.add_data(map_3, column=selected_column_1)
 
-# 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(uploaded_geojson)
+        m2.add_data(uploaded_geojson, column=selected_column_2)
     elif selected_map_2 == "Original Map 1":
-        m2.add_data(map_1)
+        m2.add_data(map_1, column=selected_column_2)
     elif selected_map_2 == "Original Map 2":
-        m2.add_data(map_2)
+        m2.add_data(map_2, column=selected_column_2)
     else:
-        m2.add_data(map_3)
+        m2.add_data(map_3, column=selected_column_2)
 
-# Additional map configurations and display
 longitude = -0.1
 latitude = 51.50
 zoomlevel = st.number_input("Zoom", 0, 20, 10)
 
 row2_col1, row2_col2 = st.columns([1, 1])
+
 with row2_col1:
     m1.set_center(longitude, latitude, zoomlevel)
 with row2_col2:
     m2.set_center(longitude, latitude, zoomlevel)
 
 row3_col1, row3_col2 = st.columns([1, 1])
+
 with row3_col1:
     m1.to_streamlit()
 with row3_col2: