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

[styles] Fixed farmland to satisfy current area priority test.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2021-08-21 13:25:54 +03:00 • committed by Alexander Borsuk
parent e2fa6e20c2
commit f02f23d265
12 changed files with 46 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto.bin
View file

Binary file not shown.

4
data/drules_proto.txt
View file

@ -31086,14 +31086,14 @@ cont {
scale: 10
area {
color: 15592899
priority: 1075
priority: -15926
}
}
element {
scale: 11
area {
color: 15592899
priority: 1075
priority: -15926
}
}
element {

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

4
data/drules_proto_clear.txt
View file

@ -30878,14 +30878,14 @@ cont {
scale: 10
area {
color: 15592899
priority: 1075
priority: -15926
}
}
element {
scale: 11
area {
color: 15592899
priority: 1075
priority: -15926
}
}
element {

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

4
data/drules_proto_dark.txt
View file

@ -31029,14 +31029,14 @@ cont {
scale: 10
area {
color: 1381632
priority: 1075
priority: -15926
}
}
element {
scale: 11
area {
color: 1381632
priority: 1075
priority: -15926
}
}
element {

BIN
data/drules_proto_vehicle_clear.bin
View file

Binary file not shown.

12
data/drules_proto_vehicle_clear.txt
View file

@ -18857,42 +18857,42 @@ cont {
scale: 14
area {
color: 15592899
priority: 1118
priority: -15883
}
}
element {
scale: 15
area {
color: 15592899
priority: 1118
priority: -15883
}
}
element {
scale: 16
area {
color: 15592899
priority: 1118
priority: -15883
}
}
element {
scale: 17
area {
color: 15592899
priority: 1118
priority: -15883
}
}
element {
scale: 18
area {
color: 15592899
priority: 1118
priority: -15883
}
}
element {
scale: 19
area {
color: 15592899
priority: 1118
priority: -15883
}
}
}

BIN
data/drules_proto_vehicle_dark.bin
View file

Binary file not shown.

12
data/drules_proto_vehicle_dark.txt
View file

@ -19247,42 +19247,42 @@ cont {
scale: 14
area {
color: 1381632
priority: 1118
priority: -15883
}
}
element {
scale: 15
area {
color: 1381632
priority: 1118
priority: -15883
}
}
element {
scale: 16
area {
color: 1381632
priority: 1118
priority: -15883
}
}
element {
scale: 17
area {
color: 1381632
priority: 1118
priority: -15883
}
}
element {
scale: 18
area {
color: 1381632
priority: 1118
priority: -15883
}
}
element {
scale: 19
area {
color: 1381632
priority: 1118
priority: -15883
}
}
}

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

@ -3,24 +3,25 @@
1.Z-INDEX of BASEMAP
2.LAND
3.BOUNDARY
3.1 Countries
3.2 Region
3.1 Countries
3.2 Region
4.VEGETATION
5.BEACH & GLACIER
6.WATER
6.1 Area water(lake,pond etc.)
6.2 Line water(river,canal etc.)
6.1 Area water(lake,pond etc.)
6.2 Line water(river,canal etc.)
7.LANDUSE
7.1 Industrial
7.2 Hostital
7.3 University & Sport
7.4 Cemetry
7.5 Pedestrian areas
7.6 Airports
7.7 Agricultural
7.1 Industrial
7.2 Hostital
7.3 University & Sport
7.4 Cemetry
7.5 Pedestrian areas
7.6 Airports
7.7 Religion
7.8 Agricultural
8.BUILDINGS
8.1 Pier
8.2 Building
8.2 Building
8.3 Barrier
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
@ -248,7 +249,6 @@ area|z12-[landuse=grass],
area|z12-[natural=grassland],
area|z12-[leisure=golf_course],
area|z12-[natural=heath],
area|z12-[landuse=farmland],
area|z12-[landuse=allotments],
area|z12-[natural=scrub],
area|z12-[landuse=orchard],
@ -570,7 +570,7 @@ area|z15-[landuse=churchyard]
/* 7.8 Agricultural */
area|z10-[landuse=farmland],
{fill-color: @farmland;fill-opacity: 1;}
{fill-position: background; fill-color: @farmland; fill-opacity: 1;}
/* Parking */

27
data/styles/vehicle/include/Basemap.mapcss
View file

@ -3,24 +3,25 @@
1.Z-INDEX of BASEMAP
2.LAND
3.BOUNDARY
3.1 Countries
3.2 Region
3.1 Countries
3.2 Region
4.VEGETATION
5.BEACH & GLACIER
6.WATER
6.1 Area water(lake,pond etc.)
6.2 Line water(river,canal etc.)
6.1 Area water(lake,pond etc.)
6.2 Line water(river,canal etc.)
7.LANDUSE
7.1 Industrial
7.2 Hostital
7.3 University & Sport
7.4 Cemetry
7.5 Pedestrian areas
7.6 Airports
7.7 Agricultural
7.1 Industrial
7.2 Hostital
7.3 University & Sport
7.4 Cemetry
7.5 Pedestrian areas
7.6 Airports
7.7 Religion
7.8 Agricultural
8.BUILDINGS
8.1 Pier
8.2 Building
8.2 Building
8.3 Barrier
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
@ -516,7 +517,7 @@ area|z15-[landuse=churchyard]
/* 7.8 Agricultural */
area|z14-[landuse=farmland],
{fill-color: @farmland;fill-opacity: 1;}
{fill-position: background; fill-color: @farmland; fill-opacity: 1;}
/* Parking */