Merge pull request from therearesomewhocallmetim/new_style_merge_master

New style merge master
This commit is contained in:
Viktor Govako 2016-06-04 03:02:31 +03:00
commit 2aa8f994bc
31 changed files with 24456 additions and 23660 deletions
data
drules_proto.bindrules_proto.txtdrules_proto_clear.bindrules_proto_clear.txtdrules_proto_dark.bindrules_proto_dark.txt
resources-6plus_clear
resources-6plus_dark
resources-6plus_legacy
resources-hdpi_clear
resources-hdpi_dark
resources-hdpi_legacy
resources-ldpi_dark
resources-ldpi_legacy
resources-mdpi_clear
resources-mdpi_dark
resources-mdpi_legacy
resources-xhdpi_dark
resources-xhdpi_legacy
resources-xxhdpi_dark
resources-xxhdpi_legacy
styles/clear/include

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
<!DOCTYPE skin>
<root>
<file width="2048" height="1024">
<file height="1024" width="2048">
<symbol minX="0" maxX="167" minY="0" maxY="244" name="route_to"/>
<symbol minX="167" maxX="243" minY="0" maxY="206" name="route_from"/>
<symbol minX="243" maxX="566" minY="0" maxY="158" name="route-arrow"/>

Binary file not shown.

Before

(image error) Size: 591 KiB

After

(image error) Size: 591 KiB

Binary file not shown.

Before

(image error) Size: 202 KiB

After

(image error) Size: 202 KiB

View file

@ -1,6 +1,6 @@
<!DOCTYPE skin>
<root>
<file height="1024" width="1024">
<file width="1024" height="1024">
<symbol minX="0" maxX="165" minY="0" maxY="165" name="route_to"/>
<symbol minX="165" maxX="488" minY="0" maxY="157" name="route-arrow"/>
<symbol minX="488" maxX="626" minY="0" maxY="138" name="compass-image"/>

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

(image error) Size: 282 KiB

After

(image error) Size: 282 KiB

Binary file not shown.

Before

(image error) Size: 98 KiB

After

(image error) Size: 98 KiB

View file

@ -1,6 +1,6 @@
<!DOCTYPE skin>
<root>
<file height="512" width="512">
<file width="512" height="512">
<symbol minX="0" maxX="105" minY="0" maxY="105" name="route_to"/>
<symbol minX="105" maxX="309" minY="0" maxY="100" name="route-arrow"/>
<symbol minX="309" maxX="397" minY="0" maxY="88" name="compass-image"/>

Binary file not shown.

Before

(image error) Size: 176 KiB

After

(image error) Size: 176 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

(image error) Size: 55 KiB

After

(image error) Size: 55 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

(image error) Size: 180 KiB

After

(image error) Size: 180 KiB

View file

@ -1,6 +1,6 @@
<!DOCTYPE skin>
<root>
<file width="1024" height="512">
<file height="512" width="1024">
<symbol minX="0" maxX="72" minY="0" maxY="104" name="route_to"/>
<symbol minX="72" maxX="106" minY="0" maxY="88" name="route_from"/>
<symbol minX="106" maxX="243" minY="0" maxY="68" name="route-arrow"/>

Binary file not shown.

Before

(image error) Size: 62 KiB

After

(image error) Size: 62 KiB

View file

@ -1,6 +1,6 @@
<!DOCTYPE skin>
<root>
<file height="256" width="512">
<file width="512" height="256">
<symbol minX="0" maxX="71" minY="0" maxY="71" name="route_to"/>
<symbol minX="71" maxX="208" minY="0" maxY="68" name="route-arrow"/>
<symbol minX="208" maxX="268" minY="0" maxY="60" name="compass-image"/>

Binary file not shown.

Before

(image error) Size: 420 KiB

After

(image error) Size: 420 KiB

View file

@ -1,6 +1,6 @@
<!DOCTYPE skin>
<root>
<file height="1024" width="1024">
<file width="1024" height="1024">
<symbol minX="0" maxX="140" minY="0" maxY="204" name="route_to"/>
<symbol minX="140" maxX="204" minY="0" maxY="172" name="route_from"/>
<symbol minX="204" maxX="474" minY="0" maxY="132" name="route-arrow"/>

Binary file not shown.

Before

(image error) Size: 141 KiB

After

(image error) Size: 141 KiB

Binary file not shown.

Before

(image error) Size: 631 KiB

After

(image error) Size: 631 KiB

View file

@ -1,6 +1,6 @@
<!DOCTYPE skin>
<root>
<file height="2048" width="2048">
<file width="2048" height="2048">
<symbol minX="0" maxX="208" minY="0" maxY="304" name="route_to"/>
<symbol minX="208" maxX="302" minY="0" maxY="256" name="route_from"/>
<symbol minX="302" maxX="705" minY="0" maxY="196" name="route-arrow"/>

Binary file not shown.

Before

(image error) Size: 231 KiB

After

(image error) Size: 231 KiB

View file

@ -1,6 +1,6 @@
<!DOCTYPE skin>
<root>
<file height="1024" width="1024">
<file width="1024" height="1024">
<symbol minX="0" maxX="205" minY="0" maxY="205" name="route_to"/>
<symbol minX="205" maxX="609" minY="0" maxY="196" name="route-arrow"/>
<symbol minX="609" maxX="781" minY="0" maxY="172" name="compass-image"/>

View file

@ -274,8 +274,8 @@ node|z12-[waterway=waterfall], area|z12-[waterway=waterfall]
text-color: @poi_label;
z-index: 2700;
}
node|z15-[waterway=waterfall], area|z15-[waterway=waterfall] { icon-image: waterfall-m.svg; }
node|z17-[waterway=waterfall], area|z17-[waterway=waterfall] { icon-image: waterfall-l.svg; }
node|z15-[waterway=waterfall], area|z15-[waterway=waterfall] { icon-image: waterfall-m.svg;text-offset: 8;font-size: 10;}
node|z17-[waterway=waterfall], area|z17-[waterway=waterfall] { icon-image: waterfall-l.svg; text-offset: 10;font-size: 10;}
node|z10-[natural=volcano], area|z10-[natural=volcano]
{
@ -286,8 +286,8 @@ node|z10-[natural=volcano], area|z10-[natural=volcano]
text-color: @poi_label;
z-index: 2700;
}
node|z15-[natural=volcano], area|z15-[natural=volcano] { icon-image: volcano-m.svg; }
node|z17-[natural=volcano], area|z17-[natural=volcano] { icon-image: volcano-l.svg; }
node|z15-[natural=volcano], area|z15-[natural=volcano] { icon-image: volcano-m.svg; text-offset: 8;font-size: 10;}
node|z17-[natural=volcano], area|z17-[natural=volcano] { icon-image: volcano-l.svg; text-offset: 10;font-size: 10;}
node|z12[natural=peak][name],
@ -374,7 +374,7 @@ node|z15-16[amenity=pub], area|z15-16[amenity=pub] { icon-image: beer-m.svg; tex
node|z15-16[amenity=fountain],area|z15-16[amenity=fountain] { icon-image: fountain-m.svg; z-index: 1000; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;icon-min-distance: 20;}
node|z15-16[amenity=drinking_water],area|z15-16[amenity=drinking_water],node|z15-16[amenity=water_point] ,area|z15-16[amenity=water_point]{ icon-image: drinking-water-m.svg;z-index: 2400; icon-min-distance: 20;}
node|z16[amenity=place_of_worship], area|z16[amenity=place_of_worship] { icon-image: place-of-worship-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
node|z16[amenity=place_of_worship], area|z16[amenity=place_of_worship] { icon-image: place-of-worship-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 10;}
node|z16[amenity=place_of_worship][religion=christian], area|z16[amenity=place_of_worship][religion=christian] { icon-image: christian-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
node|z16[amenity=place_of_worship][religion=muslim], area|z16[amenity=place_of_worship][religion=muslim] { icon-image: muslim-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
node|z16[amenity=place_of_worship][religion=buddhist], area|z16[amenity=place_of_worship][religion=buddhist] { icon-image: buddhist-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
@ -386,22 +386,22 @@ node|z16[amenity=place_of_worship][religion=taoist], area|z16[amenity=place_of_w
/*
node|z16[amenity=kindergarten], area|z16[amenity=kindergarten] { icon-image: kindergarten-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
node|z16[amenity=school], area|z16[amenity=school] { icon-image: school-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}*/
node|z16[amenity=college], area|z16[amenity=college] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
node|z16[amenity=school], area|z16[amenity=school] { icon-image: school-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }*/
node|z16[amenity=college], area|z16[amenity=college] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;}
node|z16[amenity=hospital], area|z16[amenity=hospital]{ icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
node|z16[amenity=clinic], area|z16[amenity=clinic] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
node|z16[amenity=veterinary], area|z16[amenity=veterinary] { icon-image: veterinary-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
node|z16[amenity=university][name], area|z16[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1;icon-min-distance: 11; -x-me-text-priority:16000;}
node|z16[amenity=university][!name], area|z16[amenity=university][!name] { }
node|z16[amenity=fuel], area|z16[amenity=fuel] { icon-image: fuel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; -x-me-text-priority:15500; }
node|z16[amenity=charging_station], area|z16[amenity=charging_station] { icon-image: charging-station-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; -x-me-text-priority:15500; }
node|z16[amenity=fuel], area|z16[amenity=fuel] { icon-image: fuel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; -x-me-text-priority:15500; icon-min-distance: 10;}
node|z16[amenity=charging_station], area|z16[amenity=charging_station] { icon-image: charging-station-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; -x-me-text-priority:15500; icon-min-distance: 10;}
node|z16-[natural=spring],area|z16-[natural=spring]{ icon-image: drinking-water-m.svg; z-index: 1000; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 100; z-index: 2400; }
node|z16[amenity=cafe], area|z16[amenity=cafe] { icon-image: cafe-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;}
node|z16[amenity=restaurant], area|z16[amenity=restaurant] { icon-image: restaurant-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;icon-min-distance: 10;}
node|z16[amenity=theatre], area|z16[amenity=theatre] { icon-image: theatre-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;}
node|z16[amenity=community_centre], area|z16[amenity=community_centre] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;}
node|z16-[tourism=attraction], area|z16-[tourism=attraction] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
node|z16-[leisure=water_park], area|z16-[leisure=water_park] { icon-image: swimming-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
node|z16-[tourism=attraction], area|z16-[tourism=attraction] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 10}
node|z16-[leisure=water_park], area|z16-[leisure=water_park] { icon-image: swimming-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 10}
@ -436,8 +436,8 @@ node|z17[amenity=police], area|z17[amenity=police] { icon-image: police-l.svg; t
node|z17[amenity=embassy], area|z17[amenity=embassy] { icon-image: embassy-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
node|z17[amenity=bicycle_rental], area|z17[amenity=bicycle_rental] { icon-image: bicycle-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
node|z17[amenity=post_office] { icon-image: mail-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
node|z17[amenity=cafe], area|z17[amenity=cafe] { icon-image: cafe-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
node|z17[amenity=restaurant], area|z17[amenity=restaurant] { icon-image: restaurant-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
node|z17[amenity=cafe], area|z17[amenity=cafe] { icon-image: cafe-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10}
node|z17[amenity=restaurant], area|z17[amenity=restaurant] { icon-image: restaurant-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 10}
node|z17-[amenity=fountain],area|z17-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
node|z17-[amenity=drinking_water],area|z17-[amenity=drinking_water],node|z17-[amenity=water_point] ,area|z17-[amenity=water_point]{ icon-image: drinking-water-l.svg;z-index: 2400; }
node|z17-[natural=spring],area|z17-[natural=spring]{ icon-image: drinking-water-l.svg; z-index: 1000; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 100; z-index: 2400; }
@ -489,10 +489,10 @@ node|z18-[amenity=toilets], area|z18-[amenity=toilets] { icon-image: toilets-l.s
node|z18-[amenity=atm], area|z18-[amenity=atm] { z-index: 4200; icon-image: atm-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
node|z18-[amenity=pharmacy], area|z18-[amenity=pharmacy] { icon-image: pharmacy-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
node|z18-[amenity=cafe], area|z18-[amenity=cafe] { icon-image: cafe-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
node|z18-[amenity=restaurant], area|z18-[amenity=restaurant] { icon-image: restaurant-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2600; }
node|z17-[amenity=fast_food], area|z17-[amenity=fast_food] { icon-image: fastfood-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
node|z17-[amenity=bar], area|z17-[amenity=bar] { icon-image: beer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
node|z17-[amenity=pub], area|z17-[amenity=pub] { icon-image: beer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2600; }
node|z18-[amenity=restaurant], area|z18-[amenity=restaurant] { icon-image: restaurant-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600; }
node|z17-[amenity=fast_food], area|z17-[amenity=fast_food] { icon-image: fastfood-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;icon-min-distance: 10}
node|z17-[amenity=bar], area|z17-[amenity=bar] { icon-image: beer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 10}
node|z17-[amenity=pub], area|z17-[amenity=pub] { icon-image: beer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10}
node|z18-[amenity=nightclub], area|z18-[amenity=nightclub] { icon-image: bar-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
node|z18-[amenity=bureau_de_change] { icon-image: banknote-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
node|z18-[amenity=bench] { icon-image: bench.svg;z-index: 2400; }
@ -547,7 +547,7 @@ node|z16-[man_made=windmill], area|z16-[man_made=windmill]{ icon-image: windmill
node|z16-[sport=equestrian], area|z16-[sport=equestrian]{ icon-image: equestrian-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 30;}
/* Declare common SHOPS for z15- */
node|z15-[shop], area|z15-[shop] { icon-image: shop-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; }
node|z15-[shop], area|z15-[shop] { icon-image: shop-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; icon-min-distance: 10}
node|z15-[shop=alcohol], area|z15-[shop=alcohol] { icon-image: alcohol-m.svg; }
node|z15-[shop=wine], area|z15-[shop=wine] { icon-image: alcohol-m.svg; }
@ -628,7 +628,7 @@ node|z17-[sport=equestrian], area|z17-[sport=equestrian]{ icon-image: equestrian
node|z17-[amenity=bicycle_parking], area|z17-[amenity=bicycle_parking]{ icon-image: bike-parking-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;icon-min-distance: 20;}
/* Declare common SHOPS for z17- */
node|z17-[shop], area|z17-[shop] { icon-image: shop-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; }
node|z17-[shop], area|z17-[shop] { icon-image: shop-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; icon-min-distance: 10}
node|z17-[shop=alcohol], area|z17-[shop=alcohol] { icon-image: alcohol-l.svg; }
node|z17-[shop=wine], area|z17-[shop=wine] { icon-image: alcohol-l.svg; }
@ -729,13 +729,13 @@ node|z19-[amenity=telephone] { icon-image: phone-l.svg; z-index: 2500; }
node|z19-[emergency=phone] { icon-image: phone-l.svg; z-index: 2500; }
node|z19-[amenity=recycling], area|z19-[amenity=recycling], { icon-image: recycling-l.svg;z-index: 2500; }
node|z13-[shop=mall], area|z13-[shop=mall] { icon-image: shop-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
node|z15-[shop=mall], area|z15-[shop=mall] { icon-image: shop-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600; }
node|z17-[shop=mall], area|z17-[shop=mall] { icon-image: shop-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600; }
node|z13-[shop=mall], area|z13-[shop=mall] { icon-image: shop-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2610; icon-min-distance: 15;}
node|z15-[shop=mall], area|z15-[shop=mall] { icon-image: shop-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 10;}
node|z17-[shop=mall], area|z17-[shop=mall] { icon-image: shop-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600; icon-min-distance: 5;}
node|z13-[shop=supermarket], area|z13-[shop=supermarket] { icon-image: grocery-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; }
node|z15-[shop=supermarket], area|z15-[shop=supermarket] { icon-image: grocery-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; }
node|z17-[shop=supermarket], area|z17-[shop=supermarket] { icon-image: grocery-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; }
node|z13-[shop=supermarket], area|z13-[shop=supermarket] { icon-image: grocery-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400; icon-min-distance: 25; }
node|z15-[shop=supermarket], area|z15-[shop=supermarket] { icon-image: grocery-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; icon-min-distance: 15;}
node|z17-[shop=supermarket], area|z17-[shop=supermarket] { icon-image: grocery-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; icon-min-distance: 5;}
node|z13-[amenity=marketplace], area|z13-[amenity=marketplace] { icon-image: marketplace-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; icon-min-distance: 20; }
node|z15-[amenity=marketplace], area|z15-[amenity=marketplace] { icon-image: marketplace-m.svg; text-offset: 11; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; icon-min-distance: 15; }
@ -781,7 +781,7 @@ node|z15-16[sport=soccer], area|z15-16[sport=soccer] { icon-image: soccer-m.svg;
node|z15-16[leisure=stadium] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; icon-min-distance: 40; }
node|z15-16[leisure=pitch] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6;icon-min-distance: 40; -x-me-text-priority: 16000; }
node|z15-16[sport=multi] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; icon-min-distance: 40; }
node|z15-16[sport=multi] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; icon-min-distance: 40; -x-me-text-priority: 16000; }
node|z15-16[leisure=sports_centre] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; -x-me-text-priority: 15500;icon-min-distance: 40; }
node|z15-16[leisure=sports_centre][sport=climbing] { icon-image: climbing-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; -x-me-text-priority: 15500;icon-min-distance: 40; }
node|z15-16[leisure=sports_centre][sport=swimming] { icon-image: swimming-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; -x-me-text-priority: 15500;icon-min-distance: 40; }

View file

@ -1162,6 +1162,7 @@ node|z11-12[aeroway=airport][aerodrome=international],
node|z11-12[aeroway=aerodrome][aerodrome=international]
{
icon-image: airport-m.svg;
-x-me-icon-priority: 3100;
text-offset: 7;
font-size: 11;
text: name;