diff --git a/data/classificator.txt b/data/classificator.txt index b00b44e8b9..5fc8ada7b9 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -849,6 +849,7 @@ world + locality - neighbourhood - ocean - + quarter - region - sea - square - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 79062d18f9..be8330f68e 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 56b232bfa8..30c802ff82 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -71704,6 +71704,129 @@ cont { } } } +cont { + name: "place-quarter" + element { + scale: 13 + caption { + primary { + height: 11 + color: 8355711 + } + secondary { + height: 9 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 14 + caption { + primary { + height: 12 + color: 8355711 + } + secondary { + height: 10 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 15 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 16 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 17 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 18 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 19 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 20 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } +} cont { name: "place-sea" element { @@ -72142,11 +72265,11 @@ cont { scale: 14 caption { primary { - height: 12 + height: 14 color: 8355711 } secondary { - height: 10 + height: 12 color: 8355711 offset_y: 1 } diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index 506d6ad45e..c234bfe94e 100644 Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index ee539287ed..f526c8b5c5 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -67799,6 +67799,129 @@ cont { } } } +cont { + name: "place-quarter" + element { + scale: 13 + caption { + primary { + height: 11 + color: 5592405 + } + secondary { + height: 9 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 14 + caption { + primary { + height: 12 + color: 5592405 + } + secondary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 15 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 16 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 17 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 18 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 19 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 20 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } +} cont { name: "place-sea" element { @@ -68237,11 +68360,11 @@ cont { scale: 14 caption { primary { - height: 12 + height: 14 color: 5592405 } secondary { - height: 10 + height: 12 color: 5592405 offset_y: 1 } diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index c77aa6cfe1..82907523fc 100644 Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 32246d03ca..4c9cff7d72 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -67584,6 +67584,129 @@ cont { } } } +cont { + name: "place-quarter" + element { + scale: 13 + caption { + primary { + height: 11 + color: 8355711 + } + secondary { + height: 9 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 14 + caption { + primary { + height: 12 + color: 8355711 + } + secondary { + height: 10 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 15 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 16 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 17 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 18 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 19 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 20 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } +} cont { name: "place-sea" element { @@ -68022,11 +68145,11 @@ cont { scale: 14 caption { primary { - height: 12 + height: 14 color: 8355711 } secondary { - height: 10 + height: 12 color: 8355711 offset_y: 1 } diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 697962584c..acc91be3a1 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 90c414b474..e01e0e1d16 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -71989,6 +71989,129 @@ cont { } } } +cont { + name: "place-quarter" + element { + scale: 13 + caption { + primary { + height: 11 + color: 5592405 + } + secondary { + height: 9 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 14 + caption { + primary { + height: 12 + color: 5592405 + } + secondary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 15 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 16 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 17 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 18 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 19 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 20 + caption { + primary { + height: 14 + color: 5592405 + } + secondary { + height: 12 + color: 5592405 + offset_y: 1 + } + priority: 5750 + } + } +} cont { name: "place-sea" element { @@ -72427,11 +72550,11 @@ cont { scale: 14 caption { primary { - height: 12 + height: 14 color: 5592405 } secondary { - height: 10 + height: 12 color: 5592405 offset_y: 1 } diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index acf5f8f45c..b7666e9c3b 100644 Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index a4d1677a2f..13d2f1dd5b 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -71774,6 +71774,129 @@ cont { } } } +cont { + name: "place-quarter" + element { + scale: 13 + caption { + primary { + height: 11 + color: 8355711 + } + secondary { + height: 9 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 14 + caption { + primary { + height: 12 + color: 8355711 + } + secondary { + height: 10 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 15 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 16 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 17 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 18 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 19 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } + element { + scale: 20 + caption { + primary { + height: 14 + color: 8355711 + } + secondary { + height: 12 + color: 8355711 + offset_y: 1 + } + priority: 5750 + } + } +} cont { name: "place-sea" element { @@ -72212,11 +72335,11 @@ cont { scale: 14 caption { primary { - height: 12 + height: 14 color: 8355711 } secondary { - height: 10 + height: 12 color: 8355711 offset_y: 1 } diff --git a/data/types.txt b/data/types.txt index 082497e911..21b009a550 100644 --- a/data/types.txt +++ b/data/types.txt @@ -904,7 +904,7 @@ mapswithme railway|subway|tunnel mapswithme railway|subway|tunnel -mapswithme +*place|quarter railway|subway|tunnel *shop|rental railway|subway|tunnel diff --git a/data/visibility.txt b/data/visibility.txt index fe4405ce83..29b25d4c96 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -849,6 +849,7 @@ world 000000000000000000000 + locality 000000000000011111111 - neighbourhood 000000000000000000000 - ocean 011111111111111111111 - + quarter 000000000000000000000 - region 000000000000000000000 - sea 000011111111111111111 - square 000000000000000011111 -