diff options
author | vng <viktor.govako@gmail.com> | 2015-07-02 21:01:47 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:54:49 +0300 |
commit | a58b1927cd408d31f4870082e9ab682767967716 (patch) | |
tree | e36070765024b5608eaf804b90bbb36d73ce99da /data | |
parent | 0d1f9582169d356fa7faf69f367f57cb42a053d5 (diff) |
[classificator] Added admin level value for “place-city-capital” type (2-11).
Diffstat (limited to 'data')
-rw-r--r-- | data/classificator.txt | 13 | ||||
-rw-r--r-- | data/drules_proto.bin | bin | 188612 -> 193154 bytes | |||
-rw-r--r-- | data/drules_proto.txt | 1900 | ||||
-rw-r--r-- | data/drules_proto_dark.bin | bin | 183859 -> 188161 bytes | |||
-rw-r--r-- | data/drules_proto_dark.txt | 1900 | ||||
-rw-r--r-- | data/mapcss-mapping.csv | 10 | ||||
-rw-r--r-- | data/types.txt | 10 | ||||
-rw-r--r-- | data/visibility.txt | 13 |
8 files changed, 3844 insertions, 2 deletions
diff --git a/data/classificator.txt b/data/classificator.txt index dc7e17d8d3..91e5028e62 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -507,7 +507,18 @@ world + {} place + city + - capital - + capital + + 10 - + 11 - + 2 - + 3 - + 4 - + 5 - + 6 - + 7 - + 8 - + 9 - + {} {} continent - country - diff --git a/data/drules_proto.bin b/data/drules_proto.bin Binary files differindex a14ebae9b6..f6e6831197 100644 --- a/data/drules_proto.bin +++ b/data/drules_proto.bin diff --git a/data/drules_proto.txt b/data/drules_proto.txt index b168441b68..0d81e71c12 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -43018,6 +43018,1906 @@ cont { } } cont { + name: "place-city-capital-10" + element { + scale: 5 + caption { + primary { + height: 11 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 10 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 11 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-11" + element { + scale: 5 + caption { + primary { + height: 11 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 10 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 11 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-2" + element { + scale: 5 + caption { + primary { + height: 11 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 10 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 11 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-3" + element { + scale: 5 + caption { + primary { + height: 11 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 10 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 11 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-4" + element { + scale: 5 + caption { + primary { + height: 11 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 10 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 11 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-5" + element { + scale: 5 + caption { + primary { + height: 11 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 10 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 11 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-6" + element { + scale: 5 + caption { + primary { + height: 11 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 10 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 11 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-7" + element { + scale: 5 + caption { + primary { + height: 11 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 10 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 11 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-8" + element { + scale: 5 + caption { + primary { + height: 11 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 10 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 11 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-9" + element { + scale: 5 + caption { + primary { + height: 11 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 10 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 11 + color: 10066329 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 14 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 5592405 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 4473924 + stroke_color: 15658717 + } + secondary { + height: 16 + color: 8947848 + stroke_color: 15658717 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { name: "place-continent" element { scale: 0 diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin Binary files differindex a3e9abf5e5..af573b4377 100644 --- a/data/drules_proto_dark.bin +++ b/data/drules_proto_dark.bin diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index a929cbb277..1511e3a277 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -43018,6 +43018,1906 @@ cont { } } cont { + name: "place-city-capital-10" + element { + scale: 5 + caption { + primary { + height: 11 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 10 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 11 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 0 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-11" + element { + scale: 5 + caption { + primary { + height: 11 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 10 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 11 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 0 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-2" + element { + scale: 5 + caption { + primary { + height: 11 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 10 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 11 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 0 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-3" + element { + scale: 5 + caption { + primary { + height: 11 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 10 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 11 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 0 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-4" + element { + scale: 5 + caption { + primary { + height: 11 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 10 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 11 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 0 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-5" + element { + scale: 5 + caption { + primary { + height: 11 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 10 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 11 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 0 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-6" + element { + scale: 5 + caption { + primary { + height: 11 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 10 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 11 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 0 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-7" + element { + scale: 5 + caption { + primary { + height: 11 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 10 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 11 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 0 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-8" + element { + scale: 5 + caption { + primary { + height: 11 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 10 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 11 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 0 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { + name: "place-city-capital-9" + element { + scale: 5 + caption { + primary { + height: 11 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 10 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 6 + caption { + primary { + height: 12 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 11 + color: 6710886 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 7 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 8 + caption { + primary { + height: 14 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 12 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 9 + caption { + primary { + height: 17 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 10 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 11 + caption { + primary { + height: 18 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 14 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 12 + caption { + primary { + height: 20 + color: 11184810 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 0 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 13 + caption { + primary { + height: 20 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 14 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 22 + color: 10066329 + stroke_color: 1118481 + } + secondary { + height: 16 + color: 5592405 + stroke_color: 1118481 + offset_y: 20 + } + priority: 15000 + } + } +} +cont { name: "place-continent" element { scale: 0 diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index b9bad7b996..1558a73b02 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -994,3 +994,13 @@ shop|sports;[shop=sports];;name;int_name;993; route|ferry|motor_vehicle;[route=ferry];;name;int_name;994; railway|rail|motor_vehicle;[railway=rail];;name;int_name;995; hwtag|nofoot;[hwtag=nofoot];;name;int_name;996; +place|city|capital|2;[place=city][capital=2];;name;int_name;997; +place|city|capital|3;[place=city][capital=3];;name;int_name;998; +place|city|capital|4;[place=city][capital=4];;name;int_name;999; +place|city|capital|5;[place=city][capital=5];;name;int_name;1000; +place|city|capital|6;[place=city][capital=6];;name;int_name;1001; +place|city|capital|7;[place=city][capital=7];;name;int_name;1002; +place|city|capital|8;[place=city][capital=8];;name;int_name;1003; +place|city|capital|9;[place=city][capital=9];;name;int_name;1004; +place|city|capital|10;[place=city][capital=10];;name;int_name;1005; +place|city|capital|11;[place=city][capital=11];;name;int_name;1006; diff --git a/data/types.txt b/data/types.txt index 6f0da812d1..cc5128e511 100644 --- a/data/types.txt +++ b/data/types.txt @@ -994,3 +994,13 @@ shop|sports route|ferry|motor_vehicle railway|rail|motor_vehicle hwtag|nofoot +place|city|capital|2 +place|city|capital|3 +place|city|capital|4 +place|city|capital|5 +place|city|capital|6 +place|city|capital|7 +place|city|capital|8 +place|city|capital|9 +place|city|capital|10 +place|city|capital|11 diff --git a/data/visibility.txt b/data/visibility.txt index d9f7f48700..4afb508412 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -507,7 +507,18 @@ world 00000000000000000000 + {} place 00000000000000000000 + city 00000111111111110000 + - capital 00001111111111110000 - + capital 00001111111111110000 + + 10 00000111111111110000 - + 11 00000111111111110000 - + 2 00000111111111110000 - + 3 00000111111111110000 - + 4 00000111111111110000 - + 5 00000111111111110000 - + 6 00000111111111110000 - + 7 00000111111111110000 - + 8 00000111111111110000 - + 9 00000111111111110000 - + {} {} continent 11100000000000000000 - country 00011111110000000000 - |