parks: 都営住宅内の公園を追加し、OSM重複24件を統合

2 files changed, 24 insertions, 7 deletions

diff --git a/src/components/ParkMap.astro b/src/components/ParkMap.astro
index 8fdf5bf..6de92f8 100644
--- a/src/components/ParkMap.astro
+++ b/src/components/ParkMap.astro
@@ -274,13 +274,15 @@
       if (owner && owner !== "小平市") ownerByName.set(name, owner);
     });
     const ownerLabel = (owner: string) =>
-      owner === "東京都"
-        ? "都立"
-        : owner.includes("UR")
-          ? "UR"
-          : owner.includes("民間")
-            ? "民間"
-            : owner;
+      owner.includes("都営")
+        ? "都営"
+        : owner === "東京都"
+          ? "都立"
+          : owner.includes("UR")
+            ? "UR"
+            : owner.includes("民間")
+              ? "民間"
+              : owner;
 
     const filterName = (name: string, scroll = false) => {
       document.dispatchEvent(
diff --git a/src/components/ParksTable.astro b/src/components/ParksTable.astro
index b6537ab..d83ab48 100644
--- a/src/components/ParksTable.astro
+++ b/src/components/ParksTable.astro
@@ -26,6 +26,8 @@ const TYPE_LABEL: Record<string, string> = {
   広域: "広域公園",
   広場: "広場",
   緑地: "緑地",
+  団地内公園: "団地内公園",
+  児童遊園: "児童遊園",
 };
 const TYPE_CLASS: Record<string, string> = {
   街区: "parks-type--block",
@@ -34,16 +36,20 @@ const TYPE_CLASS: Record<string, string> = {
   広域: "parks-type--wide",
   広場: "parks-type--open",
   緑地: "parks-type--green",
+  団地内公園: "parks-type--danchi",
+  児童遊園: "parks-type--jidou",
 };
 
 // 市立以外の公園に付けるバッジ（設置者が空欄なら市立として扱う）。
 function ownerLabel(owner: string): string {
+  if (owner.includes("都営")) return "都営";
   if (owner === "東京都") return "都立";
   if (owner.includes("UR")) return "UR";
   if (owner.includes("民間")) return "民間";
   return owner;
 }
 function ownerClass(owner: string): string {
+  if (owner.includes("都営")) return "parks-owner--toei";
   if (owner === "東京都") return "parks-owner--tokyo";
   if (owner === "未確認") return "parks-owner--unknown";
   return "parks-owner--other";
@@ -425,6 +431,9 @@ const total = parks.length;
   .parks-owner--tokyo {
     color: #2e7d32;
   }
+  .parks-owner--toei {
+    color: #1565c0;
+  }
   .parks-owner--other {
     color: #6d4c41;
   }
@@ -519,6 +528,12 @@ const total = parks.length;
   .parks-type--green {
     --type-color: #43a047;
   }
+  .parks-type--danchi {
+    --type-color: #546e7a;
+  }
+  .parks-type--jidou {
+    --type-color: #d81b60;
+  }
   .parks .is-facility {
     white-space: normal;
     min-width: 12rem;