Merge branch 'main' into ns-scenic-drives

scripts/taginfo_template.json

@@ -496,6 +496,14 @@
       "doc_url": "https://openmaptiles.org/schema/#poi",
       "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_p.svg"
     },
+    {
+      "key": "amenity",
+      "value": "place_of_worship",
+      "object_types": ["node", "area"],
+      "description": "Places of worship are marked by a square representing a building, topped with a finial representing the religion for common religions.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_generic.svg"
+    },
     {
       "key": "amenity",
       "value": "bus_station",
@@ -552,6 +560,71 @@
       "doc_url": "https://openmaptiles.org/schema/#poi",
       "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_rail.svg"
     },
+    {
+      "key": "religion",
+      "value": "buddhist",
+      "object_types": ["node", "area"],
+      "description": "Buddhist places of worship are marked by an icon representing a building topped by a dharmachakra.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_buddhist.svg"
+    },
+    {
+      "key": "religion",
+      "value": "christian",
+      "object_types": ["node", "area"],
+      "description": "Christian places of worship are marked by an icon representing a building topped by a cross.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_christian.svg"
+    },
+    {
+      "key": "religion",
+      "value": "hindu",
+      "object_types": ["node", "area"],
+      "description": "Hindu places of worship are marked by an icon representing a building topped by an om symbol.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_hindu.svg"
+    },
+    {
+      "key": "religion",
+      "value": "jewish",
+      "object_types": ["node", "area"],
+      "description": "Jewish places of worship are marked by an icon representing a building topped by a star of David.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_jewish.svg"
+    },
+    {
+      "key": "religion",
+      "value": "muslim",
+      "object_types": ["node", "area"],
+      "description": "Muslim places of worship are marked by an icon representing a building topped by a star and crescent.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_muslim.svg"
+    },
+    {
+      "key": "religion",
+      "value": "sikh",
+      "object_types": ["node", "area"],
+      "description": "Sikh places of worship are marked by an icon representing a building topped by a khanda.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_sikh.svg"
+    },
+    {
+      "key": "religion",
+      "value": "shinto",
+      "object_types": ["node", "area"],
+      "description": "Shinto places of worship are marked by an icon representing a building topped by a torii.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_shinto.svg"
+    },
+    {
+      "key": "religion",
+      "value": "taoist",
+      "object_types": ["node", "area"],
+      "description": "Taoist places of worship are marked by an icon representing a building topped by a yin-yang symbol.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_taoist.svg"
+    },
+
     {
       "key": "highway",
       "value": "motorway",

src/layer/poi.js

@@ -84,6 +84,70 @@ var iconDefs = {
     color: Color.poi.infrastructure,
     description: "Police station",
   },
+  pow_buddhist: {
+    classes: {
+      place_of_worship: ["buddhist"],
+    },
+    sprite: "poi_pow_buddhist",
+    color: Color.poi.infrastructure,
+    description: "Buddhist place of worship",
+  },
+  pow_christian: {
+    classes: {
+      place_of_worship: ["christian"],
+    },
+    sprite: "poi_pow_christian",
+    color: Color.poi.infrastructure,
+    description: "Christian place of worship",
+  },
+  pow_hindu: {
+    classes: {
+      place_of_worship: ["hindu"],
+    },
+    sprite: "poi_pow_hindu",
+    color: Color.poi.infrastructure,
+    description: "Hindu place of worship",
+  },
+  pow_jewish: {
+    classes: {
+      place_of_worship: ["jewish"],
+    },
+    sprite: "poi_pow_jewish",
+    color: Color.poi.infrastructure,
+    description: "Jewish place of worship",
+  },
+  pow_muslim: {
+    classes: {
+      place_of_worship: ["muslim"],
+    },
+    sprite: "poi_pow_muslim",
+    color: Color.poi.infrastructure,
+    description: "Muslim place of worship",
+  },
+  pow_sikh: {
+    classes: {
+      place_of_worship: ["sikh"],
+    },
+    sprite: "poi_pow_sikh",
+    color: Color.poi.infrastructure,
+    description: "Sikh place of worship",
+  },
+  pow_shinto: {
+    classes: {
+      place_of_worship: ["shinto"],
+    },
+    sprite: "poi_pow_shinto",
+    color: Color.poi.infrastructure,
+    description: "Shinto place of worship",
+  },
+  pow_taoist: {
+    classes: {
+      place_of_worship: ["taoist"],
+    },
+    sprite: "poi_pow_taoist",
+    color: Color.poi.infrastructure,
+    description: "Taoist place of worship",
+  },
   railway_station: {
     classes: {
       railway: ["station", "halt", "subway"],
@@ -185,7 +249,22 @@ export const poi = {
       Color.poi.transport,
       ["museum"],
       Color.poi.attraction,
-      ["hospital", "parking", "police", "school", "college", "townhall"],
+      [
+        "hospital",
+        "parking",
+        "police",
+        "school",
+        "college",
+        "townhall",
+        ...getSubclasses(iconDefs.pow_christian),
+        ...getSubclasses(iconDefs.pow_buddhist),
+        ...getSubclasses(iconDefs.pow_hindu),
+        ...getSubclasses(iconDefs.pow_jewish),
+        ...getSubclasses(iconDefs.pow_muslim),
+        ...getSubclasses(iconDefs.pow_sikh),
+        ...getSubclasses(iconDefs.pow_shinto),
+        ...getSubclasses(iconDefs.pow_taoist),
+      ],
       Color.poi.infrastructure,
       Color.poi.infrastructure,
     ],
@@ -205,6 +284,14 @@ export const poi = {
         "hospital",
         "museum",
         "police",
+        ...getSubclasses(iconDefs.pow_buddhist),
+        ...getSubclasses(iconDefs.pow_christian),
+        ...getSubclasses(iconDefs.pow_hindu),
+        ...getSubclasses(iconDefs.pow_jewish),
+        ...getSubclasses(iconDefs.pow_muslim),
+        ...getSubclasses(iconDefs.pow_sikh),
+        ...getSubclasses(iconDefs.pow_shinto),
+        ...getSubclasses(iconDefs.pow_taoist),
         ...getSubclasses(iconDefs.school),
         "townhall",
         "tram_stop",