update

pages/4_Test.py

@@ -1,39 +1,141 @@
-import folium
-import matplotlib.pyplot as plt
-import pandas as pd
-
-boroughs_count_2022_dec_df = "https://raw.githubusercontent.com/yunusserhat/data/main/data/boroughs_count_df_2022_dec.geojson"
-data_dict = boroughs_count_2022_dec_df.set_index("geo.name")["count"].to_dict()
-
-# Initialize the map centered around London
-m = folium.Map(location=[51.5074, -0.1278], zoom_start=10)
-
-boroughs_count_2022_dec_df = "https://raw.githubusercontent.com/yunusserhat/data/main/data/boroughs_count_df_2022_dec.geojson"
-
-# Choropleth map for Hate Tweets by Borough
-folium.Choropleth(
-    geo_data=boroughs_count_2022_dec_df,
-    data=data_dict,
-    columns=["geo.name", "count"],
-    key_on="feature.properties.geo.name",
-    fill_color="YlOrRd",
-    fill_opacity=0.7,
-    line_opacity=0.2,
-    legend_name="Number of Hate Tweets by Borough",
-    name="Hate Tweets",
-    highlight=True
-).add_to(m)
-
-# Adding popups to each borough
-for idx, row in boroughs_count_2022_dec_df.iterrows():
-    popup_content = f"<strong>{row['geo.name']}</strong><br>Number of Hate Tweets: {row['count']}"
-    folium.Popup(popup_content).add_to(
-        folium.GeoJson(row['geometry']).add_to(m)
+import streamlit as st
+import leafmap.foliumap as leafmap
+import leafmap.colormaps as cm
+
+st.set_page_config(layout="wide")
+
+st.sidebar.info(
+    """
+    - Web App URL: <https://interactive-crime-map.hf.space/>
+    - HuggingFace repository: <https://huggingface.co/spaces/interactive-crime/map/tree/main>
+    """
+)
+
+import json
+
+# 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
+
+if uploaded_file:
+    try:
+        # Read the uploaded file and parse as JSON (GeoJSON is a subset of JSON)
+        uploaded_geojson = json.load(uploaded_file)
+
+        # Basic validation (checking if it's a valid GeoJSON format)
+        if "features" not in uploaded_geojson:
+            st.warning("The uploaded file does not seem to be a valid GeoJSON format.")
+            uploaded_geojson = None
+        else:
+            st.success("GeoJSON file uploaded successfully!")
+
+    except json.JSONDecodeError:
+        st.error("Failed to decode the uploaded file. Please ensure it's a valid GeoJSON format.")
+
+# Assuming there are two maps in the original app.
+# Let's create a dropdown for each map to select which data to display.
+
+map_choices = ["Original Map 1", "Original Map 2"]
+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)
+
+if selected_map_1 == "Uploaded GeoJSON":
+    # Display the uploaded GeoJSON data on Map 1
+    # You'll need to integrate this with the leafmap.foliumap methods you use
+    st.write("Display uploaded GeoJSON on Map 1")
+
+elif selected_map_1 == "Original Map 1":
+    # Display the original Map 1
+    # This should be the code from your original app that displays the first map
+    st.write("Display original Map 1")
+
+# ... Similarly for Map 2 and any other maps you have
+
+# Rest of the application logic follows...
+
+
+st.sidebar.title("Contact")
+st.sidebar.info(
+    """
+    Yunus Serhat Bıçakçı at [yunusserhat.com](https://yunusserhat.com) | [GitHub](https://github.com/yunusserhat) | [Twitter](https://twitter.com/yunusserhat) | [LinkedIn](https://www.linkedin.com/in/yunusserhat)
+    """
+)
+
+st.title("Comparision of Hate Tweets, Hate Crime Rates and Total Crime Rates")
+st.markdown(
+    """
+    These interactive maps illustrate a comparison of overall borough-level rates based on Twitter and London Metropolitan Police Service (MPS) data as of December 2022.
+
+    In the first map shows the representation of hate tweets according to Twitter data, while the second and third maps shows the representation of rates of hate and all crimes according to MPS data.
+    """
+)
+
+row1_col1, row1_col2, row1_col3 = st.columns([1, 1, 1])
+
+# Twitter Hate Tweets Map
+with row1_col1:
+    twitter = "https://raw.githubusercontent.com/yunusserhat/data/main/data/boroughs_count_df_2022_dec.geojson"
+    m1 = leafmap.Map(center=[51.50, -0.1], zoom=10)
+    m1.add_data(
+        twitter,
+        column="count",
+        scheme='Quantiles',
+        cmap='YlOrRd',
+        legend_title='Total Hate Tweet Number'
+    )
+
+# MPS Hate Crimes Map
+with row1_col2:
+    mps_hate = "https://raw.githubusercontent.com/yunusserhat/data/main/data/mps_hate_2022_dec_count.geojson"
+    m2 = leafmap.Map(center=[51.50, -0.1], zoom=10)
+    m2.add_data(
+        mps_hate,
+        column="Hate_Crime_Number",
+        scheme='Quantiles',
+        cmap='YlOrRd',
+        legend_title='Hate Crime Number'
     )
 
-# Adding a layer control
-folium.LayerControl().add_to(m)
+# MPS Total Crimes Map
+with row1_col3:
+    mps_total = "https://raw.githubusercontent.com/yunusserhat/data/main/data/mps2022dec_count.geojson"
+    m3 = leafmap.Map(center=[51.50, -0.1], zoom=10)
+    m3.add_data(
+        mps_total,
+        column="Crime_Number",
+        scheme='Quantiles',
+        cmap='YlOrRd',
+        legend_title='Total Crime Number'
+    )
+
+row2_col1, row2_col2, row2_col3 = st.columns([1, 1, 1])
+
+# Setting the zoom and center for each map
+longitude = -0.1
+latitude = 51.50
+zoomlevel = st.number_input("Zoom", 0, 20, 10)
+
+with row2_col1:
+    m1.set_center(longitude, latitude, zoomlevel)
+
+with row2_col2:
+    m2.set_center(longitude, latitude, zoomlevel)
+
+with row2_col3:
+    m3.set_center(longitude, latitude, zoomlevel)
+
+row3_col1, row3_col2, row3_col3 = st.columns([1, 1, 1])
+
+with row3_col1:
+    m1.to_streamlit()
 
-# Displaying the map
-m.to_streamlit()
+with row3_col2:
+    m2.to_streamlit()
 
+with row3_col3:
+    m3.to_streamlit()