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 index a14ebae9b6..f6e6831197 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ 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 @@ -43017,6 +43017,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 { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index a3e9abf5e5..af573b4377 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ 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 @@ -43017,6 +43017,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 { 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 - diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 4d6df79745..c41586a603 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -306,8 +306,9 @@ UNIT_TEST(OsmType_Capital) { { char const * arr[][2] = { + { "admin_level", "6" }, + { "capital", "yes" }, { "place", "city" }, - { "capital", "yes" } }; XMLElement e; @@ -317,13 +318,14 @@ UNIT_TEST(OsmType_Capital) ftype::GetNameAndType(&e, params); TEST_EQUAL(params.m_Types.size(), 1, (params)); - TEST(params.IsTypeExist(GetType({"place", "city", "capital"})), ()); + TEST(params.IsTypeExist(GetType({"place", "city", "capital", "6"})), ()); } { char const * arr[][2] = { + { "admin_level", "6" }, + { "capital", "no" }, { "place", "city" }, - { "capital", "6" } }; XMLElement e; @@ -335,6 +337,25 @@ UNIT_TEST(OsmType_Capital) TEST_EQUAL(params.m_Types.size(), 1, (params)); TEST(params.IsTypeExist(GetType({"place", "city"})), ()); } + + { + char const * arr[][2] = { + { "admin_level", "6" }, + { "boundary", "administrative" }, + { "capital", "2" }, + { "place", "city" }, + }; + + XMLElement e; + FillXmlElement(arr, ARRAY_SIZE(arr), &e); + + FeatureParams params; + ftype::GetNameAndType(&e, params); + + TEST_EQUAL(params.m_Types.size(), 2, (params)); + TEST(params.IsTypeExist(GetType({"place", "city", "capital", "2"})), ()); + TEST(params.IsTypeExist(GetType({"boundary", "administrative", "6"})), ()); + } } UNIT_TEST(OsmType_Route) diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index 0ee477ed7b..fca058c90c 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -235,25 +235,13 @@ namespace ftype if (is_name_tag(k)) return false; - // Filter 3rd component of type here. - if (m_isKey) + if (!m_isKey) { - /// @todo Probably, we need to filter most keys like == "yes" here, - /// but need to carefully investigate the classificator. - - // Grab only "capital == yes" and skip all other capitals. - if (k == "capital") - return (get_mark_value(k, v) == 1); + // Take numbers only for "capital" and "admin_level". + int dummy; + if (strings::to_int(v, dummy)) + return (k == "admin_level" || k == "capital"); } - else - { - // Numbers are used in boundary-administrative-X types. - // Take only "admin_level" tags to avoid grabbing any other trash numbers. - uint64_t dummy; - if (strings::to_uint64(v, dummy)) - return (k == "admin_level"); - } - return true; } @@ -262,26 +250,27 @@ namespace ftype ClassifObjectPtr operator() (string const & k, string const & v) const { - if (!is_good_tag(k, v)) - return ClassifObjectPtr(0, 0); - - return m_parent->BinaryFind(m_isKey ? k : v); + return (is_good_tag(k, v) ? m_parent->BinaryFind(m_isKey ? k : v) : ClassifObjectPtr(0, 0)); } }; typedef vector path_type; - class do_find_root_obj + class do_find_key_value_obj { + ClassifObject const * m_parent; path_type & m_path; public: - explicit do_find_root_obj(path_type & path) : m_path(path) {} + do_find_key_value_obj(ClassifObject const * p, path_type & path) + : m_parent(p), m_path(path) + { + } bool operator() (string const & k, string const & v) { // first try to match key - ClassifObjectPtr p = do_find_obj(classif().GetRoot(), true)(k, v); + ClassifObjectPtr p = do_find_obj(m_parent, true)(k, v); if (p) { m_path.push_back(p); @@ -332,14 +321,6 @@ namespace ftype }; } - ClassifObjectPtr find_object(ClassifObject const * parent, XMLElement * p, set & skipRows) - { - // next objects trying to find by value first - ClassifObjectPtr pObj = for_each_tag_ex(p, do_find_obj(parent, false), skipRows); - // if no - try find object by key (in case of k = "area", v = "yes") - return pObj ? pObj : for_each_tag_ex(p, do_find_obj(parent, true), skipRows); - } - size_t ProcessCommonParams(XMLElement * p, FeatureParams & params) { size_t count; @@ -425,21 +406,35 @@ namespace ftype return; set skipRows; + ClassifObject const * root = classif().GetRoot(); do { path_type path; // find first root object by key - do_find_root_obj doFindRoot(path); - for_each_tag_ex(p, doFindRoot, skipRows); - - if (path.empty()) + if (!for_each_tag_ex(p, do_find_key_value_obj(root, path), skipRows)) break; + CHECK(!path.empty(), ()); - // continue find path from last element - ClassifObjectPtr pObj; - while ((pObj = find_object(path.back().get(), p, skipRows))) - path.push_back(pObj); + do + { + // continue find path from last element + ClassifObject const * parent = path.back().get(); + + // next objects trying to find by value first + ClassifObjectPtr pObj = for_each_tag_ex(p, do_find_obj(parent, false), skipRows); + + if (pObj) + { + path.push_back(pObj); + } + else + { + // if no - try find object by key (in case of k = "area", v = "yes") + if (!for_each_tag_ex(p, do_find_key_value_obj(parent, path), skipRows)) + break; + } + } while (true); // assign type uint32_t t = ftype::GetEmptyValue();