modify pages

Home.py

@@ -17,13 +17,21 @@ import numpy as np
 st.set_page_config(layout="wide")
 
 # Data source
-data_links = {
-    "東京都": "https://raw.githubusercontent.com/kunifujiwara/data/master/frac_veg/FRAC_VEG_Tokyo.geojson",
-    "神奈川県": "https://raw.githubusercontent.com/kunifujiwara/data/master/frac_veg/FRAC_VEG_Kanagawa.geojson",
-    "千葉県": "https://raw.githubusercontent.com/kunifujiwara/data/master/frac_veg/FRAC_VEG_Chiba.geojson",
-    "埼玉県": "https://raw.githubusercontent.com/kunifujiwara/data/master/frac_veg/FRAC_VEG_Saitama.geojson",
+prefectures = {
+    "北海道": "Hokkaido", "青森県": "Aomori", "岩手県": "Iwate", "宮城県": "Miyagi", "秋田県": "Akita", 
+    "山形県": "Yamagata", "福島県": "Fukushima", "茨城県": "Ibaraki", "栃木県": "Tochigi", "群馬県": "Gunma", 
+    "埼玉県": "Saitama", "千葉県": "Chiba", "東京都": "Tokyo", "神奈川県": "Kanagawa", "新潟県": "Niigata", 
+    "富山県": "Toyama", "石川県": "Ishikawa", "福井県": "Fukui", "山梨県": "Yamanashi", "長野県": "Nagano", 
+    "岐阜県": "Gifu", "静岡県": "Shizuoka", "愛知県": "Aichi", "三重県": "Mie", "滋賀県": "Shiga", 
+    "京都府": "Kyoto", "大阪府": "Osaka", "兵庫県": "Hyogo", "奈良県": "Nara", "和歌山県": "Wakayama", 
+    "鳥取県": "Tottori", "島根県": "Shimane", "岡山県": "Okayama", "広島県": "Hiroshima", "山口県": "Yamaguchi", 
+    "徳島県": "Tokushima", "香川県": "Kagawa", "愛媛県": "Ehime", "高知県": "Kochi", "福岡県": "Fukuoka", 
+    "佐賀県": "Saga", "長崎県": "Nagasaki", "熊本県": "Kumamoto", "大分県": "Oita", "宮崎県": "Miyazaki", 
+    "鹿児島県": "Kagoshima", "沖縄県": "Okinawa"
 }
 
+data_links = {pref_jp: f"https://raw.githubusercontent.com/kunifujiwara/data/master/frac_veg/FRAC_VEG_{pref_en}.geojson" for pref_jp, pref_en in prefectures.items()}
+
 @st.cache_data
 def get_geom_data(prefecture):
     response = requests.get(data_links[prefecture])
@@ -35,9 +43,6 @@ def get_geom_data(prefecture):
         st.error(f"Failed to fetch data for {prefecture}. Status code: {response.status_code}")
         return None
 
-def get_data_columns(gdf):
-    return gdf.select_dtypes(include=[float, int]).columns.tolist()
-
 def create_discontinuous_colormap(n_colors):
     cmap = plt.get_cmap('Greens')
     colors = [cmap(i / (n_colors - 1)) for i in range(n_colors)]
@@ -69,7 +74,7 @@ def calculate_zoom_level(bbox):
 def app():
     st.title("日本全国緑被率マップ （町丁目別）")
 
-    prefecture = st.selectbox("都道府県", ["東京都", "神奈川県", "千葉県", "埼玉県"])
+    prefecture = st.selectbox("都道府県", list(prefectures.keys()))
     
     gdf = get_geom_data(prefecture)
 
@@ -87,8 +92,7 @@ def app():
     else:
         gdf_filtered = gdf
 
-    attributes = get_data_columns(gdf_filtered)
-    selected_attribute = st.selectbox("指標", attributes)
+    selected_attribute = "FRAC_VEG"
 
     # Custom CSS to create a box around the color scale controls
     st.markdown("""
@@ -104,16 +108,16 @@ def app():
 
     # Color scale controls in an expander
     with st.expander("カラースケール設定", expanded=True):
-        # st.markdown('<div class="color-scale-box">', unsafe_allow_html=True)
+        st.markdown('<div class="color-scale-box">', unsafe_allow_html=True)
         col1, col2, col3, col4 = st.columns(4)
         with col1:
-            n_colors = st.slider("分割数", min_value=2, max_value=20, value=8)
+            n_colors = st.slider("分割数", min_value=2, max_value=20, value=5)
         with col2:
             alpha = st.slider("透過率", min_value=0.0, max_value=1.0, value=0.8, step=0.1)
         with col3:
-            vmin = st.number_input("最小値", value=float(gdf_filtered[selected_attribute].min()), step=0.1)
+            vmin = st.number_input("最小値", value=0.0, step=0.1)
         with col4:
-            vmax = st.number_input("最大値", value=float(gdf_filtered[selected_attribute].max()), step=0.1)
+            vmax = st.number_input("最大値", value=1.0, step=0.1)
         st.markdown('</div>', unsafe_allow_html=True)
 
     # Other controls
@@ -169,7 +173,7 @@ def app():
         layers=[layer],
         initial_view_state=view_state,
         map_style="mapbox://styles/mapbox/light-v9",
-        tooltip={"text": "{CITY_NAME_x}\n{" + selected_attribute + "}"}
+        tooltip={"text": "{CITY_NAME_x} {S_NAME_x}\n{" + selected_attribute + "}: {" + selected_attribute + "}"}
     )
 
     st.pydeck_chart(r)
@@ -185,8 +189,8 @@ def app():
         st.image(f"data:image/png;base64,{legend_img}", caption="Color Scale", use_column_width=True)
 
     if st.checkbox("Show raw data"):
-        st.write(gdf_filtered[['CITY_NAME_x', selected_attribute]])    
-    
+        st.write(gdf_filtered[['CITY_NAME_x', 'S_NAME_x', selected_attribute]])
+            
     st.markdown(        
         """
         **データソース**