diff --git a/data/classificator.txt b/data/classificator.txt index 4b8fb1aa37..d74d873b09 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -470,9 +470,18 @@ world + battlefield - boundary_stone - castle + + castrum - defensive - + fortified_church - + fortress - + hillfort - + kremlin - + manor - + palace - + shiro - stately - {} + city_gate - citywalls - fort - memorial + diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 3eea81f2d2..669c439f56 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 b37c13ba55..36f42c07e7 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -30251,6 +30251,141 @@ cont { } } } +cont { + name: "historic-castle-castrum" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} cont { name: "historic-castle-defensive" element { @@ -30386,6 +30521,951 @@ cont { } } } +cont { + name: "historic-castle-fortified_church" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-fortress" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-hillfort" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-kremlin" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-manor" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-palace" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-shiro" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} cont { name: "historic-castle-stately" element { @@ -30521,6 +31601,128 @@ cont { } } } +cont { + name: "historic-city_gate" + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} cont { name: "historic-citywalls" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index ae8463a7d1..27fd890b86 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 96f3c95fd6..9daeb5ca52 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -29892,6 +29892,141 @@ cont { } } } +cont { + name: "historic-castle-castrum" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} cont { name: "historic-castle-defensive" element { @@ -30027,6 +30162,951 @@ cont { } } } +cont { + name: "historic-castle-fortified_church" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-fortress" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-hillfort" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-kremlin" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-manor" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-palace" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-shiro" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} cont { name: "historic-castle-stately" element { @@ -30162,6 +31242,128 @@ cont { } } } +cont { + name: "historic-city_gate" + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} cont { name: "historic-citywalls" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index af8476ee09..9f7f588550 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 6e61a6ef9a..5328fe7519 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -30040,6 +30040,141 @@ cont { } } } +cont { + name: "historic-castle-castrum" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} cont { name: "historic-castle-defensive" element { @@ -30175,6 +30310,951 @@ cont { } } } +cont { + name: "historic-castle-fortified_church" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-fortress" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-hillfort" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-kremlin" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-manor" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-palace" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} +cont { + name: "historic-castle-shiro" + element { + scale: 12 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16867 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16867 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16867 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15867 + } + } +} cont { name: "historic-castle-stately" element { @@ -30310,6 +31390,128 @@ cont { } } } +cont { + name: "historic-city_gate" + element { + scale: 13 + symbol { + name: "remains-s" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 14 + symbol { + name: "remains-s" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16000 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15000 + } + } +} cont { name: "historic-citywalls" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 0edb6d7291..ecaf47fb37 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 16c84c4e99..c219181fe3 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -18592,6 +18592,106 @@ cont { } } } +cont { + name: "historic-castle-castrum" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } +} cont { name: "historic-castle-defensive" element { @@ -18692,6 +18792,706 @@ cont { } } } +cont { + name: "historic-castle-fortified_church" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-fortress" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-hillfort" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-kremlin" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-manor" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-palace" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-shiro" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15837 + } + } +} cont { name: "historic-castle-stately" element { @@ -18792,6 +19592,103 @@ cont { } } } +cont { + name: "historic-city_gate" + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16779 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16779 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16779 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15779 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16779 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15779 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16779 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15779 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16779 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15779 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16779 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15779 + } + } +} cont { name: "historic-citywalls" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index b37ec87753..5da611b162 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 42bdb4b0f0..3c1f33d613 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -18916,6 +18916,106 @@ cont { } } } +cont { + name: "historic-castle-castrum" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } +} cont { name: "historic-castle-defensive" element { @@ -19016,6 +19116,706 @@ cont { } } } +cont { + name: "historic-castle-fortified_church" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-fortress" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-hillfort" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-kremlin" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-manor" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-palace" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } +} +cont { + name: "historic-castle-shiro" + element { + scale: 12 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16837 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16837 + min_distance: 5 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16837 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15837 + } + } +} cont { name: "historic-castle-stately" element { @@ -19116,6 +19916,103 @@ cont { } } } +cont { + name: "historic-city_gate" + element { + scale: 13 + symbol { + name: "remains-m" + priority: 16779 + } + } + element { + scale: 14 + symbol { + name: "remains-m" + priority: 16779 + } + } + element { + scale: 15 + symbol { + name: "remains-m" + priority: 16779 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15779 + } + } + element { + scale: 16 + symbol { + name: "remains-m" + priority: 16779 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15779 + } + } + element { + scale: 17 + symbol { + name: "remains-m" + priority: 16779 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15779 + } + } + element { + scale: 18 + symbol { + name: "remains-m" + priority: 16779 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15779 + } + } + element { + scale: 19 + symbol { + name: "remains-m" + priority: 16779 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 6710886 + offset_y: 1 + } + priority: 15779 + } + } +} cont { name: "historic-citywalls" element { diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index be8ce05687..270d1e9a03 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf index ffe534ca99..94a3a9b158 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -3,658 +3,658 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index 6424692954..e46af7736a 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index c096e8c9e1..6635343bbc 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -3,642 +3,642 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index a3d59a62fd..07ebfff1c2 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index df697cb41e..4ece4d6870 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -3,658 +3,658 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index ff326b11ef..ebcbc14c74 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf index 3525c3178f..3b8e9ede0d 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -3,642 +3,642 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index c64353a39d..7422dbfcff 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index feb127fe32..57ee47ce40 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -3,658 +3,658 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index a41f107d9b..53ce5d4078 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf index f96548e336..b09a1a4c6f 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -3,642 +3,642 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index 05d5a1500f..88b30297ca 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index 406903aa8f..bff742eb4c 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -3,658 +3,658 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index 2f940b4f17..ffad470652 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf index 94a4e34738..548146a023 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -3,642 +3,642 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index feedec0619..7589bc864f 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index 48aa36ffec..1233191925 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -3,658 +3,658 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index eedf3f3547..bb13ccbf30 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf index 9f9223aec5..66796216cb 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -3,622 +3,622 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -627,13 +627,13 @@ - - + + - - - - + + + + diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png index 3038dcea2f..db297764b8 100644 Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/resources-xxxhdpi_clear/symbols.sdf index 81bebd0adc..8a2e1ecacd 100644 --- a/data/resources-xxxhdpi_clear/symbols.sdf +++ b/data/resources-xxxhdpi_clear/symbols.sdf @@ -2,659 +2,659 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index d19695214a..b5f89cdaa6 100644 Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf index a6d5d2b9f3..3983e78713 100644 --- a/data/resources-xxxhdpi_dark/symbols.sdf +++ b/data/resources-xxxhdpi_dark/symbols.sdf @@ -2,643 +2,643 @@ - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/types.txt b/data/types.txt index cc746ef5bc..07c8c83ea0 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1132,21 +1132,21 @@ leisure|sports_centre mapswithme mapswithme mapswithme -mapswithme +*historic|city_gate *sport|padel *sport|futsal *sport|ice_hockey *sport|field_hockey *sport|badminton *sport|pelota -mapswithme -mapswithme -mapswithme -mapswithme -mapswithme -mapswithme -mapswithme -mapswithme +*historic|castle|castrum +*historic|castle|fortified_church +*historic|castle|fortress +*historic|castle|hillfort +*historic|castle|kremlin +*historic|castle|manor +*historic|castle|palace +*historic|castle|shiro *hwtag|yescar *hwtag|nocar *tourism|gallery diff --git a/data/visibility.txt b/data/visibility.txt index 67724cec23..a9e875161c 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -470,9 +470,18 @@ world 00000000000000000000 + battlefield 00000000000000000000 - boundary_stone 00000000000000001111 - castle 00000000000011111111 + + castrum 00000000000011111111 - defensive 00000000000011111111 - + fortified_church 00000000000011111111 - + fortress 00000000000011111111 - + hillfort 00000000000011111111 - + kremlin 00000000000011111111 - + manor 00000000000011111111 - + palace 00000000000011111111 - + shiro 00000000000011111111 - stately 00000000000011111111 - {} + city_gate 00000000000001111111 - citywalls 00000000000000011111 - fort 00000000000011111111 - memorial 00000000000000011111 +