From f959c49b76efb10de80b5a5d064288ea36c58f66 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Wed, 11 Apr 2018 17:56:23 +0300 Subject: [PATCH] Fixed FIFA styles --- data/styles/clear/include/Icons.mapcss | 34 +++++++++++------- data/styles/vehicle/include/Icons.mapcss | 45 +++++++++++++++++++++++- 2 files changed, 66 insertions(+), 13 deletions(-) diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index 784f74e9bd..5d6842a2ce 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -603,6 +603,10 @@ node[aeroway=airport], node[aeroway=aerodrome] {z-index: 3100;} +node[event=fc2018], +area[event=fc2018] +{z-index: 3200;} + /* 2. NATURAL */ node|z10-[natural=volcano], @@ -3016,26 +3020,32 @@ node|z18-[sponsored=partner2], area|z18-[sponsored=partner2] {font-size: 11;} -node|z13-14[event=fc2018][leisure=stadium] +node|z13-[event=fc2018], +area|z13-[event=fc2018] +{font-size: 10;text: name;text-color: @poi_label;text-offset: 1;} + +node|z13-14[event=fc2018][leisure=stadium], +area|z13-14[event=fc2018][leisure=stadium] {icon-image: wfc_stadium.svg;icon-min-distance: 16;} -node|z15-16[event=fc2018][leisure=stadium] -{icon-image: wfc_stadium.svg;icon-min-distance: 12;} -node|z17-[event=fc2018][leisure=stadium] + +node|z15-16[event=fc2018][leisure=stadium], +area|z15-16[event=fc2018][leisure=stadium] {icon-image: wfc_stadium.svg;icon-min-distance: 12;} +node|z17-[event=fc2018][leisure=stadium], +area|z17-[event=fc2018][leisure=stadium] +{icon-image: wfc_stadium.svg;icon-min-distance: 10;} + node|z15-[event=fc2018][shop=ticket], area|z15-[event=fc2018][shop=ticket], node|z15-[event=fc2018][olympics=official_building], area|z15-[event=fc2018][olympics=official_building], -{icon-image: wfc_ticket.svg;text-offset: 1;font-size: 10;icon-min-distance: 10;} +{icon-image: wfc_ticket.svg;icon-min-distance: 10;} -node|z15-[event=fc2018][olympics=live_site ], -area|z15-[event=fc2018][olympics=live_site ] -{icon-image: wfc_fanzone.svg;text-offset: 1;font-size: 10;icon-min-distance: 10;} +node|z15-[event=fc2018][olympics=live_site], +area|z15-[event=fc2018][olympics=live_site] +{icon-image: wfc_fanzone.svg;icon-min-distance: 10;} node|z15-[event=fc2018][shop=gift], area|z15-[event=fc2018][shop=gift] -{icon-image: wfc_fanzone.svg;text-offset: 1;font-size: 10;icon-min-distance: 10;} - -node|z6-[event=fc2018_city] -{icon-image: wfc_city.svg;} +{icon-image: wfc_shop.svg;icon-min-distance: 10;} diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 867f897eb6..62a7b938a7 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -128,13 +128,16 @@ area[amenity=parking], node[railway=station][transport=subway], {z-index: 3100;} +node[event=fc2018], +area[event=fc2018] +{z-index: 3200;} + node[amenity=fuel], area[amenity=fuel], node[amenity=charging_station], area[amenity=charging_station] {z-index: 3590;} - area[building=train_station], node[highway=speed_camera], {z-index: 8000;} @@ -825,3 +828,43 @@ area|z19-[amenity=parking] /*node|z17-[amenity=bicycle_parking], area|z17-[amenity=bicycle_parking] {icon-image: bike-parking-l.svg;icon-min-distance: 20;}*/ + +/* 8 Sponsored */ + +node|z14-[sponsored=partner2], +area|z14-[sponsored=partner2] +{icon-image: partner2-l.svg;font-size: 10;text: name;text-color: @poi_label;text-offset: 1;} + +node|z18-[sponsored=partner2], +area|z18-[sponsored=partner2] +{font-size: 11;} + +node|z13-[event=fc2018], +area|z13-[event=fc2018] +{font-size: 10;text: name;text-color: @poi_label;text-offset: 1;} + +node|z13-14[event=fc2018][leisure=stadium], +area|z13-14[event=fc2018][leisure=stadium] +{icon-image: wfc_stadium.svg;icon-min-distance: 16;} + +node|z15-16[event=fc2018][leisure=stadium], +area|z15-16[event=fc2018][leisure=stadium] +{icon-image: wfc_stadium.svg;icon-min-distance: 12;} + +node|z17-[event=fc2018][leisure=stadium], +area|z17-[event=fc2018][leisure=stadium] +{icon-image: wfc_stadium.svg;icon-min-distance: 10;} + +node|z15-[event=fc2018][shop=ticket], +area|z15-[event=fc2018][shop=ticket], +node|z15-[event=fc2018][olympics=official_building], +area|z15-[event=fc2018][olympics=official_building], +{icon-image: wfc_ticket.svg;icon-min-distance: 10;} + +node|z15-[event=fc2018][olympics=live_site], +area|z15-[event=fc2018][olympics=live_site] +{icon-image: wfc_fanzone.svg;icon-min-distance: 10;} + +node|z15-[event=fc2018][shop=gift], +area|z15-[event=fc2018][shop=gift] +{icon-image: wfc_shop.svg;icon-min-distance: 10;}