diff --git a/data/classificator.txt b/data/classificator.txt
index 72d3f78eee..6531b01a60 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -998,6 +998,7 @@ world +
hamburg -
helsinki -
hiroshima -
+ hongkong -
isfahan -
istanbul -
izmir -
@@ -1117,6 +1118,7 @@ world +
hamburg -
helsinki -
hiroshima -
+ hongkong -
isfahan -
istanbul -
izmir -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 004f00c132..724e248363 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 bc1468045d..3f77fe3ae9 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -88110,6 +88110,184 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-hongkong"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 6250
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 11
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 9
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+}
cont {
name: "railway-station-subway-isfahan"
element {
@@ -105382,6 +105560,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-hongkong"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+}
cont {
name: "railway-subway_entrance-isfahan"
element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index eb08f686bb..bfa2b1d3f4 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index df049790af..790321dfe4 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -83638,6 +83638,184 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-hongkong"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 6250
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 11
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 9
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 12
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 10
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+}
cont {
name: "railway-station-subway-isfahan"
element {
@@ -100910,6 +101088,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-hongkong"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+}
cont {
name: "railway-subway_entrance-isfahan"
element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 89c20ccf55..cb620add4d 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index cd11d5f014..9056ddef0e 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -83423,6 +83423,184 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-hongkong"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 6250
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 11
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 9
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+}
cont {
name: "railway-station-subway-isfahan"
element {
@@ -100695,6 +100873,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-hongkong"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+}
cont {
name: "railway-subway_entrance-isfahan"
element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index aa53016318..3bbc7a65e2 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 df32dba419..c0d7c82a8e 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -88618,6 +88618,184 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-hongkong"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 6250
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 11
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 9
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 12
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 10
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+}
cont {
name: "railway-station-subway-isfahan"
element {
@@ -105890,6 +106068,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-hongkong"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -6300
+ }
+ }
+}
cont {
name: "railway-subway_entrance-isfahan"
element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 9b719ea8e0..f356a56ba3 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 7bcf884396..1d069b39c0 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -88403,6 +88403,184 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-hongkong"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 6250
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 6250
+ }
+ caption {
+ primary {
+ height: 11
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 9
+ color: 2236962
+ stroke_color: 872415231
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -3750
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 6250
+ }
+ 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: -3750
+ }
+ }
+}
cont {
name: "railway-station-subway-isfahan"
element {
@@ -105675,6 +105853,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-hongkong"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 3700
+ }
+ 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: -6300
+ }
+ }
+}
cont {
name: "railway-subway_entrance-isfahan"
element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 52f57b6cf1..b9349a4a12 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 f1b465e21f..e0037f2912 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -56067,6 +56067,167 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-hongkong"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 2000
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 2000
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 12
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 10
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 856032768
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+}
cont {
name: "railway-station-subway-isfahan"
element {
@@ -71984,6 +72145,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-hongkong"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 550
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 8947848
+ stroke_color: 436602368
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+}
cont {
name: "railway-subway_entrance-isfahan"
element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index 4ab78afbcd..8ec905f0f4 100644
Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ
diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index c64293aebc..a785cc860a 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -55527,6 +55527,167 @@ cont {
}
}
}
+cont {
+ name: "railway-station-subway-hongkong"
+ element {
+ scale: 13
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 2000
+ }
+ }
+ element {
+ scale: 14
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 2000
+ }
+ }
+ element {
+ scale: 15
+ symbol {
+ name: "subway-hongkong-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-hongkong-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-hongkong-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-m"
+ priority: 2000
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -8000
+ }
+ }
+}
cont {
name: "railway-station-subway-isfahan"
element {
@@ -71444,6 +71605,112 @@ cont {
}
}
}
+cont {
+ name: "railway-subway_entrance-hongkong"
+ element {
+ scale: 16
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 550
+ }
+ }
+ element {
+ scale: 17
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 18
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 19
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+ element {
+ scale: 20
+ symbol {
+ name: "subway-hongkong-s"
+ priority: 550
+ }
+ caption {
+ primary {
+ height: 13
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ secondary {
+ height: 11
+ color: 3355443
+ stroke_color: 452984831
+ offset_y: 1
+ is_optional: true
+ }
+ priority: -9450
+ }
+ }
+}
cont {
name: "railway-subway_entrance-isfahan"
element {
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 2d7a1c95d3..c5c8773f27 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 30a4627bf6..b874ba5195 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_light/symbols.png b/data/resources-6plus_light/symbols.png
index 0494fddccf..6d85f90193 100644
Binary files a/data/resources-6plus_light/symbols.png and b/data/resources-6plus_light/symbols.png differ
diff --git a/data/resources-6plus_light/symbols.sdf b/data/resources-6plus_light/symbols.sdf
index 809c60edf7..1fe327f81b 100644
--- a/data/resources-6plus_light/symbols.sdf
+++ b/data/resources-6plus_light/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 0c26deb727..0328ed8473 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 ea7e973989..f685acfcd4 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_light/symbols.png b/data/resources-hdpi_light/symbols.png
index 511191cd60..8ef7d92d5b 100644
Binary files a/data/resources-hdpi_light/symbols.png and b/data/resources-hdpi_light/symbols.png differ
diff --git a/data/resources-hdpi_light/symbols.sdf b/data/resources-hdpi_light/symbols.sdf
index ea7e973989..f685acfcd4 100644
--- a/data/resources-hdpi_light/symbols.sdf
+++ b/data/resources-hdpi_light/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 158c7d8a71..0fe5d63293 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 8e15f41bdd..0a079edfd1 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_light/symbols.png b/data/resources-mdpi_light/symbols.png
index dc53a67ebc..f958141316 100644
Binary files a/data/resources-mdpi_light/symbols.png and b/data/resources-mdpi_light/symbols.png differ
diff --git a/data/resources-mdpi_light/symbols.sdf b/data/resources-mdpi_light/symbols.sdf
index 8e15f41bdd..0a079edfd1 100644
--- a/data/resources-mdpi_light/symbols.sdf
+++ b/data/resources-mdpi_light/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 5bf1523b32..7467e70e19 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 a5e0255cc6..93c1c72a70 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_light/symbols.png b/data/resources-xhdpi_light/symbols.png
index a1e98a47c7..985f0c2afe 100644
Binary files a/data/resources-xhdpi_light/symbols.png and b/data/resources-xhdpi_light/symbols.png differ
diff --git a/data/resources-xhdpi_light/symbols.sdf b/data/resources-xhdpi_light/symbols.sdf
index a5e0255cc6..93c1c72a70 100644
--- a/data/resources-xhdpi_light/symbols.sdf
+++ b/data/resources-xhdpi_light/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index 6407ef0f88..ebad6609c7 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 fd1f9dadc2..2f61fa21fe 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_light/symbols.png b/data/resources-xxhdpi_light/symbols.png
index 5caa3aef6e..a77bd3906e 100644
Binary files a/data/resources-xxhdpi_light/symbols.png and b/data/resources-xxhdpi_light/symbols.png differ
diff --git a/data/resources-xxhdpi_light/symbols.sdf b/data/resources-xxhdpi_light/symbols.sdf
index fd1f9dadc2..2f61fa21fe 100644
--- a/data/resources-xxhdpi_light/symbols.sdf
+++ b/data/resources-xxhdpi_light/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index 8bbc8cc354..76aeab048e 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 7c5e3db756..8aed8ac251 100644
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxxhdpi_light/symbols.png b/data/resources-xxxhdpi_light/symbols.png
index 0e19d7157c..5e12a19790 100644
Binary files a/data/resources-xxxhdpi_light/symbols.png and b/data/resources-xxxhdpi_light/symbols.png differ
diff --git a/data/resources-xxxhdpi_light/symbols.sdf b/data/resources-xxxhdpi_light/symbols.sdf
index 7c5e3db756..8aed8ac251 100644
--- a/data/resources-xxxhdpi_light/symbols.sdf
+++ b/data/resources-xxxhdpi_light/symbols.sdf
@@ -514,288 +514,290 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/types.txt b/data/types.txt
index 79a722cf4e..562ad111de 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1614,3 +1614,5 @@ amenity|recycling|container
*attraction|historic
*attraction|big_wheel
*attraction|bumper_car
+*railway|station|subway|hongkong
+*railway|subway_entrance|hongkong
diff --git a/data/visibility.txt b/data/visibility.txt
index 41623e448a..5b469cf02e 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -998,6 +998,7 @@ world 000000000000000000000 +
hamburg 000000000000011111111 -
helsinki 000000000000011111111 -
hiroshima 000000000000011111111 -
+ hongkong 000000000000011111111 -
isfahan 000000000000011111111 -
istanbul 000000000000111111111 -
izmir 000000000000011111111 -
@@ -1117,6 +1118,7 @@ world 000000000000000000000 +
hamburg 000000000000000011111 -
helsinki 000000000000000011111 -
hiroshima 000000000000000011111 -
+ hongkong 000000000000000011111 -
isfahan 000000000000000011111 -
istanbul 000000000000000011111 -
izmir 000000000000000011111 -