diff --git a/data/classificator.txt b/data/classificator.txt index a870481b50..f4cee2114e 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -1034,6 +1034,7 @@ world + sf - shanghai - shiraz - + singapore - sofia - spb - stockholm - @@ -1151,6 +1152,7 @@ world + sf - shanghai - shiraz - + singapore - sofia - spb - stockholm - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 738e726d1e..725acd9286 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 245a5e039e..0a3a7c6813 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -96877,6 +96877,186 @@ cont { } } } +cont { + name: "railway-station-subway-singapore" + element { + scale: 13 + symbol { + name: "subway-singapore-s" + priority: 6650 + min_distance: 1 + } + } + element { + scale: 14 + symbol { + name: "subway-singapore-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 15 + symbol { + name: "subway-singapore-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: "subway-singapore-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: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } +} cont { name: "railway-station-subway-sofia" element { @@ -110311,6 +110491,112 @@ cont { } } } +cont { + name: "railway-subway_entrance-singapore" + element { + scale: 16 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + } + element { + scale: 17 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } +} cont { name: "railway-subway_entrance-sofia" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 742b040a5a..83cc3fbe03 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 382b59e7d2..d68618c221 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -93881,6 +93881,186 @@ cont { } } } +cont { + name: "railway-station-subway-singapore" + element { + scale: 13 + symbol { + name: "subway-singapore-s" + priority: 6650 + min_distance: 1 + } + } + element { + scale: 14 + symbol { + name: "subway-singapore-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 15 + symbol { + name: "subway-singapore-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: "subway-singapore-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: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } +} cont { name: "railway-station-subway-sofia" element { @@ -107315,6 +107495,112 @@ cont { } } } +cont { + name: "railway-subway_entrance-singapore" + element { + scale: 16 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + } + element { + scale: 17 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } +} cont { name: "railway-subway_entrance-sofia" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 139a406495..e25c89ed73 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 13899dadef..27267f1312 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -93992,6 +93992,186 @@ cont { } } } +cont { + name: "railway-station-subway-singapore" + element { + scale: 13 + symbol { + name: "subway-singapore-s" + priority: 6650 + min_distance: 1 + } + } + element { + scale: 14 + symbol { + name: "subway-singapore-s" + priority: 6650 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 15 + symbol { + name: "subway-singapore-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: "subway-singapore-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: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-m" + priority: 6650 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3350 + } + } +} cont { name: "railway-station-subway-sofia" element { @@ -107426,6 +107606,112 @@ cont { } } } +cont { + name: "railway-subway_entrance-singapore" + element { + scale: 16 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + } + element { + scale: 17 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } +} cont { name: "railway-subway_entrance-sofia" element { diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index 87e9af07c9..e57e2f3729 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 8b5c9acbec..fad3013e10 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -97379,6 +97379,186 @@ cont { } } } +cont { + name: "railway-station-subway-singapore" + element { + scale: 13 + symbol { + name: "subway-singapore-s" + priority: 6300 + min_distance: 1 + } + } + element { + scale: 14 + symbol { + name: "subway-singapore-s" + priority: 6300 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 2236962 + stroke_color: 1308622847 + offset_y: 1 + is_optional: true + } + priority: -3700 + } + } + element { + scale: 15 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + 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: -3700 + } + } + element { + scale: 16 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + 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: -3700 + } + } + element { + scale: 17 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3700 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3700 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3700 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -3700 + } + } +} cont { name: "railway-station-subway-sofia" element { @@ -110813,6 +110993,112 @@ cont { } } } +cont { + name: "railway-subway_entrance-singapore" + element { + scale: 16 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + } + element { + scale: 17 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 2236962 + stroke_color: 452984831 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } +} cont { name: "railway-subway_entrance-sofia" element { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index ed225842b0..ae87deee4b 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 1a34012b48..47f4001f90 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -97490,6 +97490,186 @@ cont { } } } +cont { + name: "railway-station-subway-singapore" + element { + scale: 13 + symbol { + name: "subway-singapore-s" + priority: 6300 + min_distance: 1 + } + } + element { + scale: 14 + symbol { + name: "subway-singapore-s" + priority: 6300 + min_distance: 1 + } + caption { + primary { + height: 11 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + secondary { + height: 9 + color: 8947848 + stroke_color: 1292964096 + offset_y: 1 + is_optional: true + } + priority: -3700 + } + } + element { + scale: 15 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + 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: -3700 + } + } + element { + scale: 16 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + 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: -3700 + } + } + element { + scale: 17 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3700 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3700 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3700 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-m" + priority: 6300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -3700 + } + } +} cont { name: "railway-station-subway-sofia" element { @@ -110924,6 +111104,112 @@ cont { } } } +cont { + name: "railway-subway_entrance-singapore" + element { + scale: 16 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + } + element { + scale: 17 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-s" + priority: 3300 + } + caption { + primary { + height: 13 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + secondary { + height: 11 + color: 8947848 + stroke_color: 437326080 + offset_y: 1 + is_optional: true + } + priority: -6700 + } + } +} cont { name: "railway-subway_entrance-sofia" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index 3d2b9ac7f2..bc29071ed5 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 9bb5f9d012..330f320e39 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -68112,6 +68112,202 @@ cont { } } } +cont { + name: "railway-station-subway-singapore" + element { + scale: 13 + symbol { + name: "subway-singapore-s" + priority: 2000 + 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: -8000 + } + } + element { + scale: 14 + symbol { + name: "subway-singapore-s" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 15 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 16 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 17 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } +} cont { name: "railway-station-subway-sofia" element { @@ -81823,6 +82019,112 @@ cont { } } } +cont { + name: "railway-subway_entrance-singapore" + element { + scale: 16 + symbol { + name: "subway-singapore-s" + priority: 550 + } + } + element { + scale: 17 + symbol { + name: "subway-singapore-s" + priority: 550 + } + caption { + primary { + height: 10 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -9450 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-s" + priority: 550 + } + caption { + primary { + height: 10 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -9450 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-s" + priority: 550 + } + caption { + primary { + height: 10 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -9450 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-s" + priority: 550 + } + caption { + primary { + height: 10 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 3355443 + stroke_color: 1728053247 + offset_y: 1 + is_optional: true + } + priority: -9450 + } + } +} cont { name: "railway-subway_entrance-sofia" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 47e98be25a..37c8dd10fe 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 f071e6f29c..5c57f5662e 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -68567,6 +68567,202 @@ cont { } } } +cont { + name: "railway-station-subway-singapore" + element { + scale: 13 + symbol { + name: "subway-singapore-s" + priority: 2000 + 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: -8000 + } + } + element { + scale: 14 + symbol { + name: "subway-singapore-s" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 15 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 16 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 17 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-m" + priority: 2000 + } + 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: -8000 + } + } +} cont { name: "railway-station-subway-sofia" element { @@ -82278,6 +82474,112 @@ cont { } } } +cont { + name: "railway-subway_entrance-singapore" + element { + scale: 16 + symbol { + name: "subway-singapore-s" + priority: 550 + } + } + element { + scale: 17 + symbol { + name: "subway-singapore-s" + priority: 550 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + priority: -9450 + } + } + element { + scale: 18 + symbol { + name: "subway-singapore-s" + priority: 550 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + priority: -9450 + } + } + element { + scale: 19 + symbol { + name: "subway-singapore-s" + priority: 550 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + priority: -9450 + } + } + element { + scale: 20 + symbol { + name: "subway-singapore-s" + priority: 550 + } + caption { + primary { + height: 10 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + secondary { + height: 10 + color: 8947848 + stroke_color: 1712394496 + offset_y: 1 + is_optional: true + } + priority: -9450 + } + } +} cont { name: "railway-subway_entrance-sofia" element { diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 4cd87e8515..fb2c921e45 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 129ec0342a..c31e770b22 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -133,19 +133,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -158,29 +158,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -330,7 +330,7 @@ - + @@ -355,7 +355,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -410,349 +410,351 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index 1350fdd5fa..dd58d51fc9 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 8a6adf2dec..01cb9d28c9 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -133,18 +133,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -158,28 +158,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -330,7 +330,7 @@ - + @@ -355,7 +355,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -483,276 +483,278 @@ - - + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index 99c186c0dc..e8959e4cb2 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 6227a0abe1..1c47c21d89 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -140,29 +140,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -360,7 +360,7 @@ - + @@ -416,343 +416,345 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index b61ff73b9b..81f36418df 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 9dd92bfdaa..f133798cee 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -140,29 +140,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -359,7 +359,7 @@ - + @@ -415,344 +415,346 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index 0f77ef4f25..ef135b96f8 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 2379597902..595d9e4089 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -140,29 +140,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -360,7 +360,7 @@ - + @@ -416,343 +416,345 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index 72601bf97c..ac6a0932e7 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 df5dbee705..d7f52b1228 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -140,29 +140,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -359,7 +359,7 @@ - + @@ -415,344 +415,346 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index f866ca2622..7988dfe2e4 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 4ccef6b741..d6f42e103f 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -140,10 +140,10 @@ - - - - + + + + @@ -162,39 +162,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -360,7 +360,7 @@ - + @@ -416,343 +416,345 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index 51673a1396..dda62b09cf 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 2015b97a4a..507b46f9d4 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -140,10 +140,10 @@ - - - - + + + + @@ -162,39 +162,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -359,7 +359,7 @@ - + @@ -415,344 +415,346 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index 6e9b530478..877e78e284 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 45adc759c9..cace42f52a 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -140,16 +140,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -162,29 +162,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -360,7 +360,7 @@ - + @@ -416,343 +416,345 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index 0b122788d5..a17da882a7 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 f956c378b6..523b1cf483 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -140,16 +140,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -162,29 +162,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -359,7 +359,7 @@ - + @@ -415,344 +415,346 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png index 409ef8b6f2..898d4e4d18 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 8d82884c51..7dcab635d7 100644 --- a/data/resources-xxxhdpi_clear/symbols.sdf +++ b/data/resources-xxxhdpi_clear/symbols.sdf @@ -140,13 +140,13 @@ - - - - - - - + + + + + + + @@ -162,21 +162,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -360,7 +360,7 @@ - + @@ -416,343 +416,345 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index 386c25b10e..e38e36b799 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 c62cca137a..e2bf145c59 100644 --- a/data/resources-xxxhdpi_dark/symbols.sdf +++ b/data/resources-xxxhdpi_dark/symbols.sdf @@ -140,13 +140,13 @@ - - - - - - - + + + + + + + @@ -162,21 +162,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -359,7 +359,7 @@ - + @@ -415,344 +415,346 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/types.txt b/data/types.txt index 7705eaa914..5ccbca1812 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1591,3 +1591,5 @@ amenity|recycling|container *amenity|parking|lane|private *amenity|compressed_air *leisure|hackerspace +*railway|station|subway|singapore +*railway|subway_entrance|singapore diff --git a/data/visibility.txt b/data/visibility.txt index 530fa6e239..e04b52dd67 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -1034,6 +1034,7 @@ world 000000000000000000000 + sf 000000000000011111111 - shanghai 000000000000011111111 - shiraz 000000000000011111111 - + singapore 000000000000011111111 - sofia 000000000000011111111 - spb 000000000001111111111 - stockholm 000000000000011111111 - @@ -1151,6 +1152,7 @@ world 000000000000000000000 + sf 000000000000000011111 - shanghai 000000000000000011111 - shiraz 000000000000000011111 - + singapore 000000000000000011111 - sofia 000000000000000011111 - spb 000000000000000011111 - stockholm 000000000000000011111 -