Prefix non-POI images by their role

Author: quincylvania

js/styleGenerator.js

@@ -638,7 +638,7 @@ export function generateStyle(baseStyleJsonString, travelMode, lens) {
       },
       "paint": {
         "line-width": lineWidth,
-        "line-pattern": ["image", "disallowed-stripes"],
+        "line-pattern": ["image", "stroke-disallowed-stripes"],
       }
     });
     addTrailLayer({
@@ -1340,9 +1340,9 @@ export function generateStyle(baseStyleJsonString, travelMode, lens) {
         ["has", key],
         [
           "case",
-          ["==", ["get", key], "yes"], ["image", "arrow-right"],
-          ["==", ["get", key], "-1"], ["image", "arrow-left"],
-          ["in", ["get", key], ["literal", ["alternating", "reversible"]]], ["image", "arrows-leftright"],
+          ["==", ["get", key], "yes"], ["image", "oneway-arrow-right"],
+          ["==", ["get", key], "-1"], ["image", "oneway-arrow-left"],
+          ["in", ["get", key], ["literal", ["alternating", "reversible"]]], ["image", "oneway-arrows-leftright"],
           ""
         ]
       ]);
@@ -1363,7 +1363,7 @@ export function generateStyle(baseStyleJsonString, travelMode, lens) {
           // unless they're tidal
           ["!=", ["get", "tidal"], "yes"],
         ],
-        ["image", "arrow-right"],
+        ["image", "oneway-arrow-right"],
         "",
       ]);
 

style/basestyle.json

@@ -56,7 +56,7 @@
         ["in", "class", "military"]
       ],
       "layout": {"visibility": "visible"},
-      "paint": {"fill-pattern": ["image", "restricted-zone"], "fill-opacity": 1}
+      "paint": {"fill-pattern": ["image", "fill-restricted-zone"], "fill-opacity": 1}
     },
     {
       "id": "hillshade-background",

style/sprites/opentrailmap.json

@@ -1 +1 @@
-{"access_point":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":128},"access_point-minor":{"height":18,"pixelRatio":1,"width":18,"x":92,"y":202},"access_point-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":152},"arrow-left":{"height":15,"pixelRatio":1,"width":23,"x":90,"y":172},"arrow-right":{"height":15,"pixelRatio":1,"width":23,"x":92,"y":187},"arrows-leftright":{"height":15,"pixelRatio":1,"width":33,"x":80,"y":80},"beaver_dam":{"height":23,"pixelRatio":1,"width":21,"x":80,"y":95},"beaver_dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":176},"beaver_dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":200},"bird_refuge":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":0},"bison_refuge":{"height":32,"pixelRatio":1,"width":32,"x":32,"y":0},"cairn":{"height":24,"pixelRatio":1,"width":18,"x":104,"y":52},"campground":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":224},"campground-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":128},"campsite":{"height":20,"pixelRatio":1,"width":24,"x":104,"y":32},"caravan_site":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":32},"caravan_site-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":56},"dam":{"height":18,"pixelRatio":1,"width":18,"x":101,"y":95},"dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":80},"dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":104},"disallowed-stripes":{"height":6,"pixelRatio":1,"width":7,"x":80,"y":118},"ferry":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":152},"ferry-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":176},"forest_reserve":{"height":32,"pixelRatio":1,"width":32,"x":64,"y":0},"game_land":{"height":32,"pixelRatio":1,"width":32,"x":96,"y":0},"grassland_reserve":{"height":32,"pixelRatio":1,"width":32,"x":128,"y":0},"guidepost":{"height":24,"pixelRatio":1,"width":18,"x":72,"y":152},"lean_to":{"height":20,"pixelRatio":1,"width":18,"x":90,"y":152},"lock":{"height":23,"pixelRatio":1,"width":14,"x":96,"y":118},"lock-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":200},"lock-hazard":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":224},"nature_reserve":{"height":32,"pixelRatio":1,"width":32,"x":160,"y":0},"park":{"height":32,"pixelRatio":1,"width":32,"x":192,"y":0},"peak":{"height":18,"pixelRatio":1,"width":22,"x":72,"y":220},"protected_area":{"height":32,"pixelRatio":1,"width":32,"x":224,"y":0},"question":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":128},"ranger_station":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":32},"ranger_station-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":56},"restricted-zone":{"height":4,"pixelRatio":1,"width":4,"x":80,"y":124},"route_marker":{"height":24,"pixelRatio":1,"width":18,"x":72,"y":176},"slipway-canoe":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":80},"slipway-canoe-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":104},"slipway-canoe-trailer":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":152},"slipway-canoe-trailer-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":176},"streamgage":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":200},"trailhead":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":224},"trailhead-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":72,"y":128},"viewpoint":{"height":16,"pixelRatio":1,"width":22,"x":72,"y":238},"waterfall":{"height":20,"pixelRatio":1,"width":20,"x":72,"y":200},"waterfall-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":32},"waterfall-hazard":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":56},"watershed_reserve":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":32},"wilderness_preserve":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":64},"wildlife_refuge":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":96}}
+{"access_point":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":128},"access_point-minor":{"height":18,"pixelRatio":1,"width":18,"x":92,"y":202},"access_point-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":152},"beaver_dam":{"height":23,"pixelRatio":1,"width":21,"x":80,"y":95},"beaver_dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":176},"beaver_dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":200},"bird_refuge":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":0},"bison_refuge":{"height":32,"pixelRatio":1,"width":32,"x":32,"y":0},"cairn":{"height":24,"pixelRatio":1,"width":18,"x":104,"y":52},"campground":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":224},"campground-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":128},"campsite":{"height":20,"pixelRatio":1,"width":24,"x":104,"y":32},"caravan_site":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":32},"caravan_site-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":56},"dam":{"height":18,"pixelRatio":1,"width":18,"x":101,"y":95},"dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":80},"dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":104},"ferry":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":152},"ferry-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":176},"fill-restricted-zone":{"height":4,"pixelRatio":1,"width":4,"x":80,"y":124},"forest_reserve":{"height":32,"pixelRatio":1,"width":32,"x":64,"y":0},"game_land":{"height":32,"pixelRatio":1,"width":32,"x":96,"y":0},"grassland_reserve":{"height":32,"pixelRatio":1,"width":32,"x":128,"y":0},"guidepost":{"height":24,"pixelRatio":1,"width":18,"x":72,"y":152},"lean_to":{"height":20,"pixelRatio":1,"width":18,"x":90,"y":152},"lock":{"height":23,"pixelRatio":1,"width":14,"x":96,"y":118},"lock-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":200},"lock-hazard":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":224},"nature_reserve":{"height":32,"pixelRatio":1,"width":32,"x":160,"y":0},"oneway-arrow-left":{"height":15,"pixelRatio":1,"width":23,"x":90,"y":172},"oneway-arrow-right":{"height":15,"pixelRatio":1,"width":23,"x":92,"y":187},"oneway-arrows-leftright":{"height":15,"pixelRatio":1,"width":33,"x":80,"y":80},"park":{"height":32,"pixelRatio":1,"width":32,"x":192,"y":0},"peak":{"height":18,"pixelRatio":1,"width":22,"x":72,"y":220},"protected_area":{"height":32,"pixelRatio":1,"width":32,"x":224,"y":0},"question":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":128},"ranger_station":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":32},"ranger_station-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":56},"route_marker":{"height":24,"pixelRatio":1,"width":18,"x":72,"y":176},"slipway-canoe":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":80},"slipway-canoe-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":104},"slipway-canoe-trailer":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":152},"slipway-canoe-trailer-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":176},"streamgage":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":200},"stroke-disallowed-stripes":{"height":6,"pixelRatio":1,"width":7,"x":80,"y":118},"trailhead":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":224},"trailhead-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":72,"y":128},"viewpoint":{"height":16,"pixelRatio":1,"width":22,"x":72,"y":238},"waterfall":{"height":20,"pixelRatio":1,"width":20,"x":72,"y":200},"waterfall-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":32},"waterfall-hazard":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":56},"watershed_reserve":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":32},"wilderness_preserve":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":64},"wildlife_refuge":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":96}}

style/sprites/opentrailmap@2x.json

@@ -1 +1 @@
-{"access_point":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":256},"access_point-minor":{"height":36,"pixelRatio":2,"width":36,"x":184,"y":404},"access_point-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":304},"arrow-left":{"height":30,"pixelRatio":2,"width":46,"x":180,"y":344},"arrow-right":{"height":30,"pixelRatio":2,"width":46,"x":184,"y":374},"arrows-leftright":{"height":30,"pixelRatio":2,"width":66,"x":160,"y":160},"beaver_dam":{"height":46,"pixelRatio":2,"width":42,"x":160,"y":190},"beaver_dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":352},"beaver_dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":400},"bird_refuge":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":0},"bison_refuge":{"height":64,"pixelRatio":2,"width":64,"x":64,"y":0},"cairn":{"height":48,"pixelRatio":2,"width":36,"x":208,"y":104},"campground":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":448},"campground-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":256},"campsite":{"height":40,"pixelRatio":2,"width":48,"x":208,"y":64},"caravan_site":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":64},"caravan_site-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":112},"dam":{"height":36,"pixelRatio":2,"width":36,"x":202,"y":190},"dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":160},"dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":208},"disallowed-stripes":{"height":12,"pixelRatio":2,"width":14,"x":160,"y":236},"ferry":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":304},"ferry-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":352},"forest_reserve":{"height":64,"pixelRatio":2,"width":64,"x":128,"y":0},"game_land":{"height":64,"pixelRatio":2,"width":64,"x":192,"y":0},"grassland_reserve":{"height":64,"pixelRatio":2,"width":64,"x":256,"y":0},"guidepost":{"height":48,"pixelRatio":2,"width":36,"x":144,"y":304},"lean_to":{"height":40,"pixelRatio":2,"width":36,"x":180,"y":304},"lock":{"height":46,"pixelRatio":2,"width":28,"x":192,"y":236},"lock-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":400},"lock-hazard":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":448},"nature_reserve":{"height":64,"pixelRatio":2,"width":64,"x":320,"y":0},"park":{"height":64,"pixelRatio":2,"width":64,"x":384,"y":0},"peak":{"height":36,"pixelRatio":2,"width":44,"x":144,"y":440},"protected_area":{"height":64,"pixelRatio":2,"width":64,"x":448,"y":0},"question":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":256},"ranger_station":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":64},"ranger_station-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":112},"restricted-zone":{"height":8,"pixelRatio":2,"width":8,"x":160,"y":248},"route_marker":{"height":48,"pixelRatio":2,"width":36,"x":144,"y":352},"slipway-canoe":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":160},"slipway-canoe-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":208},"slipway-canoe-trailer":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":304},"slipway-canoe-trailer-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":352},"streamgage":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":400},"trailhead":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":448},"trailhead-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":144,"y":256},"viewpoint":{"height":32,"pixelRatio":2,"width":44,"x":144,"y":476},"waterfall":{"height":40,"pixelRatio":2,"width":40,"x":144,"y":400},"waterfall-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":64},"waterfall-hazard":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":112},"watershed_reserve":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":64},"wilderness_preserve":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":128},"wildlife_refuge":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":192}}
+{"access_point":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":256},"access_point-minor":{"height":36,"pixelRatio":2,"width":36,"x":184,"y":404},"access_point-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":304},"beaver_dam":{"height":46,"pixelRatio":2,"width":42,"x":160,"y":190},"beaver_dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":352},"beaver_dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":400},"bird_refuge":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":0},"bison_refuge":{"height":64,"pixelRatio":2,"width":64,"x":64,"y":0},"cairn":{"height":48,"pixelRatio":2,"width":36,"x":208,"y":104},"campground":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":448},"campground-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":256},"campsite":{"height":40,"pixelRatio":2,"width":48,"x":208,"y":64},"caravan_site":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":64},"caravan_site-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":112},"dam":{"height":36,"pixelRatio":2,"width":36,"x":202,"y":190},"dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":160},"dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":208},"ferry":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":304},"ferry-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":352},"fill-restricted-zone":{"height":8,"pixelRatio":2,"width":8,"x":160,"y":248},"forest_reserve":{"height":64,"pixelRatio":2,"width":64,"x":128,"y":0},"game_land":{"height":64,"pixelRatio":2,"width":64,"x":192,"y":0},"grassland_reserve":{"height":64,"pixelRatio":2,"width":64,"x":256,"y":0},"guidepost":{"height":48,"pixelRatio":2,"width":36,"x":144,"y":304},"lean_to":{"height":40,"pixelRatio":2,"width":36,"x":180,"y":304},"lock":{"height":46,"pixelRatio":2,"width":28,"x":192,"y":236},"lock-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":400},"lock-hazard":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":448},"nature_reserve":{"height":64,"pixelRatio":2,"width":64,"x":320,"y":0},"oneway-arrow-left":{"height":30,"pixelRatio":2,"width":46,"x":180,"y":344},"oneway-arrow-right":{"height":30,"pixelRatio":2,"width":46,"x":184,"y":374},"oneway-arrows-leftright":{"height":30,"pixelRatio":2,"width":66,"x":160,"y":160},"park":{"height":64,"pixelRatio":2,"width":64,"x":384,"y":0},"peak":{"height":36,"pixelRatio":2,"width":44,"x":144,"y":440},"protected_area":{"height":64,"pixelRatio":2,"width":64,"x":448,"y":0},"question":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":256},"ranger_station":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":64},"ranger_station-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":112},"route_marker":{"height":48,"pixelRatio":2,"width":36,"x":144,"y":352},"slipway-canoe":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":160},"slipway-canoe-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":208},"slipway-canoe-trailer":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":304},"slipway-canoe-trailer-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":352},"streamgage":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":400},"stroke-disallowed-stripes":{"height":12,"pixelRatio":2,"width":14,"x":160,"y":236},"trailhead":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":448},"trailhead-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":144,"y":256},"viewpoint":{"height":32,"pixelRatio":2,"width":44,"x":144,"y":476},"waterfall":{"height":40,"pixelRatio":2,"width":40,"x":144,"y":400},"waterfall-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":64},"waterfall-hazard":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":112},"watershed_reserve":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":64},"wilderness_preserve":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":128},"wildlife_refuge":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":192}}