organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

Revert "Add styles for boundary-administrative-3, 4, 6, 8."

Browse source 
This reverts commit 67b8aea52ac50088250da2fa19dd9fd15de5fbcf.
This commit is contained in:
vng 2012-04-20 18:15:17 +03:00 • committed by Alex Zolotarev
parent f3adf78da8
commit e8e74417d9
3 changed files with 17 additions and 339 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

338
data/drules_proto.txt
View file

@ -3263,132 +3263,12 @@ cont {
}
cont {
name: "boundary-administrative-3"
element {
scale: 6
lines {
width: 0.3125
color: 0xFFFF00
priority: 55
}
lines {
width: 0.0625
color: 0xF9574B
dashdot {
dd: 0.3125
dd: 0.0625
dd: 0.0625
dd: 0.0625
}
priority: 56
}
}
element {
scale: 7
lines {
width: 0.625
color: 0xFFFF00
priority: 56
}
lines {
width: 0.125
color: 0xF9574B
dashdot {
dd: 0.625
dd: 0.125
dd: 0.125
dd: 0.125
}
priority: 57
}
}
element {
scale: 8
lines {
width: 1.25
color: 0xFFFF00
priority: 63
}
lines {
width: 0.25
color: 0xF9574B
dashdot {
dd: 1.25
dd: 0.25
dd: 0.25
dd: 0.25
}
priority: 64
}
}
element {
scale: 9
lines {
width: 1
color: 0xFFFF00
priority: 63
}
lines {
width: 0.5
color: 0xF9574B
dashdot {
dd: 2.5
dd: 0.5
dd: 0.5
dd: 0.5
}
priority: 64
}
}
element {
scale: 10
lines {
width: 5
color: 0xFFFF00
priority: 157
}
lines {
width: 1
color: 0xF9574B
dashdot {
dd: 5
dd: 1
dd: 1
dd: 1
}
priority: 158
}
}
element {
scale: 11
lines {
width: 10
color: 0xFFFF00
priority: 157
}
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 10
dd: 2
dd: 2
dd: 2
}
priority: 158
}
}
element {
scale: 12
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10446
priority: 10440
}
}
element {
@ -3396,13 +3276,7 @@ cont {
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10473
priority: 10467
}
}
element {
@ -3410,13 +3284,7 @@ cont {
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10595
priority: 10587
}
}
element {
@ -3424,13 +3292,7 @@ cont {
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10802
priority: 10791
}
}
element {
@ -3438,13 +3300,7 @@ cont {
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 11412
priority: 11401
}
}
element {
@ -3452,192 +3308,16 @@ cont {
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 11690
priority: 11679
}
}
}
cont {
name: "boundary-administrative-4"
element {
scale: 6
lines {
width: 0.3125
color: 0xFFFF00
priority: 55
}
lines {
width: 0.0625
color: 0xF9574B
dashdot {
dd: 0.3125
dd: 0.0625
dd: 0.0625
dd: 0.0625
}
priority: 56
}
}
element {
scale: 7
lines {
width: 0.625
color: 0xFFFF00
priority: 56
}
lines {
width: 0.125
color: 0xF9574B
dashdot {
dd: 0.625
dd: 0.125
dd: 0.125
dd: 0.125
}
priority: 57
}
}
element {
scale: 8
lines {
width: 1.25
color: 0xFFFF00
priority: 63
}
lines {
width: 0.25
color: 0xF9574B
dashdot {
dd: 1.25
dd: 0.25
dd: 0.25
dd: 0.25
}
priority: 64
}
}
element {
scale: 9
lines {
width: 1
color: 0xFFFF00
priority: 63
}
lines {
width: 0.5
color: 0xF9574B
dashdot {
dd: 2.5
dd: 0.5
dd: 0.5
dd: 0.5
}
priority: 64
}
}
element {
scale: 10
lines {
width: 5
color: 0xFFFF00
priority: 157
}
lines {
width: 1
color: 0xF9574B
dashdot {
dd: 5
dd: 1
dd: 1
dd: 1
}
priority: 158
}
}
element {
scale: 11
lines {
width: 10
color: 0xFFFF00
priority: 157
}
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 10
dd: 2
dd: 2
dd: 2
}
priority: 158
}
}
element {
scale: 12
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10446
}
}
element {
scale: 13
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10473
}
}
element {
scale: 14
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10595
}
}
element {
scale: 15
lines {
width: 2
color: 0xF9574B
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10802
}
}
element {
scale: 16
lines {
width: 2
width: 1
color: 0xF9574B
dashdot {
dd: 12
@ -3645,7 +3325,7 @@ cont {
dd: 4
dd: 4
}
priority: 11412
priority: 11400
}
}
element {
@ -3659,7 +3339,7 @@ cont {
dd: 4
dd: 4
}
priority: 11690
priority: 11678
}
}
}

12
data/visibility.txt
View file

@ -108,12 +108,12 @@ world 000000000000000000 +
10 000000000000000000 -
11 000000000000000000 -
2 000011111111111111 -
3 000001111111111111 -
4 000000111111111111 -
3 000000000000111111 -
4 000000000000000011 -
5 000000000000000000 -
6 000000000000000111 -
6 000000000000000000 -
7 000000000000000000 -
8 000000000000000111 -
8 000000000000000000 -
9 000000000000000000 -
[admin_level] 000000000000000000 -
[border_type] 000000000000000000 -
@ -130,8 +130,8 @@ world 000000000000000000 +
national_park 000000000011111111 -
{}
building 000000000000000111 +
entrance 000000000000000001 -
{}
entrance 000000000000000001 -
{}
communication 000000000000000000 +
line 000000000000000011 +
[location] 000000000000000000 -

6
generator/world_map_generator.hpp
View file

@ -48,11 +48,9 @@ public:
: m_worldBucket(info), m_merger(POINT_COORD_BITS)
{
// Do not strip last types for given tags,
// for example, do not cut 'admin_level' in 'boundary-administrative-XXX'.
// for example, do not cut "-2" in "boundary-administrative-2"
char const * arrDontNormalize[][3] = {
{ "boundary", "administrative", "2" },
{ "boundary", "administrative", "3" },
{ "boundary", "administrative", "4" }
{ "boundary", "administrative", "2" }
};
for (size_t i = 0; i < ARRAY_SIZE(arrDontNormalize); ++i)