Update app.py

app.py

@@ -5,6 +5,27 @@ import geopandas as gpd
 import pandas as pd
 import io
 from PIL import Image
+import numpy as np
+
+def meters_to_degrees(meters, lat):
+    """
+    Convert meters to degrees for latitude and longitude.
+
+    Parameters:
+    - meters (float): Distance in meters
+    - lat (float): Latitude at which the conversion is done (as the conversion depends on latitude)
+
+    Returns:
+    - lat_deg (float): Change in degrees of latitude
+    - lon_deg (float): Change in degrees of longitude
+    """
+    # 緯度1度あたりの距離は常に約111.32km
+    lat_deg = meters / 111320
+    
+    # 経度1度あたりの距離は緯度によって変わる（赤道では約111.32kmだが、極に近づくと小さくなる）
+    lon_deg = meters / (111320 * np.cos(np.radians(lat)))
+    
+    return lat_deg, lon_deg
 
 def create_artistic_map(lat, lon, distance, dpi, width, height, bg_color, greenery_color, water_color, building_colors, major_road_color, medium_road_color, minor_road_color):
     """
@@ -28,25 +49,23 @@ def create_artistic_map(lat, lon, distance, dpi, width, height, bg_color, greene
     Returns:
     - PIL.Image.Image: Generated map image
     """
-    # Set center point
+    # 中心点の設定
     point = (lat, lon)
 
-    # Add 1.5x buffer to the data acquisition range
-    buffer_distance = distance * 1.5
+    # 距離をもとに緯度経度の幅と高さを計算
+    lat_deg, lon_deg = meters_to_degrees(distance, lat)
 
-    # Get data within the specified range (buffered)
-    G = ox.graph_from_point(point, dist=buffer_distance, network_type='all')
-
-    # Get road data
+    # OSMデータ取得
+    G = ox.graph_from_point(point, dist=distance, network_type='all')
     nodes, edges = ox.graph_to_gdfs(G)
 
-    # Get building data
-    buildings = ox.features_from_point(point, tags={'building': True}, dist=buffer_distance)
+    # 建物データ取得
+    buildings = ox.features_from_point(point, tags={'building': True}, dist=distance)
 
-    # Get water data
-    water = ox.features_from_point(point, tags={'natural': 'water'}, dist=buffer_distance)
+    # 水域データ取得
+    water = ox.features_from_point(point, tags={'natural': 'water'}, dist=distance)
 
-    # Get greenery data (parks, grass, forest, etc.)
+    # 緑地データ取得（公園、草地、森林など）
     greenery_list = []
     greenery_tags = [
         {'leisure': 'park'},
@@ -64,22 +83,22 @@ def create_artistic_map(lat, lon, distance, dpi, width, height, bg_color, greene
     else:
         greenery = gpd.GeoDataFrame()
 
-    # Plot settings
+    # 描画設定
     fig, ax = plt.subplots(figsize=(width, height))
 
-    # Set background color
+    # 背景色を設定
     fig.patch.set_facecolor(bg_color)
     ax.set_facecolor(bg_color)
 
-    # Plot greenery
+    # 緑地の描画
     if not greenery.empty:
         greenery.plot(ax=ax, facecolor=greenery_color, edgecolor='none')
 
-    # Plot water
+    # 水域の描画
     if not water.empty:
         water.plot(ax=ax, facecolor=water_color, edgecolor='none')
 
-    # Plot buildings
+    # 建物の描画
     if not buildings.empty:
         building_types = buildings['building'].unique()
         for i, building_type in enumerate(building_types):
@@ -87,27 +106,31 @@ def create_artistic_map(lat, lon, distance, dpi, width, height, bg_color, greene
             building_color = building_colors[i % len(building_colors)]
             building_subset.plot(ax=ax, facecolor=building_color, edgecolor='none')
 
-    # Plot roads
+    # 道路の描画
     if not edges.empty and 'highway' in edges.columns:
-        # Major roads
+        # 主要道路の描画
         major_roads = edges[edges['highway'].isin(['motorway', 'trunk', 'primary'])]
         if not major_roads.empty:
             major_roads.plot(ax=ax, linewidth=2, edgecolor=major_road_color)
 
-        # Medium roads
+        # 中程度の道路の描画
         medium_roads = edges[edges['highway'].isin(['secondary', 'tertiary'])]
         if not medium_roads.empty:
             medium_roads.plot(ax=ax, linewidth=1.5, edgecolor=medium_road_color)
 
-        # Minor roads
+        # 小規模な道路の描画
         minor_roads = edges[~edges['highway'].isin(['motorway', 'trunk', 'primary', 'secondary', 'tertiary'])]
         if not minor_roads.empty:
             minor_roads.plot(ax=ax, linewidth=1, edgecolor=minor_road_color)
 
-    # Turn off axes
+    # 軸をオフに設定
     ax.axis('off')
 
-    # Save image to buffer and return as a PIL image
+    # 入力された距離をもとに表示範囲を正方形に設定
+    ax.set_xlim([lon - lon_deg, lon + lon_deg])
+    ax.set_ylim([lat - lat_deg, lat + lat_deg])
+
+    # バッファに保存して、PIL画像として返す
     buf = io.BytesIO()
     plt.savefig(buf, format='png', bbox_inches='tight', pad_inches=0, dpi=dpi)
     plt.close()
@@ -115,41 +138,41 @@ def create_artistic_map(lat, lon, distance, dpi, width, height, bg_color, greene
     return Image.open(buf)
 
 # Streamlit UI
-st.title("Customizable Artistic Summer Map Generator")
+st.title("カスタマイズ可能なアートマップジェネレーター")
 
-# Set default values for latitude, longitude, and distance
+# デフォルト値を設定
 default_lat = 35.533283
 default_lon = 139.642000
-default_distance = 100
-
-# User input for latitude, longitude, and distance
-lat = st.number_input("Enter Latitude", value=default_lat, format="%.6f")
-lon = st.number_input("Enter Longitude", value=default_lon, format="%.6f")
-distance = st.slider("Select Distance (meters)", 100, 5000, default_distance)
-
-# Image settings
-dpi = st.slider("Select Image DPI (Resolution)", 72, 600, 300)
-width = st.slider("Select Image Width (in inches)", 5, 30, 20)
-height = st.slider("Select Image Height (in inches)", 5, 30, 20)
-
-# Color settings
-bg_color = st.color_picker("Pick Background Color", "#FAF3E0")
-greenery_color = st.color_picker("Pick Greenery Color", "#80C341")
-water_color = st.color_picker("Pick Water Color", "#45A6FF")
+default_distance = 1000
+
+# ユーザー入力
+lat = st.number_input("緯度を入力してください", value=default_lat, format="%.6f")
+lon = st.number_input("経度を入力してください", value=default_lon, format="%.6f")
+distance = st.slider("距離を選択（メートル）", 100, 5000, default_distance)
+
+# 画像設定
+dpi = st.slider("画像のDPI（解像度）を選択", 72, 600, 300)
+width = st.slider("画像の幅（インチ）を選択", 5, 30, 20)
+height = st.slider("画像の高さ（インチ）を選択", 5, 30, 20)
+
+# 色設定
+bg_color = st.color_picker("背景色を選択", "#FAF3E0")
+greenery_color = st.color_picker("緑地の色を選択", "#80C341")
+water_color = st.color_picker("水域の色を選択", "#45A6FF")
 building_colors = [
-    st.color_picker(f"Pick Color for Buildings Type {i+1}", default_color)
+    st.color_picker(f"建物の色 {i+1}", default_color)
     for i, default_color in enumerate(['#FF6F61', '#FFAB73', '#FFA07A', '#FFD700', '#F08080'])
 ]
-major_road_color = st.color_picker("Pick Major Roads Color", "#FF6347")
-medium_road_color = st.color_picker("Pick Medium Roads Color", "#FF4500")
-minor_road_color = st.color_picker("Pick Minor Roads Color", "#D2691E")
+major_road_color = st.color_picker("主要道路の色を選択", "#FF6347")
+medium_road_color = st.color_picker("中程度の道路の色を選択", "#FF4500")
+minor_road_color = st.color_picker("小規模な道路の色を選択", "#D2691E")
 
-# Generate map when button is pressed
-if st.button("Generate Map"):
-    with st.spinner('Generating map...'):
+# マップ生成ボタン
+if st.button("マップを生成"):
+    with st.spinner('マップを生成中...'):
         map_image = create_artistic_map(
             lat, lon, distance, dpi, width, height,
             bg_color, greenery_color, water_color, building_colors,
             major_road_color, medium_road_color, minor_road_color
         )
-        st.image(map_image, caption="Generated Artistic Map", use_column_width=True)
+        st.image(map_image, caption="生成されたアートマップ", use_column_width=True)