diff --git a/js/styleGenerator.js b/js/styleGenerator.js index 6c89f37..c16b1e3 100644 --- a/js/styleGenerator.js +++ b/js/styleGenerator.js @@ -920,6 +920,7 @@ export function generateStyle(baseStyleJsonString, travelMode, lens) { "icon-image": [ "case", ["==", ["get", "protected_area"], "game_land"], ["image", "game_land"], + ["==", ["get", "protected_area"], "forest_reserve"], ["image", "forest_reserve"], ["==", ["get", "leisure"], "nature_reserve"], ["image", "nature_reserve"], ["==", ["get", "leisure"], "park"], ["image", "park"], ["image", "protected_area"], diff --git a/style/sprites/opentrailmap.json b/style/sprites/opentrailmap.json index bb80257..8618375 100644 --- a/style/sprites/opentrailmap.json +++ b/style/sprites/opentrailmap.json @@ -1 +1 @@ -{"access_point":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":0},"access_point-minor":{"height":18,"pixelRatio":1,"width":18,"x":193,"y":24},"access_point-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":24},"arrow-left":{"height":15,"pixelRatio":1,"width":23,"x":168,"y":87},"arrow-right":{"height":15,"pixelRatio":1,"width":23,"x":182,"y":67},"arrows-leftright":{"height":15,"pixelRatio":1,"width":33,"x":128,"y":48},"beaver_dam":{"height":23,"pixelRatio":1,"width":21,"x":152,"y":24},"beaver_dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":48},"beaver_dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":72},"cairn":{"height":24,"pixelRatio":1,"width":18,"x":128,"y":63},"campground":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":96},"campground-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":0},"campsite":{"height":20,"pixelRatio":1,"width":24,"x":161,"y":47},"caravan_site":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":24},"caravan_site-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":48},"dam":{"height":18,"pixelRatio":1,"width":18,"x":199,"y":42},"dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":72},"dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":96},"disallowed-stripes":{"height":6,"pixelRatio":1,"width":7,"x":128,"y":111},"ferry":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":0},"ferry-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":24},"game_land":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":0},"guidepost":{"height":24,"pixelRatio":1,"width":18,"x":128,"y":87},"lean_to":{"height":20,"pixelRatio":1,"width":18,"x":164,"y":67},"lock":{"height":23,"pixelRatio":1,"width":14,"x":185,"y":44},"lock-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":48},"lock-hazard":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":72},"nature_reserve":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":32},"park":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":64},"peak":{"height":18,"pixelRatio":1,"width":22,"x":146,"y":91},"protected_area":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":96},"question":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":96},"ranger_station":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":0},"ranger_station-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":24},"restricted-zone":{"height":4,"pixelRatio":1,"width":4,"x":164,"y":87},"route_marker":{"height":24,"pixelRatio":1,"width":18,"x":146,"y":67},"slipway-canoe":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":48},"slipway-canoe-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":72},"slipway-canoe-trailer":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":96},"slipway-canoe-trailer-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":0},"streamgage":{"height":24,"pixelRatio":1,"width":24,"x":152,"y":0},"trailhead":{"height":24,"pixelRatio":1,"width":24,"x":176,"y":0},"trailhead-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":200,"y":0},"viewpoint":{"height":16,"pixelRatio":1,"width":22,"x":146,"y":109},"waterfall":{"height":20,"pixelRatio":1,"width":20,"x":173,"y":24},"waterfall-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":224,"y":0},"waterfall-hazard":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":24}} \ No newline at end of file +{"access_point":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":32},"access_point-minor":{"height":18,"pixelRatio":1,"width":18,"x":152,"y":83},"access_point-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":56},"arrow-left":{"height":15,"pixelRatio":1,"width":23,"x":194,"y":60},"arrow-right":{"height":15,"pixelRatio":1,"width":23,"x":152,"y":68},"arrows-leftright":{"height":15,"pixelRatio":1,"width":33,"x":176,"y":24},"beaver_dam":{"height":23,"pixelRatio":1,"width":21,"x":184,"y":0},"beaver_dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":80},"beaver_dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":32,"y":104},"cairn":{"height":24,"pixelRatio":1,"width":18,"x":229,"y":0},"campground":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":32},"campground-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":64,"y":0},"campsite":{"height":20,"pixelRatio":1,"width":24,"x":205,"y":0},"caravan_site":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":56},"caravan_site-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":80},"dam":{"height":18,"pixelRatio":1,"width":18,"x":217,"y":62},"dam-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":56,"y":104},"dam-hazard":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":24},"disallowed-stripes":{"height":6,"pixelRatio":1,"width":7,"x":64,"y":24},"ferry":{"height":24,"pixelRatio":1,"width":24,"x":88,"y":0},"ferry-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":48},"forest_reserve":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":0},"game_land":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":32},"guidepost":{"height":24,"pixelRatio":1,"width":18,"x":209,"y":20},"lean_to":{"height":20,"pixelRatio":1,"width":18,"x":227,"y":42},"lock":{"height":23,"pixelRatio":1,"width":14,"x":175,"y":63},"lock-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":72},"lock-hazard":{"height":24,"pixelRatio":1,"width":24,"x":80,"y":96},"nature_reserve":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":64},"park":{"height":32,"pixelRatio":1,"width":32,"x":0,"y":96},"peak":{"height":18,"pixelRatio":1,"width":22,"x":227,"y":24},"protected_area":{"height":32,"pixelRatio":1,"width":32,"x":32,"y":0},"question":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":24},"ranger_station":{"height":24,"pixelRatio":1,"width":24,"x":112,"y":0},"ranger_station-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":48},"restricted-zone":{"height":4,"pixelRatio":1,"width":4,"x":205,"y":20},"route_marker":{"height":24,"pixelRatio":1,"width":18,"x":176,"y":39},"slipway-canoe":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":72},"slipway-canoe-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":104,"y":96},"slipway-canoe-trailer":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":24},"slipway-canoe-trailer-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":136,"y":0},"streamgage":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":48},"trailhead":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":72},"trailhead-noaccess":{"height":24,"pixelRatio":1,"width":24,"x":128,"y":96},"viewpoint":{"height":16,"pixelRatio":1,"width":22,"x":194,"y":44},"waterfall":{"height":20,"pixelRatio":1,"width":20,"x":152,"y":48},"waterfall-canoeable":{"height":24,"pixelRatio":1,"width":24,"x":152,"y":24},"waterfall-hazard":{"height":24,"pixelRatio":1,"width":24,"x":160,"y":0}} \ No newline at end of file diff --git a/style/sprites/opentrailmap.png b/style/sprites/opentrailmap.png index f088f69..a61f7e1 100644 Binary files a/style/sprites/opentrailmap.png and b/style/sprites/opentrailmap.png differ diff --git a/style/sprites/opentrailmap@2x.json b/style/sprites/opentrailmap@2x.json index c52590e..8572fd9 100644 --- a/style/sprites/opentrailmap@2x.json +++ b/style/sprites/opentrailmap@2x.json @@ -1 +1 @@ -{"access_point":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":0},"access_point-minor":{"height":36,"pixelRatio":2,"width":36,"x":386,"y":48},"access_point-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":48},"arrow-left":{"height":30,"pixelRatio":2,"width":46,"x":336,"y":174},"arrow-right":{"height":30,"pixelRatio":2,"width":46,"x":364,"y":134},"arrows-leftright":{"height":30,"pixelRatio":2,"width":66,"x":256,"y":96},"beaver_dam":{"height":46,"pixelRatio":2,"width":42,"x":304,"y":48},"beaver_dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":96},"beaver_dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":144},"cairn":{"height":48,"pixelRatio":2,"width":36,"x":256,"y":126},"campground":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":192},"campground-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":0},"campsite":{"height":40,"pixelRatio":2,"width":48,"x":322,"y":94},"caravan_site":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":48},"caravan_site-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":96},"dam":{"height":36,"pixelRatio":2,"width":36,"x":398,"y":84},"dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":144},"dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":192},"disallowed-stripes":{"height":12,"pixelRatio":2,"width":14,"x":256,"y":222},"ferry":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":0},"ferry-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":48},"game_land":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":0},"guidepost":{"height":48,"pixelRatio":2,"width":36,"x":256,"y":174},"lean_to":{"height":40,"pixelRatio":2,"width":36,"x":328,"y":134},"lock":{"height":46,"pixelRatio":2,"width":28,"x":370,"y":88},"lock-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":96},"lock-hazard":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":144},"nature_reserve":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":64},"park":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":128},"peak":{"height":36,"pixelRatio":2,"width":44,"x":292,"y":182},"protected_area":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":192},"question":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":192},"ranger_station":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":0},"ranger_station-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":48},"restricted-zone":{"height":8,"pixelRatio":2,"width":8,"x":328,"y":174},"route_marker":{"height":48,"pixelRatio":2,"width":36,"x":292,"y":134},"slipway-canoe":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":96},"slipway-canoe-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":144},"slipway-canoe-trailer":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":192},"slipway-canoe-trailer-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":0},"streamgage":{"height":48,"pixelRatio":2,"width":48,"x":304,"y":0},"trailhead":{"height":48,"pixelRatio":2,"width":48,"x":352,"y":0},"trailhead-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":400,"y":0},"viewpoint":{"height":32,"pixelRatio":2,"width":44,"x":292,"y":218},"waterfall":{"height":40,"pixelRatio":2,"width":40,"x":346,"y":48},"waterfall-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":448,"y":0},"waterfall-hazard":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":48}} \ No newline at end of file +{"access_point":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":64},"access_point-minor":{"height":36,"pixelRatio":2,"width":36,"x":304,"y":166},"access_point-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":112},"arrow-left":{"height":30,"pixelRatio":2,"width":46,"x":388,"y":120},"arrow-right":{"height":30,"pixelRatio":2,"width":46,"x":304,"y":136},"arrows-leftright":{"height":30,"pixelRatio":2,"width":66,"x":352,"y":48},"beaver_dam":{"height":46,"pixelRatio":2,"width":42,"x":368,"y":0},"beaver_dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":160},"beaver_dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":64,"y":208},"cairn":{"height":48,"pixelRatio":2,"width":36,"x":458,"y":0},"campground":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":64},"campground-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":128,"y":0},"campsite":{"height":40,"pixelRatio":2,"width":48,"x":410,"y":0},"caravan_site":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":112},"caravan_site-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":160},"dam":{"height":36,"pixelRatio":2,"width":36,"x":434,"y":124},"dam-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":112,"y":208},"dam-hazard":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":48},"disallowed-stripes":{"height":12,"pixelRatio":2,"width":14,"x":128,"y":48},"ferry":{"height":48,"pixelRatio":2,"width":48,"x":176,"y":0},"ferry-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":96},"forest_reserve":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":0},"game_land":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":64},"guidepost":{"height":48,"pixelRatio":2,"width":36,"x":418,"y":40},"lean_to":{"height":40,"pixelRatio":2,"width":36,"x":454,"y":84},"lock":{"height":46,"pixelRatio":2,"width":28,"x":350,"y":126},"lock-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":144},"lock-hazard":{"height":48,"pixelRatio":2,"width":48,"x":160,"y":192},"nature_reserve":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":128},"park":{"height":64,"pixelRatio":2,"width":64,"x":0,"y":192},"peak":{"height":36,"pixelRatio":2,"width":44,"x":454,"y":48},"protected_area":{"height":64,"pixelRatio":2,"width":64,"x":64,"y":0},"question":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":48},"ranger_station":{"height":48,"pixelRatio":2,"width":48,"x":224,"y":0},"ranger_station-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":96},"restricted-zone":{"height":8,"pixelRatio":2,"width":8,"x":410,"y":40},"route_marker":{"height":48,"pixelRatio":2,"width":36,"x":352,"y":78},"slipway-canoe":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":144},"slipway-canoe-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":208,"y":192},"slipway-canoe-trailer":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":48},"slipway-canoe-trailer-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":272,"y":0},"streamgage":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":96},"trailhead":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":144},"trailhead-noaccess":{"height":48,"pixelRatio":2,"width":48,"x":256,"y":192},"viewpoint":{"height":32,"pixelRatio":2,"width":44,"x":388,"y":88},"waterfall":{"height":40,"pixelRatio":2,"width":40,"x":304,"y":96},"waterfall-canoeable":{"height":48,"pixelRatio":2,"width":48,"x":304,"y":48},"waterfall-hazard":{"height":48,"pixelRatio":2,"width":48,"x":320,"y":0}} \ No newline at end of file diff --git a/style/sprites/opentrailmap@2x.png b/style/sprites/opentrailmap@2x.png index c39686e..410e24b 100644 Binary files a/style/sprites/opentrailmap@2x.png and b/style/sprites/opentrailmap@2x.png differ diff --git a/style/sprites/svg/forest_reserve.svg b/style/sprites/svg/forest_reserve.svg new file mode 100644 index 0000000..d17feca --- /dev/null +++ b/style/sprites/svg/forest_reserve.svg @@ -0,0 +1,11 @@ + + + forest_reserve + + + + + + + + \ No newline at end of file