kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

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

Browse source 
This reverts commit cdd56786aa27f4c7df010bb433ea53d6a2b4c97d.
This commit is contained in:
vng 2012-05-03 16:26:36 +03:00 • committed by Alex Zolotarev
parent e9ff94fabc
commit 894ba909e6
3 changed files with 339 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

338
data/drules_proto.txt
View file

@ -3263,12 +3263,132 @@ 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
priority: 10440
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10446
}
}
element {
@ -3276,7 +3396,13 @@ cont {
lines {
width: 2
color: 0xF9574B
priority: 10467
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10473
}
}
element {
@ -3284,7 +3410,13 @@ cont {
lines {
width: 2
color: 0xF9574B
priority: 10587
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10595
}
}
element {
@ -3292,7 +3424,13 @@ cont {
lines {
width: 2
color: 0xF9574B
priority: 10791
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 10802
}
}
element {
@ -3300,7 +3438,13 @@ cont {
lines {
width: 2
color: 0xF9574B
priority: 11401
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 11412
}
}
element {
@ -3308,16 +3452,136 @@ cont {
lines {
width: 2
color: 0xF9574B
priority: 11679
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 11690
}
}
}
cont {
name: "boundary-administrative-4"
element {
scale: 16
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
@ -3325,7 +3589,63 @@ cont {
dd: 4
dd: 4
}
priority: 11400
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
color: 0xF9574B
dashdot {
dd: 12
dd: 4
dd: 4
dd: 4
}
priority: 11412
}
}
element {
@ -3339,7 +3659,7 @@ cont {
dd: 4
dd: 4
}
priority: 11678
priority: 11690
}
}
}

12
data/visibility.txt
View file

@ -108,12 +108,12 @@ world 000000000000000000 +
10 000000000000000000 -
11 000000000000000000 -
2 000011111111111111 -
3 000000000000111111 -
4 000000000000000011 -
3 000001111111111111 -
4 000000111111111111 -
5 000000000000000000 -
6 000000000000000000 -
6 000000000000000111 -
7 000000000000000000 -
8 000000000000000000 -
8 000000000000000111 -
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,9 +48,11 @@ public:
: m_worldBucket(info), m_merger(POINT_COORD_BITS)
{
// Do not strip last types for given tags,
// for example, do not cut "-2" in "boundary-administrative-2"
// for example, do not cut 'admin_level' in 'boundary-administrative-XXX'.
char const * arrDontNormalize[][3] = {
{ "boundary", "administrative", "2" }
{ "boundary", "administrative", "2" },
{ "boundary", "administrative", "3" },
{ "boundary", "administrative", "4" }
};
for (size_t i = 0; i < ARRAY_SIZE(arrDontNormalize); ++i)