diff options
-rw-r--r-- | data/classificator.txt | 8 | ||||
-rw-r--r-- | data/drules_proto.bin | bin | 248601 -> 250158 bytes | |||
-rw-r--r-- | data/drules_proto.txt | 640 | ||||
-rw-r--r-- | data/drules_proto_clear.bin | bin | 213694 -> 215098 bytes | |||
-rw-r--r-- | data/drules_proto_clear.txt | 559 | ||||
-rw-r--r-- | data/drules_proto_dark.bin | bin | 211061 -> 212465 bytes | |||
-rw-r--r-- | data/drules_proto_dark.txt | 559 | ||||
-rw-r--r-- | data/drules_proto_legacy.bin | bin | 208118 -> 209435 bytes | |||
-rw-r--r-- | data/drules_proto_legacy.txt | 703 | ||||
-rw-r--r-- | data/editor.config | 20 | ||||
-rw-r--r-- | data/mapcss-mapping.csv | 5 | ||||
-rw-r--r-- | data/types.txt | 5 | ||||
-rw-r--r-- | data/visibility.txt | 8 |
13 files changed, 2344 insertions, 163 deletions
diff --git a/data/classificator.txt b/data/classificator.txt index 7553873412..89885ef0b4 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -441,7 +441,12 @@ world + recreation_ground - sauna - slipway - - sports_centre - + sports_centre + + climbing - + shooting - + swimming - + yoga - + {} stadium - swimming_pool - track - @@ -732,6 +737,7 @@ world + books - butcher - car - + car_parts - car_repair + tyres - {} diff --git a/data/drules_proto.bin b/data/drules_proto.bin Binary files differindex ae6ca685f6..6cda16fee8 100644 --- a/data/drules_proto.bin +++ b/data/drules_proto.bin diff --git a/data/drules_proto.txt b/data/drules_proto.txt index ced852cfa7..96472b4b24 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -44261,6 +44261,554 @@ cont { } } cont { + name: "leisure-sports_centre-climbing" + element { + scale: 12 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { + name: "leisure-sports_centre-shooting" + element { + scale: 12 + symbol { + name: "archery-s" + priority: 16849 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 13 + symbol { + name: "archery-s" + priority: 16849 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "archery-s" + priority: 16849 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "archery-m" + priority: 16849 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "archery-m" + priority: 16849 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "archery-l" + priority: 16849 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "archery-l" + priority: 16849 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "archery-l" + priority: 16849 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { + name: "leisure-sports_centre-swimming" + element { + scale: 12 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "swimming-l" + apply_for_type: 1 + priority: 16863 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "swimming-l" + apply_for_type: 1 + priority: 16863 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { + name: "leisure-sports_centre-yoga" + element { + scale: 12 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { name: "leisure-stadium" element { scale: 12 @@ -45442,49 +45990,49 @@ cont { scale: 12 area { color: 15000804 - priority: -16312 + priority: -16344 } } element { scale: 13 area { color: 15000804 - priority: -16312 + priority: -16344 } } element { scale: 14 area { color: 15000804 - priority: -16312 + priority: -16344 } } element { scale: 15 area { color: 15000804 - priority: -16312 + priority: -16344 } } element { scale: 16 area { color: 15000804 - priority: -16312 + priority: -16344 } } element { scale: 17 area { color: 15000804 - priority: -16312 + priority: -16344 } } element { scale: 18 area { color: 15000804 - priority: -16312 + priority: -16344 } } } @@ -72169,6 +72717,84 @@ cont { } } cont { + name: "shop-car_parts" + element { + scale: 15 + symbol { + name: "shop-m" + priority: 16849 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16849 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16849 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16849 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16849 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15849 + } + } +} +cont { name: "shop-car_repair" element { scale: 15 diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin Binary files differindex fdcda2ef36..013eddb534 100644 --- a/data/drules_proto_clear.bin +++ b/data/drules_proto_clear.bin diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 3956cc994e..6f8500fda5 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -38988,6 +38988,487 @@ cont { } } cont { + name: "leisure-sports_centre-climbing" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { + name: "leisure-sports_centre-shooting" + element { + scale: 13 + symbol { + name: "archery-s" + priority: 16849 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "archery-s" + priority: 16849 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "archery-m" + priority: 16849 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "archery-m" + priority: 16849 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "archery-l" + priority: 16849 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "archery-l" + priority: 16849 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "archery-l" + priority: 16849 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { + name: "leisure-sports_centre-swimming" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "swimming-l" + apply_for_type: 1 + priority: 16863 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "swimming-l" + apply_for_type: 1 + priority: 16863 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { + name: "leisure-sports_centre-yoga" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { name: "leisure-stadium" element { scale: 13 @@ -61842,6 +62323,84 @@ cont { } } cont { + name: "shop-car_parts" + element { + scale: 15 + symbol { + name: "shop-m" + priority: 16849 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16849 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16849 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16849 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16849 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 10 + } + priority: 15849 + } + } +} +cont { name: "shop-car_repair" element { scale: 15 diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin Binary files differindex f3b58d6a9c..e4ddd2b9e8 100644 --- a/data/drules_proto_dark.bin +++ b/data/drules_proto_dark.bin diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 88d9fe8f64..9ffebc2f39 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -38988,6 +38988,487 @@ cont { } } cont { + name: "leisure-sports_centre-climbing" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { + name: "leisure-sports_centre-shooting" + element { + scale: 13 + symbol { + name: "archery-s" + priority: 16849 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "archery-s" + priority: 16849 + min_distance: 50 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "archery-m" + priority: 16849 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "archery-m" + priority: 16849 + min_distance: 40 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "archery-l" + priority: 16849 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "archery-l" + priority: 16849 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "archery-l" + priority: 16849 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { + name: "leisure-sports_centre-swimming" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "swimming-l" + apply_for_type: 1 + priority: 16863 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "swimming-l" + apply_for_type: 1 + priority: 16863 + min_distance: 10 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { + name: "leisure-sports_centre-yoga" + element { + scale: 13 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 14 + symbol { + name: "pitch-s" + apply_for_type: 1 + priority: 16068 + min_distance: 50 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 15 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 16 + symbol { + name: "pitch-m" + apply_for_type: 1 + priority: 16068 + min_distance: 40 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 17 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 18 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } + element { + scale: 19 + symbol { + name: "pitch-l" + apply_for_type: 1 + priority: 16068 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 10 + } + priority: 15500 + } + } +} +cont { name: "leisure-stadium" element { scale: 13 @@ -61842,6 +62323,84 @@ cont { } } cont { + name: "shop-car_parts" + element { + scale: 15 + symbol { + name: "shop-m" + priority: 16849 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 16 + symbol { + name: "shop-m" + priority: 16849 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 17 + symbol { + name: "shop-l" + priority: 16849 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 18 + symbol { + name: "shop-l" + priority: 16849 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15849 + } + } + element { + scale: 19 + symbol { + name: "shop-l" + priority: 16849 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 10 + } + priority: 15849 + } + } +} +cont { name: "shop-car_repair" element { scale: 15 diff --git a/data/drules_proto_legacy.bin b/data/drules_proto_legacy.bin Binary files differindex cf91acaad3..9d8e301ac2 100644 --- a/data/drules_proto_legacy.bin +++ b/data/drules_proto_legacy.bin diff --git a/data/drules_proto_legacy.txt b/data/drules_proto_legacy.txt index c5eadd5ab6..9f50385281 100644 --- a/data/drules_proto_legacy.txt +++ b/data/drules_proto_legacy.txt @@ -37541,7 +37541,7 @@ cont { } } cont { - name: "leisure-stadium" + name: "leisure-sports_centre-climbing" element { scale: 12 area { @@ -37624,6 +37624,362 @@ cont { } } cont { + name: "leisure-sports_centre-shooting" + element { + scale: 12 + area { + color: 13691076 + priority: -16304 + } + } + element { + scale: 13 + area { + color: 13691076 + priority: -16305 + } + } + element { + scale: 14 + area { + color: 13691076 + priority: -16306 + } + } + element { + scale: 15 + area { + color: 13691076 + priority: -16307 + } + } + element { + scale: 16 + area { + color: 13691076 + priority: -16308 + } + } + element { + scale: 17 + area { + color: 13691076 + priority: -16309 + } + symbol { + name: "shooting-borderless" + priority: 16000 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 18 + area { + color: 13691076 + priority: -16310 + } + symbol { + name: "shooting-borderless" + priority: 16000 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 19 + area { + color: 13691076 + priority: -16311 + } + symbol { + name: "shooting-borderless" + priority: 16000 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } +} +cont { + name: "leisure-sports_centre-swimming" + element { + scale: 12 + area { + color: 13691076 + priority: -16312 + } + } + element { + scale: 13 + area { + color: 13691076 + priority: -16313 + } + } + element { + scale: 14 + area { + color: 13691076 + priority: -16314 + } + } + element { + scale: 15 + area { + color: 13691076 + priority: -16315 + } + } + element { + scale: 16 + area { + color: 13691076 + priority: -16316 + } + } + element { + scale: 17 + area { + color: 13691076 + priority: -16317 + } + symbol { + name: "swimming-borderless" + priority: 16000 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 18 + area { + color: 13691076 + priority: -16318 + } + symbol { + name: "swimming-borderless" + priority: 16000 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 19 + area { + color: 13691076 + priority: -16319 + } + symbol { + name: "swimming-borderless" + priority: 16000 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } +} +cont { + name: "leisure-sports_centre-yoga" + element { + scale: 12 + area { + color: 13691076 + priority: -16320 + } + } + element { + scale: 13 + area { + color: 13691076 + priority: -16321 + } + } + element { + scale: 14 + area { + color: 13691076 + priority: -16322 + } + } + element { + scale: 15 + area { + color: 13691076 + priority: -16323 + } + } + element { + scale: 16 + area { + color: 13691076 + priority: -16324 + } + } + element { + scale: 17 + area { + color: 13691076 + priority: -16325 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 18 + area { + color: 13691076 + priority: -16326 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 19 + area { + color: 13691076 + priority: -16327 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } +} +cont { + name: "leisure-stadium" + element { + scale: 12 + area { + color: 13691076 + priority: -16328 + } + } + element { + scale: 13 + area { + color: 13691076 + priority: -16329 + } + } + element { + scale: 14 + area { + color: 13691076 + priority: -16330 + } + } + element { + scale: 15 + area { + color: 13691076 + priority: -16331 + } + } + element { + scale: 16 + area { + color: 13691076 + priority: -16332 + } + } + element { + scale: 17 + area { + color: 13691076 + priority: -16333 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 18 + area { + color: 13691076 + priority: -16334 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 19 + area { + color: 13691076 + priority: -16335 + } + caption { + primary { + height: 12 + color: 4210752 + stroke_color: 16777215 + } + priority: 15000 + } + } +} +cont { name: "leisure-swimming_pool" element { scale: 13 @@ -37681,56 +38037,56 @@ cont { scale: 12 area { color: 13691076 - priority: -16304 + priority: -16336 } } element { scale: 13 area { color: 13691076 - priority: -16305 + priority: -16337 } } element { scale: 14 area { color: 13691076 - priority: -16306 + priority: -16338 } } element { scale: 15 area { color: 13691076 - priority: -16307 + priority: -16339 } } element { scale: 16 area { color: 13691076 - priority: -16308 + priority: -16340 } } element { scale: 17 area { color: 13691076 - priority: -16309 + priority: -16341 } } element { scale: 18 area { color: 13691076 - priority: -16310 + priority: -16342 } } element { scale: 19 area { color: 13691076 - priority: -16311 + priority: -16343 } } } @@ -38379,56 +38735,56 @@ cont { scale: 12 area { color: 15000804 - priority: -16312 + priority: -16344 } } element { scale: 13 area { color: 15000804 - priority: -16313 + priority: -16345 } } element { scale: 14 area { color: 15000804 - priority: -16314 + priority: -16346 } } element { scale: 15 area { color: 15000804 - priority: -16315 + priority: -16347 } } element { scale: 16 area { color: 15000804 - priority: -16316 + priority: -16348 } } element { scale: 17 area { color: 15000804 - priority: -16317 + priority: -16349 } } element { scale: 18 area { color: 15000804 - priority: -16318 + priority: -16350 } } element { scale: 19 area { color: 15000804 - priority: -16319 + priority: -16351 } } } @@ -39099,7 +39455,7 @@ cont { scale: 14 area { color: 15649877 - priority: -16320 + priority: -16352 } caption { primary { @@ -39114,7 +39470,7 @@ cont { scale: 15 area { color: 15649877 - priority: -16321 + priority: -16353 } caption { primary { @@ -39129,7 +39485,7 @@ cont { scale: 16 area { color: 15649877 - priority: -16322 + priority: -16354 } caption { primary { @@ -39144,7 +39500,7 @@ cont { scale: 17 area { color: 15649877 - priority: -16323 + priority: -16355 } caption { primary { @@ -39159,7 +39515,7 @@ cont { scale: 18 area { color: 15649877 - priority: -16324 + priority: -16356 } caption { primary { @@ -39174,7 +39530,7 @@ cont { scale: 19 area { color: 15649877 - priority: -16325 + priority: -16357 } caption { primary { @@ -39497,140 +39853,140 @@ cont { scale: 0 area { color: 16777215 - priority: -16326 + priority: -16358 } } element { scale: 1 area { color: 16777215 - priority: -16327 + priority: -16359 } } element { scale: 2 area { color: 16777215 - priority: -16328 + priority: -16360 } } element { scale: 3 area { color: 16777215 - priority: -16329 + priority: -16361 } } element { scale: 4 area { color: 16777215 - priority: -16330 + priority: -16362 } } element { scale: 5 area { color: 16777215 - priority: -16331 + priority: -16363 } } element { scale: 6 area { color: 16777215 - priority: -16332 + priority: -16364 } } element { scale: 7 area { color: 16777215 - priority: -16333 + priority: -16365 } } element { scale: 8 area { color: 16777215 - priority: -16334 + priority: -16366 } } element { scale: 9 area { color: 16777215 - priority: -16335 + priority: -16367 } } element { scale: 10 area { color: 16777215 - priority: -16336 + priority: -16368 } } element { scale: 11 area { color: 16777215 - priority: -16337 + priority: -16369 } } element { scale: 12 area { color: 16777215 - priority: -16338 + priority: -16370 } } element { scale: 13 area { color: 16777215 - priority: -16339 + priority: -16371 } } element { scale: 14 area { color: 16777215 - priority: -16340 + priority: -16372 } } element { scale: 15 area { color: 16777215 - priority: -16341 + priority: -16373 } } element { scale: 16 area { color: 16777215 - priority: -16342 + priority: -16374 } } element { scale: 17 area { color: 16777215 - priority: -16343 + priority: -16375 } } element { scale: 18 area { color: 16777215 - priority: -16344 + priority: -16376 } } element { scale: 19 area { color: 16777215 - priority: -16345 + priority: -16377 } } } @@ -39640,28 +39996,28 @@ cont { scale: 12 area { color: 13691076 - priority: -16346 + priority: -16378 } } element { scale: 13 area { color: 13691076 - priority: -16347 + priority: -16379 } } element { scale: 14 area { color: 13691076 - priority: -16348 + priority: -16380 } } element { scale: 15 area { color: 13691076 - priority: -16349 + priority: -16381 } caption { primary { @@ -39675,7 +40031,7 @@ cont { scale: 16 area { color: 13691076 - priority: -16350 + priority: -16382 } caption { primary { @@ -39689,7 +40045,7 @@ cont { scale: 17 area { color: 13691076 - priority: -16351 + priority: -16383 } caption { primary { @@ -39703,7 +40059,7 @@ cont { scale: 18 area { color: 13691076 - priority: -16352 + priority: -16384 } caption { primary { @@ -39717,7 +40073,7 @@ cont { scale: 19 area { color: 13691076 - priority: -16353 + priority: -16385 } caption { primary { @@ -40653,56 +41009,56 @@ cont { scale: 12 area { color: 13691076 - priority: -16354 + priority: -16386 } } element { scale: 13 area { color: 13691076 - priority: -16355 + priority: -16387 } } element { scale: 14 area { color: 13691076 - priority: -16356 + priority: -16388 } } element { scale: 15 area { color: 13691076 - priority: -16357 + priority: -16389 } } element { scale: 16 area { color: 13691076 - priority: -16358 + priority: -16390 } } element { scale: 17 area { color: 13691076 - priority: -16359 + priority: -16391 } } element { scale: 18 area { color: 13691076 - priority: -16360 + priority: -16392 } } element { scale: 19 area { color: 13691076 - priority: -16361 + priority: -16393 } } } @@ -41273,42 +41629,42 @@ cont { scale: 14 area { color: 10535864 - priority: -16362 + priority: -16394 } } element { scale: 15 area { color: 10535864 - priority: -16363 + priority: -16395 } } element { scale: 16 area { color: 10535864 - priority: -16364 + priority: -16396 } } element { scale: 17 area { color: 10535864 - priority: -16365 + priority: -16397 } } element { scale: 18 area { color: 10535864 - priority: -16366 + priority: -16398 } } element { scale: 19 area { color: 10535864 - priority: -16367 + priority: -16399 } } } @@ -41318,56 +41674,56 @@ cont { scale: 12 area { color: 10535864 - priority: -16368 + priority: -16400 } } element { scale: 13 area { color: 10535864 - priority: -16369 + priority: -16401 } } element { scale: 14 area { color: 10535864 - priority: -16370 + priority: -16402 } } element { scale: 15 area { color: 10535864 - priority: -16371 + priority: -16403 } } element { scale: 16 area { color: 10535864 - priority: -16372 + priority: -16404 } } element { scale: 17 area { color: 10535864 - priority: -16373 + priority: -16405 } } element { scale: 18 area { color: 10535864 - priority: -16374 + priority: -16406 } } element { scale: 19 area { color: 10535864 - priority: -16375 + priority: -16407 } } } @@ -41377,42 +41733,42 @@ cont { scale: 14 area { color: 10535864 - priority: -16376 + priority: -16408 } } element { scale: 15 area { color: 10535864 - priority: -16377 + priority: -16409 } } element { scale: 16 area { color: 10535864 - priority: -16378 + priority: -16410 } } element { scale: 17 area { color: 10535864 - priority: -16379 + priority: -16411 } } element { scale: 18 area { color: 10535864 - priority: -16380 + priority: -16412 } } element { scale: 19 area { color: 10535864 - priority: -16381 + priority: -16413 } } } @@ -41422,42 +41778,42 @@ cont { scale: 10 area { color: 11720357 - priority: -16382 + priority: -16414 } } element { scale: 11 area { color: 11720357 - priority: -16383 + priority: -16415 } } element { scale: 12 area { color: 11720357 - priority: -16384 + priority: -16416 } } element { scale: 13 area { color: 11720357 - priority: -16385 + priority: -16417 } } element { scale: 14 area { color: 11720357 - priority: -16386 + priority: -16418 } } element { scale: 15 area { color: 11720357 - priority: -16387 + priority: -16419 } caption { primary { @@ -41471,7 +41827,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16388 + priority: -16420 } caption { primary { @@ -41486,7 +41842,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16389 + priority: -16421 } caption { primary { @@ -41501,7 +41857,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16390 + priority: -16422 } caption { primary { @@ -41516,7 +41872,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16391 + priority: -16423 } caption { primary { @@ -41534,42 +41890,42 @@ cont { scale: 10 area { color: 11720357 - priority: -16392 + priority: -16424 } } element { scale: 11 area { color: 11720357 - priority: -16393 + priority: -16425 } } element { scale: 12 area { color: 11720357 - priority: -16394 + priority: -16426 } } element { scale: 13 area { color: 11720357 - priority: -16395 + priority: -16427 } } element { scale: 14 area { color: 11720357 - priority: -16396 + priority: -16428 } } element { scale: 15 area { color: 11720357 - priority: -16397 + priority: -16429 } caption { primary { @@ -41583,7 +41939,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16398 + priority: -16430 } caption { primary { @@ -41598,7 +41954,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16399 + priority: -16431 } caption { primary { @@ -41613,7 +41969,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16400 + priority: -16432 } caption { primary { @@ -41628,7 +41984,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16401 + priority: -16433 } caption { primary { @@ -41646,42 +42002,42 @@ cont { scale: 10 area { color: 11720357 - priority: -16402 + priority: -16434 } } element { scale: 11 area { color: 11720357 - priority: -16403 + priority: -16435 } } element { scale: 12 area { color: 11720357 - priority: -16404 + priority: -16436 } } element { scale: 13 area { color: 11720357 - priority: -16405 + priority: -16437 } } element { scale: 14 area { color: 11720357 - priority: -16406 + priority: -16438 } } element { scale: 15 area { color: 11720357 - priority: -16407 + priority: -16439 } caption { primary { @@ -41695,7 +42051,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16408 + priority: -16440 } caption { primary { @@ -41710,7 +42066,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16409 + priority: -16441 } caption { primary { @@ -41725,7 +42081,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16410 + priority: -16442 } caption { primary { @@ -41740,7 +42096,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16411 + priority: -16443 } caption { primary { @@ -41758,42 +42114,42 @@ cont { scale: 10 area { color: 11720357 - priority: -16412 + priority: -16444 } } element { scale: 11 area { color: 11720357 - priority: -16413 + priority: -16445 } } element { scale: 12 area { color: 11720357 - priority: -16414 + priority: -16446 } } element { scale: 13 area { color: 11720357 - priority: -16415 + priority: -16447 } } element { scale: 14 area { color: 11720357 - priority: -16416 + priority: -16448 } } element { scale: 15 area { color: 11720357 - priority: -16417 + priority: -16449 } caption { primary { @@ -41807,7 +42163,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16418 + priority: -16450 } caption { primary { @@ -41822,7 +42178,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16419 + priority: -16451 } caption { primary { @@ -41837,7 +42193,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16420 + priority: -16452 } caption { primary { @@ -41852,7 +42208,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16421 + priority: -16453 } caption { primary { @@ -45814,7 +46170,7 @@ cont { scale: 14 area { color: 14539465 - priority: -16422 + priority: -16454 } caption { primary { @@ -45828,7 +46184,7 @@ cont { scale: 15 area { color: 14539465 - priority: -16423 + priority: -16455 } caption { primary { @@ -45842,7 +46198,7 @@ cont { scale: 16 area { color: 14539465 - priority: -16424 + priority: -16456 } caption { primary { @@ -45856,7 +46212,7 @@ cont { scale: 17 area { color: 14539465 - priority: -16425 + priority: -16457 } caption { primary { @@ -45870,7 +46226,7 @@ cont { scale: 18 area { color: 14539465 - priority: -16426 + priority: -16458 } caption { primary { @@ -45884,7 +46240,7 @@ cont { scale: 19 area { color: 14539465 - priority: -16427 + priority: -16459 } caption { primary { @@ -46929,14 +47285,14 @@ cont { scale: 11 area { color: 14539465 - priority: -16428 + priority: -16460 } } element { scale: 12 area { color: 14539465 - priority: -16429 + priority: -16461 } caption { primary { @@ -46951,7 +47307,7 @@ cont { scale: 13 area { color: 14539465 - priority: -16430 + priority: -16462 } caption { primary { @@ -46973,7 +47329,7 @@ cont { scale: 14 area { color: 14539465 - priority: -16431 + priority: -16463 } caption { primary { @@ -46995,7 +47351,7 @@ cont { scale: 15 area { color: 14539465 - priority: -16432 + priority: -16464 } caption { primary { @@ -47017,7 +47373,7 @@ cont { scale: 16 area { color: 14539465 - priority: -16433 + priority: -16465 } caption { primary { @@ -47039,7 +47395,7 @@ cont { scale: 17 area { color: 14539465 - priority: -16434 + priority: -16466 } caption { primary { @@ -47061,7 +47417,7 @@ cont { scale: 18 area { color: 14539465 - priority: -16435 + priority: -16467 } caption { primary { @@ -47083,7 +47439,7 @@ cont { scale: 19 area { color: 14539465 - priority: -16436 + priority: -16468 } caption { primary { @@ -62706,6 +63062,45 @@ cont { } } cont { + name: "shop-car_parts" + element { + scale: 17 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 4210752 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15003 + } + } +} +cont { name: "shop-car_repair" element { scale: 16 @@ -65215,21 +65610,21 @@ cont { scale: 12 area { color: 13626551 - priority: -16437 + priority: -16469 } } element { scale: 13 area { color: 13626551 - priority: -16438 + priority: -16470 } } element { scale: 14 area { color: 13626551 - priority: -16439 + priority: -16471 } symbol { name: "campsite" @@ -65240,7 +65635,7 @@ cont { scale: 15 area { color: 13626551 - priority: -16440 + priority: -16472 } symbol { name: "campsite" @@ -65251,7 +65646,7 @@ cont { scale: 16 area { color: 13626551 - priority: -16441 + priority: -16473 } symbol { name: "campsite" @@ -65325,35 +65720,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16442 + priority: -16474 } } element { scale: 13 area { color: 13626551 - priority: -16443 + priority: -16475 } } element { scale: 14 area { color: 13626551 - priority: -16444 + priority: -16476 } } element { scale: 15 area { color: 13626551 - priority: -16445 + priority: -16477 } } element { scale: 16 area { color: 13626551 - priority: -16446 + priority: -16478 } } element { @@ -66046,35 +66441,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16447 + priority: -16479 } } element { scale: 13 area { color: 13626551 - priority: -16448 + priority: -16480 } } element { scale: 14 area { color: 13626551 - priority: -16449 + priority: -16481 } } element { scale: 15 area { color: 13626551 - priority: -16450 + priority: -16482 } } element { scale: 16 area { color: 13626551 - priority: -16451 + priority: -16483 } } element { @@ -66209,35 +66604,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16452 + priority: -16484 } } element { scale: 13 area { color: 13626551 - priority: -16453 + priority: -16485 } } element { scale: 14 area { color: 13626551 - priority: -16454 + priority: -16486 } } element { scale: 15 area { color: 13626551 - priority: -16455 + priority: -16487 } } element { scale: 16 area { color: 13626551 - priority: -16456 + priority: -16488 } } element { diff --git a/data/editor.config b/data/editor.config index 2452329eaa..5055dfd89f 100644 --- a/data/editor.config +++ b/data/editor.config @@ -830,6 +830,26 @@ <tag k="tourism" v="information" /> <tag k="information" v="board" /> </type--> + <type id="shop-car_parts" group="shop"> + <include group="poi" /> + <include field="operator" /> + </type> + <!--type id="leisure-sports_centre-climbing"> + <include group="poi" /> + <include field="internet" /> + </type> + <type id="leisure-sports_centre-shooting"> + <include group="poi" /> + <include field="internet" /> + </type> + <type id="leisure-sports_centre-swimming"> + <include group="poi" /> + <include field="internet" /> + </type> + <type id="leisure-sports_centre-yoga"> + <include group="poi" /> + <include field="internet" /> + </type--> <type id="building" can_add="no"> <include field="street" /> <include field="housename" /> diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index d28bda8b58..d82fd788e9 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1101,3 +1101,8 @@ tourism|information|map;[tourism=information][information=map];;name;int_name;11 tourism|information|office;[tourism=information][information=office];;name;int_name;1101; traffic_calming|bump;1102; traffic_calming|hump;1103; +shop|car_parts;1104; +leisure|sports_centre|climbing;[leisure=sports_centre][sport=climbing];;name;int_name;1105; +leisure|sports_centre|shooting;[leisure=sports_centre][sport=shooting];;name;int_name;1106; +leisure|sports_centre|swimming;[leisure=sports_centre][sport=swimming];;name;int_name;1107; +leisure|sports_centre|yoga;[leisure=sports_centre][sport=yoga];;name;int_name;1108; diff --git a/data/types.txt b/data/types.txt index 6e077fdca6..02c365d0e2 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1101,3 +1101,8 @@ tourism|information|map tourism|information|office traffic_calming|bump traffic_calming|hump +shop|car_parts +leisure|sports_centre|climbing +leisure|sports_centre|shooting +leisure|sports_centre|swimming +leisure|sports_centre|yoga diff --git a/data/visibility.txt b/data/visibility.txt index df8e41cf14..27bb9fd528 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -441,7 +441,12 @@ world 00000000000000000000 + recreation_ground 00000000000011111111 - sauna 00000000000000000000 - slipway 00000000000000000111 - - sports_centre 00000000000011111111 - + sports_centre 00000000000011111111 + + climbing 00000000000011111111 - + shooting 00000000000011111111 - + swimming 00000000000011111111 - + yoga 00000000000011111111 - + {} stadium 00000000000011111111 - swimming_pool 00000000000001111111 - track 00000000000011111111 - @@ -732,6 +737,7 @@ world 00000000000000000000 + books 00000000000000000111 - butcher 00000000000000000111 - car 00000000000000000111 - + car_parts 00000000000000000111 - car_repair 00000000000000001111 + tyres 00000000000000001111 - {} |