diff --git a/data/drules_proto.bin b/data/drules_proto.bin index aed366cac3..ba8d7686d0 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 e619c2891a..e88cf0bfa5 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -72714,33 +72714,88 @@ cont { } cont { name: "power-generator-wind" + element { + scale: 13 + symbol { + name: "dot-m" + priority: 120 + } + } + element { + scale: 14 + symbol { + name: "dot-m" + priority: 120 + } + } + element { + scale: 15 + symbol { + name: "dot-m" + priority: 120 + } + } + element { + scale: 16 + symbol { + name: "dot-m" + priority: 120 + } + } element { scale: 17 symbol { - name: "power-m" + name: "dot-m" priority: 120 } } element { scale: 18 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 19 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 20 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } } cont { @@ -72854,28 +72909,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -72885,28 +72940,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -72916,28 +72971,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -72947,28 +73002,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -72978,59 +73033,132 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } cont { name: "power-plant-wind" + element { + scale: 13 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + } + element { + scale: 14 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + } + element { + scale: 15 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 + } + } element { scale: 17 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 18 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 19 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 20 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } } @@ -73040,7 +73168,7 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -73049,14 +73177,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -73065,14 +73193,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -73081,14 +73209,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -73097,7 +73225,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 7120277cfe..d08bc2de25 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 91ff86a5cd..e2af96d6fb 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -69119,33 +69119,74 @@ cont { } cont { name: "power-generator-wind" + element { + scale: 15 + symbol { + name: "dot-m" + priority: 120 + } + } + element { + scale: 16 + symbol { + name: "dot-m" + priority: 120 + } + } element { scale: 17 symbol { - name: "power-m" + name: "dot-m" priority: 120 } } element { scale: 18 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 19 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 20 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } } cont { @@ -69191,28 +69232,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -69222,28 +69263,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -69253,28 +69294,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -69284,28 +69325,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -69315,59 +69356,118 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } cont { name: "power-plant-wind" + element { + scale: 15 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 + } + } element { scale: 17 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 18 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 19 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 20 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } } @@ -69377,7 +69477,7 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -69386,14 +69486,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -69402,14 +69502,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -69418,14 +69518,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -69434,7 +69534,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 52bccbcb1f..8f10909dd5 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 b2d64bfe2f..ff74d060de 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -69334,33 +69334,74 @@ cont { } cont { name: "power-generator-wind" + element { + scale: 15 + symbol { + name: "dot-m" + priority: 120 + } + } + element { + scale: 16 + symbol { + name: "dot-m" + priority: 120 + } + } element { scale: 17 symbol { - name: "power-m" + name: "dot-m" priority: 120 } } element { scale: 18 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 19 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 20 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } } cont { @@ -69406,28 +69447,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -69437,28 +69478,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -69468,28 +69509,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -69499,28 +69540,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -69530,59 +69571,118 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } cont { name: "power-plant-wind" + element { + scale: 15 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9770 + } + } element { scale: 17 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 18 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 19 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 20 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9770 } } } @@ -69592,7 +69692,7 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -69601,14 +69701,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -69617,14 +69717,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -69633,14 +69733,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -69649,7 +69749,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } } diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index e4f58b6a96..f258765ba3 100644 Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt index f28df8ddee..00819cd7ff 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -73495,33 +73495,106 @@ cont { } cont { name: "power-generator-wind" + element { + scale: 13 + symbol { + name: "dot-m" + priority: 120 + } + } + element { + scale: 14 + symbol { + name: "dot-m" + priority: 120 + } + } + element { + scale: 15 + symbol { + name: "dot-m" + priority: 120 + } + } + element { + scale: 16 + symbol { + name: "wind_turbine-m" + priority: 120 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9880 + } + } element { scale: 17 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 18 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 19 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 20 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } } cont { @@ -73637,28 +73710,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -73668,28 +73741,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -73699,28 +73772,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -73730,28 +73803,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -73761,59 +73834,132 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } cont { name: "power-plant-wind" + element { + scale: 13 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + } + element { + scale: 14 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + } + element { + scale: 15 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 + } + } element { scale: 17 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 18 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 19 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 20 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: -9770 } } } @@ -73823,7 +73969,7 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -73832,14 +73978,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -73848,14 +73994,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -73864,14 +74010,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -73880,7 +74026,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } } diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 41ca4cf6d7..5bcf7a7269 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 158823a38a..6fcba7d0be 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -73710,33 +73710,106 @@ cont { } cont { name: "power-generator-wind" + element { + scale: 13 + symbol { + name: "dot-m" + priority: 120 + } + } + element { + scale: 14 + symbol { + name: "dot-m" + priority: 120 + } + } + element { + scale: 15 + symbol { + name: "dot-m" + priority: 120 + } + } + element { + scale: 16 + symbol { + name: "wind_turbine-m" + priority: 120 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9880 + } + } element { scale: 17 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 18 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 19 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } element { scale: 20 symbol { - name: "power-m" + name: "wind_turbine-m" priority: 120 } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9880 + } } } cont { @@ -73852,28 +73925,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -73883,28 +73956,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -73914,28 +73987,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -73945,28 +74018,28 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } @@ -73976,59 +74049,132 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } } } cont { name: "power-plant-wind" + element { + scale: 13 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + } + element { + scale: 14 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + } + element { + scale: 15 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + } + element { + scale: 16 + symbol { + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9770 + } + } element { scale: 17 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 18 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 19 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9770 } } element { scale: 20 symbol { - name: "power-m" - priority: 120 + name: "power_plant_wind-m" + priority: 230 + } + caption { + primary { + height: 10 + color: 9211020 + offset_y: 1 + is_optional: true + } + priority: -9770 } } } @@ -74038,7 +74184,7 @@ cont { scale: 17 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -74047,14 +74193,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 18 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -74063,14 +74209,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 19 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -74079,14 +74225,14 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } element { scale: 20 symbol { name: "power-m" - priority: 120 + priority: 230 } caption { primary { @@ -74095,7 +74241,7 @@ cont { offset_y: 1 is_optional: true } - priority: -9880 + priority: -9770 } } } diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 10c4a7fabf..8ec3dbfd95 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 9106dee48b..dd2d19296d 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -72,44 +72,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -222,548 +222,550 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index 5e8cb55708..5c67fc51f2 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 d6f6a92fae..89d6ef41f2 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -72,44 +72,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -222,548 +222,550 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index 19bc60a840..d2647a6326 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 0738d99783..39fb8e44cc 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -97,673 +97,675 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 59681aea2e..2762e386b6 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 0738d99783..39fb8e44cc 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -97,673 +97,675 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index 9c8a9eb4fc..68d0eb37c8 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 f9c1d3d385..a7d731b4b9 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -97,40 +97,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -228,542 +228,544 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index 141b874f9e..58a7d19a92 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 f9c1d3d385..a7d731b4b9 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -97,40 +97,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -228,542 +228,544 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index 6f2bec4cfb..3fc6732b54 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 e40d8c1162..fea1846c15 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -97,137 +97,138 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -254,252 +255,253 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index 17c8c159aa..80ef832d6f 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 e40d8c1162..fea1846c15 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -97,137 +97,138 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -254,252 +255,253 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index b702cc5ef2..a5e4109e53 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 4a65266cef..ff15c020eb 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -97,409 +97,411 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index 0f8533e870..f875e79c7f 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 4a65266cef..ff15c020eb 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -97,409 +97,411 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png index b65211c80b..5acbf8ca90 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 ff998c866d..13ded08252 100644 --- a/data/resources-xxxhdpi_clear/symbols.sdf +++ b/data/resources-xxxhdpi_clear/symbols.sdf @@ -97,26 +97,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -228,542 +228,544 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index 0cbda6f194..53e085fd4a 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 ff998c866d..13ded08252 100644 --- a/data/resources-xxxhdpi_dark/symbols.sdf +++ b/data/resources-xxxhdpi_dark/symbols.sdf @@ -97,26 +97,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -228,542 +228,544 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 345e351434..64b59302f2 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -1178,7 +1178,7 @@ power-plant-coal # icon z17- power-plant-gas # icon z17- power-plant-hydro # icon z17- power-plant-solar # icon z17- -power-plant-wind # icon z17- +power-plant-wind # icon z15- (also has caption(optional) z16-) power-station # icon z17- (also has caption(optional) z17-) === 230 @@ -1219,7 +1219,7 @@ leisure-track-area # caption z16- (also has are power-generator # icon z17- power-generator-gas # icon z17- power-generator-hydro # icon z17- -power-generator-wind # icon z17- +power-generator-wind # icon z15- (also has caption(optional) z18-) === 120 amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) @@ -2046,6 +2046,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) # === -9750 +# power-plant-wind # caption(optional) z16- (also has icon z15-) +# power-station # caption(optional) z17- (also has icon z17-) +# === -9770 + # barrier-entrance # caption(optional) z16- (also has icon z16-) # entrance-main # caption(optional) z18- (also has icon z18-) # === -9780 @@ -2070,7 +2074,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # landuse-industrial-mine # caption(optional) z15- (also has icon z15-, area z15-) # landuse-landfill # caption(optional) z15- (also has icon z15-, area z15-) # landuse-quarry # caption(optional) z15- (also has icon z15-, area z15-) -# power-station # caption(optional) z17- (also has icon z17-) +# power-generator-wind # caption(optional) z18- (also has icon z15-) # === -9880 # amenity-parking-lane-private # caption(optional) z19- (also has icon z19-, area z17-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index d0fe044768..fb8aa07fb5 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1178,7 +1178,7 @@ power-plant-coal # icon z17- power-plant-gas # icon z17- power-plant-hydro # icon z17- power-plant-solar # icon z17- -power-plant-wind # icon z17- +power-plant-wind # icon z13- (also has caption(optional) z16-) power-station # icon z17- (also has caption(optional) z17-) === 230 @@ -1219,7 +1219,7 @@ leisure-track-area # caption z16- (also has are power-generator # icon z17- power-generator-gas # icon z17- power-generator-hydro # icon z17- -power-generator-wind # icon z17- +power-generator-wind # icon z13- (also has caption(optional) z16-) === 120 amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) @@ -2048,6 +2048,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) # === -9750 +# power-plant-wind # caption(optional) z16- (also has icon z13-) +# power-station # caption(optional) z17- (also has icon z17-) +# === -9770 + # barrier-entrance # caption(optional) z16- (also has icon z16-) # entrance-main # caption(optional) z18- (also has icon z18-) # === -9780 @@ -2072,7 +2076,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # landuse-industrial-mine # caption(optional) z15- (also has icon z15-, area z15-) # landuse-landfill # caption(optional) z15- (also has icon z15-, area z15-) # landuse-quarry # caption(optional) z15- (also has icon z15-, area z15-) -# power-station # caption(optional) z17- (also has icon z17-) +# power-generator-wind # caption(optional) z16- (also has icon z13-) # === -9880 # amenity-parking-lane-private # caption(optional) z19- (also has icon z19-, area z17-)