diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 5a8f61eef8..c4c7193709 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 4e7f579c18..23744de7ca 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -30257,7 +30257,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 16790 + priority: 16556 min_distance: 24 } caption { @@ -30265,56 +30265,77 @@ cont { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 15790 + priority: 15556 } } element { scale: 16 symbol { name: "monument-m" - priority: 16790 - min_distance: 24 + priority: 16556 + min_distance: 12 } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 15790 + priority: 15556 } } element { scale: 17 symbol { name: "monument-m" - priority: 16790 - min_distance: 24 + priority: 16556 + min_distance: 12 } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 15790 + priority: 15556 } } element { scale: 18 symbol { name: "monument-m" - priority: 16790 - min_distance: 24 + priority: 16556 + min_distance: 12 } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } - priority: 15790 + priority: 15556 + } + } + element { + scale: 19 + symbol { + name: "monument-m" + priority: 16556 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15556 } } } @@ -30323,24 +30344,24 @@ cont { element { scale: 15 symbol { - name: "monument-m" - priority: 16917 - min_distance: 12 + name: "zero-icon" + priority: 16556 + min_distance: 24 } } element { scale: 16 symbol { - name: "monument-m" - priority: 16917 + name: "zero-icon" + priority: 16556 min_distance: 12 } } element { scale: 17 symbol { - name: "monument-m" - priority: 16917 + name: "zero-icon" + priority: 16556 min_distance: 12 } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 0df66d25fa..6fbbe70f8e 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 79574d78b5..08906905e6 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -29947,8 +29947,120 @@ cont { } } } +cont { + name: "historic-memorial" + element { + scale: 15 + symbol { + name: "monument-m" + priority: 16556 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15556 + } + } + element { + scale: 16 + symbol { + name: "monument-m" + priority: 16556 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15556 + } + } + element { + scale: 17 + symbol { + name: "monument-m" + priority: 16556 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15556 + } + } + element { + scale: 18 + symbol { + name: "monument-m" + priority: 16556 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15556 + } + } + element { + scale: 19 + symbol { + name: "monument-m" + priority: 16556 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15556 + } + } +} cont { name: "historic-memorial-plaque" + element { + scale: 15 + symbol { + name: "zero-icon" + priority: 16556 + min_distance: 24 + } + } + element { + scale: 16 + symbol { + name: "zero-icon" + priority: 16556 + min_distance: 12 + } + } + element { + scale: 17 + symbol { + name: "zero-icon" + priority: 16556 + min_distance: 12 + } + } element { scale: 18 symbol { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 23d132d191..617ab1d663 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 6efe25b2f9..f47d03d7b4 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -30103,8 +30103,120 @@ cont { } } } +cont { + name: "historic-memorial" + element { + scale: 15 + symbol { + name: "monument-m" + priority: 16556 + min_distance: 24 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15556 + } + } + element { + scale: 16 + symbol { + name: "monument-m" + priority: 16556 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15556 + } + } + element { + scale: 17 + symbol { + name: "monument-m" + priority: 16556 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15556 + } + } + element { + scale: 18 + symbol { + name: "monument-m" + priority: 16556 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15556 + } + } + element { + scale: 19 + symbol { + name: "monument-m" + priority: 16556 + min_distance: 12 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15556 + } + } +} cont { name: "historic-memorial-plaque" + element { + scale: 15 + symbol { + name: "zero-icon" + priority: 16556 + min_distance: 24 + } + } + element { + scale: 16 + symbol { + name: "zero-icon" + priority: 16556 + min_distance: 12 + } + } + element { + scale: 17 + symbol { + name: "zero-icon" + priority: 16556 + min_distance: 12 + } + } element { scale: 18 symbol { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 27f3a006a0..626c7300d4 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 dd5e5072ee..f5950b62c3 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -17994,50 +17994,26 @@ cont { element { scale: 15 symbol { - name: "monument-m" + name: "zero-icon" priority: 16790 min_distance: 24 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15790 - } } element { scale: 16 symbol { - name: "monument-m" + name: "zero-icon" priority: 16790 min_distance: 12 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15790 - } } element { scale: 17 symbol { - name: "monument-m" + name: "zero-icon" priority: 16790 min_distance: 12 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15790 - } } element { scale: 18 @@ -18046,14 +18022,6 @@ cont { priority: 16790 min_distance: 12 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15790 - } } element { scale: 19 @@ -18062,14 +18030,6 @@ cont { priority: 16790 min_distance: 12 } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15790 - } } } cont { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 1ac68bedbb..923d54feab 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 bfd1d7f1b7..986b572c08 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -18384,50 +18384,26 @@ cont { element { scale: 15 symbol { - name: "monument-m" + name: "zero-icon" priority: 16790 min_distance: 24 } - caption { - primary { - height: 10 - color: 6710886 - offset_y: 1 - } - priority: 15790 - } } element { scale: 16 symbol { - name: "monument-m" + name: "zero-icon" priority: 16790 min_distance: 12 } - caption { - primary { - height: 10 - color: 6710886 - offset_y: 1 - } - priority: 15790 - } } element { scale: 17 symbol { - name: "monument-m" + name: "zero-icon" priority: 16790 min_distance: 12 } - caption { - primary { - height: 10 - color: 6710886 - offset_y: 1 - } - priority: 15790 - } } element { scale: 18 @@ -18436,14 +18412,6 @@ cont { priority: 16790 min_distance: 12 } - caption { - primary { - height: 10 - color: 6710886 - offset_y: 1 - } - priority: 15790 - } } element { scale: 19 @@ -18452,14 +18420,6 @@ cont { priority: 16790 min_distance: 12 } - caption { - primary { - height: 10 - color: 6710886 - offset_y: 1 - } - priority: 15790 - } } } cont {