Update app.py

app.py

@@ -7,8 +7,6 @@ treasures = [
     {"name": "寶藏第3個", "lat": 24.956398, "lon": 121.297729},
 ]
 
-found = set()  # 儲存已找到寶藏的 index
-
 def haversine(lat1, lon1, lat2, lon2):
     R = 6371000
     phi1, phi2 = math.radians(lat1), math.radians(lat2)
@@ -18,19 +16,20 @@ def haversine(lat1, lon1, lat2, lon2):
     c = 2 * math.atan2(math.sqrt(a), math.sqrt(1-a))
     return R * c
 
-def check_nearest(lat, lon):
+def check_nearest(lat, lon, found):
     if not lat or not lon:
-        return "❌ 請先取得 GPS", "", ""
+        return "❌ 請先取得 GPS", "", "", found
 
     try:
         lat = float(lat)
         lon = float(lon)
     except:
-        return "❌ 座標格式錯誤", "", ""
+        return "❌ 座標格式錯誤", "", "", found
 
     nearest = None
     nearest_idx = None
     min_distance = float("inf")
+
     for idx, treasure in enumerate(treasures):
         dist = haversine(lat, lon, treasure["lat"], treasure["lon"])
         if dist < min_distance:
@@ -38,14 +37,11 @@ def check_nearest(lat, lon):
             nearest = treasure
             nearest_idx = idx
 
-    if nearest is None:
-        return "❌ 無寶藏", "", ""
-
     dist = haversine(lat, lon, nearest["lat"], nearest["lon"])
     gmap = f"https://www.google.com/maps/dir/{lat},{lon}/{nearest['lat']},{nearest['lon']}"
 
     if dist <= 30 and nearest_idx not in found:
-        found.add(nearest_idx)
+        found.append(nearest_idx)
         status = f"🎯 找到 {nearest['name']}！距離：{dist:.2f} 公尺 ✅"
         html = f"""
         <h3>{nearest['name']} 🎉 已找到！</h3>
@@ -65,7 +61,7 @@ def check_nearest(lat, lon):
         """
 
     progress = f"✅ 已找到：{', '.join([treasures[i]['name'] for i in sorted(found)])}" if found else ""
-    return status, html, progress
+    return status, html, progress, found
 
 with gr.Blocks() as demo:
     gr.Markdown("# 🗺️ GPS 尋寶遊戲")
@@ -101,8 +97,10 @@ with gr.Blocks() as demo:
     status = gr.Markdown()
     link = gr.HTML()
     progress = gr.Markdown()
+    found_state = gr.State([])
 
     btn = gr.Button("🔍 檢查距離 + 導航")
-    btn.click(fn=check_nearest, inputs=[lat, lon], outputs=[status, link, progress])
+    btn.click(fn=check_nearest, inputs=[lat, lon, found_state],
+              outputs=[status, link, progress, found_state])
 
 demo.launch()