Merge branch 'ZeLonewolf:main' into aaroads

aaroads-wiki · Feb 29, 2024 · e5ce938 · e5ce938
2 parents 0f522da + c3859ce
commit e5ce938
Show file tree

Hide file tree

Showing 15 changed files with 293 additions and 69 deletions.
diff --git a/icons/poi_book_upright.svg b/icons/poi_book_upright.svg
diff --git a/icons/poi_car_repair.svg b/icons/poi_car_repair.svg
diff --git a/icons/poi_car_shop.svg b/icons/poi_car_shop.svg
diff --git a/icons/poi_hostel.svg b/icons/poi_hostel.svg
diff --git a/icons/poi_hotel.svg b/icons/poi_hotel.svg
diff --git a/icons/poi_taxi.svg b/icons/poi_taxi.svg
diff --git a/icons/shield_us_az_scenic.svg b/icons/shield_us_az_scenic.svg
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
@@ -399,6 +399,14 @@
       "doc_url": "https://openmaptiles.org/schema/#poi",
       "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_school.svg"
     },
+    {
+      "key": "amenity",
+      "value": "taxi",
+      "object_types": ["node", "area"],
+      "description": "Taxi stands are marked by an icon representing the front view of a taxi cab.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_taxi.svg"
+    },
     {
       "key": "amenity",
       "value": "kindergarten",
@@ -479,6 +487,38 @@
       "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": "guest_house",
+      "object_types": ["node", "area"],
+      "description": "Guest houses are marked by an icon representing a person laying in a bed.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_hotel.svg"
+    },
+    {
+      "key": "tourism",
+      "value": "hostel",
+      "object_types": ["node", "area"],
+      "description": "Hostels are marked by an icon representing two people laying in a bunk bed.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_hostel.svg"
+    },
+    {
+      "key": "tourism",
+      "value": "hotel",
+      "object_types": ["node", "area"],
+      "description": "Hotels are marked by an icon representing a person laying in a bed.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_hotel.svg"
+    },
+    {
+      "key": "tourism",
+      "value": "motel",
+      "object_types": ["node", "area"],
+      "description": "Motels are marked by an icon representing a person laying in a bed.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_hotel.svg"
+    },
     {
       "key": "tourism",
       "value": "museum",
@@ -487,7 +527,6 @@
       "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",
@@ -496,6 +535,14 @@
       "doc_url": "https://openmaptiles.org/schema/#poi",
       "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_health_cross.svg"
     },
+    {
+      "key": "amenity",
+      "value": "library",
+      "object_types": ["node", "area"],
+      "description": "Libraries are marked by an icon representing a book.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_book_upright.svg"
+    },
     {
       "key": "amenity",
       "value": "parking",
@@ -632,6 +679,22 @@
       "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": "car",
+      "object_types": ["node", "area"],
+      "description": "Car dealerships are marked by an icon representing a front facing vehicle.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_car_shop.svg"
+    },
+    {
+      "key": "shop",
+      "value": "car_repair",
+      "object_types": ["node", "area"],
+      "description": "Car mechanic shops are marked by an icon representing a front facing vehicle with a wrench above it.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_car_repair.svg"
+    },
     {
       "key": "shop",
       "value": "supermarket",

diff --git a/shieldlib/src/screen_gfx.ts b/shieldlib/src/screen_gfx.ts
@@ -5,7 +5,9 @@ import rgba from "color-rgba";
 const defaultFontFamily = '"sans-serif-condensed", "Arial Narrow", sans-serif';
 export const shieldFont = (size: number, fontFamily: string) =>
   `condensed 500 ${size}px ${fontFamily || defaultFontFamily}`;
-export const fontSizeThreshold = 12;
+
+//If a computed shield font size is below this value, choose a wider shield if possible
+export const fontSizeThreshold = 11.8;
 
 // Replaces `sourceVal` with a blend of `lightenVal` and `darkenVal` proportional to the brightness;
 // i.e. white becomes `darkenVal`, black becomes `lightenVal`, and anit-aliased pixels remain anit-aliased