Update pages/6_Heat island.py

pages/6_Heat island.py

@@ -28,14 +28,14 @@ def compute_difference_geojson(geojson_2013, geojson_2023):
     difference_geojson = {"type": "FeatureCollection", "features": []}
 
     name_to_hot_nights_2013 = {
-        feature['properties']['NAME_EN']: feature['properties']['Hot_Nights']
+        feature['properties']['NAME_EN']: feature['properties']['Hot_nights']
         for feature in geojson_2013['features']
     }
 
     for feature in geojson_2023['features']:
         name_en = feature['properties']['NAME_EN']
         hot_nights_2013 = name_to_hot_nights_2013.get(name_en, 0)
-        hot_nights_2023 = feature['properties']['Hot_Nights']
+        hot_nights_2023 = feature['properties']['Hot_nights']
         difference = hot_nights_2023 - hot_nights_2013
 
         feature['properties']['Difference'] = difference
@@ -47,7 +47,7 @@ def geojson_to_dataframe(geojson_data, year):
     features = geojson_data['features']
     data = {
         'District': [feature['properties']['NAME_EN'] for feature in features],
-        'Hot_Nights': [feature['properties']['Hot_Nights'] for feature in features],
+        'Hot_nights': [feature['properties']['Hot_nights'] for feature in features],
         'Year': [year] * len(features)  # Add year column
     }
     return pd.DataFrame(data)
@@ -55,8 +55,8 @@ def geojson_to_dataframe(geojson_data, year):
 geojson_2013 = load_geojson('ref/2013_hot.geojson')
 geojson_2023 = load_geojson('ref/2023_hot.geojson')
 
-hot_nights_2013 = [feature['properties']['Hot_Nights'] for feature in geojson_2013['features']]
-hot_nights_2023 = [feature['properties']['Hot_Nights'] for feature in geojson_2023['features']]
+hot_nights_2013 = [feature['properties']['Hot_nights'] for feature in geojson_2013['features']]
+hot_nights_2023 = [feature['properties']['Hot_nights'] for feature in geojson_2023['features']]
 all_hot_nights = hot_nights_2013 + hot_nights_2023
 
 colormap = folium.LinearColormap(
@@ -69,31 +69,38 @@ colormap = folium.LinearColormap(
 difference_geojson = compute_difference_geojson(geojson_2013, geojson_2023)
 
 diff_colormap = folium.LinearColormap(
-    colors=['blue', 'lightblue', 'white', 'pink', 'red'],
-    index=[-50, -10, 0, 10, 50],
-    vmin=-50,
+    colors=['blue', 'lightblue', 'white', 'yellow', 'red'],
+    index=[-20, -5, 0, 10, 50],
+    vmin=-20,
     vmax=50,
     caption='Change in Hot Nights'
 )
 
-m = folium.Map(location=[22.35994791346238, 114.15924623933743], zoom_start=11, tiles='https://landsd.azure-api.net/dev/osm/xyz/basemap/gs/WGS84/tile/{z}/{x}/{y}.png?key=f4d3e21d4fc14954a1d5930d4dde3809',attr="Map infortmation from Lands Department")
+m = folium.Map(location=[22.35994791346238, 114.15924623933743], zoom_start=11, tiles='https://landsd.azure-api.net/dev/osm/xyz/basemap/gs/WGS84/tile/{z}/{x}/{y}.png?key=f4d3e21d4fc14954a1d5930d4dde3809', attr="Map information from Lands Department", control_scale=True)
+
 folium.TileLayer(
-        tiles='https://mapapi.geodata.gov.hk/gs/api/v1.0.0/xyz/label/hk/en/wgs84/{z}/{x}/{y}.png',
-        attr="Map infortmation from Lands Department").add_to(m)
+    tiles='https://mapapi.geodata.gov.hk/gs/api/v1.0.0/xyz/label/hk/en/wgs84/{z}/{x}/{y}.png',
+    attr="Map information from Lands Department",
+    overlay=True,
+    name="Labels"
+).add_to(m)
 
 feature_group_2013 = folium.FeatureGroup(name='2013 Hot Nights', show=False)
 feature_group_2023 = folium.FeatureGroup(name='2023 Hot Nights', show=False)
 feature_group_diff = folium.FeatureGroup(name='Change in Hot Nights', show=True)
 
-plot_geojson(feature_group_2013, geojson_2013, 'Hot_Nights', colormap)
-plot_geojson(feature_group_2023, geojson_2023, 'Hot_Nights', colormap)
+plot_geojson(feature_group_2013, geojson_2013, 'Hot_nights', colormap)
+plot_geojson(feature_group_2023, geojson_2023, 'Hot_nights', colormap)
 plot_geojson(feature_group_diff, difference_geojson, 'Difference', diff_colormap)
 
 feature_group_2013.add_to(m)
 feature_group_2023.add_to(m)
 feature_group_diff.add_to(m)
 
-layer_control = folium.LayerControl().add_to(m)
+folium.LayerControl().add_to(m)
+
+colormap.add_to(m)
+diff_colormap.add_to(m)
 
 colormap.add_to(m)
 diff_colormap.add_to(m)
@@ -107,9 +114,9 @@ def plot_combined_box_plot(df):
     fig = px.box(
         df,
         x='Year',
-        y='Hot_Nights',
+        y='Hot_nights',
         title='Hot Nights (2013 vs 2023)',
-        labels={'Hot_Nights': 'Number of Hot Nights', 'Year': 'Year'},
+        labels={'Hot_nights': 'Number of Hot Nights', 'Year': 'Year'},
         color='Year'
     )
     fig.update_layout(
@@ -183,4 +190,4 @@ with col3:
     st.caption(
         'From data from the CO-WIN network, there has been a significant increase in the number of hot nights in Hong Kong. "Hot nights" refers to nights where the temperature remains above 28 degrees. Within the period from 2013 to 2023, 9 districts in Hong Kong have experienced an increase in the frequency of hot nights, the most significant are those in the urban.')
 
-    st.plotly_chart(plot_combined_box_plot(combined_df), use_container_width=True ,height=380)
+    st.plotly_chart(plot_combined_box_plot(combined_df), use_container_width=True ,height=380)