1 files changed, 37 insertions, 4 deletions

diff --git a/src/components/ParkMap.astro b/src/components/ParkMap.astro
index 7ca85ab..ac85c0e 100644
--- a/src/components/ParkMap.astro
+++ b/src/components/ParkMap.astro
@@ -629,7 +629,21 @@
         lyr._parkName = ourName;
         lyr._osmName = name;
         allLayers.push(lyr);
-        if (ourName) layersByName.set(ourName, lyr);
+        if (ourName) {
+          const existing = layersByName.get(ourName);
+          if (!existing) {
+            layersByName.set(ourName, lyr);
+          } else if (
+            typeof existing.getLayers === "function" &&
+            typeof existing.addLayer === "function"
+          ) {
+            existing.addLayer(lyr);
+          } else {
+            const group = L.featureGroup([existing, lyr]);
+            group._osmName = existing._osmName;
+            layersByName.set(ourName, group);
+          }
+        }
 
         if (ourName) {
           lyr.on("add", () => {
@@ -760,6 +774,25 @@
     addFacilities(nearbyFacilities as any[], true);
     publicFacilityLayer.addTo(map);
 
+    // 道路で分かれた公園など、同じ公園に複数のポリゴンがある場合は
+    // いちばん大きいポリゴンの中心にアイコンを置く。
+    const centerOfLayer = (lyr: any) => {
+      if (lyr && typeof lyr.getLayers === "function") {
+        let best: any = null;
+        let bestArea = -1;
+        for (const child of lyr.getLayers()) {
+          const b = child.getBounds();
+          const area = (b.getNorth() - b.getSouth()) * (b.getEast() - b.getWest());
+          if (area > bestArea) {
+            bestArea = area;
+            best = child;
+          }
+        }
+        if (best) return best.getBounds().getCenter();
+      }
+      return lyr.getBounds().getCenter();
+    };
+
     // 拡大時だけ表示する設備アイコン（トイレ・水飲み場）
     // 一覧と一致した公園のポリゴン内にだけ表示する。
     const facilityLayer = L.layerGroup();
@@ -778,7 +811,7 @@
         );
       }
       const clock = (p["時計"] || "").trim();
-      if (clock === "○" || clock === "あり" || clock === "有") {
+      if (clock === "○" || clock === "あり" || clock === "有" || clock === "1") {
         icons.push(
           '<span class="park-fac park-fac-clock" title="時計あり" aria-label="時計あり">⏰</span>',
         );
@@ -795,7 +828,7 @@
         );
       }
       if (!icons.length) return;
-      const center = lyr.getBounds().getCenter();
+      const center = centerOfLayer(lyr);
       L.marker([center.lat, center.lng], {
         icon: L.divIcon({
           className: "park-fac-markers",
@@ -854,7 +887,7 @@
         );
       }
       if (!icons.length) return;
-      const center = lyr.getBounds().getCenter();
+      const center = centerOfLayer(lyr);
       L.marker([center.lat, center.lng], {
         icon: L.divIcon({
           className: "park-play-markers",