diff --git a/data/classificator.txt b/data/classificator.txt index d346d0a497..3179e11d7e 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -525,9 +525,12 @@ world + world_towns_level - {} historic + + aircraft - + anchor - archaeological_site - battlefield - boundary_stone - + cannon - castle + castrum - defensive - @@ -544,6 +547,7 @@ world + citywalls - fort - gallows - + locomotive - memorial + cross - plaque - @@ -552,13 +556,17 @@ world + stolperstein - war_memorial - {} + mine - monument - pillory - ruins - ship - + stone - + tank - tomb - wayside_cross - wayside_shrine - + wreck - {} hwtag + bidir_bicycle - @@ -615,7 +623,9 @@ world + grass - greenfield - greenhouse_horticulture - - industrial - + industrial + + mine - + {} landfill - meadow - military + diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 89a4959e0b..a6c3d83270 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 6ae2d889d3..d7364746ca 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -15396,7 +15396,7 @@ cont { scale: 18 symbol { name: "main_entrance-s" - priority: 170 + priority: 220 } caption { primary { @@ -15406,14 +15406,14 @@ cont { text: "ref" is_optional: true } - priority: -9830 + priority: -9780 } } element { scale: 19 symbol { name: "main_entrance-s" - priority: 170 + priority: 220 } caption { primary { @@ -15429,7 +15429,7 @@ cont { text: "addr:flats" is_optional: true } - priority: -9830 + priority: -9780 } } } @@ -33523,6 +33523,108 @@ cont { } } } +cont { + name: "historic-aircraft" + element { + scale: 16 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} +cont { + name: "historic-anchor" + element { + scale: 18 + symbol { + name: "anchor-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } + element { + scale: 19 + symbol { + name: "anchor-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } +} cont { name: "historic-archaeological_site" element { @@ -33580,7 +33682,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -33590,14 +33692,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33607,14 +33709,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33624,14 +33726,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33641,14 +33743,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33658,7 +33760,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -33733,6 +33835,41 @@ cont { } } } +cont { + name: "historic-cannon" + element { + scale: 18 + symbol { + name: "cannon-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } + element { + scale: 19 + symbol { + name: "cannon-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } +} cont { name: "historic-castle" element { @@ -35614,13 +35751,80 @@ cont { } } } +cont { + name: "historic-locomotive" + element { + scale: 16 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} cont { name: "historic-memorial" element { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 24 } caption { @@ -35630,14 +35834,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35647,14 +35851,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35664,14 +35868,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35681,14 +35885,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35698,7 +35902,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } } @@ -35762,7 +35966,7 @@ cont { scale: 18 symbol { name: "plaque" - priority: 600 + priority: 210 min_distance: 12 } caption { @@ -35772,14 +35976,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9400 + priority: -9790 } } element { scale: 19 symbol { name: "plaque" - priority: 600 + priority: 210 min_distance: 12 } caption { @@ -35789,7 +35993,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9400 + priority: -9790 } } } @@ -35799,7 +36003,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -35809,14 +36013,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35826,14 +36030,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35843,14 +36047,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35860,14 +36064,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35877,7 +36081,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -35887,7 +36091,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -35897,14 +36101,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35914,14 +36118,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35931,14 +36135,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35948,14 +36152,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35965,7 +36169,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -35995,7 +36199,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -36005,14 +36209,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -36022,14 +36226,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -36039,14 +36243,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -36056,14 +36260,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -36073,7 +36277,90 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 + } + } +} +cont { + name: "historic-mine" + element { + scale: 15 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 16 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 17 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 18 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 19 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 } } } @@ -36334,6 +36621,23 @@ cont { } cont { name: "historic-ship" + element { + scale: 15 + symbol { + name: "historic-ship-m" + priority: 2900 + min_distance: 8 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } element { scale: 16 symbol { @@ -36403,6 +36707,108 @@ cont { } } } +cont { + name: "historic-stone" + element { + scale: 18 + symbol { + name: "stone-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } + element { + scale: 19 + symbol { + name: "stone-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } +} +cont { + name: "historic-tank" + element { + scale: 16 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} cont { name: "historic-tomb" element { @@ -36607,6 +37013,73 @@ cont { } } } +cont { + name: "historic-wreck" + element { + scale: 16 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} cont { name: "hwtag-oneway" element { @@ -39575,6 +40048,109 @@ cont { } } } +cont { + name: "landuse-industrial-mine" + element { + scale: 15 + area { + color: 15000299 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 16 + area { + color: 15000299 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 17 + area { + color: 15000299 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 18 + area { + color: 15000299 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 19 + area { + color: 15000299 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } +} cont { name: "landuse-landfill" element { @@ -40059,12 +40635,18 @@ cont { color: 15000299 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 6710886 + color: 4473924 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -40073,12 +40655,18 @@ cont { color: 15000299 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 6710886 + color: 4473924 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -40087,12 +40675,18 @@ cont { color: 15000299 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 6710886 + color: 4473924 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -40101,12 +40695,18 @@ cont { color: 15000299 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 6710886 + color: 4473924 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -40115,12 +40715,18 @@ cont { color: 15000299 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 6710886 + color: 4473924 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } } @@ -102149,7 +102755,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -102159,14 +102765,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102176,14 +102782,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102193,14 +102799,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102210,14 +102816,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102227,7 +102833,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -102237,7 +102843,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -102247,14 +102853,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102264,14 +102870,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102281,14 +102887,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102298,14 +102904,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102315,7 +102921,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -102325,7 +102931,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -102335,14 +102941,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102352,14 +102958,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102369,14 +102975,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102386,14 +102992,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102403,7 +103009,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -102413,7 +103019,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -102423,14 +103029,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102440,14 +103046,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102457,14 +103063,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102474,14 +103080,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102491,7 +103097,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -102501,7 +103107,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -102511,14 +103117,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102528,14 +103134,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102545,14 +103151,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102562,14 +103168,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102579,7 +103185,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 49cc20fce1..e94debfeb5 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 9f3b65828c..8bc3f645fc 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -15254,7 +15254,7 @@ cont { scale: 18 symbol { name: "main_entrance-s" - priority: 170 + priority: 220 } caption { primary { @@ -15264,14 +15264,14 @@ cont { text: "ref" is_optional: true } - priority: -9830 + priority: -9780 } } element { scale: 19 symbol { name: "main_entrance-s" - priority: 170 + priority: 220 } caption { primary { @@ -15287,7 +15287,7 @@ cont { text: "addr:flats" is_optional: true } - priority: -9830 + priority: -9780 } } } @@ -33215,6 +33215,108 @@ cont { } } } +cont { + name: "historic-aircraft" + element { + scale: 16 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} +cont { + name: "historic-anchor" + element { + scale: 18 + symbol { + name: "anchor-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } + element { + scale: 19 + symbol { + name: "anchor-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } +} cont { name: "historic-archaeological_site" element { @@ -33272,7 +33374,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -33282,14 +33384,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33299,14 +33401,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33316,14 +33418,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33333,14 +33435,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33350,7 +33452,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -33425,6 +33527,41 @@ cont { } } } +cont { + name: "historic-cannon" + element { + scale: 18 + symbol { + name: "cannon-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } + element { + scale: 19 + symbol { + name: "cannon-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } +} cont { name: "historic-castle" element { @@ -35306,13 +35443,80 @@ cont { } } } +cont { + name: "historic-locomotive" + element { + scale: 16 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} cont { name: "historic-memorial" element { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 24 } caption { @@ -35322,14 +35526,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35339,14 +35543,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35356,14 +35560,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35373,14 +35577,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35390,7 +35594,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } } @@ -35454,7 +35658,7 @@ cont { scale: 18 symbol { name: "plaque" - priority: 600 + priority: 210 min_distance: 12 } caption { @@ -35464,14 +35668,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9400 + priority: -9790 } } element { scale: 19 symbol { name: "plaque" - priority: 600 + priority: 210 min_distance: 12 } caption { @@ -35481,7 +35685,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9400 + priority: -9790 } } } @@ -35491,7 +35695,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -35501,14 +35705,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35518,14 +35722,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35535,14 +35739,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35552,14 +35756,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35569,7 +35773,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -35579,7 +35783,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -35589,14 +35793,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35606,14 +35810,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35623,14 +35827,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35640,14 +35844,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35657,7 +35861,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -35687,7 +35891,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -35697,14 +35901,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35714,14 +35918,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35731,14 +35935,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35748,14 +35952,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35765,7 +35969,90 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 + } + } +} +cont { + name: "historic-mine" + element { + scale: 15 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 16 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 17 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 18 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 19 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 } } } @@ -36026,6 +36313,23 @@ cont { } cont { name: "historic-ship" + element { + scale: 15 + symbol { + name: "historic-ship-m" + priority: 2900 + min_distance: 8 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } element { scale: 16 symbol { @@ -36095,6 +36399,108 @@ cont { } } } +cont { + name: "historic-stone" + element { + scale: 18 + symbol { + name: "stone-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } + element { + scale: 19 + symbol { + name: "stone-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } +} +cont { + name: "historic-tank" + element { + scale: 16 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} cont { name: "historic-tomb" element { @@ -36299,6 +36705,73 @@ cont { } } } +cont { + name: "historic-wreck" + element { + scale: 16 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} cont { name: "hwtag-oneway" element { @@ -39267,6 +39740,109 @@ cont { } } } +cont { + name: "landuse-industrial-mine" + element { + scale: 15 + area { + color: 15000299 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 16 + area { + color: 15000299 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 17 + area { + color: 15000299 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 18 + area { + color: 15000299 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 19 + area { + color: 15000299 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } +} cont { name: "landuse-landfill" element { @@ -39751,12 +40327,18 @@ cont { color: 15000299 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 6710886 + color: 4473924 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -39765,12 +40347,18 @@ cont { color: 15000299 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 6710886 + color: 4473924 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -39779,12 +40367,18 @@ cont { color: 15000299 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 6710886 + color: 4473924 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -39793,12 +40387,18 @@ cont { color: 15000299 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 6710886 + color: 4473924 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -39807,12 +40407,18 @@ cont { color: 15000299 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 6710886 + color: 4473924 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } } @@ -101671,7 +102277,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -101681,14 +102287,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101698,14 +102304,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101715,14 +102321,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101732,14 +102338,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101749,7 +102355,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -101759,7 +102365,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -101769,14 +102375,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101786,14 +102392,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101803,14 +102409,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101820,14 +102426,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101837,7 +102443,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -101847,7 +102453,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -101857,14 +102463,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101874,14 +102480,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101891,14 +102497,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101908,14 +102514,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101925,7 +102531,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -101935,7 +102541,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -101945,14 +102551,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101962,14 +102568,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101979,14 +102585,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101996,14 +102602,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102013,7 +102619,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -102023,7 +102629,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -102033,14 +102639,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102050,14 +102656,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102067,14 +102673,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102084,14 +102690,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102101,7 +102707,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index c405f66d06..8d19f707ea 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 9755ed4322..9026c399f8 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -15254,7 +15254,7 @@ cont { scale: 18 symbol { name: "main_entrance-s" - priority: 170 + priority: 220 } caption { primary { @@ -15264,14 +15264,14 @@ cont { text: "ref" is_optional: true } - priority: -9830 + priority: -9780 } } element { scale: 19 symbol { name: "main_entrance-s" - priority: 170 + priority: 220 } caption { primary { @@ -15287,7 +15287,7 @@ cont { text: "addr:flats" is_optional: true } - priority: -9830 + priority: -9780 } } } @@ -33363,6 +33363,108 @@ cont { } } } +cont { + name: "historic-aircraft" + element { + scale: 16 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "aircraft-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} +cont { + name: "historic-anchor" + element { + scale: 18 + symbol { + name: "anchor-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } + element { + scale: 19 + symbol { + name: "anchor-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } +} cont { name: "historic-archaeological_site" element { @@ -33420,7 +33522,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -33430,14 +33532,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33447,14 +33549,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33464,14 +33566,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33481,14 +33583,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -33498,7 +33600,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -33573,6 +33675,41 @@ cont { } } } +cont { + name: "historic-cannon" + element { + scale: 18 + symbol { + name: "cannon-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } + element { + scale: 19 + symbol { + name: "cannon-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } +} cont { name: "historic-castle" element { @@ -35454,13 +35591,80 @@ cont { } } } +cont { + name: "historic-locomotive" + element { + scale: 16 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "locomotive-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} cont { name: "historic-memorial" element { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 24 } caption { @@ -35470,14 +35674,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35487,14 +35691,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35504,14 +35708,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35521,14 +35725,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 4200 min_distance: 12 } caption { @@ -35538,7 +35742,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -5800 } } } @@ -35602,7 +35806,7 @@ cont { scale: 18 symbol { name: "plaque" - priority: 600 + priority: 210 min_distance: 12 } caption { @@ -35612,14 +35816,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9400 + priority: -9790 } } element { scale: 19 symbol { name: "plaque" - priority: 600 + priority: 210 min_distance: 12 } caption { @@ -35629,7 +35833,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9400 + priority: -9790 } } } @@ -35639,7 +35843,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -35649,14 +35853,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35666,14 +35870,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35683,14 +35887,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35700,14 +35904,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35717,7 +35921,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -35727,7 +35931,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -35737,14 +35941,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35754,14 +35958,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35771,14 +35975,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35788,14 +35992,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35805,7 +36009,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -35835,7 +36039,7 @@ cont { scale: 15 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -35845,14 +36049,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35862,14 +36066,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35879,14 +36083,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35896,14 +36100,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "monument-m" - priority: 4250 + priority: 5025 min_distance: 12 } caption { @@ -35913,7 +36117,90 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 + } + } +} +cont { + name: "historic-mine" + element { + scale: 15 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 16 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 17 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 18 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 19 + symbol { + name: "mine-m" + priority: 2900 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -7100 } } } @@ -36174,6 +36461,23 @@ cont { } cont { name: "historic-ship" + element { + scale: 15 + symbol { + name: "historic-ship-m" + priority: 2900 + min_distance: 8 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } element { scale: 16 symbol { @@ -36243,6 +36547,108 @@ cont { } } } +cont { + name: "historic-stone" + element { + scale: 18 + symbol { + name: "stone-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } + element { + scale: 19 + symbol { + name: "stone-m" + priority: 210 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -9790 + } + } +} +cont { + name: "historic-tank" + element { + scale: 16 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "tank-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} cont { name: "historic-tomb" element { @@ -36447,6 +36853,73 @@ cont { } } } +cont { + name: "historic-wreck" + element { + scale: 16 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 17 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 18 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } + element { + scale: 19 + symbol { + name: "wreck-m" + priority: 5025 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -4975 + } + } +} cont { name: "hwtag-oneway" element { @@ -39410,6 +39883,109 @@ cont { } } } +cont { + name: "landuse-industrial-mine" + element { + scale: 15 + area { + color: 1643545 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 16 + area { + color: 1643545 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 17 + area { + color: 1643545 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 18 + area { + color: 1643545 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } + element { + scale: 19 + area { + color: 1643545 + priority: -1950 + } + symbol { + name: "mine-m" + priority: 1800 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: -8200 + } + } +} cont { name: "landuse-landfill" element { @@ -39894,12 +40470,18 @@ cont { color: 1643545 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 10066329 + color: 5592405 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -39908,12 +40490,18 @@ cont { color: 1643545 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 10066329 + color: 5592405 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -39922,12 +40510,18 @@ cont { color: 1643545 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 10066329 + color: 5592405 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -39936,12 +40530,18 @@ cont { color: 1643545 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 10066329 + color: 5592405 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } element { @@ -39950,12 +40550,18 @@ cont { color: 1643545 priority: -1950 } + symbol { + name: "mine-m" + priority: 1800 + } caption { primary { height: 10 - color: 10066329 + color: 5592405 + offset_y: 1 + is_optional: true } - priority: 1800 + priority: -8200 } } } @@ -101757,7 +102363,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -101767,14 +102373,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101784,14 +102390,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101801,14 +102407,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101818,14 +102424,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101835,7 +102441,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -101845,7 +102451,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -101855,14 +102461,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101872,14 +102478,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101889,14 +102495,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101906,14 +102512,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101923,7 +102529,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -101933,7 +102539,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -101943,14 +102549,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101960,14 +102566,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101977,14 +102583,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -101994,14 +102600,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102011,7 +102617,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -102021,7 +102627,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -102031,14 +102637,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102048,14 +102654,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102065,14 +102671,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102082,14 +102688,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102099,7 +102705,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } @@ -102109,7 +102715,7 @@ cont { scale: 15 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 8 } caption { @@ -102119,14 +102725,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 16 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102136,14 +102742,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 17 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102153,14 +102759,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 18 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102170,14 +102776,14 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } element { scale: 19 symbol { name: "tourism-m" - priority: 4250 + priority: 5025 min_distance: 24 } caption { @@ -102187,7 +102793,7 @@ cont { offset_y: 1 is_optional: true } - priority: -5750 + priority: -4975 } } } diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index df01ac9f81..e714a4a632 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 4423c376f5..b2e0d8d70d 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -23950,6 +23950,44 @@ cont { } } } +cont { + name: "landuse-industrial-mine" + element { + scale: 15 + area { + color: 14802147 + priority: -1960 + } + } + element { + scale: 16 + area { + color: 14802147 + priority: -1960 + } + } + element { + scale: 17 + area { + color: 14802147 + priority: -1960 + } + } + element { + scale: 18 + area { + color: 14802147 + priority: -1960 + } + } + element { + scale: 19 + area { + color: 14802147 + priority: -1960 + } + } +} cont { name: "landuse-landfill" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 3abe909e0b..51c5414f54 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 3a211ae017..50b593e600 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -24326,6 +24326,44 @@ cont { } } } +cont { + name: "landuse-industrial-mine" + element { + scale: 15 + area { + color: 854541 + priority: -1960 + } + } + element { + scale: 16 + area { + color: 854541 + priority: -1960 + } + } + element { + scale: 17 + area { + color: 854541 + priority: -1960 + } + } + element { + scale: 18 + area { + color: 854541 + priority: -1960 + } + } + element { + scale: 19 + area { + color: 854541 + priority: -1960 + } + } +} cont { name: "landuse-landfill" element { diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 4e41a9e528..f6a7998108 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf index 320a5c8ac5..24e1ad612c 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -4,723 +4,731 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index 8679a9b8b6..cf79c400e8 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index 5e041e1ddb..4e3a7a5e36 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -4,722 +4,730 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index 23e686d019..4bc197b8ac 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index 810190d40b..764e905d46 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -3,724 +3,732 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 797878a4af..141c5d02ba 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf index fb998b010c..e784f105ff 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -3,723 +3,731 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index ddf67ea9a9..9771cc128c 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index e791678c46..04c76a84c6 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -3,724 +3,732 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index ad1efbe8f5..c9c551a3b6 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf index 8566b95948..c5b86f80de 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -3,723 +3,731 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index dcaa88430a..04a4bda3cb 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index 713e6d26fc..c7723fd535 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -3,724 +3,732 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index c8cb2264bc..87d9cb8015 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf index f14ad7171c..cebad791e4 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -3,723 +3,731 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index fa04243846..bedd52bfdd 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index ddbcaee517..919c1ddabd 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -3,724 +3,732 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index f2071ada7a..7386be4b38 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf index ff69663cb8..7c9df4b41f 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -3,723 +3,731 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png index be8b399fd9..b70afbc76b 100644 Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/resources-xxxhdpi_clear/symbols.sdf index 1469b9c77a..b4d46f2886 100644 --- a/data/resources-xxxhdpi_clear/symbols.sdf +++ b/data/resources-xxxhdpi_clear/symbols.sdf @@ -2,725 +2,733 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index d753d14b52..9020ef0ba2 100644 Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf index 089cc18685..3db5fa42be 100644 --- a/data/resources-xxxhdpi_dark/symbols.sdf +++ b/data/resources-xxxhdpi_dark/symbols.sdf @@ -2,724 +2,732 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/types.txt b/data/types.txt index 364731358e..4e69dbe5dc 100644 --- a/data/types.txt +++ b/data/types.txt @@ -748,7 +748,7 @@ boundary|administrative|4 *barrier|ditch *barrier|kissing_gate *barrier|turnstile -mapswithme +*landuse|industrial|mine mapswithme mapswithme mapswithme @@ -1572,3 +1572,11 @@ amenity|recycling|container *amenity|place_of_worship|christian|mormon *amenity|public_bath *amenity|vehicle_inspection +*historic|cannon +*historic|anchor +*historic|stone +*historic|aircraft +*historic|tank +*historic|mine +*historic|wreck +*historic|locomotive diff --git a/data/visibility.txt b/data/visibility.txt index 7e22aa18ce..be56cf6c9d 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -525,9 +525,12 @@ world 00000000000000000000 + world_towns_level 00000011110000000000 - {} historic 00000000000000000000 + + aircraft 00000000000000000000 - + anchor 00000000000000000000 - archaeological_site 00000000000000000111 - battlefield 00000000000000011111 - boundary_stone 00000000000000001111 - + cannon 00000000000000000000 - castle 00000000000011111111 + castrum 00000000000011111111 - defensive 00000000000011111111 - @@ -544,6 +547,7 @@ world 00000000000000000000 + citywalls 00000000000000011111 - fort 00000000000011111111 - gallows 00000000000000001111 - + locomotive 00000000000000000000 - memorial 00000000000000011111 + cross 00000000000000000111 - plaque 00000000000000000000 - @@ -552,13 +556,17 @@ world 00000000000000000000 + stolperstein 00000000000000000000 - war_memorial 00000000000000011111 - {} + mine 00000000000000000000 - monument 00000000000001111111 - pillory 00000000000000001111 - ruins 00000000000000000111 - ship 00000000000000001111 - + stone 00000000000000000000 - + tank 00000000000000000000 - tomb 00000000000000001111 - wayside_cross 00000000000000001111 - wayside_shrine 00000000000000001111 - + wreck 00000000000000000000 - {} hwtag 00000000000000000000 + bidir_bicycle 00000000000000000000 - @@ -615,7 +623,9 @@ world 00000000000000000000 + grass 00000000000000111111 - greenfield 00000000000000000000 - greenhouse_horticulture 00000000000000000000 - - industrial 00000000000000011111 - + industrial 00000000000000011111 + + mine 00000000000000011111 - + {} landfill 00000000000000011111 - meadow 00000000000000111111 - military 00000000000000000000 +