Yunus Serhat Bıçakçı commited on
Commit
17daa05
·
1 Parent(s): d57d724
Files changed (1) hide show
  1. pages/4_Test.py +11 -11
pages/4_Test.py CHANGED
@@ -66,7 +66,7 @@ if uploaded_file:
66
  st.error("Failed to decode the uploaded file. Please ensure it's a valid GeoJSON format.")
67
 
68
  # Map Selection
69
- map_choices = ["Original Map 1", "Original Map 2", "Original Map 3"]
70
  if uploaded_geojson:
71
  map_choices.append("Uploaded GeoJSON")
72
 
@@ -75,11 +75,11 @@ selected_map_1 = st.selectbox("Select data for Map 1", map_choices)
75
  # Determine the columns based on the selected dataset for Map 1
76
  if selected_map_1 == "Uploaded GeoJSON" and uploaded_geojson:
77
  available_columns_1 = get_columns_from_geojson(uploaded_geojson)
78
- elif selected_map_1 == "Original Map 1":
79
  available_columns_1 = get_columns_from_url(map_1)
80
- elif selected_map_1 == "Original Map 2":
81
  available_columns_1 = get_columns_from_url(map_2)
82
- elif selected_map_1 == "Original Map 3":
83
  available_columns_1 = get_columns_from_url(map_3)
84
 
85
  selected_column_1 = st.selectbox("Select column for Map 1 visualization", available_columns_1)
@@ -89,11 +89,11 @@ selected_map_2 = st.selectbox("Select data for Map 2", map_choices)
89
  # Determine the columns based on the selected dataset for Map 2
90
  if selected_map_2 == "Uploaded GeoJSON" and uploaded_geojson:
91
  available_columns_2 = get_columns_from_geojson(uploaded_geojson)
92
- elif selected_map_2 == "Original Map 1":
93
  available_columns_2 = get_columns_from_url(map_1)
94
- elif selected_map_2 == "Original Map 2":
95
  available_columns_2 = get_columns_from_url(map_2)
96
- elif selected_map_2 == "Original Map 3":
97
  available_columns_2 = get_columns_from_url(map_3)
98
 
99
  selected_column_2 = st.selectbox("Select column for Map 2 visualization", available_columns_2)
@@ -105,9 +105,9 @@ with row1_col1:
105
  m1 = leafmap.Map(center=[51.50, -0.1], zoom=10)
106
  if selected_map_1 == "Uploaded GeoJSON":
107
  m1.add_data(uploaded_geojson, column=selected_column_1)
108
- elif selected_map_1 == "Original Map 1":
109
  m1.add_data(map_1, column=selected_column_1)
110
- elif selected_map_1 == "Original Map 2":
111
  m1.add_data(map_2, column=selected_column_1)
112
  else:
113
  m1.add_data(map_3, column=selected_column_1)
@@ -116,9 +116,9 @@ with row1_col2:
116
  m2 = leafmap.Map(center=[51.50, -0.1], zoom=10)
117
  if selected_map_2 == "Uploaded GeoJSON":
118
  m2.add_data(uploaded_geojson, column=selected_column_2)
119
- elif selected_map_2 == "Original Map 1":
120
  m2.add_data(map_1, column=selected_column_2)
121
- elif selected_map_2 == "Original Map 2":
122
  m2.add_data(map_2, column=selected_column_2)
123
  else:
124
  m2.add_data(map_3, column=selected_column_2)
 
66
  st.error("Failed to decode the uploaded file. Please ensure it's a valid GeoJSON format.")
67
 
68
  # Map Selection
69
+ map_choices = ["Hate Tweets", "MPS Hate Crime Data", "MPS All Crime Data"]
70
  if uploaded_geojson:
71
  map_choices.append("Uploaded GeoJSON")
72
 
 
75
  # Determine the columns based on the selected dataset for Map 1
76
  if selected_map_1 == "Uploaded GeoJSON" and uploaded_geojson:
77
  available_columns_1 = get_columns_from_geojson(uploaded_geojson)
78
+ elif selected_map_1 == "Hate Tweets":
79
  available_columns_1 = get_columns_from_url(map_1)
80
+ elif selected_map_1 == "MPS Hate Crime Data":
81
  available_columns_1 = get_columns_from_url(map_2)
82
+ elif selected_map_1 == "MPS All Crime Data":
83
  available_columns_1 = get_columns_from_url(map_3)
84
 
85
  selected_column_1 = st.selectbox("Select column for Map 1 visualization", available_columns_1)
 
89
  # Determine the columns based on the selected dataset for Map 2
90
  if selected_map_2 == "Uploaded GeoJSON" and uploaded_geojson:
91
  available_columns_2 = get_columns_from_geojson(uploaded_geojson)
92
+ elif selected_map_2 == "Hate Tweets":
93
  available_columns_2 = get_columns_from_url(map_1)
94
+ elif selected_map_2 == "MPS Hate Crime Data":
95
  available_columns_2 = get_columns_from_url(map_2)
96
+ elif selected_map_2 == "MPS All Crime Data":
97
  available_columns_2 = get_columns_from_url(map_3)
98
 
99
  selected_column_2 = st.selectbox("Select column for Map 2 visualization", available_columns_2)
 
105
  m1 = leafmap.Map(center=[51.50, -0.1], zoom=10)
106
  if selected_map_1 == "Uploaded GeoJSON":
107
  m1.add_data(uploaded_geojson, column=selected_column_1)
108
+ elif selected_map_1 == "Hate Tweets":
109
  m1.add_data(map_1, column=selected_column_1)
110
+ elif selected_map_1 == "MPS Hate Crime Data":
111
  m1.add_data(map_2, column=selected_column_1)
112
  else:
113
  m1.add_data(map_3, column=selected_column_1)
 
116
  m2 = leafmap.Map(center=[51.50, -0.1], zoom=10)
117
  if selected_map_2 == "Uploaded GeoJSON":
118
  m2.add_data(uploaded_geojson, column=selected_column_2)
119
+ elif selected_map_2 == "Hate Tweets":
120
  m2.add_data(map_1, column=selected_column_2)
121
+ elif selected_map_2 == "MPS Hate Crime Data":
122
  m2.add_data(map_2, column=selected_column_2)
123
  else:
124
  m2.add_data(map_3, column=selected_column_2)