diff --git a/data/classificator.txt b/data/classificator.txt index 5fc8ada7b9..dc9942e37c 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -1287,6 +1287,7 @@ world + hairdresser - hardware - health_food - + hearing_aids - herbalist - hifi - houseware - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 57a462b1a7..43a38f3c94 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 d4e50b4b90..9a8e330297 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -119929,6 +119929,60 @@ cont { } } } +cont { + name: "shop-hearing_aids" + element { + scale: 18 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } + element { + scale: 19 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } + element { + scale: 20 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } +} cont { name: "shop-herbalist" element { diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index c234bfe94e..c0d8e65364 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 f526c8b5c5..d6ea170955 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -115252,6 +115252,60 @@ cont { } } } +cont { + name: "shop-hearing_aids" + element { + scale: 18 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } + element { + scale: 19 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } + element { + scale: 20 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } +} cont { name: "shop-herbalist" element { diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index 82907523fc..80b82eadac 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 4c9cff7d72..8e9c0d2b37 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -115037,6 +115037,60 @@ cont { } } } +cont { + name: "shop-hearing_aids" + element { + scale: 18 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } + element { + scale: 19 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } + element { + scale: 20 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } +} cont { name: "shop-herbalist" element { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 72fd33c84a..8194e0c048 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 5e151386dc..fdad23393b 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -120696,6 +120696,60 @@ cont { } } } +cont { + name: "shop-hearing_aids" + element { + scale: 18 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } + element { + scale: 19 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } + element { + scale: 20 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } +} cont { name: "shop-herbalist" element { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index 586aad0bae..1b75d34b47 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 76898356ff..e3418a83f2 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -120481,6 +120481,60 @@ cont { } } } +cont { + name: "shop-hearing_aids" + element { + scale: 18 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } + element { + scale: 19 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } + element { + scale: 20 + symbol { + name: "hearing_aids-m" + priority: 500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9500 + } + } +} cont { name: "shop-herbalist" element { diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 90ee5826df..266330984e 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1137,11 +1137,11 @@ shop-fabric # icon z16- (also has captio shop-fishing # icon z18- (also has caption(optional) z18-) shop-funeral_directors # icon z16- (also has caption(optional) z16-) shop-gas # icon z18- (also has caption(optional) z18-) +shop-hearing_aids # icon z18- (also has caption(optional) z18-) shop-herbalist # icon z18- (also has caption(optional) z18-) shop-hifi # icon z18- (also has caption(optional) z18-) shop-lottery # icon z18- (also has caption(optional) z18-) shop-medical_supply # icon z18- (also has caption(optional) z18-) -shop-hearing_aids # icon z16- (also has caption(optional) z16-) shop-outpost # icon z18- (also has caption(optional) z18-) shop-pet_grooming # icon z18- (also has caption(optional) z18-) shop-storage_rental # icon z18- (also has caption(optional) z18-) @@ -1154,7 +1154,6 @@ amenity-shower # icon z17- (also has captio amenity-toilets # icon z18- (also has caption(optional) z18-) office # icon z18- (also has caption(optional) z18-) shop # icon z18- (also has caption(optional) z18-) - === 470 amenity-bbq # icon z18- (also has caption(optional) z18-) @@ -2054,6 +2053,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-fishing # caption(optional) z18- (also has icon z18-) # shop-funeral_directors # caption(optional) z16- (also has icon z16-) # shop-gas # caption(optional) z18- (also has icon z18-) +# shop-hearing_aids # caption(optional) z18- (also has icon z18-) # shop-herbalist # caption(optional) z18- (also has icon z18-) # shop-hifi # caption(optional) z18- (also has icon z18-) # shop-lottery # caption(optional) z18- (also has icon z18-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 30ca962cea..5deca040b9 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1137,11 +1137,11 @@ shop-fabric # icon z16- (also has captio shop-fishing # icon z18- (also has caption(optional) z18-) shop-funeral_directors # icon z16- (also has caption(optional) z16-) shop-gas # icon z18- (also has caption(optional) z18-) +shop-hearing_aids # icon z18- (also has caption(optional) z18-) shop-herbalist # icon z18- (also has caption(optional) z18-) shop-hifi # icon z18- (also has caption(optional) z18-) shop-lottery # icon z18- (also has caption(optional) z18-) shop-medical_supply # icon z18- (also has caption(optional) z18-) -shop-hearing_aids # icon z16- (also has caption(optional) z16-) shop-outpost # icon z18- (also has caption(optional) z18-) shop-pet_grooming # icon z18- (also has caption(optional) z18-) shop-storage_rental # icon z18- (also has caption(optional) z18-) @@ -1154,7 +1154,6 @@ amenity-shower # icon z17- (also has captio amenity-toilets # icon z15- (also has caption(optional) z18-) office # icon z18- (also has caption(optional) z18-) shop # icon z18- (also has caption(optional) z18-) - === 470 amenity-bbq # icon z16- (also has caption(optional) z16-) @@ -2055,6 +2054,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-fishing # caption(optional) z18- (also has icon z18-) # shop-funeral_directors # caption(optional) z16- (also has icon z16-) # shop-gas # caption(optional) z18- (also has icon z18-) +# shop-hearing_aids # caption(optional) z18- (also has icon z18-) # shop-herbalist # caption(optional) z18- (also has icon z18-) # shop-hifi # caption(optional) z18- (also has icon z18-) # shop-lottery # caption(optional) z18- (also has icon z18-) diff --git a/data/types.txt b/data/types.txt index 21b009a550..53ec847281 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1619,3 +1619,4 @@ amenity|recycling|container *railway|station|light_rail|berlin *railway|station|subway|shenzhen *railway|subway_entrance|shenzhen +*shop|hearing_aids diff --git a/data/visibility.txt b/data/visibility.txt index 29b25d4c96..f5f13a96ae 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -1287,6 +1287,7 @@ world 000000000000000000000 + hairdresser 000000000000000000000 - hardware 000000000000000000000 - health_food 000000000000000000000 - + hearing_aids 000000000000000000000 - herbalist 000000000000000000000 - hifi 000000000000000000000 - houseware 000000000000000000000 -