Update app.py

app.py

@@ -97,22 +97,40 @@ def create_artistic_map(lat=None, lon=None, distance=None, polygon=None, dpi=300
         return None
 
     # 建物データ取得
-    buildings = features[features['building'].notnull()]
+    if 'building' in features.columns:
+        buildings = features[features['building'].notnull()]
+    else:
+        buildings = gpd.GeoDataFrame()
 
     # 水域データ取得
-    water = features[features['natural'] == 'water']
-
-    # 緑地データ取得（自然地形など）
-    greenery = features[
-        (features['natural'].notnull()) &
-        (features['natural'] != 'water')
-    ]
+    if 'natural' in features.columns:
+        water = features[features['natural'] == 'water']
+        # 緑地データ取得（自然地形など）
+        greenery = features[(features['natural'].notnull()) & (features['natural'] != 'water')]
+    else:
+        water = gpd.GeoDataFrame()
+        greenery = gpd.GeoDataFrame()
 
     # その他のフィーチャの取得
-    amenities = features[features['amenity'].notnull()]
-    man_made = features[features['man_made'].notnull()]
-    aeroways = features[features['aeroway'].notnull()]
-    waterways = features[features['waterway'].notnull()]
+    if 'amenity' in features.columns:
+        amenities = features[features['amenity'].notnull()]
+    else:
+        amenities = gpd.GeoDataFrame()
+
+    if 'man_made' in features.columns:
+        man_made = features[features['man_made'].notnull()]
+    else:
+        man_made = gpd.GeoDataFrame()
+
+    if 'aeroway' in features.columns:
+        aeroways = features[features['aeroway'].notnull()]
+    else:
+        aeroways = gpd.GeoDataFrame()
+
+    if 'waterway' in features.columns:
+        waterways = features[features['waterway'].notnull()]
+    else:
+        waterways = gpd.GeoDataFrame()
 
     # 描画設定
     fig, ax = plt.subplots(figsize=(width, height))