diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss index 19750c545..dfb8d9914 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/default/dark/colors.mapcss @@ -231,14 +231,14 @@ @subway_label: #9E9E9E; @indigenous_label: #6A512F; @shop_label: #6B425C; -@industry_label: #574469; +@industry_label: #000000; @food_label: #8C491C; -@entertainment_label: #8C311B; +@entertainment_label: #000000; @culture_label: #6E4426; @hotel_label: #614A43; -@sport_label: #2B5C4B; -@nature_label: #3C612E; -@water_label: #0A6074; +@sport_label: #000000; +@nature_label: #000000; +@water_label: #000000; @neutral_label: #51585E; @healthcare_label: #983E44; @public_transport_label: #2F6499; diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 7b89afcc8..c56baccb8 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -44,7 +44,7 @@ node|z18-[office], {icon-image: office-m.svg;} node|z18-[craft], -{icon-image: craft-m.svg;} +{text-color: @industry_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;icon-image: craft-m.svg;} node|z16-[shop], {icon-min-distance: 10;} @@ -1457,7 +1457,7 @@ node|z17-[amenity=prison], node|z18-[amenity=prison], {font-size: 11;} -node|z15-[amenity=townhall], +node|z16-[amenity=townhall], {icon-image: public-building-m.svg;} node|z17-[office=diplomatic], {icon-image: embassy-m.svg;} @@ -2269,4 +2269,239 @@ node|z18-[amenity=parking_space][parking_space=disabled], /* 8. Colored Labels */ -@import("../../default/include/Icons_Label_Colors.mapcss"); \ No newline at end of file +node[amenity=car_rental], +node[amenity=car_sharing], +node[amenity=internet_cafe], +node[amenity=marketplace], +node[amenity=motorcycle_rental], +node[shop=alcohol], +node[shop=antiques], +node[shop=art], +node[shop=auction], +node[shop=bakery], +node[shop=beauty], +node[shop=beverages], +node[shop=bicycle], +node[shop=books], +node[shop=butcher], +node[shop=camera], +node[shop=car], +node[shop=caravan], +node[shop=charity], +node[shop=cheese], +node[shop=chemist], +node[shop=chocolate], +node[shop=clothes], +node[shop=collector], +node[shop=computer], +node[shop=confectionery], +node[shop=convenience], +node[shop=copyshop], +node[shop=cosmetics], +node[shop=deli], +node[shop=department_store], +node[shop=doityourself], +node[shop=dry_cleaning], +node[shop=dry_cleaning], +node[shop=electronics], +node[shop=erotic], +node[shop=fabric], +node[shop=farm], +node[shop=florist], +node[shop=furniture], +node[shop=garden_centre], +node[shop=gift], +node[shop=greengrocer], +node[shop=grocery], +node[shop=hairdresser], +node[shop=hardware], +node[shop=health_food], +node[shop=hearing_aids], +node[shop=houseware], +node[shop=interior_decoration], +node[shop=jewelry], +node[shop=kiosk], +node[shop=kitchen], +node[shop=laundry], +node[shop=laundry], +node[shop=lighting], +node[shop=mall], +node[shop=mobile_phone], +node[shop=motorcycle], +node[shop=music], +node[shop=musical_instrument], +node[shop=optician], +node[shop=outdoor], +node[shop=pasta], +node[shop=pastry], +node[shop=pawnbroker], +node[shop=pet], +node[shop=photo], +node[shop=rental], +node[shop=rental][rental=bike], +node[shop=seafood], +node[shop=second_hand], +node[shop=sewing], +node[shop=shoes], +node[shop=sports], +node[shop=stationery], +node[shop=supermarket], +node[shop=ticket], +node[shop=tobacco], +node[shop=toys], +node[shop=variety_store], +node[shop=video], +node[shop=video_games], +node[shop=wine], +node[shop], +{text-color: @shop_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} + +node[amenity=car_wash], +node[amenity=fuel], +node[amenity=studio], +node[amenity=vehicle_inspection], +node[craft=beekeeper], +node[craft=blacksmith], +node[craft=carpenter], +node[craft=caterer], +node[craft=electrician], +node[craft=electronics_repair], +node[craft=grinding_mill], +node[craft=handicraft], +node[craft=hvac], +node[craft=key_cutter], +node[craft=locksmith], +node[craft=metal_construction], +node[craft=painter], +node[craft=plumber], +node[craft=sawmill], +node[craft], +node[landuse=industrial][industrial=mine], +node[landuse=quarry], +node[man_made=works], +node[office], +node[shop=agrarian], +node[shop=car_parts], +node[shop=car_repair], +node[shop=car_repair][service=tyres], +node[shop=funeral_directors], +node[shop=gas], +node[shop=motorcycle_repair], +node[shop=tattoo], +node[shop=trade], +node[shop=tyres], +node[shop=wholesale], +{text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} + +node[amenity=bar], +node[amenity=biergarten], +node[amenity=cafe], +node[amenity=fast_food], +node[amenity=food_court], +node[amenity=ice_cream], +node[amenity=nightclub], +node[amenity=pub], +node[amenity=restaurant], +{text-color: @food_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} + +node[amenity=casino], +node[amenity=cinema], +node[amenity=gambling], +node[amenity=stripclub], +node[amenity=theatre], +node[leisure=adult_gaming_centre], +node[leisure=amusement_arcade], +node[leisure=bowling_alley], +node[leisure=escape_game], +node[shop=bookmaker], +node[shop=lottery], +node[tourism=aquarium], +node[tourism=theme_park], +node[tourism=zoo], +{text-color: @entertainment_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} + +node[amenity=arts_centre], +node[amenity=community_centre], +node[amenity=conference_centre], +node[amenity=events_venue], +node[amenity=exhibition_centre], +node[amenity=place_of_worship] +node[amenity=social_facility], +node[historic=ship], +node[leisure=hackerspace], +node[tourism=attraction], +node[tourism=gallery], +node[tourism=museum], +{text-color: @culture_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} + +node[leisure=resort], +node[tourism=alpine_hut], +node[tourism=apartment], +node[tourism=chalet], +node[tourism=guest_house], +node[tourism=hostel], +node[tourism=hotel], +node[tourism=motel], +node[tourism=wilderness_hut], +{text-color: @hotel_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} + +node[leisure=dance], +node[leisure=fitness_centre], +node[leisure=sports_centre], +node[leisure=stadium], +{text-color: @sport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} + +node[landuse=plant_nursery], +{text-color: @nature_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} + +node[amenity=public_bath], +node[leisure=beach_resort], +node[leisure=marina], +node[leisure=sports_centre][sport=scuba_diving], +node[leisure=sports_centre][sport=swimming], +node[shop=massage], +{text-color: @water_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} + +area[amenity=university][name] +node[aeroway=gate], +node[amenity=atm], +node[amenity=bank], +node[amenity=bureau_de_change], +node[amenity=charging_station][motorcar?], +node[amenity=childcare], +node[amenity=college], +node[amenity=courthouse], +node[amenity=driving_school], +node[amenity=fire_station], +node[amenity=kindergarten], +node[amenity=language_school], +node[amenity=library], +node[amenity=money_transfer], +node[amenity=music_school], +node[amenity=nursing_home], +node[amenity=police], +node[amenity=post_office], +node[amenity=prison], +node[amenity=school], +node[amenity=townhall], +node[amenity=university][name], +node[barrier=border_control], +node[building=guardhouse], +node[office=security], +node[shop=money_lender], +node[tourism=information][information=office], +{text-color: @neutral_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} + +area[amenity=hospital], +node[amenity=clinic], +node[amenity=dentist], +node[amenity=doctors], +node[amenity=hospital], +node[amenity=pharmacy], +node[amenity=veterinary], +node[healthcare], +{text-color: @healthcare_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} + +node[amenity=bicycle_rental], +node[amenity=taxi], +{text-color: @public_transport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;} diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index 51bfd0191..58c222d04 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -229,7 +229,7 @@ @subway_label: #333333; @indigenous_label: #6A512F; @shop_label: #8C5678; -@industry_label: #907E9E; +@industry_label: #9482A3; @food_label: #BA7141; @entertainment_label: #D16B53; @culture_label: #82512D; diff --git a/data/styles/default/light/symbols/america-football-m.svg b/data/styles/default/light/symbols/america-football-m.svg index e7f537dd9..32ab666c0 100644 --- a/data/styles/default/light/symbols/america-football-m.svg +++ b/data/styles/default/light/symbols/america-football-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/animal-m.svg b/data/styles/default/light/symbols/animal-m.svg index 4bf204a36..50c3ab1dc 100644 --- a/data/styles/default/light/symbols/animal-m.svg +++ b/data/styles/default/light/symbols/animal-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/archery-m.svg b/data/styles/default/light/symbols/archery-m.svg index 41f85500e..248fb86e1 100644 --- a/data/styles/default/light/symbols/archery-m.svg +++ b/data/styles/default/light/symbols/archery-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/australian-football-m.svg b/data/styles/default/light/symbols/australian-football-m.svg index 0a804cbdd..80c69aa83 100644 --- a/data/styles/default/light/symbols/australian-football-m.svg +++ b/data/styles/default/light/symbols/australian-football-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/badminton-m.svg b/data/styles/default/light/symbols/badminton-m.svg index 4e717e446..a7744e2cd 100644 --- a/data/styles/default/light/symbols/badminton-m.svg +++ b/data/styles/default/light/symbols/badminton-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/baseball-m.svg b/data/styles/default/light/symbols/baseball-m.svg index 2718a2042..68fd292e9 100644 --- a/data/styles/default/light/symbols/baseball-m.svg +++ b/data/styles/default/light/symbols/baseball-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/basketball-m.svg b/data/styles/default/light/symbols/basketball-m.svg index 08f5554c2..26146314e 100644 --- a/data/styles/default/light/symbols/basketball-m.svg +++ b/data/styles/default/light/symbols/basketball-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/bowling-m.svg b/data/styles/default/light/symbols/bowling-m.svg index 8ac67d479..0451bd00e 100644 --- a/data/styles/default/light/symbols/bowling-m.svg +++ b/data/styles/default/light/symbols/bowling-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/climbing-m.svg b/data/styles/default/light/symbols/climbing-m.svg index 72da2afce..b3c936651 100644 --- a/data/styles/default/light/symbols/climbing-m.svg +++ b/data/styles/default/light/symbols/climbing-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/cricket-m.svg b/data/styles/default/light/symbols/cricket-m.svg index c5f00072f..097ad7cdc 100644 --- a/data/styles/default/light/symbols/cricket-m.svg +++ b/data/styles/default/light/symbols/cricket-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/curling-m.svg b/data/styles/default/light/symbols/curling-m.svg index 2e52b6107..3e1bd7ef0 100644 --- a/data/styles/default/light/symbols/curling-m.svg +++ b/data/styles/default/light/symbols/curling-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/equestrian-m.svg b/data/styles/default/light/symbols/equestrian-m.svg index a5fc53db7..9ebb14d86 100644 --- a/data/styles/default/light/symbols/equestrian-m.svg +++ b/data/styles/default/light/symbols/equestrian-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/escape_game.svg b/data/styles/default/light/symbols/escape_game.svg index c2a33b646..f3ca43d20 100644 --- a/data/styles/default/light/symbols/escape_game.svg +++ b/data/styles/default/light/symbols/escape_game.svg @@ -1,9 +1 @@ - - - escape_game - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/golf-m.svg b/data/styles/default/light/symbols/golf-m.svg index 33085db31..75396b351 100644 --- a/data/styles/default/light/symbols/golf-m.svg +++ b/data/styles/default/light/symbols/golf-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/handball-m.svg b/data/styles/default/light/symbols/handball-m.svg index 01d7a9f0f..55cfab631 100644 --- a/data/styles/default/light/symbols/handball-m.svg +++ b/data/styles/default/light/symbols/handball-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/hockey-m.svg b/data/styles/default/light/symbols/hockey-m.svg index cdb337b27..8aac10e90 100644 --- a/data/styles/default/light/symbols/hockey-m.svg +++ b/data/styles/default/light/symbols/hockey-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/martial-arts-m.svg b/data/styles/default/light/symbols/martial-arts-m.svg index c7e2ae028..637616a8a 100644 --- a/data/styles/default/light/symbols/martial-arts-m.svg +++ b/data/styles/default/light/symbols/martial-arts-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/padel-m.svg b/data/styles/default/light/symbols/padel-m.svg index 6da9ff03f..73423955b 100644 --- a/data/styles/default/light/symbols/padel-m.svg +++ b/data/styles/default/light/symbols/padel-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/pelota-m.svg b/data/styles/default/light/symbols/pelota-m.svg index 856b9d6d1..4901850dc 100644 --- a/data/styles/default/light/symbols/pelota-m.svg +++ b/data/styles/default/light/symbols/pelota-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/pitch-m.svg b/data/styles/default/light/symbols/pitch-m.svg index 1c86d9fde..75358ab88 100644 --- a/data/styles/default/light/symbols/pitch-m.svg +++ b/data/styles/default/light/symbols/pitch-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/shower-m.svg b/data/styles/default/light/symbols/shower-m.svg index 0bc0ab09b..fde2e4934 100644 --- a/data/styles/default/light/symbols/shower-m.svg +++ b/data/styles/default/light/symbols/shower-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/skateboard-m.svg b/data/styles/default/light/symbols/skateboard-m.svg index a8aab0d1a..4fd7a99d2 100644 --- a/data/styles/default/light/symbols/skateboard-m.svg +++ b/data/styles/default/light/symbols/skateboard-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/skiing-m.svg b/data/styles/default/light/symbols/skiing-m.svg index a33af2e4b..2de774ea4 100644 --- a/data/styles/default/light/symbols/skiing-m.svg +++ b/data/styles/default/light/symbols/skiing-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/soccer-m.svg b/data/styles/default/light/symbols/soccer-m.svg index 9c14bcbf4..b2e239dfe 100644 --- a/data/styles/default/light/symbols/soccer-m.svg +++ b/data/styles/default/light/symbols/soccer-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/table-tennis-m.svg b/data/styles/default/light/symbols/table-tennis-m.svg index 20aad7570..6759f2c97 100644 --- a/data/styles/default/light/symbols/table-tennis-m.svg +++ b/data/styles/default/light/symbols/table-tennis-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/tennis-m.svg b/data/styles/default/light/symbols/tennis-m.svg index cf834bc2e..b0cc72036 100644 --- a/data/styles/default/light/symbols/tennis-m.svg +++ b/data/styles/default/light/symbols/tennis-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/volleyball-m.svg b/data/styles/default/light/symbols/volleyball-m.svg index 083b63693..780e100a4 100644 --- a/data/styles/default/light/symbols/volleyball-m.svg +++ b/data/styles/default/light/symbols/volleyball-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/data/styles/default/light/symbols/yoga-m.svg b/data/styles/default/light/symbols/yoga-m.svg index d79376e70..82973881e 100644 --- a/data/styles/default/light/symbols/yoga-m.svg +++ b/data/styles/default/light/symbols/yoga-m.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file