diff --git a/data/classificator.txt b/data/classificator.txt index 476c599002..1319c32e60 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -922,7 +922,10 @@ world + {} station + funicular - - light_rail - + light_rail + + london - + porto - + {} monorail - subway + adana - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index f7ef02ac60..7b1ee44bee 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 addb5bec4f..adef1c6f9e 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -64554,6 +64554,402 @@ cont { } } } +cont { + name: "railway-station-light_rail-london" + element { + scale: 12 + symbol { + name: "light_rail-dlr-london-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 9 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 8 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 13 + symbol { + name: "light_rail-dlr-london-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 14 + symbol { + name: "light_rail-dlr-london-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 15 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 12 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 16 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 17 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 18 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 19 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } +} +cont { + name: "railway-station-light_rail-porto" + element { + scale: 12 + symbol { + name: "light_rail-porto-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 9 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 8 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 13 + symbol { + name: "light_rail-porto-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 14 + symbol { + name: "light_rail-porto-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 15 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 12 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 16 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 17 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 18 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 19 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } +} cont { name: "railway-station-monorail" element { @@ -86942,14 +87338,14 @@ cont { element { scale: 16 symbol { - name: "subway-london-s" + name: "subway_entrance-london-s" priority: 3300 } } element { scale: 17 symbol { - name: "subway-london-s" + name: "subway_entrance-london-s" priority: 3300 } caption { @@ -86973,7 +87369,7 @@ cont { element { scale: 18 symbol { - name: "subway-london-m" + name: "subway_entrance-london-m" priority: 3300 } caption { @@ -86997,7 +87393,7 @@ cont { element { scale: 19 symbol { - name: "subway-london-m" + name: "subway_entrance-london-m" priority: 3300 } caption { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 672961c982..ace0625bea 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 1571fd8695..7eb4ff7753 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -64110,6 +64110,402 @@ cont { } } } +cont { + name: "railway-station-light_rail-london" + element { + scale: 12 + symbol { + name: "light_rail-dlr-london-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 9 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 8 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 13 + symbol { + name: "light_rail-dlr-london-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 14 + symbol { + name: "light_rail-dlr-london-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 15 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 12 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 16 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 17 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 18 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 19 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } +} +cont { + name: "railway-station-light_rail-porto" + element { + scale: 12 + symbol { + name: "light_rail-porto-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 9 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 8 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 13 + symbol { + name: "light_rail-porto-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 10 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 2236962 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 14 + symbol { + name: "light_rail-porto-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 15 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 12 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 16 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 17 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 18 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 19 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } +} cont { name: "railway-station-monorail" element { @@ -86498,14 +86894,14 @@ cont { element { scale: 16 symbol { - name: "subway-london-s" + name: "subway_entrance-london-s" priority: 3300 } } element { scale: 17 symbol { - name: "subway-london-s" + name: "subway_entrance-london-s" priority: 3300 } caption { @@ -86529,7 +86925,7 @@ cont { element { scale: 18 symbol { - name: "subway-london-m" + name: "subway_entrance-london-m" priority: 3300 } caption { @@ -86553,7 +86949,7 @@ cont { element { scale: 19 symbol { - name: "subway-london-m" + name: "subway_entrance-london-m" priority: 3300 } caption { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index c3bb824ca6..59ec17c23a 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 42cd739cce..8cd8511aa2 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -64196,6 +64196,402 @@ cont { } } } +cont { + name: "railway-station-light_rail-london" + element { + scale: 12 + symbol { + name: "light_rail-dlr-london-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 9 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + secondary { + height: 8 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 13 + symbol { + name: "light_rail-dlr-london-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 14 + symbol { + name: "light_rail-dlr-london-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 15 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 16 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 17 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 18 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 19 + symbol { + name: "light_rail-dlr-london-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } +} +cont { + name: "railway-station-light_rail-porto" + element { + scale: 12 + symbol { + name: "light_rail-porto-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 9 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + secondary { + height: 8 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 13 + symbol { + name: "light_rail-porto-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 14 + symbol { + name: "light_rail-porto-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 15 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 16 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 17 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 18 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 19 + symbol { + name: "light_rail-porto-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } +} cont { name: "railway-station-monorail" element { @@ -86584,14 +86980,14 @@ cont { element { scale: 16 symbol { - name: "subway-london-s" + name: "subway_entrance-london-s" priority: 3300 } } element { scale: 17 symbol { - name: "subway-london-s" + name: "subway_entrance-london-s" priority: 3300 } caption { @@ -86615,7 +87011,7 @@ cont { element { scale: 18 symbol { - name: "subway-london-m" + name: "subway_entrance-london-m" priority: 3300 } caption { @@ -86639,7 +87035,7 @@ cont { element { scale: 19 symbol { - name: "subway-london-m" + name: "subway_entrance-london-m" priority: 3300 } caption { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 38a69907ff..119a36e15e 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 b035ab4500..19a34eab4e 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -41830,6 +41830,368 @@ cont { } } } +cont { + name: "railway-station-light_rail-london" + element { + scale: 12 + symbol { + name: "light_rail-dlr-london-s" + priority: 2900 + min_distance: 1 + } + } + element { + scale: 13 + symbol { + name: "light_rail-dlr-london-s" + priority: 2900 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 14 + symbol { + name: "light_rail-dlr-london-s" + priority: 2900 + min_distance: 1 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 15 + symbol { + name: "light_rail-dlr-london-m" + priority: 2900 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 3355443 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 16 + symbol { + name: "light_rail-dlr-london-m" + priority: 2900 + } + caption { + primary { + height: 13 + color: 3355443 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 3355443 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 17 + symbol { + name: "light_rail-dlr-london-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 18 + symbol { + name: "light_rail-dlr-london-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 19 + symbol { + name: "light_rail-dlr-london-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } +} +cont { + name: "railway-station-light_rail-porto" + element { + scale: 12 + symbol { + name: "light_rail-porto-s" + priority: 2900 + min_distance: 1 + } + } + element { + scale: 13 + symbol { + name: "light_rail-porto-s" + priority: 2900 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 14 + symbol { + name: "light_rail-porto-s" + priority: 2900 + min_distance: 1 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 15 + symbol { + name: "light_rail-porto-m" + priority: 2900 + } + caption { + primary { + height: 12 + color: 3355443 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 3355443 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 16 + symbol { + name: "light_rail-porto-m" + priority: 2900 + } + caption { + primary { + height: 13 + color: 3355443 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 3355443 + stroke_color: 872415231 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 17 + symbol { + name: "light_rail-porto-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 18 + symbol { + name: "light_rail-porto-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 19 + symbol { + name: "light_rail-porto-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 3355443 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } +} cont { name: "railway-station-monorail" element { @@ -65856,14 +66218,14 @@ cont { element { scale: 16 symbol { - name: "subway-london-s" + name: "subway_entrance-london-s" priority: 550 } } element { scale: 17 symbol { - name: "subway-london-s" + name: "subway_entrance-london-s" priority: 550 } caption { @@ -65887,7 +66249,7 @@ cont { element { scale: 18 symbol { - name: "subway-london-m" + name: "subway_entrance-london-m" priority: 550 } caption { @@ -65911,7 +66273,7 @@ cont { element { scale: 19 symbol { - name: "subway-london-m" + name: "subway_entrance-london-m" priority: 550 } caption { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 44e8173e07..c046951ba0 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 78c113d9af..c0dc308953 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -42206,6 +42206,368 @@ cont { } } } +cont { + name: "railway-station-light_rail-london" + element { + scale: 12 + symbol { + name: "light_rail-dlr-london-s" + priority: 2900 + min_distance: 1 + } + } + element { + scale: 13 + symbol { + name: "light_rail-dlr-london-s" + priority: 2900 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 14 + symbol { + name: "light_rail-dlr-london-s" + priority: 2900 + min_distance: 1 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 15 + symbol { + name: "light_rail-dlr-london-m" + priority: 2900 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 16 + symbol { + name: "light_rail-dlr-london-m" + priority: 2900 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 17 + symbol { + name: "light_rail-dlr-london-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 18 + symbol { + name: "light_rail-dlr-london-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 19 + symbol { + name: "light_rail-dlr-london-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } +} +cont { + name: "railway-station-light_rail-porto" + element { + scale: 12 + symbol { + name: "light_rail-porto-s" + priority: 2900 + min_distance: 1 + } + } + element { + scale: 13 + symbol { + name: "light_rail-porto-s" + priority: 2900 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 14 + symbol { + name: "light_rail-porto-s" + priority: 2900 + min_distance: 1 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 15 + symbol { + name: "light_rail-porto-m" + priority: 2900 + } + caption { + primary { + height: 12 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 16 + symbol { + name: "light_rail-porto-m" + priority: 2900 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 856756480 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 17 + symbol { + name: "light_rail-porto-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 18 + symbol { + name: "light_rail-porto-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } + element { + scale: 19 + symbol { + name: "light_rail-porto-m" + priority: 2900 + } + caption { + primary { + height: 14 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 12 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -7100 + } + } +} cont { name: "railway-station-monorail" element { @@ -66232,14 +66594,14 @@ cont { element { scale: 16 symbol { - name: "subway-london-s" + name: "subway_entrance-london-s" priority: 550 } } element { scale: 17 symbol { - name: "subway-london-s" + name: "subway_entrance-london-s" priority: 550 } caption { @@ -66263,7 +66625,7 @@ cont { element { scale: 18 symbol { - name: "subway-london-m" + name: "subway_entrance-london-m" priority: 550 } caption { @@ -66287,7 +66649,7 @@ cont { element { scale: 19 symbol { - name: "subway-london-m" + name: "subway_entrance-london-m" priority: 550 } caption { diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 6d3bf88864..71d98c3dde 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 b82186bdc9..fe51708c5c 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -4,737 +4,741 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index 62d57e8c3c..f8515c03b8 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 dee3722c7f..76b75c52b3 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -4,469 +4,469 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + @@ -474,266 +474,270 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index 298c9fb2f2..52753f2155 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 2347402328..85a3f8d932 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -3,738 +3,742 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index cc582f9b8f..5059abd982 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 ca31d6bb52..6cd7bcd32e 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -3,737 +3,741 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index d26701ffba..1d5bf85629 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 33de303d1a..b565ec82dd 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -3,738 +3,742 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index 3eb61be13b..57b7a5c92c 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 3a74003a8f..5b193e2788 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -3,737 +3,741 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index 3f5d26cd4a..9b5778a404 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 cd496e00af..ba9fef452d 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -3,738 +3,742 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index 2a23ca6806..4abdfb0192 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 16cfc908d3..14b04894d4 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -3,737 +3,741 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index 50eec74ea5..7f408ba455 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 0dba4798fb..8c8d125398 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -3,738 +3,742 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index ee0b85fe5a..f2f726e752 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 0261cdd1c0..160aeba418 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -3,737 +3,741 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png index ff21ddec65..b79f799ac4 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 a1bd4399ae..853286f153 100644 --- a/data/resources-xxxhdpi_clear/symbols.sdf +++ b/data/resources-xxxhdpi_clear/symbols.sdf @@ -2,739 +2,743 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index bf848dc544..077382c170 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 62a09db395..8522513080 100644 --- a/data/resources-xxxhdpi_dark/symbols.sdf +++ b/data/resources-xxxhdpi_dark/symbols.sdf @@ -2,738 +2,742 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/types.txt b/data/types.txt index f9ebe08d7b..3ae07eec2e 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1583,3 +1583,5 @@ amenity|recycling|container *craft|caterer *craft|grinding_mill *leisure|outdoor_seating +*railway|station|light_rail|london +*railway|station|light_rail|porto diff --git a/data/visibility.txt b/data/visibility.txt index e35b247831..c27d55cadc 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -922,7 +922,10 @@ world 00000000000000000000 + {} station 00000000000011111111 + funicular 00000000000011111111 - - light_rail 00000000000011111111 - + light_rail 00000000000011111111 + + london 00000000000011111111 - + porto 00000000000011111111 - + {} monorail 00000000000011111111 - subway 00000000000001111111 + adana 00000000000011111111 -