This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch legends in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit a4b127dd343765cfaa9bdcba021678cd7140e064 Author: Bertil Chapuis <[email protected]> AuthorDate: Mon Jan 8 22:46:49 2024 +0100 Organize all the icons according to the list --- basemap/layers/point/icon.js | 2800 +++++++++++++++++++++--------------------- basemap/themes/default.js | 298 +---- 2 files changed, 1410 insertions(+), 1688 deletions(-) diff --git a/basemap/layers/point/icon.js b/basemap/layers/point/icon.js index e5b44efe..7e8f76a5 100644 --- a/basemap/layers/point/icon.js +++ b/basemap/layers/point/icon.js @@ -22,21 +22,8 @@ import theme from '../../theme.js'; * https://wiki.openstreetmap.org/wiki/OpenStreetMap_Carto/Symbols */ let directives = [ - // Aeroway - { - 'filter': ['==', ['get', 'aeroway'], 'aerodrome'], - 'icon-image': 'aerodrome', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor - }, - { - 'filter': ['==', ['get', 'aeroway'], 'helipad'], - 'icon-image': 'helipad', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor - }, - // Amenity + // Gastronomy { 'filter': [ 'all', @@ -44,1511 +31,1407 @@ let directives = [ ['==', ['get', 'amenity'], 'food_court'] ], 'icon-image': 'restaurant', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.gastronomyIconColor, + 'text-color': theme.gastronomyIconColor }, { 'filter': ['==', ['get', 'amenity'], 'cafe'], 'icon-image': 'cafe', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.gastronomyIconColor, + 'text-color': theme.gastronomyIconColor }, { 'filter': ['==', ['get', 'amenity'], 'fast_food'], 'icon-image': 'fast_food', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.gastronomyIconColor, + 'text-color': theme.gastronomyIconColor }, { 'filter': ['==', ['get', 'amenity'], 'bar'], 'icon-image': 'bar', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.gastronomyIconColor, + 'text-color': theme.gastronomyIconColor }, { 'filter': ['==', ['get', 'amenity'], 'pub'], 'icon-image': 'pub', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.gastronomyIconColor, + 'text-color': theme.gastronomyIconColor }, { 'filter': ['==', ['get', 'amenity'], 'ice_cream'], 'icon-image': 'ice_cream', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.gastronomyIconColor, + 'text-color': theme.gastronomyIconColor }, { 'filter': ['==', ['get', 'amenity'], 'biergarten'], 'icon-image': 'biergarten', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.gastronomyIconColor, + 'text-color': theme.gastronomyIconColor + }, + { + 'filter': ['==', ['get', 'leisure'], 'outdoor_seating'], + 'icon-image': 'outdoor_seating', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, + }, + + // Culture, entertainment, and arts + { + 'filter': ['==', ['get', 'tourism'], 'artwork'], + 'icon-image': 'artwork', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { 'filter': ['==', ['get', 'amenity'], 'community_centre'], 'icon-image': 'community_centre', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { 'filter': ['==', ['get', 'amenity'], 'library'], 'icon-image': 'library', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor + }, + { + 'filter': ['==', ['get', 'tourism'], 'museum'], + 'icon-image': 'museum', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { 'filter': ['==', ['get', 'amenity'], 'theatre'], 'icon-image': 'theatre', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { 'filter': ['==', ['get', 'amenity'], 'cinema'], 'icon-image': 'cinema', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { 'filter': ['==', ['get', 'amenity'], 'nightclub'], 'icon-image': 'nightclub', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { 'filter': ['==', ['get', 'amenity'], 'arts_centre'], 'icon-image': 'arts_centre', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor + }, + { + 'filter': ['==', ['get', 'tourism'], 'gallery'], + 'icon-image': 'art', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { 'filter': ['==', ['get', 'amenity'], 'internet_cafe'], 'icon-image': 'internet_cafe', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { 'filter': ['==', ['get', 'amenity'], 'casino'], 'icon-image': 'casino', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { 'filter': ['==', ['get', 'amenity'], 'public_bookcase'], 'icon-image': 'public_bookcase', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'public_bath'], - 'icon-image': 'public_bath', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'amusement_arcade'], + 'icon-image': 'amusement_arcade', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, + + // Historical objects { - 'filter': ['==', ['get', 'amenity'], 'toilets'], - 'icon-image': 'toilets', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'historic'], 'memorial'], + 'icon-image': 'memorial', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'recycling'], - 'icon-image': 'recycling', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'historic'], 'archaeological_site'], + 'icon-image': 'archaeological_site', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'waste_basket'], - 'icon-image': 'waste_basket', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'historic'], 'wayside_shrine'], + 'icon-image': 'wayside_shrine', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'waste_disposal'], - 'icon-image': 'waste_disposal', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'historic'], 'monument'], + 'icon-image': 'monument', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'bench'], - 'icon-image': 'bench', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'historic'], 'castle'], + 'icon-image': 'castle', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'shelter'], - 'icon-image': 'shelter', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': [ + 'any', + [ + 'all', + ['==', ['get', 'historic'], 'memorial'], + ['==', ['get', 'memorial'], 'plaque'] + ], + [ + 'all', + ['==', ['get', 'historic'], 'memorial'], + ['==', ['get', 'memorial'], 'blue_plaque'] + ] + ], + 'icon-image': 'plaque', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'drinking_water'], - 'icon-image': 'drinking_water', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': [ + 'any', + [ + 'all', + ['==', ['get', 'historic'], 'memorial'], + ['==', ['get', 'memorial'], 'statue'] + ], + [ + 'all', + ['==', ['get', 'tourism'], 'artwork'], + ['==', ['get', 'artwork_type'], 'statue'] + ] + ], + 'icon-image': 'statue', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'fountain'], - 'icon-image': 'fountain', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': [ + 'any', + ['==', ['get', 'historic'], 'memorial'], + ['==', ['get', 'memorial'], 'stone'] + ], + 'icon-image': 'stone', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'bbq'], - 'icon-image': 'bbq', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': [ + 'any', + [ + 'all', + ['==', ['get', 'historic'], 'castle'], + ['==', ['get', 'castle_type'], 'palace'] + ], + [ + 'all', + ['==', ['get', 'historic'], 'castle'], + ['==', ['get', 'castle_type'], 'stately'] + ] + ], + 'icon-image': 'palace', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, + // { + // 'filter': ['==', ['get', 'historic'], 'castle'], =>defensive / =>fortress / =>castrum / =>shiro / =>kremlin + // 'icon-image': 'fortress', + // 'icon-color': theme.historyIconColor, + // 'text-color': theme.historyIconColor + // }, { - 'filter': ['==', ['get', 'amenity'], 'shower'], - 'icon-image': 'shower', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'historic'], 'fort'], + 'icon-image': 'historic_fort', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'bank'], - 'icon-image': 'bank', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': [ + 'any', + [ + 'all', + ['==', ['get', 'historic'], 'memorial'], + ['==', ['get', 'memorial'], 'bust'] + ], + [ + 'all', + ['==', ['get', 'tourism'], 'artwork'], + ['==', ['get', 'artwork_type'], 'bust'] + ] + ], + 'icon-image': 'bust', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'atm'], - 'icon-image': 'atm', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'historic'], 'city_gate'], + 'icon-image': 'city_gate', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'bureau_de_change'], - 'icon-image': 'bureau_de_change', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': [ + 'any', + ['==', ['get', 'historic'], 'manor'], + [ + 'all', + ['==', ['get', 'historic'], 'castle'], + ['==', ['get', 'castle_type'], 'manor'] + ] + ], + 'icon-image': 'manor', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'pharmacy'], - 'icon-image': 'pharmacy', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'man_made'], 'obelisk'], + 'icon-image': 'obelisk', + 'icon-color': theme.historyIconColor, + 'text-color': theme.historyIconColor }, + + // Leisure, recreation, and sport { - 'filter': ['==', ['get', 'amenity'], 'hospital'], - 'icon-image': 'hospital', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'playground'], + 'icon-image': 'playground', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, { 'filter': [ 'any', - ['==', ['get', 'amenity'], 'clinic'], - ['==', ['get', 'amenity'], 'doctors'] + ['==', ['get', 'leisure'], 'fitness_centre'], + ['==', ['get', 'leisure'], 'fitness_station'] ], - 'icon-image': 'doctors', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-image': 'fitness', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, { - 'filter': ['==', ['get', 'amenity'], 'dentist'], - 'icon-image': 'dentist', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'golf_course'], + 'icon-image': 'golf', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, { - 'filter': ['==', ['get', 'amenity'], 'veterinary'], - 'icon-image': 'veterinary', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': [ + 'any', + ['==', ['get', 'leisure'], 'water_park'], + ['==', ['get', 'leisure'], 'swimming_area'], + [ + 'all', + ['==', ['get', 'leisure'], 'sports_centre'], + ['==', ['get', 'sport'], 'swimming'] + ] + ], + 'icon-image': 'water_park', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, { - 'filter': ['==', ['get', 'amenity'], 'post_box'], - 'icon-image': 'post_box', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'shop'], 'massage'], + 'icon-image': 'massage', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, { - 'filter': ['==', ['get', 'amenity'], 'post_office'], - 'icon-image': 'post_office', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'sauna'], + 'icon-image': 'sauna', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, - // { - // 'filter': ['==', ['get', 'amenity'], 'parcel_locker'], - // 'icon-image': 'parcel_locker', - // 'icon-color': theme.pointIconAmenityIconColor, - // 'text-color': theme.pointIconAmenityTextColor - // }, { - 'filter': ['==', ['get', 'amenity'], 'telephone'], - 'icon-image': 'telephone', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'public_bath'], + 'icon-image': 'public_bath', + 'icon-color': theme.pointIconPublicBathIconColor, + 'text-color': theme.pointIconPublicBathTextColor }, { - 'filter': ['==', ['get', 'amenity'], 'parking'], - 'icon-image': 'parking', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'miniature_golf'], + 'icon-image': 'miniature_golf', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, { - 'filter': [ - 'any', - ['all', - ['==', ['get', 'amenity'], 'parking'], - ['==', ['get', 'parking'], 'lane'], - ], - ['all', - ['==', ['get', 'amenity'], 'parking'], - ['==', ['get', 'parking'], 'street_side'] - ] - ], - 'icon-image': 'parking_subtle', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'beach_resort'], + 'icon-image': 'beach_resort', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, { - 'filter': ['==', ['get', 'amenity'], 'fuel'], - 'icon-image': 'fuel', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'fishing'], + 'icon-image': 'fishing', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, { - 'filter': ['==', ['get', 'amenity'], 'bicycle_parking'], - 'icon-image': 'bicycle_parking', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'bowling_alley'], + 'icon-image': 'bowling_alley', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, { - 'filter': ['==', ['get', 'amenity'], 'bus_station'], - 'icon-image': 'bus_station', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'dog_park'], + 'icon-image': 'dog_park', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, { - 'filter': ['==', ['get', 'amenity'], 'bicycle_rental'], - 'icon-image': 'rental_bicycle', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'golf'], 'pin'], + 'icon-image': 'leisure_golf_pin', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, + + // Waste management { - 'filter': ['==', ['get', 'amenity'], 'taxi'], - 'icon-image': 'taxi', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'toilets'], + 'icon-image': 'toilets', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': [ - 'all', - ['==', ['get', 'amenity'], 'vending_machine'], - ['==', ['get', 'vending'], 'parking_tickets'] - ], - 'icon-image': 'parking_tickets', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'recycling'], + 'icon-image': 'recycling', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'charging_station'], - 'icon-image': 'charging_station', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'waste_basket'], + 'icon-image': 'waste_basket', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'car_rental'], - 'icon-image': 'rental_car', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'waste_disposal'], + 'icon-image': 'waste_disposal', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { 'filter': [ 'all', - ['==', ['get', 'amenity'], 'parking_entrance'], - ['==', ['get', 'parking'], 'underground'] + ['==', ['get', 'amenity'], 'vending_machine'], + ['==', ['get', 'vending'], 'excrement_bags'] ], - 'icon-image': 'parking_entrance_underground', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-image': 'excrement_bags', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, + + // Outdoor { - 'filter': [ - 'all', - ['==', ['get', 'amenity'], 'vending_machine'], - ['==', ['get', 'vending'], 'public_transport_tickets'] - ], - 'icon-image': 'public_transport_tickets', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'bench'], + 'icon-image': 'bench', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'ferry_terminal'], - 'icon-image': 'ferry', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'shelter'], + 'icon-image': 'shelter', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'motorcycle_parking'], - 'icon-image': 'motorcycle_parking', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'drinking_water'], + 'icon-image': 'drinking_water', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'bicycle_repair_station'], - 'icon-image': 'bicycle_repair_station', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'tourism'], 'picnic_site'], + 'icon-image': 'picnic', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'boat_rental'], - 'icon-image': 'boat_rental', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'fountain'], + 'icon-image': 'fountain', + 'icon-color': theme.waterIconColor, + 'text-color': theme.waterIconColor }, { - 'filter': [ - 'all', - ['==', ['get', 'amenity'], 'parking_entrance'], - ['==', ['get', 'parking'], 'multi-storey'] - ], - 'icon-image': 'parking_entrance_multistorey', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'tourism'], 'camp_site'], + 'icon-image': 'camping', + 'icon-color': theme.accommodationIconColor, + 'text-color': theme.accommodationIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'police'], - 'icon-image': 'police', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'picnic_table'], + 'icon-image': 'picnic', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor, }, { - 'filter': ['==', ['get', 'amenity'], 'townhall'], - 'icon-image': 'town_hall', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'tourism'], 'caravan_site'], + 'icon-image': 'caravan_park', + 'icon-color': theme.accommodationIconColor, + 'text-color': theme.accommodationIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'fire_station'], - 'icon-image': 'firestation', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'bbq'], + 'icon-image': 'bbq', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'social_facility'], - 'icon-image': 'social_facility', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'shower'], + 'icon-image': 'shower', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'courthouse'], - 'icon-image': 'courthouse', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'firepit'], + 'icon-image': 'firepit', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor, }, { - 'filter': ['==', ['get', 'amenity'], 'prison'], - 'icon-image': 'prison', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'leisure'], 'bird_hide'], + 'icon-image': 'bird_hide', + 'icon-color': theme.leisureIconColor, + 'text-color': theme.leisureIconColor, }, + + // Tourism and accommodation { 'filter': [ 'all', - ['==', ['get', 'amenity'], 'place_of_worship'], - ['==', ['get', 'religion'], 'christian'] + ['==', ['get', 'tourism'], 'information'], + ['==', ['get', 'information'], 'guidepost'] ], - 'icon-image': 'christian', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-image': 'guidepost', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { 'filter': [ 'all', - ['==', ['get', 'amenity'], 'place_of_worship'], - ['==', ['get', 'religion'], 'jewish'] + ['==', ['get', 'tourism'], 'information'], + ['==', ['get', 'information'], 'board'] ], - 'icon-image': 'jewish', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-image': 'board', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { 'filter': [ - 'all', - ['==', ['get', 'amenity'], 'place_of_worship'], - ['==', ['get', 'religion'], 'muslim'] + 'any', + [ + 'all', + ['==', ['get', 'tourism'], 'information'], + ['==', ['get', 'information'], 'map'] + ], + [ + 'all', + ['==', ['get', 'tourism'], 'information'], + ['==', ['get', 'information'], 'tactile_map'] + ] ], - 'icon-image': 'muslim', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-image': 'map', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { 'filter': [ - 'all', - ['==', ['get', 'amenity'], 'place_of_worship'], - ['==', ['get', 'religion'], 'taoist'] + 'any', + ['==', ['get', 'tourism'], 'information'], + ['==', ['get', 'information'], 'office'] ], - 'icon-image': 'taoist', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-image': 'office', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { 'filter': [ - 'all', - ['==', ['get', 'amenity'], 'place_of_worship'], - ['==', ['get', 'religion'], 'hindu'] + 'any', + ['==', ['get', 'tourism'], 'information'], + ['==', ['get', 'information'], 'terminal'] ], - 'icon-image': 'hinduist', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-image': 'terminal', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { 'filter': [ - 'all', - ['==', ['get', 'amenity'], 'place_of_worship'], - ['==', ['get', 'religion'], 'buddhist'] + 'any', + ['==', ['get', 'tourism'], 'information'], + ['==', ['get', 'information'], 'audioguide'] ], - 'icon-image': 'buddhist', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'icon-image': 'audioguide', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': [ - 'all', - ['==', ['get', 'amenity'], 'place_of_worship'], - ['==', ['get', 'religion'], 'shinto'] - ], - 'icon-image': 'shintoist', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'tourism'], 'viewpoint'], + 'icon-image': 'viewpoint', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': [ - 'all', - ['==', ['get', 'amenity'], 'place_of_worship'], - ['==', ['get', 'religion'], 'sikh'] - ], - 'icon-image': 'sikhist', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'tourism'], 'hotel'], + 'icon-image': 'hotel', + 'icon-color': theme.accommodationIconColor, + 'text-color': theme.accommodationIconColor }, { - 'filter': [ - 'all', - ['==', ['get', 'amenity'], 'place_of_worship'], - ['==', ['get', 'without or other religion'], '* value'] - ], - 'icon-image': 'place_of_worship', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'tourism'], 'guest_house'], + 'icon-image': 'guest_house', + 'icon-color': theme.accommodationIconColor, + 'text-color': theme.accommodationIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'marketplace'], - 'icon-image': 'marketplace', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'tourism'], 'hostel'], + 'icon-image': 'hostel', + 'icon-color': theme.accommodationIconColor, + 'text-color': theme.accommodationIconColor }, { - 'filter': [ - 'any', - ['==', ['get', 'amenity'], 'nursing_home'], - ['==', ['get', 'amenity'], 'childcare'] - ], - 'icon-image': 'social_facility', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'tourism'], 'chalet'], + 'icon-image': 'chalet', + 'icon-color': theme.accommodationIconColor, + 'text-color': theme.accommodationIconColor }, { - 'filter': ['==', ['get', 'amenity'], 'hunting_stand'], - 'icon-image': 'hunting_stand', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'tourism'], 'motel'], + 'icon-image': 'motel', + 'icon-color': theme.accommodationIconColor, + 'text-color': theme.accommodationIconColor + }, + { + 'filter': ['==', ['get', 'tourism'], 'apartment'], + 'icon-image': 'apartment', + 'icon-color': theme.accommodationIconColor, + 'text-color': theme.accommodationIconColor + }, + { + 'filter': ['==', ['get', 'tourism'], 'alpine_hut'], + 'icon-image': 'alpinehut', + 'icon-color': theme.accommodationIconColor, + 'text-color': theme.accommodationIconColor + }, + { + 'filter': ['==', ['get', 'tourism'], 'wilderness_hut'], + 'icon-image': 'wilderness_hut', + 'icon-color': theme.accommodationIconColor, + 'text-color': theme.accommodationIconColor }, - // Historic + // Finance { - 'filter': ['==', ['get', 'historic'], 'memorial'], - 'icon-image': 'memorial', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'filter': ['==', ['get', 'amenity'], 'bank'], + 'icon-image': 'bank', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': ['==', ['get', 'historic'], 'archaeological_site'], - 'icon-image': 'archaeological_site', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'filter': ['==', ['get', 'amenity'], 'atm'], + 'icon-image': 'atm', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': ['==', ['get', 'historic'], 'wayside_shrine'], - 'icon-image': 'wayside_shrine', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'filter': ['==', ['get', 'amenity'], 'bureau_de_change'], + 'icon-image': 'bureau_de_change', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, + + // Healthcare { - 'filter': ['==', ['get', 'historic'], 'monument'], - 'icon-image': 'monument', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'filter': ['==', ['get', 'amenity'], 'pharmacy'], + 'icon-image': 'pharmacy', + 'icon-color': theme.healthIconColor, + 'text-color': theme.healthIconColor }, { - 'filter': ['==', ['get', 'historic'], 'castle'], - 'icon-image': 'castle', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'filter': ['==', ['get', 'amenity'], 'hospital'], + 'icon-image': 'hospital', + 'icon-color': theme.healthIconColor, + 'text-color': theme.healthIconColor }, { 'filter': [ 'any', - [ - 'all', - ['==', ['get', 'historic'], 'memorial'], - ['==', ['get', 'memorial'], 'plaque'] - ], - [ - 'all', - ['==', ['get', 'historic'], 'memorial'], - ['==', ['get', 'memorial'], 'blue_plaque'] - ] + ['==', ['get', 'amenity'], 'clinic'], + ['==', ['get', 'amenity'], 'doctors'] ], - 'icon-image': 'plaque', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'icon-image': 'doctors', + 'icon-color': theme.healthIconColor, + 'text-color': theme.healthIconColor }, { - 'filter': [ - 'any', - [ - 'all', - ['==', ['get', 'historic'], 'memorial'], - ['==', ['get', 'memorial'], 'statue'] - ], - [ - 'all', - ['==', ['get', 'tourism'], 'artwork'], - ['==', ['get', 'artwork_type'], 'statue'] - ] - ], - 'icon-image': 'statue', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'filter': ['==', ['get', 'amenity'], 'dentist'], + 'icon-image': 'dentist', + 'icon-color': theme.healthIconColor, + 'text-color': theme.healthIconColor }, { - 'filter': [ - 'any', - ['==', ['get', 'historic'], 'memorial'], - ['==', ['get', 'memorial'], 'stone'] - ], - 'icon-image': 'stone', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'filter': ['==', ['get', 'amenity'], 'veterinary'], + 'icon-image': 'veterinary', + 'icon-color': theme.healthIconColor, + 'text-color': theme.healthIconColor + }, + + // Communication + { + 'filter': ['==', ['get', 'amenity'], 'post_box'], + 'icon-image': 'post_box', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor + }, + { + 'filter': ['==', ['get', 'amenity'], 'post_office'], + 'icon-image': 'post_office', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor + }, + // { + // 'filter': ['==', ['get', 'amenity'], 'parcel_locker'], + // 'icon-image': 'parcel_locker', + // 'icon-color': theme.amenityIconColor, + // 'text-color': theme.amenityIconColor + // }, + { + 'filter': ['==', ['get', 'amenity'], 'telephone'], + 'icon-image': 'telephone', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor + }, + { + 'filter': ['==', ['get', 'emergency'], 'phone'], + 'icon-image': 'emergency_phone', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor + }, + + // Transportation + { + 'filter': ['==', ['get', 'amenity'], 'parking'], + 'icon-image': 'parking', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { 'filter': [ 'any', - [ - 'all', - ['==', ['get', 'historic'], 'castle'], - ['==', ['get', 'castle_type'], 'palace'] + ['all', + ['==', ['get', 'amenity'], 'parking'], + ['==', ['get', 'parking'], 'lane'], ], - [ - 'all', - ['==', ['get', 'historic'], 'castle'], - ['==', ['get', 'castle_type'], 'stately'] + ['all', + ['==', ['get', 'amenity'], 'parking'], + ['==', ['get', 'parking'], 'street_side'] ] ], - 'icon-image': 'palace', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'icon-image': 'parking_subtle', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': ['==', ['get', 'historic'], 'castle'], - 'icon-image': 'fortress', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'filter': ['==', ['get', 'highway'], 'bus_stop'], + 'icon-image': 'bus_stop', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': ['==', ['get', 'historic'], 'fort'], - 'icon-image': 'historic_fort', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'filter': ['==', ['get', 'amenity'], 'fuel'], + 'icon-image': 'fuel', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': [ + 'filter': ['==', ['get', 'amenity'], 'bicycle_parking'], + 'icon-image': 'bicycle_parking', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor + }, + { + 'filter': [ 'any', - [ - 'all', - ['==', ['get', 'historic'], 'memorial'], - ['==', ['get', 'memorial'], 'bust'] - ], - [ - 'all', - ['==', ['get', 'tourism'], 'artwork'], - ['==', ['get', 'artwork_type'], 'bust'] - ] + ['==', ['get', 'railway'], 'station'], + ['==', ['get', 'railway'], 'halt'], + ['==', ['get', 'railway'], 'tram_stop'] ], - 'icon-image': 'bust', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'icon-image': 'place-6', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': ['==', ['get', 'historic'], 'city_gate'], - 'icon-image': 'city_gate', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'filter': ['==', ['get', 'amenity'], 'bus_station'], + 'icon-image': 'bus_station', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': [ - 'any', - ['==', ['get', 'historic'], 'manor'], - [ - 'all', - ['==', ['get', 'historic'], 'castle'], - ['==', ['get', 'castle_type'], 'manor'] - ] - ], - 'icon-image': 'manor', - 'icon-color': theme.pointIconHistoricIconColor, - 'text-color': theme.pointIconHistoricTextColor + 'filter': ['==', ['get', 'aeroway'], 'helipad'], + 'icon-image': 'helipad', + 'icon-color': theme.otherTransportIconColor, + 'text-color': theme.otherTransportIconColor }, - - // Leisure { - 'filter': ['==', ['get', 'leisure'], 'playground'], - 'icon-image': 'playground', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'aeroway'], 'aerodrome'], + 'icon-image': 'aerodrome', + 'icon-color': theme.otherTransportIconColor, + 'text-color': theme.otherTransportIconColor }, { - 'filter': [ - 'any', - ['==', ['get', 'leisure'], 'fitness_centre'], - ['==', ['get', 'leisure'], 'fitness_station'] - ], - 'icon-image': 'fitness', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'amenity'], 'bicycle_rental'], + 'icon-image': 'rental_bicycle', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': ['==', ['get', 'leisure'], 'golf_course'], - 'icon-image': 'golf', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'leisure'], 'slipway'], + 'icon-image': 'slipway', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor + }, + { + 'filter': ['==', ['get', 'amenity'], 'taxi'], + 'icon-image': 'taxi', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { 'filter': [ - 'any', - ['==', ['get', 'leisure'], 'water_park'], - ['==', ['get', 'leisure'], 'swimming_area'], - ['==', ['get', 'leisure'], 'sports_centre'], - ['==', ['get', 'sport'], 'swimming'] + 'all', + ['==', ['get', 'amenity'], 'vending_machine'], + ['==', ['get', 'vending'], 'parking_tickets'] ], - 'icon-image': 'water_park', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'icon-image': 'parking_tickets', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': ['==', ['get', 'leisure'], 'sauna'], - 'icon-image': 'sauna', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'railway'], 'subway_entrance'], + 'icon-image': 'entrance', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': ['==', ['get', 'leisure'], 'outdoor_seating'], - 'icon-image': 'outdoor_seating', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'amenity'], 'charging_station'], + 'icon-image': 'charging_station', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': ['==', ['get', 'leisure'], 'amusement_arcade'], - 'icon-image': 'amusement_arcade', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'highway'], 'elevator'], + 'icon-image': 'elevator', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': ['==', ['get', 'leisure'], 'miniature_golf'], - 'icon-image': 'miniature_golf', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'amenity'], 'car_rental'], + 'icon-image': 'rental_car', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': ['==', ['get', 'leisure'], 'beach_resort'], - 'icon-image': 'beach_resort', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': [ + 'all', + ['==', ['get', 'amenity'], 'parking_entrance'], + ['==', ['get', 'parking'], 'underground'] + ], + 'icon-image': 'parking_entrance_underground', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': ['==', ['get', 'leisure'], 'fishing'], - 'icon-image': 'fishing', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': [ + 'all', + ['==', ['get', 'amenity'], 'vending_machine'], + ['==', ['get', 'vending'], 'public_transport_tickets'] + ], + 'icon-image': 'public_transport_tickets', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': ['==', ['get', 'leisure'], 'bowling_alley'], - 'icon-image': 'bowling_alley', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'amenity'], 'ferry_terminal'], + 'icon-image': 'ferry', + 'icon-color': theme.otherTransportIconColor, + 'text-color': theme.otherTransportIconColor }, { - 'filter': ['==', ['get', 'leisure'], 'dog_park'], - 'icon-image': 'dog_park', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'amenity'], 'motorcycle_parking'], + 'icon-image': 'motorcycle_parking', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': ['==', ['get', 'golf'], 'pin'], - 'icon-image': 'leisure_golf_pin', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'amenity'], 'bicycle_repair_station'], + 'icon-image': 'bicycle_repair_station', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, { - 'filter': ['==', ['get', 'leisure'], 'picnic_table'], - 'icon-image': 'picnic', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'amenity'], 'boat_rental'], + 'icon-image': 'boat_rental', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, { - 'filter': ['==', ['get', 'leisure'], 'firepit'], - 'icon-image': 'firepit', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': [ + 'all', + ['==', ['get', 'amenity'], 'parking_entrance'], + ['==', ['get', 'parking'], 'multi-storey'] + ], + 'icon-image': 'parking_entrance_multistorey', + 'icon-color': theme.transportationIconColor, + 'text-color': theme.transportationIconColor }, + + // Road features + // { + // 'filter': ['==', ['get', 'oneway'], 'yes'], + // 'icon-image': 'oneway', + // 'icon-color': theme.otherIconColor, + // 'text-color': theme.otherIconColor + // }, { - 'filter': ['==', ['get', 'leisure'], 'bird_hide'], - 'icon-image': 'bird_hide', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'barrier'], 'gate'], + 'icon-image': 'gate', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, - { - 'filter': ['==', ['get', 'leisure'], 'slipway'], - 'icon-image': 'slipway', - 'icon-color': theme.pointIconLeisureColor, - 'text-color': theme.pointIconLeisureTextColor, + 'filter': ['==', ['get', 'highway'], 'traffic_signals'], + 'icon-image': 'traffic_light', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, - - // Man-made + // { + // 'filter': [ + // 'any', + // ['==', ['get', 'railway'], 'level_crossing'], + // ['==', ['get', 'railway'], 'crossing'] + // ], + // 'icon-image': 'level_crossing2', + // 'icon-color': theme.otherIconColor, + // 'text-color': theme.otherIconColor + // }, { - 'filter': ['any', ['==', ['get', 'man_made'], 'storage_tank'], ['==', ['get', 'man_made'], 'silo']], - 'icon-image': 'storage_tank', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': [ + 'any', + ['==', ['get', 'railway'], 'level_crossing'], + ['==', ['get', 'railway'], 'crossing'] + ], + 'icon-image': 'level_crossing', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': ['==', ['get', 'man_made'], 'tower'], - 'icon-image': 'tower_generic', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': [ + 'any', + ['==', ['get', 'barrier'], 'bollard'], + ['==', ['get', 'barrier'], 'block'], + ['==', ['get', 'barrier'], 'turnstile'], + ['==', ['get', 'barrier'], 'log'] + ], + 'icon-image': 'gate', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': ['all', ['==', ['get', 'man_made'], 'tower'], ['==', ['get', 'tower:type'], 'communication']], - 'icon-image': 'tower_cantilever_communication', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': [ + 'any', + ['==', ['get', 'barrier'], 'lift_gate'], + ['==', ['get', 'barrier'], 'swing_gate'] + ], + 'icon-image': 'lift_gate', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': ['any', ['==', ['get', 'historic'], 'wayside_cross'], ['==', ['get', 'man_made'], 'cross']], - 'icon-image': 'christian', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'barrier'], 'cycle_barrier'], + 'icon-image': 'cycle_barrier', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': ['==', ['get', 'man_made'], 'water_tower'], - 'icon-image': 'water_tower', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'barrier'], 'stile'], + 'icon-image': 'stile', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, + // { + // 'filter': ['==', ['get', 'highway'], 'mini_roundabout'], + // 'icon-image': 'highway_mini_roundabout', + // 'icon-color': theme.otherIconColor, + // 'text-color': theme.otherIconColor + // }, { - 'filter': ['==', ['get', 'man_made'], 'obelisk'], - 'icon-image': 'obelisk', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'barrier'], 'toll_booth'], + 'icon-image': 'toll_booth', + 'icon-color': theme.accommodationIconColor, + 'text-color': theme.accommodationIconColor }, { - 'filter': ['==', ['get', 'man_made'], 'mast'], - 'icon-image': 'mast', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'barrier'], 'cattle_grid'], + 'icon-image': 'barrier_cattle_grid', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': ['==', ['get', 'man_made'], 'chimney'], - 'icon-image': 'chimney', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'barrier'], 'kissing_gate'], + 'icon-image': 'kissing_gate', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': [ - 'any', - [ - 'all', - ['==', ['get', 'man_made'], 'tower'], - ['==', ['get', 'tower:type'], 'observation'] - ], - [ - 'all', - ['==', ['get', 'man_made'], 'tower'], - ['==', ['get', 'tower:type'], 'watchtower'] - ] - ], - 'icon-image': 'tower_observation', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'barrier'], 'full-height_turnstile'], + 'icon-image': 'full-height_turnstile', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': [ - 'all', - ['==', ['get', 'man_made'], 'tower'], - ['==', ['get', 'tower:type'], 'bell_tower'] - ], - 'icon-image': 'tower_bell_tower', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'barrier'], 'motorcycle_barrier'], + 'icon-image': 'motorcycle_barrier', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { 'filter': [ - 'all', - ['==', ['get', 'man_made'], 'tower'], - ['==', ['get', 'tower:type'], 'lighting'] + 'any', + ['==', ['get', 'ford'], 'yes'], + ['==', ['get', 'ford'], 'stepping_stones'] ], - 'icon-image': 'tower_lighting', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'icon-image': 'ford', + 'icon-color': theme.waterIconColor, + 'text-color': theme.waterwayLabelTextColor }, + // { + // 'filter': ['==', ['get', 'mountain_pass'], 'yes'], + // 'icon-image': 'mountain_pass', + // 'icon-color': theme.transportationIconColor, + // 'text-color': theme.transportationIconColor + // }, { - 'filter': ['==', ['get', 'man_made'], 'lighthouse'], - 'icon-image': 'lighthouse', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'waterway'], 'dam'], + 'icon-image': 'place-6', + 'icon-color': theme.pointIconWaterIconColor, + 'text-color': theme.pointIconWaterTextColor }, - { - 'filter': ['==', ['get', 'man_made'], 'crane'], - 'icon-image': 'crane', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'waterway'], 'weir'], + 'icon-image': 'place-6', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': ['==', ['get', 'man_made'], 'windmill'], - 'icon-image': 'windmill', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'waterway'], 'lock_gate'], + 'icon-image': 'place-6', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, + // { + // 'filter': ['==', ['get', 'Node with highway'], 'turning_circle at way with highway'], + // 'icon-image': 'turning_circle_on_highway_track', + // 'icon-color': theme.otherIconColor, + // 'text-color': theme.otherIconColor + // }, + + // Nature { - 'filter': [ - 'all', - ['==', ['get', 'man_made'], 'tower'], - ['==', ['get', 'tower:type'], 'communication'], - ['==', ['get', 'tower:construction'], 'lattice'] - ], - 'icon-image': 'tower_lattice_communication', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'natural'], 'peak'], + 'icon-image': 'peak', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': [ - 'all', - ['==', ['get', 'man_made'], 'mast'], - ['==', ['get', 'tower:type'], 'lighting'] - ], - 'icon-image': 'mast_lighting', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'natural'], 'spring'], + 'icon-image': 'spring', + 'icon-color': theme.waterIconColor, + 'text-color': theme.waterIconColor }, { - 'filter': [ - 'all', - ['==', ['get', 'man_made'], 'mast'], - ['==', ['get', 'tower:type'], 'communication'] - ], - 'icon-image': 'mast_communications', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'natural'], 'cave_entrance'], + 'icon-image': 'cave', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': ['==', ['get', 'man_made'], 'communications_tower'], - 'icon-image': 'communication_tower', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'waterway'], 'waterfall'], + 'icon-image': 'waterfall', + 'icon-color': theme.waterIconColor, + 'text-color': theme.waterIconColor }, { - 'filter': [ - 'all', - ['==', ['get', 'man_made'], 'tower'], - ['==', ['get', 'tower:type'], 'defensive'] - ], - 'icon-image': 'tower_defensive', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'filter': ['==', ['get', 'natural'], 'saddle'], + 'icon-image': 'saddle', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor }, { - 'filter': [ - 'all', - ['==', ['get', 'man_made'], 'tower'], - ['==', ['get', 'tower:type'], 'cooling'] + 'filter': ['==', ['get', 'natural'], 'volcano'], + 'icon-image': 'peak', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor + }, + + // Administrative facilities + { + 'filter': ['==', ['get', 'amenity'], 'police'], + 'icon-image': 'police', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor + }, + { + 'filter': ['==', ['get', 'amenity'], 'townhall'], + 'icon-image': 'town_hall', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor + }, + { + 'filter': ['==', ['get', 'amenity'], 'fire_station'], + 'icon-image': 'firestation', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor + }, + { + 'filter': ['==', ['get', 'amenity'], 'social_facility'], + 'icon-image': 'social_facility', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor + }, + { + 'filter': ['==', ['get', 'amenity'], 'courthouse'], + 'icon-image': 'courthouse', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor + }, + { + 'filter': [ + 'all', + ['==', ['get', 'office'], 'diplomatic'], + ['==', ['get', 'diplomatic'], 'embassy'] ], - 'icon-image': 'tower_cooling', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'icon-image': 'diplomatic', + 'icon-color': theme.officeIconColor, + 'text-color': theme.officeIconColor }, { 'filter': [ 'all', - ['==', ['get', 'man_made'], 'tower'], - ['==', ['get', 'tower:construction'], 'lattice'] + ['==', ['get', 'office'], 'diplomatic'], + ['==', ['get', 'diplomatic'], 'consulate'] ], - 'icon-image': 'tower_lattice', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'icon-image': 'consulate', + 'icon-color': theme.officeIconColor, + 'text-color': theme.officeIconColor + }, + { + 'filter': ['==', ['get', 'amenity'], 'prison'], + 'icon-image': 'prison', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor }, + + // Religious place { 'filter': [ 'all', - ['==', ['get', 'man_made'], 'tower'], - ['==', ['get', 'tower:type'], 'lighting'], - ['==', ['get', 'tower:construction'], 'lattice'] + ['==', ['get', 'amenity'], 'place_of_worship'], + ['==', ['get', 'religion'], 'christian'] ], - 'icon-image': 'tower_lattice_lighting', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'icon-image': 'christian', + 'icon-color': theme.religionIconColor, + 'text-color': theme.religionIconColor }, { 'filter': [ 'all', - ['==', ['get', 'man_made'], 'tower'], - ['==', ['get', 'tower:construction'], 'dish'] + ['==', ['get', 'amenity'], 'place_of_worship'], + ['==', ['get', 'religion'], 'jewish'] ], - 'icon-image': 'tower_dish', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'icon-image': 'jewish', + 'icon-color': theme.religionIconColor, + 'text-color': theme.religionIconColor }, { 'filter': [ 'all', - ['==', ['get', 'man_made'], 'tower'], - ['==', ['get', 'tower:construction'], 'dome'] + ['==', ['get', 'amenity'], 'place_of_worship'], + ['==', ['get', 'religion'], 'muslim'] ], - 'icon-image': 'tower_dome', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'icon-image': 'muslim', + 'icon-color': theme.religionIconColor, + 'text-color': theme.religionIconColor }, { 'filter': [ 'all', - ['==', ['get', 'man_made'], 'telescope'], - ['==', ['get', 'telescope:type'], 'radio'] + ['==', ['get', 'amenity'], 'place_of_worship'], + ['==', ['get', 'religion'], 'taoist'] ], - 'icon-image': 'telescope_dish', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'icon-image': 'taoist', + 'icon-color': theme.religionIconColor, + 'text-color': theme.religionIconColor }, { 'filter': [ 'all', - ['==', ['get', 'man_made'], 'telescope'], - ['==', ['get', 'telescope:type'], 'optical'] + ['==', ['get', 'amenity'], 'place_of_worship'], + ['==', ['get', 'religion'], 'hindu'] ], - 'icon-image': 'telescope_dome', - 'icon-color': theme.pointIconManMadeIconColor, - 'text-color': theme.pointIconManMadeTextColor, + 'icon-image': 'hinduist', + 'icon-color': theme.religionIconColor, + 'text-color': theme.religionIconColor }, - - // Military { - filter: ['==', ['get', 'military'], 'bunker'], - 'icon-image': 'bunker', - 'icon-color': theme.pointIconBunkerIconColor, - 'text-color': theme.pointIconBunkerTextColor, + 'filter': [ + 'all', + ['==', ['get', 'amenity'], 'place_of_worship'], + ['==', ['get', 'religion'], 'buddhist'] + ], + 'icon-image': 'buddhist', + 'icon-color': theme.religionIconColor, + 'text-color': theme.religionIconColor }, - - // Natural { - filter: ['==', ['get', 'natural'], 'spring'], - 'icon-image': 'spring', - 'icon-color': theme.pointIconSpringIconColor, - 'text-color': theme.pointIconSpringTextColor, + 'filter': [ + 'all', + ['==', ['get', 'amenity'], 'place_of_worship'], + ['==', ['get', 'religion'], 'shinto'] + ], + 'icon-image': 'shintoist', + 'icon-color': theme.religionIconColor, + 'text-color': theme.religionIconColor }, { - filter: ['==', ['get', 'natural'], 'cave_entrance'], - 'icon-image': 'entrance', - 'icon-color': theme.pointIconCaveEntranceIconColor, - 'text-color': theme.pointIconCaveEntranceTextColor, + 'filter': [ + 'all', + ['==', ['get', 'amenity'], 'place_of_worship'], + ['==', ['get', 'religion'], 'sikh'] + ], + 'icon-image': 'sikhist', + 'icon-color': theme.religionIconColor, + 'text-color': theme.religionIconColor }, + // { + // 'filter': [ + // 'all', + // ['==', ['get', 'amenity'], 'place_of_worship'], + // ['==', ['get', 'without or other religion'], '* value'] + // ], + // 'icon-image': 'place_of_worship', + // 'icon-color': theme.religionIconColor, + // 'text-color': theme.religionIconColor + // }, + + // Shop and services { - filter: ['==', ['get', 'natural'], 'peak'], - 'icon-image': 'peak', - 'icon-color': theme.pointIconPeakIconColor, - 'text-color': theme.pointIconPeakTextColor, + 'filter': ['==', ['get', 'amenity'], 'marketplace'], + 'icon-image': 'marketplace', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor }, { - filter: ['==', ['get', 'natural'], 'saddle'], - 'icon-image': 'saddle', - 'icon-color': theme.pointIconSaddleIconColor, - 'text-color': theme.pointIconSaddleTextColor, + 'filter': ['==', ['get', 'shop'], 'convenience'], + 'icon-image': 'convenience', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - filter: ['==', ['get', 'natural'], 'volcano'], - 'icon-image': 'volcano', - 'icon-color': theme.pointIconVolcanoIconColor, - 'text-color': theme.pointIconVolcanoTextColor, + 'filter': ['==', ['get', 'shop'], 'supermarket'], + 'icon-image': 'supermarket', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, - - // Railway { 'filter': [ 'any', - ['==', ['get', 'railway'], 'station'], - ['==', ['get', 'railway'], 'halt'], - ['==', ['get', 'railway'], 'tram_stop'] + ['==', ['get', 'shop'], 'clothes'], + ['==', ['get', 'shop'], 'fashion'] ], - 'icon-image': 'place-6', - 'icon-color': theme.pointIconHaltIconColor, - 'text-color': theme.pointIconHaltTextColor, + 'icon-image': 'clothes', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': [ - 'any', - ['==', ['get', 'railway'], 'level_crossing'], - ['==', ['get', 'railway'], 'crossing'] + 'filter': ['==', ['get', 'shop'], 'hairdresser'], + 'icon-image': 'hairdresser', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, + }, + { + 'filter': ['==', ['get', 'shop'], 'bakery'], + 'icon-image': 'bakery', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, + }, + { + 'filter': ['==', ['get', 'shop'], 'car_repair'], + 'icon-image': 'car_repair', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, + }, + { + 'filter': ['any', + ['==', ['get', 'shop'], 'doityourself'], + ['==', ['get', 'shop'], 'hardware'] ], - 'icon-image': 'level_crossing2', - 'icon-color': theme.pointIconRailwayIconColor, - 'text-color': theme.pointIconRailwayIconColor, + 'icon-image': 'diy', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': [ - 'any', - ['==', ['get', 'railway'], 'level_crossing'], - ['==', ['get', 'railway'], 'crossing'] + 'filter': ['==', ['get', 'shop'], 'car'], + 'icon-image': 'car', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, + }, + { + 'filter': ['any', + ['==', ['get', 'shop'], 'kiosk'], + ['==', ['get', 'shop'], 'newsagent'] ], - 'icon-image': 'level_crossing', - 'icon-color': theme.pointIconRailwayIconColor, - 'text-color': theme.pointIconRailwayIconColor, + 'icon-image': 'newsagent', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, - - // Railway (custom) { - 'filter': ['==', ['get', 'railway'], 'subway_entrance'], - 'icon-image': 'entrance', - 'icon-color': theme.pointIconRailwayIconColor, - 'text-color': theme.pointIconRailwayIconColor, + 'filter': ['==', ['get', 'shop'], 'beauty'], + 'icon-image': 'beauty', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, - - // Tourism { - 'filter': ['==', ['get', 'tourism'], 'artwork'], - 'icon-image': 'artwork', - 'icon-color': theme.pointIconAmenityIconColor, - 'text-color': theme.pointIconAmenityTextColor + 'filter': ['==', ['get', 'amenity'], 'car_wash'], + 'icon-image': 'car_wash', + 'icon-color': theme.amenityIconColor, + 'text-color': theme.amenityIconColor, }, { - 'filter': ['==', ['get', 'tourism'], 'gallery'], - 'icon-image': 'art', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'filter': ['==', ['get', 'shop'], 'butcher'], + 'icon-image': 'butcher', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': ['==', ['get', 'tourism'], 'picnic_site'], - 'icon-image': 'picnic', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'filter': ['any', + ['==', ['get', 'shop'], 'alcohol'], + ['==', ['get', 'shop'], 'wine'] + ], + 'icon-image': 'alcohol', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': ['==', ['get', 'tourism'], 'camp_site'], - 'icon-image': 'camping', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'filter': ['==', ['get', 'shop'], 'furniture'], + 'icon-image': 'furniture', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': ['==', ['get', 'tourism'], 'caravan_site'], - 'icon-image': 'caravan_park', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'filter': ['==', ['get', 'shop'], 'florist'], + 'icon-image': 'florist', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': [ - 'all', - ['==', ['get', 'tourism'], 'information'], - ['==', ['get', 'information'], 'guidepost'] - ], - 'icon-image': 'guidepost', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'filter': ['==', ['get', 'shop'], 'mobile_phone'], + 'icon-image': 'mobile_phone', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': [ - 'all', - ['==', ['get', 'tourism'], 'information'], - ['==', ['get', 'information'], 'board'] - ], - 'icon-image': 'board', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'filter': ['==', ['get', 'shop'], 'electronics'], + 'icon-image': 'electronics', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': [ - 'any', - [ - 'all', - ['==', ['get', 'tourism'], 'information'], - ['==', ['get', 'information'], 'map'] - ], - [ - 'all', - ['==', ['get', 'tourism'], 'information'], - ['==', ['get', 'information'], 'tactile_map'] - ] - ], - 'icon-image': 'map', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'filter': ['==', ['get', 'shop'], 'shoes'], + 'icon-image': 'shoes', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, + }, + { + 'filter': ['==', ['get', 'shop'], 'car_parts'], + 'icon-image': 'car_parts', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': [ 'any', - ['==', ['get', 'tourism'], 'information'], - ['==', ['get', 'information'], 'office'] + ['==', ['get', 'shop'], 'greengrocer'], + ['==', ['get', 'shop'], 'farm'] ], - 'icon-image': 'office', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'icon-image': 'greengrocer', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': [ 'any', - ['==', ['get', 'tourism'], 'information'], - ['==', ['get', 'information'], 'terminal'] + ['==', ['get', 'shop'], 'laundry'], + ['==', ['get', 'shop'], 'dry_cleaning'] ], - 'icon-image': 'terminal', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'icon-image': 'laundry', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, + }, + { + 'filter': ['==', ['get', 'shop'], 'optician'], + 'icon-image': 'optician', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': [ 'any', - ['==', ['get', 'tourism'], 'information'], - ['==', ['get', 'information'], 'audioguide'] + ['==', ['get', 'shop'], 'jewelry'], + ['==', ['get', 'shop'], 'jewellery'] ], - 'icon-image': 'audioguide', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor - }, - { - 'filter': ['==', ['get', 'tourism'], 'viewpoint'], - 'icon-image': 'viewpoint', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'icon-image': 'jewelry', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': ['==', ['get', 'tourism'], 'hotel'], - 'icon-image': 'hotel', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'filter': ['==', ['get', 'shop'], 'books'], + 'icon-image': 'library', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': ['==', ['get', 'tourism'], 'guest_house'], - 'icon-image': 'guest_house', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'filter': ['==', ['get', 'shop'], 'gift'], + 'icon-image': 'gift', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': ['==', ['get', 'tourism'], 'hostel'], - 'icon-image': 'hostel', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor + 'filter': ['==', ['get', 'shop'], 'department_store'], + 'icon-image': 'department_store', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { - 'filter': ['==', ['get', 'tourism'], 'chalet'], - 'icon-image': 'chalet', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor - }, - { - 'filter': ['==', ['get', 'tourism'], 'motel'], - 'icon-image': 'motel', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor - }, - { - 'filter': ['==', ['get', 'tourism'], 'apartment'], - 'icon-image': 'apartment', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor - }, - { - 'filter': ['==', ['get', 'tourism'], 'alpine_hut'], - 'icon-image': 'alpinehut', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor - }, - { - 'filter': ['==', ['get', 'tourism'], 'wilderness_hut'], - 'icon-image': 'wilderness_hut', - 'icon-color': theme.pointIconTourismIconColor, - 'text-color': theme.pointIconTourismTextColor - }, - - // Power - { - 'filter': [ - 'all', - ['==', ['get', 'power'], 'generator'], - ['any', - ['==', ['get', 'generator:source'], 'wind'], - ['==', ['get', 'generator:method'], 'wind_turbine)'] - ] - ], - 'icon-image': 'generator_wind', - 'icon-color': theme.pointIconPowerIconColor, - 'text-color': theme.pointIconPowerTextColor, - }, - { - 'filter': ['==', ['get', 'power'], 'tower'], - 'icon-image': 'power_tower', - 'icon-color': theme.pointIconPowerIconColor, - 'text-color': theme.pointIconPowerTextColor, - }, - { - 'filter': ['==', ['get', 'power'], 'pole'], - 'icon-image': 'power_pole', - 'icon-color': theme.pointIconPowerIconColor, - 'text-color': theme.pointIconPowerTextColor, - }, - - // Waterway - { - 'filter': ['==', ['get', 'waterway'], 'dam'], - 'icon-image': 'place-6', - 'icon-color': theme.pointIconWaterIconColor, - 'text-color': theme.pointIconWaterTextColor - }, - { - 'filter': ['==', ['get', 'waterway'], 'weir'], - 'icon-image': 'place-6', - 'icon-color': theme.pointIconWaterIconColor, - 'text-color': theme.pointIconWaterTextColor - }, - { - 'filter': ['==', ['get', 'waterway'], 'lock_gate'], - 'icon-image': 'place-6', - 'icon-color': theme.pointIconWaterIconColor, - 'text-color': theme.pointIconWaterTextColor - }, - { - 'filter': ['==', ['get', 'waterway'], 'waterfall'], - 'icon-image': 'waterfall', - 'icon-color': theme.pointIconWaterIconColor, - 'text-color': theme.pointIconWaterTextColor - }, - - // Nature - { - 'filter': ['==', ['get', 'natural'], 'peak'], - 'icon-image': 'peak', - 'icon-color': theme.pointIconPeakIconColor, - 'text-color': theme.pointIconPeakTextColor - }, - { - 'filter': ['==', ['get', 'natural'], 'spring'], - 'icon-image': 'spring', - 'icon-color': theme.pointIconSpringIconColor, - 'text-color': theme.pointIconSpringTextColor - }, - { - 'filter': ['==', ['get', 'natural'], 'cave_entrance'], - 'icon-image': 'cave', - 'icon-color': theme.pointIconCaveEntranceIconColor, - 'text-color': theme.pointIconCaveEntranceTextColor - }, - { - 'filter': ['==', ['get', 'natural'], 'saddle'], - 'icon-image': 'saddle', - 'icon-color': theme.pointIconSaddleIconColor, - 'text-color': theme.pointIconSaddleTextColor - }, - { - 'filter': ['==', ['get', 'natural'], 'volcano'], - 'icon-image': 'peak', - 'icon-color': theme.pointIconVolcanoIconColor, - 'text-color': theme.pointIconVolcanoTextColor - }, - - // Shop - { - 'filter': ['==', ['get', 'shop'], 'convenience'], - 'icon-image': 'convenience', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'supermarket'], - 'icon-image': 'supermarket', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': [ - 'any', - ['==', ['get', 'shop'], 'clothes'], - ['==', ['get', 'shop'], 'fashion'] - ], - 'icon-image': 'clothes', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'hairdresser'], - 'icon-image': 'hairdresser', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'bakery'], - 'icon-image': 'bakery', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'car_repair'], - 'icon-image': 'car_repair', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['any', - ['==', ['get', 'shop'], 'doityourself'], - ['==', ['get', 'shop'], 'hardware'] - ], - 'icon-image': 'diy', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'car'], - 'icon-image': 'car', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['any', - ['==', ['get', 'shop'], 'kiosk'], - ['==', ['get', 'shop'], 'newsagent'] - ], - 'icon-image': 'newsagent', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'beauty'], - 'icon-image': 'beauty', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'amenity'], 'car_wash'], - 'icon-image': 'car_wash', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'butcher'], - 'icon-image': 'butcher', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['any', - ['==', ['get', 'shop'], 'alcohol'], - ['==', ['get', 'shop'], 'wine'] - ], - 'icon-image': 'alcohol', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'furniture'], - 'icon-image': 'furniture', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'florist'], - 'icon-image': 'florist', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'mobile_phone'], - 'icon-image': 'mobile_phone', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'electronics'], - 'icon-image': 'electronics', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'shoes'], - 'icon-image': 'shoes', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'car_parts'], - 'icon-image': 'car_parts', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': [ - 'any', - ['==', ['get', 'shop'], 'greengrocer'], - ['==', ['get', 'shop'], 'farm'] - ], - 'icon-image': 'greengrocer', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': [ - 'any', - ['==', ['get', 'shop'], 'laundry'], - ['==', ['get', 'shop'], 'dry_cleaning'] - ], - 'icon-image': 'laundry', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'optician'], - 'icon-image': 'optician', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': [ - 'any', - ['==', ['get', 'shop'], 'jewelry'], - ['==', ['get', 'shop'], 'jewellery'] - ], - 'icon-image': 'jewelry', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'books'], - 'icon-image': 'library', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'gift'], - 'icon-image': 'gift', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'department_store'], - 'icon-image': 'department_store', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'bicycle'], - 'icon-image': 'bicycle', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'filter': ['==', ['get', 'shop'], 'bicycle'], + 'icon-image': 'bicycle', + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': [ @@ -1558,56 +1441,56 @@ let directives = [ ['==', ['get', 'shop'], 'pastry'] ], 'icon-image': 'confectionery', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'variety_store'], 'icon-image': 'variety_store', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'travel_agency'], 'icon-image': 'travel_agency', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'sports'], 'icon-image': 'sports', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'chemist'], 'icon-image': 'chemist', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'computer'], 'icon-image': 'computer', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'stationery'], 'icon-image': 'stationery', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'pet'], 'icon-image': 'pet', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'beverages'], 'icon-image': 'beverages', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': [ @@ -1616,68 +1499,68 @@ let directives = [ ['==', ['get', 'shop'], 'perfumery'] ], 'icon-image': 'perfumery', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'tyres'], 'icon-image': 'tyres', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'motorcycle'], 'icon-image': 'motorcycle', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'garden_centre'], 'icon-image': 'garden_centre', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'copyshop'], 'icon-image': 'copyshop', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'toys'], 'icon-image': 'toys', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'deli'], 'icon-image': 'deli', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'tobacco'], 'icon-image': 'tobacco', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'seafood'], 'icon-image': 'seafood', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'interior_decoration'], 'icon-image': 'interior_decoration', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'ticket'], 'icon-image': 'ticket', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': [ @@ -1687,8 +1570,8 @@ let directives = [ ['==', ['get', 'shop'], 'photography'] ], 'icon-image': 'photo', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': [ @@ -1697,367 +1580,462 @@ let directives = [ ['==', ['get', 'shop'], 'wholesale'] ], 'icon-image': 'trade', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'outdoor'], 'icon-image': 'outdoor', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'houseware'], 'icon-image': 'houseware', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'art'], 'icon-image': 'art', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'paint'], 'icon-image': 'paint', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'fabric'], 'icon-image': 'fabric', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'bookmaker'], 'icon-image': 'bookmaker', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'second_hand'], 'icon-image': 'second_hand', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'charity'], 'icon-image': 'charity', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'bed'], 'icon-image': 'bed', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'medical_supply'], 'icon-image': 'medical_supply', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'hifi'], 'icon-image': 'hifi', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'music'], 'icon-image': 'music', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'coffee'], 'icon-image': 'coffee', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'musical_instrument'], 'icon-image': 'musical_instrument', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'tea'], 'icon-image': 'tea', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'video'], 'icon-image': 'video', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'bag'], 'icon-image': 'bag', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'carpet'], 'icon-image': 'carpet', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'video_games'], 'icon-image': 'video_games', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'amenity'], 'vehicle_inspection'], 'icon-image': 'vehicle_inspection', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, { 'filter': ['==', ['get', 'shop'], 'dairy'], 'icon-image': 'dairy', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, - }, - { - 'filter': ['==', ['get', 'shop'], 'massage'], - 'icon-image': 'massage', - 'icon-color': theme.pointIconShopIconColor, - 'text-color': theme.pointIconShopTextColor, + 'icon-color': theme.shopIconColor, + 'text-color': theme.shopIconColor, }, - // { // 'filter': ['!=', ['get', 'shop'], 'yes'], // 'icon-image': 'place-4', - // 'icon-color': theme.pointIconShopIconColor, - // 'text-color': theme.pointIconShopTextColor, + // 'icon-color': theme.shopIconColor, + // 'text-color': theme.shopIconColor, // }, + { + 'filter': ['==', ['get', 'office'], '*'], + 'icon-image': 'office', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor + }, + { + 'filter': [ + 'any', + ['==', ['get', 'amenity'], 'nursing_home'], + ['==', ['get', 'amenity'], 'childcare'] + ], + 'icon-image': 'place-6', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor + }, + // Landmarks, man-made infrastructure, masts and towers + { + 'filter': ['any', ['==', ['get', 'man_made'], 'storage_tank'], ['==', ['get', 'man_made'], 'silo']], + 'icon-image': 'storage_tank', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['==', ['get', 'man_made'], 'tower'], + 'icon-image': 'tower_generic', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['all', ['==', ['get', 'man_made'], 'tower'], ['==', ['get', 'tower:type'], 'communication']], + 'icon-image': 'tower_cantilever_communication', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'power'], 'generator'], + ['any', + ['==', ['get', 'generator:source'], 'wind'], + ['==', ['get', 'generator:method'], 'wind_turbine)'] + ] + ], + 'icon-image': 'generator_wind', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['==', ['get', 'amenity'], 'hunting_stand'], + 'icon-image': 'hunting_stand', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['any', ['==', ['get', 'historic'], 'wayside_cross'], ['==', ['get', 'man_made'], 'cross']], + 'icon-image': 'christian', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['==', ['get', 'man_made'], 'water_tower'], + 'icon-image': 'water_tower', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['==', ['get', 'man_made'], 'mast'], + 'icon-image': 'mast', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + filter: ['==', ['get', 'military'], 'bunker'], + 'icon-image': 'bunker', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['==', ['get', 'man_made'], 'chimney'], + 'icon-image': 'chimney', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'any', + [ + 'all', + ['==', ['get', 'man_made'], 'tower'], + ['==', ['get', 'tower:type'], 'observation'] + ], + [ + 'all', + ['==', ['get', 'man_made'], 'tower'], + ['==', ['get', 'tower:type'], 'watchtower'] + ] + ], + 'icon-image': 'tower_observation', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'tower'], + ['==', ['get', 'tower:type'], 'bell_tower'] + ], + 'icon-image': 'tower_bell_tower', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'tower'], + ['==', ['get', 'tower:type'], 'lighting'] + ], + 'icon-image': 'tower_lighting', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['==', ['get', 'man_made'], 'lighthouse'], + 'icon-image': 'lighthouse', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['==', ['get', 'advertising'], 'column'], + 'icon-image': 'column', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['==', ['get', 'man_made'], 'crane'], + 'icon-image': 'crane', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['==', ['get', 'man_made'], 'windmill'], + 'icon-image': 'windmill', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'tower'], + ['==', ['get', 'tower:type'], 'communication'], + ['==', ['get', 'tower:construction'], 'lattice'] + ], + 'icon-image': 'tower_lattice_communication', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'mast'], + ['==', ['get', 'tower:type'], 'lighting'] + ], + 'icon-image': 'mast_lighting', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'mast'], + ['==', ['get', 'tower:type'], 'communication'] + ], + 'icon-image': 'mast_communications', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': ['==', ['get', 'man_made'], 'communications_tower'], + 'icon-image': 'communication_tower', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'tower'], + ['==', ['get', 'tower:type'], 'defensive'] + ], + 'icon-image': 'tower_defensive', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'tower'], + ['==', ['get', 'tower:type'], 'cooling'] + ], + 'icon-image': 'tower_cooling', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'tower'], + ['==', ['get', 'tower:construction'], 'lattice'] + ], + 'icon-image': 'tower_lattice', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'tower'], + ['==', ['get', 'tower:type'], 'lighting'], + ['==', ['get', 'tower:construction'], 'lattice'] + ], + 'icon-image': 'tower_lattice_lighting', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'tower'], + ['==', ['get', 'tower:construction'], 'dish'] + ], + 'icon-image': 'tower_dish', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'tower'], + ['==', ['get', 'tower:construction'], 'dome'] + ], + 'icon-image': 'tower_dome', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'telescope'], + ['==', ['get', 'telescope:type'], 'radio'] + ], + 'icon-image': 'telescope_dish', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, + { + 'filter': [ + 'all', + ['==', ['get', 'man_made'], 'telescope'], + ['==', ['get', 'telescope:type'], 'optical'] + ], + 'icon-image': 'telescope_dome', + 'icon-color': theme.manMadeIconColor, + 'text-color': theme.manMadeIconColor, + }, - // // To be classified + // Electricity // { - // 'filter': ['==', ['get', 'tourism'], 'museum'], - // 'icon-image': 'museum', - // 'icon-color': theme.pointIconAmenityIconColor, - // 'text-color': theme.pointIconAmenityTextColor + // 'filter': ['==', ['get', 'power'], 'tower'], + // 'icon-image': 'power_tower', + // 'icon-color': theme.powerIconColor, + // 'text-color': theme.powerIconColor, // }, // { - // 'filter': [ - // 'all', - // ['==', ['get', 'amenity'], 'vending_machine'], - // ['==', ['get', 'vending'], 'excrement_bags'] - // ], - // 'icon-image': 'excrement_bags', - // 'icon-color': theme.pointIconAmenityIconColor, - // 'text-color': theme.pointIconAmenityTextColor - // }, - // { - // 'filter': ['==', ['get', 'emergency'], 'phone'], - // 'icon-image': 'emergency_phone', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'highway'], 'bus_stop'], - // 'icon-image': 'bus_stop', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'highway'], 'traffic_signals'], - // 'icon-image': 'traffic_light', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'highway'], 'elevator'], - // 'icon-image': 'elevator', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'oneway'], 'yes'], - // 'icon-image': 'oneway', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'barrier'], 'gate'], - // 'icon-image': 'barrier_gate', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': [ - // 'any', - // ['==', ['get', 'barrier'], 'bollard'], - // ['==', ['get', 'barrier'], 'block'], - // ['==', ['get', 'barrier'], 'turnstile'], - // ['==', ['get', 'barrier'], 'log'] - // ], - // 'icon-image': 'barrier', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': [ - // 'any', - // ['==', ['get', 'barrier'], 'lift_gate'], - // ['==', ['get', 'barrier'], 'swing_gate'] - // ], - // 'icon-image': 'liftgate', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'barrier'], 'cycle_barrier'], - // 'icon-image': 'cycle_barrier', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'barrier'], 'stile'], - // 'icon-image': 'barrier_stile', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'highway'], 'mini_roundabout'], - // 'icon-image': 'highway_mini_roundabout', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'barrier'], 'toll_booth'], - // 'icon-image': 'toll_booth', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'barrier'], 'cattle_grid'], - // 'icon-image': 'barrier_cattle_grid', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'barrier'], 'kissing_gate'], - // 'icon-image': 'kissing_gate', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'barrier'], 'full-height_turnstile'], - // 'icon-image': 'full_height_turnstile', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'barrier'], 'motorcycle_barrier'], - // 'icon-image': 'motorcycle_barrier', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': [ - // 'any', - // ['==', ['get', 'ford'], 'yes'], - // ['==', ['get', 'ford'], 'stepping_stones'] - // ], - // 'icon-image': 'ford', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'mountain_pass'], 'yes'], - // 'icon-image': 'mountain_pass', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': [ - // 'all', - // ['==', ['get', 'office'], 'diplomatic'], - // ['==', ['get', 'diplomatic'], 'embassy'] - // ], - // 'icon-image': 'diplomatic', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': [ - // 'all', - // ['==', ['get', 'office'], 'diplomatic'], - // ['==', ['get', 'diplomatic'], 'consulate'] - // ], - // 'icon-image': 'office_diplomatic_consulate', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'office'], '*'], - // 'icon-image': 'office', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'advertising'], 'column'], - // 'icon-image': 'column', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'place'], 'city'], - // 'icon-image': 'place', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['has', 'capital'], - // 'icon-image': 'place_capital', - // 'icon-color': '', - // 'text-color': '' + // 'filter': ['==', ['get', 'power'], 'pole'], + // 'icon-image': 'place-6', + // 'icon-color': theme.powerIconColor, + // 'text-color': theme.powerIconColor, // }, + + // Places + { + 'filter': ['==', ['get', 'place'], 'city'], + 'icon-image': 'place-6', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor, + }, + { + 'filter': ['has', 'capital'], + 'icon-image': 'place_capital', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor, + }, // { // 'filter': ['==', ['get', 'entrance'], 'yes'], - // 'icon-image': 'rect', - // 'icon-color': '', - // 'text-color': '' + // 'icon-image': 'entrance', + // 'icon-color': theme.otherIconColor, + // 'text-color': theme.otherIconColor, // }, // { // 'filter': ['==', ['get', 'entrance'], 'main'], - // 'icon-image': 'entrance_main', - // 'icon-color': '', - // 'text-color': '' + // 'icon-image': 'entrance', + // 'icon-color': theme.otherIconColor, + // 'text-color': theme.otherIconColor, // }, // { // 'filter': ['==', ['get', 'entrance'], 'service'], // 'icon-image': 'entrance', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': [ - // 'all', - // ['has', 'entrance'], - // ['==', ['get', 'access'], 'no'] - // ], - // 'icon-image': 'rectdiag', - // 'icon-color': '', - // 'text-color': '' - // }, - // { - // 'filter': ['==', ['get', 'Node with highway'], 'turning_circle at way with highway'], - // 'icon-image': 'turning_circle_on_highway_track', - // 'icon-color': '', - // 'text-color': '' + // 'icon-color': theme.otherIconColor, + // 'text-color': theme.otherIconColor, // }, + { + 'filter': [ + 'all', + ['has', 'entrance'], + ['==', ['get', 'access'], 'no'] + ], + 'icon-image': 'entrance', + 'icon-color': theme.otherIconColor, + 'text-color': theme.otherIconColor, + }, ]; export default asLayerObject(withSortKeys(directives), { diff --git a/basemap/themes/default.js b/basemap/themes/default.js index 07a5c3bb..f2c56432 100644 --- a/basemap/themes/default.js +++ b/basemap/themes/default.js @@ -275,282 +275,6 @@ export default { pedestrianAreaPaintFillColor: 'rgb(221, 221, 231)', pointCountryLabelCountryTextColor: 'rgb(90, 56, 90)', pointCountryLabelPaintTextHaloColor: 'rgba(255, 255, 255, 0.8)', - pointIconAlpineHutIconColor: 'rgb(0, 146, 219)', - pointIconAlpineHutTextColor: 'rgb(0, 146, 219)', - pointIconAmusementArcadeIconColor: 'rgb(13, 134, 22)', - pointIconAmusementArcadeTextColor: 'rgb(13, 134, 22)', - pointIconApartmentIconColor: 'rgb(0, 146, 219)', - pointIconApartmentTextColor: 'rgb(0, 146, 219)', - pointIconArchaeologicalSiteIconColor: 'rgb(115, 74, 7)', - pointIconArchaeologicalSiteTextColor: 'rgb(115, 74, 7)', - pointIconArtsCentreIconColor: 'rgb(115, 74, 7)', - pointIconArtsCentreTextColor: 'rgb(115, 74, 7)', - pointIconArtworkIconColor: 'rgb(115, 74, 7)', - pointIconArtworkTextColor: 'rgb(115, 74, 7)', - pointIconAtmIconColor: 'rgb(115, 74, 7)', - pointIconAtmTextColor: 'rgb(115, 74, 7)', - pointIconBankIconColor: 'rgb(115, 74, 7)', - pointIconBankTextColor: 'rgb(115, 74, 7)', - pointIconBarIconColor: 'rgb(199, 116, 0)', - pointIconBarTextColor: 'rgb(199, 116, 0)', - pointIconBbqIconColor: 'rgb(115, 74, 7)', - pointIconBbqTextColor: 'rgb(115, 74, 7)', - pointIconBeachResortIconColor: 'rgb(13, 134, 22)', - pointIconBeachResortTextColor: 'rgb(13, 134, 22)', - pointIconBenchIconColor: 'rgb(102, 102, 102)', - pointIconBenchTextColor: 'rgb(102, 102, 102)', - pointIconBicycleParkingIconColor: 'rgb(0, 146, 219)', - pointIconBicycleParkingTextColor: 'rgb(0, 146, 219)', - pointIconBicycleRentalIconColor: 'rgb(0, 146, 219)', - pointIconBicycleRentalTextColor: 'rgb(0, 146, 219)', - pointIconBicycleRepairStationIconColor: 'rgb(115, 74, 7)', - pointIconBicycleRepairStationTextColor: 'rgb(115, 74, 7)', - pointIconBiergartenIconColor: 'rgb(199, 116, 0)', - pointIconBiergartenTextColor: 'rgb(199, 116, 0)', - pointIconBirdHideIconColor: 'rgb(13, 134, 22)', - pointIconBirdHideTextColor: 'rgb(13, 134, 22)', - pointIconBoatRentalIconColor: 'rgb(0, 146, 219)', - pointIconBoatRentalTextColor: 'rgb(0, 146, 219)', - pointIconBowlingAlleyIconColor: 'rgb(13, 134, 22)', - pointIconBowlingAlleyTextColor: 'rgb(13, 134, 22)', - pointIconBunkerIconColor: 'rgb(85, 85, 85)', - pointIconBunkerTextColor: 'rgb(85, 85, 85)', - pointIconBureauDeChangeIconColor: 'rgb(115, 74, 7)', - pointIconBureauDeChangeTextColor: 'rgb(115, 74, 7)', - pointIconBusStationIconColor: 'rgb(0, 146, 219)', - pointIconBusStationTextColor: 'rgb(0, 146, 219)', - pointIconBusStopIconColor: 'rgb(0, 146, 219)', - pointIconBusStopTextColo: 'rgb(0, 146, 219)', - pointIconCafeIconColor: 'rgb(199, 116, 0)', - pointIconCafeTextColor: 'rgb(199, 116, 0)', - pointIconCampSiteIconColor: 'rgb(0, 146, 219)', - pointIconCampSiteTextColor: 'rgb(0, 146, 219)', - pointIconCarRentalIconColor: 'rgb(0, 146, 219)', - pointIconCarRentalTextColor: 'rgb(0, 146, 219)', - pointIconCarWashIconColor: 'rgb(115, 74, 7)', - pointIconCarWashTextColor: 'rgb(115, 74, 7)', - pointIconCaravaneSiteIconColor: 'rgb(0, 146, 219)', - pointIconCaravaneSiteTextColor: 'rgb(0, 146, 219)', - pointIconCasinoIconColor: 'rgb(115, 74, 7)', - pointIconCasinoTextColor: 'rgb(115, 74, 7)', - pointIconCastleIconColor: 'rgb(115, 74, 7)', - pointIconCastleTextColor: 'rgb(115, 74, 7)', - pointIconCaveEntranceIconColor: 'rgb(85, 85, 85)', - pointIconCaveEntranceTextColor: 'rgb(85, 85, 85)', - pointIconChaletIconColor: 'rgb(0, 146, 219)', - pointIconChaletTextColor: 'rgb(0, 146, 219)', - pointIconChargingStationIconColor: 'rgb(0, 146, 219)', - pointIconChargingStationTextColor: 'rgb(0, 146, 219)', - pointIconChildcareIconColor: 'rgb(76, 76, 0)', - pointIconChildcareTextColor: 'rgb(76, 76, 0)', - pointIconChimneyIconColor: 'rgb(85, 85, 85)', - pointIconChimneyTextColor: 'rgb(85, 85, 85)', - pointIconCinemaIconColor: 'rgb(115, 74, 7)', - pointIconCinemaTextColor: 'rgb(115, 74, 7)', - pointIconCityGateIconColor: 'rgb(85, 85, 85)', - pointIconCityGateTextColor: 'rgb(85, 85, 85)', - pointIconCliniqueIconColor: 'rgb(191, 0, 0)', - pointIconCliniqueTextColor: 'rgb(191, 0, 0)', - pointIconCommunicationTowerIconColor: 'rgb(85, 85, 85)', - pointIconCommunicationTowerTextColor: 'rgb(85, 85, 85)', - pointIconCommunityCentreIconColor: 'rgb(115, 74, 7)', - pointIconCommunityCentreTextColor: 'rgb(115, 74, 7)', - pointIconCourthouseIconColor: 'rgb(115, 74, 7)', - pointIconCourthouseTextColor: 'rgb(115, 74, 7)', - pointIconCraneIconColor: 'rgb(85, 85, 85)', - pointIconCraneTextColor: 'rgb(85, 85, 85)', - pointIconCrossIconColor: 'rgb(85, 85, 85)', - pointIconCrossTextColor: 'rgb(85, 85, 85)', - pointIconCrossingIconColor: 'rgb(102, 102, 102)', - pointIconCrossingTextColor: 'rgb(102, 102, 102)', - pointIconDamIconColor: 'rgb(173, 173, 173)', - pointIconDamTextColor: 'rgb(173, 173, 173)', - pointIconDentistIconColor: 'rgb(191, 0, 0)', - pointIconDentistTextColor: 'rgb(191, 0, 0)', - pointIconDoctorIconColor: 'rgb(191, 0, 0)', - pointIconDoctorTextColor: 'rgb(191, 0, 0)', - pointIconDrinkingWaterIconColor: 'rgb(115, 74, 7)', - pointIconDrinkingWaterTextColor: 'rgb(115, 74, 7)', - pointIconDrivingSchoolIconColor: 'rgb(172, 58, 173)', - pointIconDrivingSchoolTextColor: 'rgb(172, 58, 173)', - pointIconFastFoodIconColor: 'rgb(199, 116, 0)', - pointIconFastFoodTextColor: 'rgb(199, 116, 0)', - pointIconFerryTerminalIconColor: 'rgb(132, 97, 196)', - pointIconFerryTerminalTextColor: 'rgb(132, 97, 196)', - pointIconFireStationIconColor: 'rgb(115, 74, 7)', - pointIconFireStationTextColor: 'rgb(115, 74, 7)', - pointIconFirepitIconColor: 'rgb(115, 74, 7)', - pointIconFirepitTextColor: 'rgb(115, 74, 7)', - pointIconFishingIconColor: 'rgb(13, 134, 22)', - pointIconFishingTextColor: 'rgb(13, 134, 22)', - pointIconFitnessCentreIconColor: 'rgb(13, 134, 22)', - pointIconFitnessCentreTextColor: 'rgb(13, 134, 22)', - pointIconFitnessStationIconColor: 'rgb(13, 134, 22)', - pointIconFitnessStationTextColor: 'rgb(13, 134, 22)', - pointIconFoodCourtIconColor: 'rgb(199, 116, 0)', - pointIconFoodCourtTextColor: 'rgb(199, 116, 0)', - pointIconFortIconColor: 'rgb(115, 74, 7)', - pointIconFortTextColor: 'rgb(115, 74, 7)', - pointIconFountainIconColor: 'rgb(87, 104, 236)', - pointIconFountainTextColor: 'rgb(87, 104, 236)', - pointIconFuelIconColor: 'rgb(0, 146, 219)', - pointIconFuelTextColor: 'rgb(0, 146, 219)', - pointIconGalleryIconColor: 'rgb(115, 74, 7)', - pointIconGalleryTextColor: 'rgb(115, 74, 7)', - pointIconGolfCourseIconColor: 'rgb(13, 134, 22)', - pointIconGolfCourseTextColor: 'rgb(13, 134, 22)', - pointIconGuestHouseIconColor: 'rgb(0, 146, 219)', - pointIconGuestHouseextColor: 'rgb(0, 146, 219)', - pointIconHaltIconColor: 'rgb(122, 129, 177)', - pointIconHaltTextColor: 'rgb(122, 129, 177)', - pointIconHospitalIconColor: 'rgb(191, 0, 0)', - pointIconHospitalTextColor: 'rgb(191, 0, 0)', - pointIconHostelIconColor: 'rgb(0, 146, 219)', - pointIconHostelTextColor: 'rgb(0, 146, 219)', - pointIconHuntingStandIconColor: 'rgb(85, 85, 85)', - pointIconHuntingStandTextColor: 'rgb(85, 85, 85)', - pointIconIceCreamIconColor: 'rgb(199, 116, 0)', - pointIconIceCreamTextColor: 'rgb(199, 116, 0)', - pointIconInternetCafeIconColor: 'rgb(115, 74, 7)', - pointIconInternetCafeTextColor: 'rgb(115, 74, 7)', - pointIconLayerIconHaloColor: 'rgba(255, 255, 255, 0.8)', - pointIconLayerTextHaloColor: 'rgba(255, 255, 255, 0.8)', - pointIconLevelCrossingIconColor: 'rgb(102, 102, 102)', - pointIconLevelCrossingTextColor: 'rgb(102, 102, 102)', - pointIconLibraryIconColor: 'rgb(115, 74, 7)', - pointIconLibraryTextColor: 'rgb(115, 74, 7)', - pointIconLightHouseTextColor: 'rgb(85, 85, 85)', - pointIconLighthouseIconColor: 'rgb(85, 85, 85)', - pointIconLockGateIconColor: 'rgb(173, 173, 173)', - pointIconLockGateTextColor: 'rgb(173, 173, 173)', - pointIconManorIconColor: 'rgb(115, 74, 7)', - pointIconManorTextColor: 'rgb(115, 74, 7)', - pointIconMarketplaceIconColor: 'rgb(172, 58, 173)', - pointIconMarketplaceTextColor: 'rgb(172, 58, 173)', - pointIconMastIconColor: 'rgb(85, 85, 85)', - pointIconMastTextColor: 'rgb(85, 85, 85)', - pointIconMemorialIconColor: 'rgb(115, 74, 7)', - pointIconMemorialTextColor: 'rgb(115, 74, 7)', - pointIconMiniatureGolfIconColor: 'rgb(13, 134, 22)', - pointIconMiniatureGolfTextColor: 'rgb(13, 134, 22)', - pointIconMonumentIconColor: 'rgb(115, 74, 7)', - pointIconMonumentTextColor: 'rgb(115, 74, 7)', - pointIconMotelIconColor: 'rgb(0, 146, 219)', - pointIconMotelTextColor: 'rgb(0, 146, 219)', - pointIconMotorcycleParkingIconColor: 'rgb(0, 146, 219)', - pointIconMotorcycleParkingTextColor: 'rgb(0, 146, 219)', - pointIconMuseumIconColor: 'rgb(115, 74, 7)', - pointIconMuseumTextColor: 'rgb(115, 74, 7)', - pointIconNightclubTextColor: 'rgb(115, 74, 7)', - pointIconNigthclubIconColor: 'rgb(115, 74, 7)', - pointIconNursingHomeIconColor: 'rgb(76, 76, 0)', - pointIconNursingHomeTextColor: 'rgb(76, 76, 0)', - pointIconObeliskIconColor: 'rgb(115, 74, 7)', - pointIconObeliskTextColor: 'rgb(115, 74, 7)', - pointIconOutdoorSeatingIconColor: 'rgb(13, 134, 22)', - pointIconOutdoorSeatingTextColor: 'rgb(13, 134, 22)', - pointIconParkingEntranceIconColor: 'rgb(0, 146, 219)', - pointIconParkingEntranceTextColor: 'rgb(0, 146, 219)', - pointIconParkingIconColor: 'rgb(0, 146, 219)', - pointIconParkingTextColor: 'rgb(0, 146, 219)', - pointIconPeakIconColor: 'rgb(209, 144, 85)', - pointIconPeakTextColor: 'rgb(209, 144, 85)', - pointIconPharmacieIconColor: 'rgb(191, 0, 0)', - pointIconPharmacieTextColor: 'rgb(191, 0, 0)', - pointIconPicnicSiteIconColor: 'rgb(102, 102, 102)', - pointIconPicnicSiteTextColor: 'rgb(102, 102, 102)', - pointIconPicnicTableIconColor: 'rgb(102, 102, 102)', - pointIconPicnicTableTextColor: 'rgb(102, 102, 102)', - pointIconPlaceOfWorkshipIconColor: 'rgb(0, 0, 0)', - pointIconPlaceOfWorkshipTextColor: 'rgb(0, 0, 0)', - pointIconPlaygroundIconColor: 'rgb(13, 134, 22)', - pointIconPlaygroundTextColor: 'rgb(13, 134, 22)', - pointIconPoliceIconColor: 'rgb(115, 74, 7)', - pointIconPoliceTextColor: 'rgb(115, 74, 7)', - pointIconPostBoxIconColor: 'rgb(115, 74, 7)', - pointIconPostBoxTextColor: 'rgb(115, 74, 7)', - pointIconPostOfficeIconColor: 'rgb(115, 74, 7)', - pointIconPostOfficeTextColor: 'rgb(115, 74, 7)', - pointIconPrisonIconColor: 'rgb(115, 74, 7)', - pointIconPrisonTextColor: 'rgb(115, 74, 7)', - pointIconPubIconColor: 'rgb(199, 116, 0)', - pointIconPubTextColor: 'rgb(199, 116, 0)', - pointIconPublicBathIconColor: 'rgb(115, 74, 7)', - pointIconPublicBathTextColor: 'rgb(115, 74, 7)', - pointIconPublicBookCaseTextColor: 'rgb(115, 74, 7)', - pointIconPublicBookcaseIconColor: 'rgb(115, 74, 7)', - pointIconRecyclingIconColor: 'rgb(115, 74, 7)', - pointIconRecyclingTextColor: 'rgb(115, 74, 7)', - pointIconRestaurantIconColor: 'rgb(199, 116, 0)', - pointIconRestaurantTextColor: 'rgb(199, 116, 0)', - pointIconSaddleIconColor: 'rgb(209, 144, 85)', - pointIconSaddleTextColor: 'rgb(209, 144, 85)', - pointIconSaunaIconColor: 'rgb(13, 134, 22)', - pointIconSaunaTextColor: 'rgb(13, 134, 22)', - pointIconShelterIconColor: 'rgb(102, 102, 102)', - pointIconShelterTextColor: 'rgb(102, 102, 102)', - pointIconShowerIconColor: 'rgb(115, 74, 7)', - pointIconShowerTextColor: 'rgb(115, 74, 7)', - pointIconSiloIconColor: 'rgb(85, 85, 85)', - pointIconSiloTextColor: 'rgb(85, 85, 85)', - pointIconSlipwayIconColor: 'rgb(0, 146, 219)', - pointIconSlipwayTextColor: 'rgb(0, 146, 219)', - pointIconSocialFacilityIconColor: 'rgb(115, 74, 7)', - pointIconSocialFacilityTextColor: 'rgb(115, 74, 7)', - pointIconSpringIconColor: 'rgb(0, 146, 219)', - pointIconSpringTextColor: 'rgb(0, 146, 219)', - pointIconStationIconColor: 'rgb(122, 129, 177)', - pointIconStationTextColor: 'rgb(122, 129, 177)', - pointIconStorageTankIconColor: 'rgb(85, 85, 85)', - pointIconStorageTankTextColor: 'rgb(85, 85, 85)', - pointIconSubwayEntranceIconColor: 'rgb(0, 146, 219)', - pointIconSubwayEntranceTextColor: 'rgb(0, 146, 219)', - pointIconSwimmingAreaIconColor: 'rgb(13, 134, 22)', - pointIconSwimmingAreaTextColor: 'rgb(13, 134, 22)', - pointIconTaxiIconColor: 'rgb(0, 146, 219)', - pointIconTaxiTextColor: 'rgb(0, 146, 219)', - pointIconTelephoneIconColor: 'rgb(115, 74, 7)', - pointIconTelephoneTextColor: 'rgb(115, 74, 7)', - pointIconTelescopeIconColor: 'rgb(85, 85, 85)', - pointIconTelescopeTextColor: 'rgb(85, 85, 85)', - pointIconTheatreIconColor: 'rgb(115, 74, 7)', - pointIconTheatreTextColor: 'rgb(115, 74, 7)', - pointIconToiletsIconColor: 'rgb(115, 74, 7)', - pointIconToiletsTextColor: 'rgb(115, 74, 7)', - pointIconTowerIconColor: 'rgb(85, 85, 85)', - pointIconTowerTextColor: 'rgb(85, 85, 85)', - pointIconTowmhallTextColor: 'rgb(115, 74, 7)', - pointIconTownhallIconColor: 'rgb(115, 74, 7)', - pointIconTramStopIconColor: 'rgb(122, 129, 177)', - pointIconTramStopTextColor: 'rgb(122, 129, 177)', - pointIconVehicleInspectionIconColor: 'rgb(115, 74, 7)', - pointIconVehicleInspectionTextColor: 'rgb(115, 74, 7)', - pointIconVeterinaryIconColor: 'rgb(191, 0, 0)', - pointIconVeterinaryTextColor: 'rgb(191, 0, 0)', - pointIconViewpointIconColor: 'rgb(115, 74, 7)', - pointIconViewpointTextColor: 'rgb(115, 74, 7)', - pointIconVolcanoIconColor: 'rgb(212, 0, 0)', - pointIconVolcanoTextColor: 'rgb(212, 0, 0)', - pointIconWasteBasketIconColor: 'rgb(102, 102, 102)', - pointIconWasteBasketTextColor: 'rgb(102, 102, 102)', - pointIconWasteDisposalIconColor: 'rgb(115, 74, 7)', - pointIconWasteDisposalTextColor: 'rgb(115, 74, 7)', - pointIconWaterParkIconColor: 'rgb(13, 134, 22)', - pointIconWaterParkTextColor: 'rgb(13, 134, 22)', - pointIconWaterTowerIconColor: 'rgb(85, 85, 85)', - pointIconWaterTowerTextColor: 'rgb(85, 85, 85)', - pointIconWaterfallIconColor: 'rgb(0, 146, 219)', - pointIconWaterfallTextColor: 'rgb(0, 146, 219)', - pointIconWayShrineIconColor: 'rgb(85, 85, 85)', - pointIconWaysideCrossIconColor: 'rgb(85, 85, 85)', - pointIconWaysideCrossTextColor: 'rgb(85, 85, 85)', - pointIconWaysideShrineTextColor: 'rgb(85, 85, 85)', - pointIconWeirIconColor: 'rgb(0, 146, 219)', - pointIconWeirTextColor: 'rgb(0, 146, 219)', - pointIconWildernessHutIconColor: 'rgb(0, 146, 219)', - pointIconWildernessHutTextColor: 'rgb(0, 146, 219)', - pointIconWindmillIconColor: 'rgb(85, 85, 85)', - pointIconWindmillTextColor: 'rgb(85, 85, 85)', pointLabelCityFilterOneLabelColor: 'rgb(100, 100, 100)', pointLabelCityFilterTwoLabelColor: 'rgb(50, 50, 50)', pointLabelCityLabelColor: 'rgb(25, 25, 25)', @@ -613,7 +337,7 @@ export default { pointIconLeisureColor: 'rgb(13, 134, 22)', pointIconLeisureTextColor: 'rgb(13, 134, 22)', pointIconAmenityIconColor: 'rgb(199, 116, 0)', - pointIconAmenityTextColor: 'rgb(199, 116, 0)', + aerodromeTextColor: 'rgb(199, 116, 0)', pointIconHistoricIconColor: 'rgb(115, 74, 7)', pointIconHistoricTextColor: 'rgb(115, 74, 7)', pointIconRailwayIconColor: 'rgb(0, 146, 218)', @@ -623,6 +347,24 @@ export default { pointIconWaterIconColor: 'rgb(0, 146, 219)', pointIconWaterTextColor: 'rgb(0, 146, 219)', + // Icon colors + amenityIconColor: 'rgb(115, 74, 7)', + historyIconColor: 'rgb(115, 74, 7)', + transportationIconColor: 'rgb(0, 146, 218)', + accommodationIconColor: 'rgb(0, 146, 218)', + shopIconColor: 'rgb(172, 57, 172)', + healthIconColor: 'rgb(191, 0, 0)', + gastronomyIconColor: 'rgb(199, 116, 0)', + religionIconColor: 'rgb(0, 0, 0)', + powerIconColor: 'rgb(0, 0, 0)', + waterIconColor: 'rgb(0, 146, 219)', + officeIconColor: 'rgb(72, 99, 160)', + manMadeIconColor: 'rgb(85, 85, 85)', + leisureIconColor: 'rgb(13, 134, 22)', + otherTransportIconColor: 'rgb(132, 97, 196)', + otherIconColor: 'rgb(124, 124, 124)', + + // Line widths highwayMotorwayLineWidth: [5, 0.5, 16, 7], highwayTrunkLineWidth: [5, 0.5, 16, 6], highwayPrimaryLineWidth: [5, 0.5, 16, 6], @@ -653,4 +395,6 @@ export default { railwayTramLineWidth: [5, 0.5, 16, 3], railwayDisusedLineWidth: [5, 0.5, 16, 1], highwayOutlineWidth: [5, 0.5, 16, 1, 22, 1], + aerodromeIconColor: undefined + };
