pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[styles] Fix errors in the refactored style

Browse source
This commit is contained in:
Ilya Zverev 2017-01-19 18:32:52 +03:00
parent f19596fcd2
commit 390b3d4832
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/styles/clear/include/Basemap.mapcss
View file

@ -377,11 +377,6 @@ area|z11-[natural=wetland],
/* 6.2 Line water(river,canal etc.) */
/* Do not draw tunnel waterways */
line[waterway][tunnel]
{width: 0;}
line|z10[waterway=river],
line|z10[waterway=riverbank],
{width: 1;}
@ -430,6 +425,11 @@ line|z17-[waterway=ditch],
line|z17-[waterway=drain],
{width: 1.8;opacity: 1;color: @river;dashes: 0.9,0.9;}
/* Do not draw tunnel waterways */
line[waterway][tunnel]
{width: 0;}
/* 7.LANDUSE */
area|z10-[aeroway=airport][aerodrome=international],

10
data/styles/clear/include/Basemap_label.mapcss
View file

@ -550,11 +550,6 @@ area|z10-[natural=water][bbox_area<4000000],
/* 6.2 Line water(river,canal etc.) Do not draw tunnel waterways */
line[waterway]
{text-position: line;}
line[waterway][tunnel]
{text: none;}
line|z11-14[waterway=river],
line|z11-14[waterway=riverbank],
line|z13-14[waterway=stream],
@ -569,6 +564,11 @@ line|z18-[waterway=stream],
line|z18-[waterway=canal],
{font-size: 12;text:name;text-color: @water_label;}
line[waterway]
{text-position: line;}
line[waterway][tunnel]
{text: none;}
/* 7. LANDUSE*/
/*7.2 Hostital 7.3 University & Sport */

16
data/styles/clear/include/Icons.mapcss
View file

@ -782,16 +782,14 @@ node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;f
/* 3.2.4 Kiev Subway Station */
node|z13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;text-offset: 8;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;}
node|z14[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;}
node|z15[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;}
node|z15-16[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;}
node|z17-[railway=station][transport=subway][city=kiev] {icon-image: none.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
node[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;text-offset: 6;font-size: 12;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
node|z17[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;font-size: 13;}
node|z18-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;font-size: 13;}
node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;font-size: 13;}
/* 3.2.5 London Subway Station */
node|z13[railway=station][transport=subway][city=london] {icon-image: subway-london-s.svg;icon-min-distance: 1;}
node|z14[railway=station][transport=subway][city=london] {icon-image: subway-london-s.svg;}
node|z15[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;}
node|z15-16[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;}
node|z17-[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;}
node|z17[railway=subway_entrance][city=london] {icon-image: subway-london-s.svg;}
node|z18-[railway=subway_entrance][city=london] {icon-image: subway-london-m.svg;}
@ -799,14 +797,14 @@ node|z18-[railway=subway_entrance][city=london] {icon-image: subway-london-m.svg
/* 3.2.6 Paris Subway Station */
node|z13[railway=station][transport=subway][city=paris] {icon-image: subway-paris-s.svg;icon-min-distance: 1;}
node|z14[railway=station][transport=subway][city=paris] {icon-image: subway-paris-s.svg;}
node|z15[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;}
node|z15-16[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;}
node|z17-[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;}
node|z17-[railway=subway_entrance][city=paris] {icon-image: subway-paris-s.svg;}
/* 3.2.7 Barselona Subway Station */
node|z13[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-s.svg;icon-min-distance: 1;}
node|z14[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-s.svg;}
node|z15[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;}
node|z15-16[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;}
node|z17-[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;}
node|z17[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-s.svg;}
node|z18-[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-m.svg;}
@ -814,7 +812,7 @@ node|z18-[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona
/* 3.2.8 Madrid Subway Station */
node|z13[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-s.svg;icon-min-distance: 1;}
node|z14[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-s.svg;}
node|z15[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;}
node|z15-16[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;}
node|z17-[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;}
node|z17[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-s.svg;}
node|z18-[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-m.svg;}
@ -822,7 +820,7 @@ node|z18-[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-m.svg
/* 3.2.9 Berlin Subway Station*/
node|z13[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-s.svg;icon-min-distance: 1;}
node|z14[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-s.svg;}
node|z15[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;}
node|z15-16[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;}
node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;}
node|z17-[railway=subway_entrance][city=berlin] {icon-image: subway-berlin-s.svg;}