diff options
Diffstat (limited to 'src/data/parks-rows.ts')
| -rw-r--r-- | src/data/parks-rows.ts | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/data/parks-rows.ts b/src/data/parks-rows.ts index 39d7ae0..26ba50d 100644 --- a/src/data/parks-rows.ts +++ b/src/data/parks-rows.ts @@ -21,7 +21,7 @@ function nearbyCentroid(feature: any): [number, number] { } function mapsQueryForNearby(name: string, city: string): string { - return name ? (city && !name.includes(city) ? `${city}${name}` : name) : ""; + return name ? (city && !name.startsWith(city) ? `${city}${name}` : name) : ""; } // 「小平市小川町2-1325」→「小川町」。公共施設の住所から町名を取り出す。 @@ -51,8 +51,7 @@ const nearbyRows: Park[] = ((nearbyData as any).features ?? []).map((f: any) => "水飲み場": "", "ベンチ・椅子": "", "テーブル": "", - "パーゴラ": "", - "東屋": "", + "シェルター等": String(p["シェルター等"] || ""), "防災用具": "", "ボール遊び": "", "遊具": "", @@ -66,6 +65,7 @@ const nearbyRows: Park[] = ((nearbyData as any).features ?? []).map((f: any) => "設置者": "市外", "状態": "", "地図キー": p.key || `${p.osm_type || ""}/${p.osm_id || ""}`, + "時計": String(p["時計"] || ""), "地図URL": `https://www.google.com/maps/search/?api=1&query=${encodeURIComponent(mapsQuery)}`, }; }); @@ -79,7 +79,11 @@ function facilityRow(f: any, nearby: boolean): Park { const hours = f.hours ? `開館 ${f.hours}` : ""; const closed = f.closed ? `休館 ${f.closed}` : ""; const note = [type, hours, closed, f.note].filter(Boolean).join("。"); - const mapsQuery = nearby ? mapsQueryForNearby(name, city) : `小平市${name}`; + const mapsQuery = nearby + ? mapsQueryForNearby(name, city) + : name.startsWith("小平市") + ? name + : `小平市${name}`; const toilet = f.toilet === "○" ? "○" : ""; const water = f.water === "○" ? "○" : ""; return { @@ -95,8 +99,7 @@ function facilityRow(f: any, nearby: boolean): Park { "給水": water, "ベンチ・椅子": "", "テーブル": "", - "パーゴラ": "", - "東屋": "", + "シェルター等": String(f["シェルター等"] || ""), "防災用具": "", "ボール遊び": "", "遊具": "", |