diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 3083a5469e..19c7b89a5c 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 d7021daacd..55d9b2f36c 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -11000,6 +11000,329 @@ cont { } } } +cont { + name: "event-fc2018" + element { + scale: 13 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 16 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 14 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 16 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 15 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 15 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 15 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 15 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 16 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 16 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 16 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 16 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 17 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 17 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 17 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 17 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 18 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 18 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 18 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 18 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 19 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 19 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 19 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 19 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } +} +cont { + name: "event-fc2018_city" + element { + scale: 6 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 7 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 8 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 9 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 10 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 11 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 12 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 13 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 17 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 19 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } +} cont { name: "highway-bridleway" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 82c40bef59..1197355051 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 72935846d4..fc6d55e8dc 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -10954,6 +10954,329 @@ cont { } } } +cont { + name: "event-fc2018" + element { + scale: 13 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 16 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 14 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 16 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 15 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 15 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 15 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 15 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 16 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 16 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 16 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 16 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 17 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 17 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 17 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 17 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 18 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 18 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 18 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 18 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 19 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 19 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 19 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 19 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } +} +cont { + name: "event-fc2018_city" + element { + scale: 6 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 7 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 8 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 9 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 10 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 11 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 12 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 13 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 17 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 19 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } +} cont { name: "highway-bridleway" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index b566489772..d9d1d4e4eb 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 78b75d8be7..bab474e960 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -10954,6 +10954,329 @@ cont { } } } +cont { + name: "event-fc2018" + element { + scale: 13 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 16 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 14 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 16 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 15 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 15 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 15 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 15 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 16 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 16 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 16 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 16 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 17 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 17 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 17 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 17 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 18 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 18 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 18 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 18 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } + element { + scale: 19 + symbol { + name: "wfc_ticket" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=ticket" + } + element { + scale: 19 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=olympics=live_site " + } + element { + scale: 19 + symbol { + name: "wfc_fanzone" + priority: 16000 + min_distance: 10 + } + apply_if: "extra_tag=shop=gift" + } + element { + scale: 19 + symbol { + name: "wfc_stadium" + apply_for_type: 1 + priority: 16000 + min_distance: 12 + } + apply_if: "extra_tag=leisure=stadium" + } +} +cont { + name: "event-fc2018_city" + element { + scale: 6 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 7 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 8 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 9 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 10 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 11 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 12 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 13 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 14 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 15 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 17 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } + element { + scale: 19 + symbol { + name: "wfc_city" + apply_for_type: 1 + priority: 16000 + } + } +} cont { name: "highway-bridleway" element {