Merge branch 'main' into 1ec5-road-rebuild

osm-americana · Dec 23, 2023 · fbcc605 · fbcc605
2 parents 30e66d6 + 2a585eb
commit fbcc605
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/icons/poi_supermarket.svg b/icons/poi_supermarket.svg
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
@@ -632,7 +632,14 @@
       "doc_url": "https://openmaptiles.org/schema/#poi",
       "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_taoist.svg"
     },
-
+    {
+      "key": "shop",
+      "value": "supermarket",
+      "object_types": ["node", "area"],
+      "description": "Supermarkets are marked by an icon representing a grocery cart.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_supermarket.svg"
+    },
     {
       "key": "highway",
       "value": "motorway",

diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
@@ -3392,10 +3392,10 @@ export function loadShields() {
     34
   );
 
-  // Netherlands
+  // Netherlands, Kingdom of the (European Netherlands, Aruba, and Curacao)
   // https://wiki.openstreetmap.org/wiki/The_Netherlands_road_network
   shields["NL:A"] = roundedRectShield(Color.shields.red, Color.shields.white);
-  shields["NL:N"] = roundedRectShield(
+  shields["NL:N"] = shields["AW:route"] = roundedRectShield(
     Color.shields.yellow,
     Color.shields.black
   );
@@ -3417,7 +3417,7 @@ export function loadShields() {
     "Rotterdam",
     "Zaanstad",
   ].forEach((city) => (shields[`NL:S:${city}`] = nlCityRoute));
-  shields["NL:binnenstedelijke_ring"] = nlCityRoute; // for both Netherlands and Curacao
+  shields["NL:binnenstedelijke_ring"] = nlCityRoute; // for both European Netherlands and Curacao
   [
     "Ommen",
     "Schouwen",

diff --git a/src/layer/poi.js b/src/layer/poi.js
@@ -180,6 +180,14 @@ var iconDefs = {
     color: Color.poi.infrastructure,
     description: "School",
   },
+  supermarket: {
+    classes: {
+      grocery: ["supermarket"],
+    },
+    sprite: "poi_supermarket",
+    color: Color.poi.consumer,
+    description: "Supermarket",
+  },
   college: {
     classes: {
       college: ["college", "university"],
@@ -250,6 +258,7 @@ export const poi = {
         ...getSubclasses(iconDefs.fuel),
         ...getSubclasses(iconDefs.bar),
         ...getSubclasses(iconDefs.coffee),
+        ...getSubclasses(iconDefs.supermarket),
       ],
       Color.poi.consumer,
       [
@@ -306,6 +315,7 @@ export const poi = {
         ...getSubclasses(iconDefs.pow_shinto),
         ...getSubclasses(iconDefs.pow_taoist),
         ...getSubclasses(iconDefs.school),
+        ...getSubclasses(iconDefs.supermarket),
         "townhall",
         "tram_stop",
       ],
@@ -335,7 +345,7 @@ export const poi = {
       [
         "match",
         ["get", "subclass"],
-        ["bus_stop", "tram_stop", "fuel"],
+        ["bus_stop", "tram_stop", "fuel", "supermarket"],
         "",
         label.localizedName,
       ],