diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index a459a2c321..045b38a0ba 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -102,7 +102,6 @@ node[public_transport=station], area[public_transport=station], {z-index: 2800;} - node[amenity=car_wash], area[amenity=car_wash], node[amenity=car_rental], @@ -111,6 +110,54 @@ node[shop=car_repair][service=tyres], area[shop=car_repair][service=tyres], {z-index: 2832;} +node[historic=boundary_stone], +area[historic=boundary_stone], +node[historic=wayside_cross], +area[historic=wayside_cross], +node[historic=ship], +area[historic=ship], +node[historic=tomb], +area[historic=tomb], +node[historic=ruins], +area[historic=ruins], +node[historic=wayside_shrine], +area[historic=wayside_shrine], +node[historic=archaeological_site], +area[historic=archaeological_site], +node[amenity=arts_centre], +area[amenity=arts_centre] +{z-index: 2868;} +node[tourism=attraction], +area[tourism=attraction], +node[amenity=community_centre], +area[amenity=community_centre], +node[tourism=artwork] +{z-index: 2870;} +node[tourism=attraction], +area[tourism=attraction], +node[historic=monument], +area[historic=monument], +node[historic=memorial], +area[historic=memorial], +node[tourism=theme_park], +area[tourism=theme_park] +{z-index: 2872;} +node[tourism=gallery] +{z-index: 2874;} +node[tourism=museum], +area[tourism=museum] +{z-index: 2876;} +node[leisure=stadium], +area[leisure=stadium] +{z-index: 2878;} +node[tourism=zoo], +area[tourism=zoo] +{z-index: 2882;} +node[historic=fort], +area[historic=fort], +node[historic=castle], +area[historic=castle] +{z-index: 2890;} node[amenity=hospital], node[building=hospital], @@ -137,6 +184,9 @@ node[shop=mall], area[shop=mall] {z-index: 3000;} +node[tourism=viewpoint] +{z-index: 3001;} + area[aeroway=airport], area[aeroway=aerodrome], node[aeroway=airport], @@ -418,8 +468,183 @@ node|z17-[railway=level_crossing] /* 4.1 Main POI */ +node|z15-[historic=fort], +area|z15-[historic=fort], +node|z15-[historic=castle], +area|z15-[historic=castle], +node|z15-[historic=monument], +area|z15-[historic=monument], +node|z15-[tourism=museum], +area|z15-[tourism=museum], +node|z15-[tourism=zoo], +area|z15-[tourism=zoo], +node|z15-[amenity=theatre], +area|z15-[amenity=theatre], +node|z15-[tourism=attraction], +area|z15-[tourism=attraction], +node|z15-[tourism=theme_park], +area|z15-[tourism=theme_park], +node|z15-[amenity=community_centre], +area|z15-[amenity=community_centre], +node|z15-[tourism=viewpoint], +node|z15-[historic=memorial], +area|z15-[historic=memorial], +node|z15-[tourism=gallery], +area|z15-[tourism=gallery], +node|z15-[tourism=artwork], +node|z16-[historic=boundary_stone], +area|z16-[historic=boundary_stone], +node|z16-[historic=wayside_cross], +area|z16-[historic=wayside_cross], +node|z16-[historic=ship], +area|z16-[historic=ship], +node|z16-[historic=tomb], +area|z16-[historic=tomb], +node|z16-[historic=museum], +area|z16-[historic=museum], +node|z17-[historic=ruins], +area|z17-[historic=ruins], +node|z17-[historic=wayside_shrine], +area|z17-[historic=wayside_shrine], +node|z17-[historic=archaeological_site], +area|z17-[historic=archaeological_site], +node|z17-[amenity=arts_centre], +area|z17-[amenity=arts_centre] +{text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} +node|z12-14[historic=fort], +area|z12-14[historic=fort], +node|z12-14[historic=castle], +area|z12-14[historic=castle] +{icon-image: remains-m.svg;} +node|z15[historic=fort], +area|z15[historic=fort], +node|z15[historic=castle], +area|z15[historic=castle] +{icon-image: remains-m.svg;icon-min-distance: 5;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} +node|z16[historic=fort], +area|z16[historic=fort], +node|z16[historic=castle], +area|z16[historic=castle] +{icon-image: remains-m.svg;text-offset: 1;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} +node|z17-[historic=ruins], +area|z17-[historic=ruins], +node|z17-[historic=fort], +area|z17-[historic=fort], +node|z17-[historic=castle], +area|z17-[historic=castle], +node|z17-[historic=archaeological_site], +area|z17-[historic=archaeological_site] +{icon-image: remains-m.svg;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} +node|z13-14[historic=monument], +area|z13-14[historic=monument] +{icon-image: monument-m.svg;} +node|z15[historic=monument], +area|z15[historic=monument], +node|z15[historic=memorial], +area|z15[historic=memorial] +{icon-image: monument-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} +node|z16-[historic=monument], +area|z16-[historic=monument], +node|z16-[historic=memorial], +area|z16-[historic=memorial] +{icon-image: monument-m.svg;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} + +node|z15[tourism=museum], +area|z15[tourism=museum] +{icon-image: museum-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} +node|z16-[tourism=museum], +area|z16-[tourism=museum], +node|z16-[historic=museum], +area|z16-[historic=museum] +{icon-image: museum-m.svg;text-offset: 1;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} + +node|z15[tourism=gallery] +{icon-image: gallery-m.svg;icon-min-distance: 8;} /* <-- <-- не показывается, непонятно почему, позже разобраться */ +node|z16-[tourism=gallery], +area|z16-[tourism=gallery], +node|z17-[amenity=arts_centre], +area|z17-[amenity=arts_centre] +{icon-image: gallery-m.svg;text-offset: 1;icon-min-distance: 12;} + +node|z16-[amenity=theatre], +area|z16-[amenity=theatre] +{icon-image: theatre-m.svg;icon-min-distance: 10;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} + +node|z15[tourism=zoo], +area|z15[tourism=zoo] +{icon-image: zoo-m.svg;icon-min-distance: 8;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} +node|z16-[tourism=zoo], +area|z16-[tourism=zoo] +{icon-image: zoo-m.svg;text-offset: 1;icon-min-distance: 8;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} + +node|z14[tourism=viewpoint] +{icon-image: viewpoint-m.svg;icon-min-distance: 8;} +node|z15-[tourism=viewpoint] +{icon-image: viewpoint-m.svg;icon-min-distance: 8;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;} + +node|z16[historic=boundary_stone], +area|z16[historic=boundary_stone], +node|z16[historic=wayside_cross], +area|z16[historic=wayside_cross] +{icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;} +node|z16[historic=ship], +area|z16[historic=ship] +{icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;} +node|z16[historic=tomb], +area|z16[historic=tomb] +{icon-image: tomb-m.svg;font-size: 11;icon-min-distance: 8;} +node|z16[historic=wayside_shrine], +area|z16[historic=wayside_shrine] +{icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;} + +node|z17-[historic=boundary_stone], +area|z17-[historic=boundary_stone], +node|z17-[historic=wayside_cross], +area|z17-[historic=wayside_cross] +{icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;} +node|z17-[historic=ship], +area|z17-[historic=ship] +{icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;} +node|z17-[historic=tomb], +area|z17-[historic=tomb] +{icon-image: tomb-m.svg;font-size: 11;icon-min-distance: 8;} +node|z17-[historic=wayside_shrine], +area|z17-[historic=wayside_shrine] +{icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;} + +node|z15[tourism=artwork] +{icon-image: tourism-m.svg;icon-min-distance: 8;} +node|z16[tourism=artwork] +{icon-image: tourism-m.svg;icon-min-distance: 28;} +node|z14[tourism=theme_park], +area|z14[tourism=theme_park] +{icon-image: theme_park-m.svg;icon-min-distance: 12;} +node|z15[tourism=attraction], +area|z15[tourism=attraction] +{icon-image: tourism-m.svg;icon-min-distance: 36;} +node|z15[tourism=theme_park], +area|z15[tourism=theme_park] +{icon-image: theme_park-m.svg;icon-min-distance: 36;} +node|z16-[tourism=attraction], +area|z16-[tourism=attraction] +{icon-image: tourism-m.svg;icon-min-distance: 36;} +node|z16-[tourism=theme_park], +area|z16-[tourism=theme_park] +{icon-image: theme_park-m.svg;icon-min-distance: 24;} +node|z17-[tourism=artwork] +{icon-image: tourism-m.svg;icon-min-distance: 24;} + +node|z14[amenity=community_centre], +area|z14[amenity=community_centre] +{icon-image: tourism-m.svg;icon-min-distance: 8;} +node|z15[amenity=community_centre], +area|z15[amenity=community_centre] +{icon-image: tourism-m.svg;icon-min-distance: 24;} +node|z16[amenity=community_centre], +area|z16[amenity=community_centre] +{icon-image: tourism-m.svg;icon-min-distance: 16;} /* 4.3 Food */ @@ -431,9 +656,6 @@ node|z17-[amenity=fast_food], area|z17-[amenity=fast_food], {text: name;text-color: @poi_label;text-offset: 1;font-size: 13;} - - - node|z15[amenity=cafe], area|z15[amenity=cafe] {icon-image: cafe-m.svg;icon-min-distance: 3;font-size: 12.5;}