Rename canoe icons -> access_point. Drop support for canoe=put_in/egr…

…ess. Add minor access point icon for places without parking

js/styleGenerator.js

@@ -1183,15 +1183,19 @@ async function generateStyle(travelMode, lens) {
           ["==", ["get", "trailer"], "no"], ["image", "slipway-canoe-noaccess"],
           ["image", "slipway-canoe-trailer-noaccess"],
         ],
-        ["any", ["==", ["get", "waterway"], "access_point"], ["in", ["get", "canoe"], ["literal", ["put_in", "put_in;egress", "egress"]]]], ["image", "canoe-noaccess"],
+        ["==", ["get", "waterway"], "access_point"], ["image", "access_point-noaccess"],
         ""
       ],
       ["==", ["get", "leisure"], "slipway"], [
         "case",
         ["==", ["get", "trailer"], "no"], ["image", "slipway-canoe"],
         ["image", "slipway-canoe-trailer"],
       ],
-      ["any", ["==", ["get", "waterway"], "access_point"], ["in", ["get", "canoe"], ["literal", ["put_in", "put_in;egress", "egress"]]]], ["image", "canoe"],
+      ["==", ["get", "waterway"], "access_point"], [
+        "case",
+        ["==", ["get", "parking"], "no"], ["image", "access_point-minor"],
+        ["image", "access_point"],
+      ],
       ""
     ];
   }

style/sprites/opentrailmap.json

@@ -1 +1 @@
-{"arrow-left":{"height":15,"pixelRatio":1,"width":23,"x":166,"y":111},"arrow-right":{"height":15,"pixelRatio":1,"width":23,"x":170,"y":67},"arrows-leftright":{"height":15,"pixelRatio":1,"width":33,"x":144,"y":96},"beaver_dam":{"height":23,"pixelRatio":1,"width":21,"x":152,"y":0},"beaver_dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":96},"beaver_dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":96},"cairn":{"height":24,"pixelRatio":1,"width":18,"x":152,"y":43},"campground":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":0},"campground-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":24},"campsite":{"height":20,"pixelRatio":1,"width":24,"x":152,"y":23},"canoe":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":48},"canoe-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":72},"caravan_site":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":96},"caravan_site-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":0},"dam":{"height":18,"pixelRatio":1,"width":18,"x":198,"y":20},"dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":24},"dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":48},"disallowed-stripes":{"height":6,"pixelRatio":1,"width":7,"x":188,"y":61},"ferry":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":72},"ferry-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":72,"y":96},"guidepost":{"height":24,"pixelRatio":1,"width":18,"x":152,"y":67},"lean_to":{"height":20,"pixelRatio":1,"width":18,"x":193,"y":0},"lock":{"height":23,"pixelRatio":1,"width":14,"x":188,"y":38},"lock-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":0},"lock-hazard":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":24},"nature_reserve":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":0},"park":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":32},"peak":{"height":18,"pixelRatio":1,"width":22,"x":176,"y":20},"protected_area":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":64},"question":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":48},"ranger_station":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":72},"ranger_station-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":96,"y":96},"restricted-zone":{"height":4,"pixelRatio":1,"width":4,"x":176,"y":38},"route_marker":{"height":24,"pixelRatio":1,"width":18,"x":170,"y":43},"slipway-canoe":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":0},"slipway-canoe-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":24},"slipway-canoe-trailer":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":48},"slipway-canoe-trailer-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":72},"streamgage":{"height":24,"pixelRatio":1,"width":24,"x":120,"y":96},"trailhead":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":0},"trailhead-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":24},"viewpoint":{"height":16,"pixelRatio":1,"width":22,"x":144,"y":111},"waterfall":{"height":20,"pixelRatio":1,"width":20,"x":173,"y":0},"waterfall-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":48},"waterfall-hazard":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":72}}
+{"access_point":{"height":24,"pixelRatio":1,"width":24,"x":0,"y":96},"access_point-minor":{"height":18,"pixelRatio":1,"width":18,"x":198,"y":20},"access_point-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":24,"y":96},"arrow-left":{"height":15,"pixelRatio":1,"width":23,"x":166,"y":111},"arrow-right":{"height":15,"pixelRatio":1,"width":23,"x":170,"y":67},"arrows-leftright":{"height":15,"pixelRatio":1,"width":33,"x":144,"y":96},"beaver_dam":{"height":23,"pixelRatio":1,"width":21,"x":152,"y":0},"beaver_dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":0},"beaver_dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":24},"cairn":{"height":24,"pixelRatio":1,"width":18,"x":152,"y":43},"campground":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":48},"campground-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":72},"campsite":{"height":20,"pixelRatio":1,"width":24,"x":152,"y":23},"caravan_site":{"height":24,"pixelRatio":1,"width":24,"x":48,"y":96},"caravan_site-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":0},"dam":{"height":18,"pixelRatio":1,"width":18,"x":211,"y":0},"dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":24},"dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":48},"disallowed-stripes":{"height":6,"pixelRatio":1,"width":7,"x":188,"y":61},"ferry":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":72},"ferry-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":72,"y":96},"guidepost":{"height":24,"pixelRatio":1,"width":18,"x":152,"y":67},"lean_to":{"height":20,"pixelRatio":1,"width":18,"x":193,"y":0},"lock":{"height":23,"pixelRatio":1,"width":14,"x":188,"y":38},"lock-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":0},"lock-hazard":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":24},"nature_reserve":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":0},"park":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":32},"peak":{"height":18,"pixelRatio":1,"width":22,"x":176,"y":20},"protected_area":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":64},"question":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":48},"ranger_station":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":72},"ranger_station-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":96,"y":96},"restricted-zone":{"height":4,"pixelRatio":1,"width":4,"x":176,"y":38},"route_marker":{"height":24,"pixelRatio":1,"width":18,"x":170,"y":43},"slipway-canoe":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":0},"slipway-canoe-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":24},"slipway-canoe-trailer":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":48},"slipway-canoe-trailer-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":72},"streamgage":{"height":24,"pixelRatio":1,"width":24,"x":120,"y":96},"trailhead":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":0},"trailhead-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":24},"viewpoint":{"height":16,"pixelRatio":1,"width":22,"x":144,"y":111},"waterfall":{"height":20,"pixelRatio":1,"width":20,"x":173,"y":0},"waterfall-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":48},"waterfall-hazard":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":72}}

style/sprites/opentrailmap@2x.json

@@ -1 +1 @@
-{"arrow-left":{"height":30,"pixelRatio":2,"width":46,"x":332,"y":222},"arrow-right":{"height":30,"pixelRatio":2,"width":46,"x":340,"y":134},"arrows-leftright":{"height":30,"pixelRatio":2,"width":66,"x":288,"y":192},"beaver_dam":{"height":46,"pixelRatio":2,"width":42,"x":304,"y":0},"beaver_dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":192},"beaver_dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":192},"cairn":{"height":48,"pixelRatio":2,"width":36,"x":304,"y":86},"campground":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":0},"campground-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":48},"campsite":{"height":40,"pixelRatio":2,"width":48,"x":304,"y":46},"canoe":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":96},"canoe-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":144},"caravan_site":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":192},"caravan_site-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":0},"dam":{"height":36,"pixelRatio":2,"width":36,"x":396,"y":40},"dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":48},"dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":96},"disallowed-stripes":{"height":12,"pixelRatio":2,"width":14,"x":376,"y":122},"ferry":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":144},"ferry-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":144,"y":192},"guidepost":{"height":48,"pixelRatio":2,"width":36,"x":304,"y":134},"lean_to":{"height":40,"pixelRatio":2,"width":36,"x":386,"y":0},"lock":{"height":46,"pixelRatio":2,"width":28,"x":376,"y":76},"lock-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":0},"lock-hazard":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":48},"nature_reserve":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":0},"park":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":64},"peak":{"height":36,"pixelRatio":2,"width":44,"x":352,"y":40},"protected_area":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":128},"question":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":96},"ranger_station":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":144},"ranger_station-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":192,"y":192},"restricted-zone":{"height":8,"pixelRatio":2,"width":8,"x":352,"y":76},"route_marker":{"height":48,"pixelRatio":2,"width":36,"x":340,"y":86},"slipway-canoe":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":0},"slipway-canoe-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":48},"slipway-canoe-trailer":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":96},"slipway-canoe-trailer-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":144},"streamgage":{"height":48,"pixelRatio":2,"width":48,"x":240,"y":192},"trailhead":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":0},"trailhead-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":48},"viewpoint":{"height":32,"pixelRatio":2,"width":44,"x":288,"y":222},"waterfall":{"height":40,"pixelRatio":2,"width":40,"x":346,"y":0},"waterfall-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":96},"waterfall-hazard":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":144}}
+{"access_point":{"height":48,"pixelRatio":2,"width":48,"x":0,"y":192},"access_point-minor":{"height":36,"pixelRatio":2,"width":36,"x":396,"y":40},"access_point-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":48,"y":192},"arrow-left":{"height":30,"pixelRatio":2,"width":46,"x":332,"y":222},"arrow-right":{"height":30,"pixelRatio":2,"width":46,"x":340,"y":134},"arrows-leftright":{"height":30,"pixelRatio":2,"width":66,"x":288,"y":192},"beaver_dam":{"height":46,"pixelRatio":2,"width":42,"x":304,"y":0},"beaver_dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":0},"beaver_dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":48},"cairn":{"height":48,"pixelRatio":2,"width":36,"x":304,"y":86},"campground":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":96},"campground-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":144},"campsite":{"height":40,"pixelRatio":2,"width":48,"x":304,"y":46},"caravan_site":{"height":48,"pixelRatio":2,"width":48,"x":96,"y":192},"caravan_site-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":0},"dam":{"height":36,"pixelRatio":2,"width":36,"x":422,"y":0},"dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":48},"dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":96},"disallowed-stripes":{"height":12,"pixelRatio":2,"width":14,"x":376,"y":122},"ferry":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":144},"ferry-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":144,"y":192},"guidepost":{"height":48,"pixelRatio":2,"width":36,"x":304,"y":134},"lean_to":{"height":40,"pixelRatio":2,"width":36,"x":386,"y":0},"lock":{"height":46,"pixelRatio":2,"width":28,"x":376,"y":76},"lock-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":0},"lock-hazard":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":48},"nature_reserve":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":0},"park":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":64},"peak":{"height":36,"pixelRatio":2,"width":44,"x":352,"y":40},"protected_area":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":128},"question":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":96},"ranger_station":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":144},"ranger_station-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":192,"y":192},"restricted-zone":{"height":8,"pixelRatio":2,"width":8,"x":352,"y":76},"route_marker":{"height":48,"pixelRatio":2,"width":36,"x":340,"y":86},"slipway-canoe":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":0},"slipway-canoe-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":48},"slipway-canoe-trailer":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":96},"slipway-canoe-trailer-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":144},"streamgage":{"height":48,"pixelRatio":2,"width":48,"x":240,"y":192},"trailhead":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":0},"trailhead-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":48},"viewpoint":{"height":32,"pixelRatio":2,"width":44,"x":288,"y":222},"waterfall":{"height":40,"pixelRatio":2,"width":40,"x":346,"y":0},"waterfall-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":96},"waterfall-hazard":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":144}}