Update app.py

app.py

@@ -6,6 +6,7 @@ import pandas as pd
 import io
 from PIL import Image
 import numpy as np
+import time
 
 def meters_to_degrees(meters, lat):
     # 緯度1度あたりの距離は常に約111.32km
@@ -20,8 +21,22 @@ 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,
     display_greenery, display_water, display_buildings,
-    display_major_roads, display_medium_roads, display_minor_roads
+    display_major_roads, display_medium_roads, display_minor_roads,
+    progress_bar, time_placeholder
 ):
+    start_time = time.time()
+    current_step = 0
+    total_steps = 2  # 基本のステップ数
+
+    if display_greenery:
+        total_steps += 1
+    if display_water:
+        total_steps += 1
+    if display_buildings:
+        total_steps += 1
+    if display_major_roads or display_medium_roads or display_minor_roads:
+        total_steps += 1
+
     # 中心点の設定
     point = (lat, lon)
     
@@ -35,6 +50,15 @@ def create_artistic_map(
     fig.patch.set_facecolor(bg_color)
     ax.set_facecolor(bg_color)
     
+    # 進捗を更新
+    current_step += 1
+    elapsed_time = time.time() - start_time
+    estimated_total_time = (elapsed_time / current_step) * total_steps
+    remaining_time = estimated_total_time - elapsed_time
+    progress_percent = int((current_step / total_steps) * 100)
+    progress_bar.progress(progress_percent)
+    time_placeholder.text(f"残り時間: 約{int(remaining_time // 60)}分{int(remaining_time % 60)}秒")
+
     # 緑地の描画
     if display_greenery:
         # 緑地データ取得
@@ -57,6 +81,15 @@ def create_artistic_map(
         if greenery_list:
             greenery = pd.concat(greenery_list)
             greenery.plot(ax=ax, facecolor=greenery_color, edgecolor='none')
+
+        # 進捗を更新
+        current_step += 1
+        elapsed_time = time.time() - start_time
+        estimated_total_time = (elapsed_time / current_step) * total_steps
+        remaining_time = estimated_total_time - elapsed_time
+        progress_percent = int((current_step / total_steps) * 100)
+        progress_bar.progress(progress_percent)
+        time_placeholder.text(f"残り時間: 約{int(remaining_time // 60)}分{int(remaining_time % 60)}秒")
     
     # 水域の描画
     if display_water:
@@ -76,6 +109,15 @@ def create_artistic_map(
         if water_list:
             water = pd.concat(water_list)
             water.plot(ax=ax, facecolor=water_color, edgecolor='none')
+
+        # 進捗を更新
+        current_step += 1
+        elapsed_time = time.time() - start_time
+        estimated_total_time = (elapsed_time / current_step) * total_steps
+        remaining_time = estimated_total_time - elapsed_time
+        progress_percent = int((current_step / total_steps) * 100)
+        progress_bar.progress(progress_percent)
+        time_placeholder.text(f"残り時間: 約{int(remaining_time // 60)}分{int(remaining_time % 60)}秒")
     
     # 建物の描画
     if display_buildings:
@@ -87,6 +129,15 @@ def create_artistic_map(
                 building_subset = buildings[buildings['building'] == building_type]
                 building_color = building_colors[i % len(building_colors)]
                 building_subset.plot(ax=ax, facecolor=building_color, edgecolor='none')
+
+        # 進捗を更新
+        current_step += 1
+        elapsed_time = time.time() - start_time
+        estimated_total_time = (elapsed_time / current_step) * total_steps
+        remaining_time = estimated_total_time - elapsed_time
+        progress_percent = int((current_step / total_steps) * 100)
+        progress_bar.progress(progress_percent)
+        time_placeholder.text(f"残り時間: 約{int(remaining_time // 60)}分{int(remaining_time % 60)}秒")
     
     # 道路の描画
     if display_major_roads or display_medium_roads or display_minor_roads:
@@ -99,31 +150,51 @@ def create_artistic_map(
                 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)
-    
+        
             # 中程度の道路の描画
             if display_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)
-    
+        
             # 小規模な道路の描画
             if display_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)
-    
+
+        # 進捗を更新
+        current_step += 1
+        elapsed_time = time.time() - start_time
+        estimated_total_time = (elapsed_time / current_step) * total_steps
+        remaining_time = estimated_total_time - elapsed_time
+        progress_percent = int((current_step / total_steps) * 100)
+        progress_bar.progress(progress_percent)
+        time_placeholder.text(f"残り時間: 約{int(remaining_time // 60)}分{int(remaining_time % 60)}秒")
+        
     # 軸をオフに設定
     ax.axis('off')
-    
+        
     # 表示範囲を設定
     ax.set_xlim([lon - lon_deg, lon + lon_deg])
     ax.set_ylim([lat - lat_deg, lat + lat_deg])
-    
+
+    # 最終処理の進捗を更新
+    current_step += 1
+    progress_percent = int((current_step / total_steps) * 100)
+    progress_bar.progress(progress_percent)
+    time_placeholder.text("最終処理中...")
+
     # バッファに保存して、PIL画像として返す
     buf = io.BytesIO()
     plt.savefig(buf, format='png', bbox_inches='tight', pad_inches=0, dpi=dpi)
     plt.close()
     buf.seek(0)
+    
+    # 進捗を100%に更新
+    progress_bar.progress(100)
+    time_placeholder.text("完了しました！")
+
     return Image.open(buf)
 
 # Streamlit UI
@@ -203,12 +274,15 @@ else:
 
 # マップ生成ボタン
 if st.button("マップを生成"):
-    with st.spinner('マップを生成中...'):
-        map_image = create_artistic_map(
-            lat, lon, distance*1000, dpi, width, height,
-            bg_color, greenery_color, water_color, building_colors,
-            major_road_color, medium_road_color, minor_road_color,
-            display_greenery, display_water, display_buildings,
-            display_major_roads, display_medium_roads, display_minor_roads
-        )
-        st.image(map_image, caption="生成されたアートマップ", use_column_width=True)
+    # 進捗バーと残り時間のプレースホルダーを初期化
+    progress_bar = st.progress(0)
+    time_placeholder = st.empty()
+    map_image = create_artistic_map(
+        lat, lon, distance*1000, dpi, width, height,
+        bg_color, greenery_color, water_color, building_colors,
+        major_road_color, medium_road_color, minor_road_color,
+        display_greenery, display_water, display_buildings,
+        display_major_roads, display_medium_roads, display_minor_roads,
+        progress_bar, time_placeholder
+    )
+    st.image(map_image, caption="生成されたアートマップ", use_column_width=True)