Merge branch 'main' into clay-shields-sa-national

osm-americana · Apr 12, 2023 · f1f10a6 · f1f10a6
2 parents 5b7c2d3 + d57077e
commit f1f10a6
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 19 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -376,7 +376,7 @@ For consistency, POI icons use the following color palette:
 | Infrastructure         | Pantone 294     | <img src="doc-img/pantone_294.svg" height=18 width=50 /> Blue               | 0 63 135    | #003f87     |
 | Consumer               | UTexas Orange   | <img src="doc-img/texas_orange.svg" height=18 width=50 /> Orange            | 191 87 0    | #bf5700     |
 | Outdoor                |                 | TBD (green?)                                                                |             |             |
-| Attraction             |                 | TBD (brown?)                                                                |             |             |
+| Attraction             | Pantone 469     | <img src="doc-img/pantone_469.svg" height=18 width=50 /> Brown              | 105 63 35   | #693f23     |
 | Airport                | Medium Purple C | <img src="doc-img/pantone_medium_purple_c.svg" height=18 width=50 /> Purple | 78 0 142    | #4e008e     |
 | Transport              | Pantone 234 C   | <img src="doc-img/pantone_234_c.svg" height=18 width=50 /> Mauve            | 162 0 103   | #a20067     |
 | Knockout               |                 | <img src="doc-img/background.svg" height=18 width=50 /> Lt Grayish Orange   | 249 245 240 | #f9f5f0     |
diff --git a/icons/poi_museum.svg b/icons/poi_museum.svg
diff --git a/icons/poi_school.svg b/icons/poi_school.svg
diff --git a/scripts/fonts.json b/scripts/fonts.json
@@ -23,6 +23,7 @@
     "Noto Sans Myanmar": ["regular", "700"],
     "Noto Sans Oriya": ["regular", "700"],
     "Noto Sans Sinhala": ["regular", "700"],
+    "Noto Sans Symbols": ["regular", "700"],
     "Noto Sans Tamil": ["regular", "700"],
     "Noto Sans Thaana": ["regular", "700"],
     "Noto Serif Tibetan": ["regular", "700"],
@@ -50,7 +51,10 @@
       [126208, 126287],
       [126464, 126719]
     ],
-    "armenian": [[1328, 1423]],
+    "armenian": [
+      [1328, 1423],
+      [64272, 64279]
+    ],
     "bengali": [[2432, 2559]],
     "bopomofo": [
       [12544, 12591],
@@ -80,6 +84,7 @@
       [11648, 11743],
       [43776, 43823]
     ],
+    "fullwidth": [[65280, 65519]],
     "greek": [
       [880, 1023],
       [7936, 8191],
@@ -108,7 +113,7 @@
     ],
     "hebrew": [
       [1424, 1535],
-      [64285, 64331]
+      [64280, 64335]
     ],
     "hiragana": [[12352, 12447]],
     "kanbun": [[12688, 12703]],
@@ -120,15 +125,14 @@
     ],
     "khmer": [[6016, 6911]],
     "latin": [
-      [33, 767],
+      [33, 879],
       [7424, 7615],
       [7680, 7935],
-      [8304, 8591],
+      [8192, 8591],
       [11360, 11391],
       [42784, 43007],
       [43824, 43887],
-      [64256, 64335],
-      [65280, 65519],
+      [64256, 64271],
       [67456, 67519],
       [122624, 122879]
     ],
@@ -137,6 +141,7 @@
     "oriya": [[2816, 2943]],
     "sinhala": [[3456, 3583]],
     "space": [[32, 32]],
+    "symbols": [[8592, 8703]],
     "tamil": [[2944, 3071]],
     "telugu": [[3072, 3199]],
     "thaana": [[1920, 1983]],
@@ -152,7 +157,7 @@
       },
       {
         "file": "MPlusRounded1C-regular",
-        "ranges": ["hiragana", "kanbun", "katakana"]
+        "ranges": ["fullwidth", "hiragana", "kanbun", "katakana"]
       },
       {
         "file": "NotoSansArabic-regular",
@@ -226,6 +231,10 @@
         "file": "NotoSansSinhala-regular",
         "ranges": ["sinhala"]
       },
+      {
+        "file": "NotoSansSymbols-regular",
+        "ranges": ["symbols"]
+      },
       {
         "file": "NotoSansTamil-regular",
         "ranges": ["tamil"]
@@ -262,7 +271,7 @@
       },
       {
         "file": "MPlusRounded1C-700",
-        "ranges": ["hiragana", "kanbun", "katakana"]
+        "ranges": ["fullwidth", "hiragana", "kanbun", "katakana"]
       },
       {
         "file": "NotoSansArabic-700",
@@ -336,6 +345,10 @@
         "file": "NotoSansSinhala-700",
         "ranges": ["sinhala"]
       },
+      {
+        "file": "NotoSansSymbols-700",
+        "ranges": ["symbols"]
+      },
       {
         "file": "NotoSansTamil-700",
         "ranges": ["tamil"]
@@ -372,7 +385,7 @@
       },
       {
         "file": "MPlusRounded1C-regular",
-        "ranges": ["hiragana", "kanbun", "katakana"]
+        "ranges": ["fullwidth", "hiragana", "kanbun", "katakana"]
       },
       {
         "file": "NotoSansArabic-regular",
@@ -446,6 +459,10 @@
         "file": "NotoSansSinhala-regular",
         "ranges": ["sinhala"]
       },
+      {
+        "file": "NotoSansSymbols-regular",
+        "ranges": ["symbols"]
+      },
       {
         "file": "NotoSansTamil-regular",
         "ranges": ["tamil"]
@@ -482,7 +499,7 @@
       },
       {
         "file": "MPlusRounded1C-700",
-        "ranges": ["hiragana", "kanbun", "katakana"]
+        "ranges": ["fullwidth", "hiragana", "kanbun", "katakana"]
       },
       {
         "file": "NotoSansArabic-700",
@@ -556,6 +573,10 @@
         "file": "NotoSansSinhala-700",
         "ranges": ["sinhala"]
       },
+      {
+        "file": "NotoSansSymbols-700",
+        "ranges": ["symbols"]
+      },
       {
         "file": "NotoSansTamil-700",
         "ranges": ["tamil"]

diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
@@ -463,6 +463,15 @@
       "doc_url": "https://openmaptiles.org/schema/#poi",
       "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_town_hall.svg"
     },
+    {
+      "key": "tourism",
+      "value": "museum",
+      "object_types": ["node", "area"],
+      "description": "Museums are marked by an icon representing a Classical columned building.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_museum.svg"
+    },
+
     {
       "key": "amenity",
       "value": "clinic",

diff --git a/src/constants/color.js b/src/constants/color.js
@@ -81,7 +81,7 @@ export const poi = {
   infrastructure: palette.blue,
   consumer: palette.texas_orange,
   //outdoor:
-  //attraction:
+  attraction: palette.brown,
   airport: `hsl(${hue.airport}, 100%, 28%)`,
   transport: palette.mauve,
 };
diff --git a/src/layer/poi.js b/src/layer/poi.js
@@ -52,6 +52,14 @@ var iconDefs = {
     color: Color.poi.infrastructure,
     description: "Doctor's office or clinic",
   },
+  museum: {
+    classes: {
+      museum: ["museum"],
+    },
+    sprite: "poi_museum",
+    color: Color.poi.attraction,
+    description: "Museum",
+  },
   parking: {
     classes: {
       parking: ["parking"],
@@ -62,19 +70,19 @@ var iconDefs = {
   },
   railway_station: {
     classes: {
-      railway: ["station", "subway"],
+      railway: ["station", "halt", "subway"],
     },
     sprite: "poi_rail_circle",
     color: Color.poi.transport,
     description: "Train or subway station",
   },
   railway_stop: {
     classes: {
-      railway: ["halt", "tram_stop"],
+      railway: ["tram_stop"],
     },
     sprite: "poi_rail",
     color: Color.poi.transport,
-    description: "Tram stop or train halt",
+    description: "Tram stop",
   },
   school: {
     classes: {
@@ -152,6 +160,8 @@ export const poi = {
         ...getSubclasses(iconDefs.railway_stop),
       ],
       Color.poi.transport,
+      ["museum"],
+      Color.poi.attraction,
       ["hospital", "parking", "school", "townhall"],
       Color.poi.infrastructure,
       Color.poi.infrastructure,
@@ -163,17 +173,17 @@ export const poi = {
     [
       "match",
       ["get", "subclass"],
-      ["station"],
+      ["station", "halt"],
       12,
       ["bus_station", "subway"],
       14,
       [
         "bus_stop",
-        "halt",
         "hospital",
-        "tram_stop",
+        "museum",
         ...getSubclasses(iconDefs.school),
         "townhall",
+        "tram_stop",
       ],
       15,
       [...getSubclasses(iconDefs.bar), ...getSubclasses(iconDefs.coffee)],