diff --git a/data/colors.txt b/data/colors.txt
index d3d73a5db7..d0850a711b 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -195,7 +195,6 @@
1521138534
1711284770
1711293440
-1712394496
1712446720
1713508676
1713512977
@@ -214,7 +213,6 @@
1723579306
1724693486
1724697787
-1726934749
1727987712
1728053247
2147492386
diff --git a/data/patterns.txt b/data/patterns.txt
index 0b0fa2186a..7d003fb115 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -2,13 +2,18 @@
1.0 1.0
1.5 1.0
2.0 1.0
-3.0 1.5
-3.5 2.0
-5.0 3.0
+1.0 2.0
+1.0 3.5
+1.0 4.0
+2.0 5.0
+3.0 6.0
4.0 4.0
5.0 5.0
6.0 6.0
2.0 2.0
+3.0 1.5
+3.5 2.0
+5.0 3.0
6.0 3.0
5.0 2.0
2.0 6.0
@@ -26,7 +31,6 @@
8.0 4.0
1.2 2.0 1.2 2.0 1.2 4.4
1.0 3.0
-1.0 4.0
1.0 2.4
1.0 1.2
1.6 1.6
@@ -51,7 +55,6 @@
14.4 14.4
2.4 2.4
2.4 2.4 2.4 2.4 2.4 12.0
-3.0 6.0
6.0 12.0
8.0 16.0
7.2 16.8
diff --git a/data/resources-6plus/symbols.sdf b/data/resources-6plus/symbols.sdf
index a31850414f..220c88c513 100644
--- a/data/resources-6plus/symbols.sdf
+++ b/data/resources-6plus/symbols.sdf
@@ -1,179 +1,179 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
index 576f1650ae..5a90e5f46b 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -1,310 +1,318 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi/symbols.sdf b/data/resources-hdpi/symbols.sdf
index d563567bd7..2fe16013c4 100644
--- a/data/resources-hdpi/symbols.sdf
+++ b/data/resources-hdpi/symbols.sdf
@@ -1,179 +1,179 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
index eb88080b3d..10b618fcb9 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -1,310 +1,318 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
index 23864d8e3b..9f358dba08 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
-
+
diff --git a/data/resources-ldpi_clear/symbols.sdf b/data/resources-ldpi_clear/symbols.sdf
index e168fcb438..9eaf048b90 100644
--- a/data/resources-ldpi_clear/symbols.sdf
+++ b/data/resources-ldpi_clear/symbols.sdf
@@ -7,304 +7,312 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-ldpi_dark/symbols.sdf b/data/resources-ldpi_dark/symbols.sdf
index 55b03290df..81cf2ae9d9 100644
--- a/data/resources-ldpi_dark/symbols.sdf
+++ b/data/resources-ldpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
-
+
diff --git a/data/resources-mdpi/symbols.sdf b/data/resources-mdpi/symbols.sdf
index b4e051af2c..88a765a6f6 100644
--- a/data/resources-mdpi/symbols.sdf
+++ b/data/resources-mdpi/symbols.sdf
@@ -1,182 +1,182 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
index 869943cf0e..34a5e1e566 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -20,294 +20,302 @@
-
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
index 8e66b34586..4eea085afe 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
-
+
diff --git a/data/resources-xhdpi/symbols.sdf b/data/resources-xhdpi/symbols.sdf
index 776484a699..fa66ddc9c5 100644
--- a/data/resources-xhdpi/symbols.sdf
+++ b/data/resources-xhdpi/symbols.sdf
@@ -1,182 +1,182 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
index 189900ab9b..01eb0e4059 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -1,313 +1,321 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
index eeb8ce46d4..bd72bd2185 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
-
+
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
index 0ef18dbcd0..2ac7145b81 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -1,313 +1,321 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
index 7cc08f4fec..ce77bec879 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
-
+
diff --git a/data/resources-yota/symbols.sdf b/data/resources-yota/symbols.sdf
index 10d3f8c6ef..79a5008d9f 100644
--- a/data/resources-yota/symbols.sdf
+++ b/data/resources-yota/symbols.sdf
@@ -1,178 +1,178 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss
index 131f691a7d..dea2ce1cec 100644
--- a/data/styles/clear/include/POI.mapcss
+++ b/data/styles/clear/include/POI.mapcss
@@ -9,8 +9,9 @@ node|z15-[amenity], area|z15-[amenity] { z-index: 4000; }
node|z15[tourism=museum], area|z15[tourism=museum] { icon-image: museum-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z15[tourism=gallery] { icon-image: gallery-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; } /* <-- <-- не показывается, непонятно почему, позже разобраться */
node|z15[tourism=zoo], area|z15[tourism=zoo] { icon-image: zoo-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
-node|z15[amenity=university] { icon-image: college-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 4; }
-node|z15[amenity=hospital] { icon-image: hospital-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z15[amenity=university][name] { icon-image: college-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 4; }
+node|z15[amenity=university][!name]{};
+node|z15[amenity=hospital] { icon-imag[name]e: hospital-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
/* TOURISM, HISTORIC */
@@ -20,6 +21,9 @@ node|z18-[tourism], area|z18-[tourism] { font-size: 10; text: name; text-color:
node|z16[tourism=museum],area|z16[tourism=museum] { icon-image: museum-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z16[historic=museum],area|z16[historic=museum] { icon-image: museum-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z16[historic=monument],area|z16[historic=monument] { icon-image: monument-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z16-[historic=fort],area|z16-[historic=fort] { icon-image: remains-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z16-[historic=castle],area|z16-[historic=castle] { icon-image: remains-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+
/*node|z16[historic=memorial], area|z16[historic=memorial] { icon-image: monument-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }*/
node|z16[tourism=gallery],area|z16[tourism=gallery] { icon-image: gallery-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z16[tourism=zoo], area|z16[tourism=zoo] { icon-image: zoo-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
@@ -39,7 +43,22 @@ node|z17-[tourism=attraction] { icon-image: tourism-l.svg; text-offset: 8; font
node|z17-[tourism=viewpoint] { icon-image: tourism-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z17-[tourism=information] { icon-image: information-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z17-[tourism=camp_site], area|z17-[tourism=camp_site] { icon-image: campsite-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[tourism=picnic_site], area|z17-[tourism=picnic_site] { icon-image: picnic-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[amenity=shelter], area|z17-[amenity=shelter] { icon-image: picnic-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[historic=memorial], area|z17-[historic=memorial] { icon-image: monument-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[historic=monument],area|z17-[historic=monument] { icon-image: monument-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[historic=archaeological_site],area|z17-[historic=archaeological_site] { icon-image: remains-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[historic=ruins],area|z17-[historic=ruins] { icon-image: remains-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[historic=fort],area|z17-[historic=fort] { icon-image: remains-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[historic=castle],area|z17-[historic=castle] { icon-image: remains-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z18-[tourism=camp_site], area|z18-[tourism=camp_site] { icon-image: campsite-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z18-[tourism=picnic_site], area|z18-[tourism=picnic_site] { icon-image: picnic-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z18-[amenity=shelter], area|z18-[amenity=shelter] { icon-image: picnic-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+
+node|z19-[tourism=camp_site], area|z19-[tourism=camp_site] { icon-image: campsite-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label;z-index: 1000; }
+node|z19-[tourism=picnic_site], area|z19-[tourism=picnic_site] { icon-image: picnic-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label;z-index: 1000; }
+node|z19-[amenity=shelter], area|z19-[amenity=shelter] { icon-image: picnic-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label;z-index: 1000; }
/* NATURAL*/
@@ -102,11 +121,11 @@ area|z15[natural=peak],area|z15-16[natural=bare_rock],area|z15-16[natural=rock]
node|z16-[natural=peak],node|z17-[natural=bare_rock],node|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 8; font-size: 11; text: name; text-color: @poi_label; }
area|z16-[natural=peak],area|z17-[natural=bare_rock],area|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 8; font-size: 11; text: name; text-color: @poi_label; }
-node|z12-14[boundary=national_park],area|z12-14[boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.4; text-halo-color: @label_halo_light;
+node|z12-14[landuse=forest][boundary=national_park],area|z12-14[landuse=forest][boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.4; text-halo-color: @label_halo_light;
text-halo-radius:0.5; z-index: 1000;}
-node|z15-16[boundary=national_park],area|z15-16[boundary=national_park] { icon-image: nparkf-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label;text-halo-opacity: 0.4; text-halo-color: @label_halo_light;
+node|z15-16[landuse=forest][boundary=national_park],area|z15-16[landuse=forest][boundary=national_park] { icon-image: nparkf-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label;text-halo-opacity: 0.4; text-halo-color: @label_halo_light;
text-halo-radius:0.5; z-index: 1000;}
-node|z17-[boundary=national_park],area|z17-[boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 12; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.4; text-halo-color: @label_halo_light;
+node|z17-[landuse=forest][boundary=national_park],area|z17-[landuse=forest][boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 12; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.4; text-halo-color: @label_halo_light;
text-halo-radius:0.5; z-index: 1000;}
node|z12-14[leisure=nature_reserve],area|z12-14[leisure=nature_reserve] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.4; text-halo-color: @label_halo_light;
@@ -134,9 +153,8 @@ node|z16[amenity=school], area|z16[amenity=school] { icon-image: school-m.svg; t
node|z16[amenity=college], area|z16[amenity=college] { icon-image: college-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z16[amenity=hospital], area|z16[amenity=hospital] { icon-image: hospital-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z16[amenity=clinic], area|z16[amenity=clinic] { icon-image: hospital-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
-node|z16[amenity=dentist], area|z16[amenity=dentist] { icon-image: hospital-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
-node|z16[amenity=doctors], area|z16[amenity=doctors] { icon-image: hospital-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
-node|z16[amenity=university], area|z16[amenity=university] { icon-image: college-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 4; }
+node|z16[amenity=university], area|z16[amenity=university][name] { icon-image: college-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 4; }
+node|z16[amenity=university], area|z16[amenity=university][!name]{};
node|z16[amenity=fuel], area|z16[amenity=fuel] { icon-image: fuel-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z16-[natural=spring],area|z16-[natural=spring]{ icon-image: drinking-water-m.svg; z-index: 1000; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 100; }
@@ -148,10 +166,8 @@ node|z17[amenity=school], area|z17[amenity=school] { icon-image: school-l.svg; t
node|z17[amenity=college], area|z17[amenity=college] { icon-image: college-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z17[amenity=hospital], area|z17[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z17[amenity=clinic], area|z17[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
-node|z17[amenity=dentist], area|z17[amenity=dentist] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
-node|z17[amenity=doctor], area|z17[amenity=doctor] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
-node|z17[amenity=university], area|z17[amenity=university] { icon-image: college-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 4; }
-
+node|z17[amenity=university], area|z17[amenity=university][name] { icon-image: college-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 4; }
+node|z17[amenity=university], area|z17[amenity=university][!name]{};
node|z17[amenity=cinema], area|z17[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z17[amenity=bank], area|z17[amenity=bank] { z-index: 4500; icon-image: bank-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z17[amenity=fuel], area|z17[amenity=fuel] { icon-image: fuel-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
@@ -166,6 +182,10 @@ node|z17-[amenity=drinking_water],area|z17-[amenity=drinking_water],node|z17-[am
node|z17-[natural=spring],area|z17-[natural=spring]{ icon-image: drinking-water-l.svg; z-index: 1000; text-offset:8; font-size: 10; text: name; text-color: @poi_label; z-index: 100; }
node|z17-[historic=memorial], area|z17-[historic=memorial] { icon-image: monument-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z17-[historic=monument],area|z17-[historic=monument] { icon-image: monument-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[historic=archaeological_site],area|z17-[historic=archaeological_site] { icon-image: remains-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[historic=ruins],area|z17-[historic=ruins] { icon-image: remains-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[historic=fort],area|z17-[historic=fort] { icon-image: remains-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[historic=castle],area|z17-[historic=castle] { icon-image: remains-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z18-[amenity=place_of_worship], area|z18-[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
@@ -175,9 +195,8 @@ node|z18-[amenity=school], area|z18-[amenity=school] { icon-image: school-l.svg;
node|z18-[amenity=college], area|z18-[amenity=college] { icon-image: college-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z18-[amenity=hospital], area|z18-[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z18-[amenity=clinic], area|z18-[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
-node|z18-[amenity=dentist], area|z18-[amenity=dentist] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
-node|z18-[amenity=doctor], area|z18-[amenity=doctor] { icon-image: hospital-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
-node|z18-[amenity=university], area|z18-[amenity=university] { icon-image: college-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 5; }
+node|z18-[amenity=university], area|z18-[amenity=university][name] { icon-image: college-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 5; }
+node|z18-[amenity=university], area|z18-[amenity=university][!name]{};
node|z18-[amenity=cinema], area|z18-[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z18-[amenity=bank], area|z18-[amenity=bank] { z-index: 4500; icon-image: bank-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z18-[amenity=fuel], area|z18-[amenity=fuel] { icon-image: fuel-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
@@ -191,8 +210,9 @@ node|z18-[amenity=pharmacy], area|z18-[amenity=pharmacy] { icon-image: pharmacy-
node|z18-[amenity=cafe], area|z18-[amenity=cafe] { icon-image: cafe-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z18-[amenity=restaurant], area|z18-[amenity=restaurant] { icon-image: restaurant-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z18-[amenity=fast_food], area|z18-[amenity=fast_food] { icon-image: fastfood-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
-node|z18-[amenity=bar], area|z18-[amenity=bar] { icon-image: bar-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z18-[amenity=bar], area|z18-[amenity=bar] { icon-image: pub-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z18-[amenity=pub], area|z18-[amenity=pub] { icon-image: pub-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z18-[amenity=nightclub], area|z18-[amenity=nightclub] { icon-image: bar-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z18-[amenity=bureau_de_change] { icon-image: banknote-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
node|z18-[amenity=bench] { icon-image: bench.svg; }
node|z18-[amenity=fountain],area|z18-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
@@ -250,7 +270,7 @@ node|z17-[building=hospital], area|z17-[building=hospital] { icon-image: hospita
/* PARKINGS */
-area|z16-[amenity=parking] {fill-color: @parking;fill-oppacity:1;z-index: 10000;}
+area|z16-[amenity=parking] {fill-color: @parking;fill-oppacity:1;fill-position:background;z-index: 4; }
node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 4; }
node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 4; }
@@ -258,7 +278,7 @@ node|z17[amenity=parking][access=permissive],
node|z17[amenity=parking][access=private] { icon-image: zero-icon.svg; z-index: 4; }
-node|z18-[amenity=parking], area|z18-[amenity=parking] { icon-image: parking-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 4; }
+node|z18-[amenity=parking], area|z18-[amenity=parking] { icon-image: parking-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 10; }
/* MAN MADE */
@@ -267,4 +287,5 @@ node|z15-16[man_made=lighthouse], area|z15-16[man_made=lighthouse] { icon-image:
node|z17-[man_made=lighthouse], area|z17-[man_made=lighthouse] { icon-image: lighthouse-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
/* BORDER CONTROL*/
-node|z15-[barrier=border_control]{ icon-image:bcontrol-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 10000;}
+node|z15-[barrier=border_control]{ icon-image:bcontrol-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label;}
+node|z17-[barrier=border_control]{ icon-image:bcontrol-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label;}
diff --git a/data/styles/clear/include/landuse.mapcss b/data/styles/clear/include/landuse.mapcss
index fd18ee9a26..6a0d932958 100644
--- a/data/styles/clear/include/landuse.mapcss
+++ b/data/styles/clear/include/landuse.mapcss
@@ -14,8 +14,7 @@ area|z12-[man_made=breakwater],
{
fill-color: @background;
fill-opacity: 1;
- z-index: 120;
- fill-position: background;
+ z-index: 1000;
}
line|z14-[man_made=pier],
@@ -24,9 +23,7 @@ line|z14-[man_made=breakwater]
casing-color: @background;
fill-color: @background;
fill-opacity: 1;
- z-index: 120;
- fill-position: background;
-
+ z-index: 1000;
}
line|z17-[man_made=pier],
line|z17-[man_made=breakwater]
@@ -34,8 +31,7 @@ line|z17-[man_made=breakwater]
casing-color: @background;
fill-color: @background;
fill-opacity: 1;
- z-index: 120;
- fill-position: background;
+ z-index: 1000;
}
/* PEDESTRIAN AREAS */
@@ -47,9 +43,9 @@ area|z14-[area:highway=footway],
area|z14-[area:highway=living_street],
{
fill-color: @pedestrian_area;
- fill-opacity: 0.3;
- z-index: 44;
fill-position: background;
+ fill-opacity: 0.3;
+ z-index: 550;
}
area|z16-[highway=pedestrian][area?],
@@ -59,40 +55,41 @@ area|z16-[area:highway=footway],
area|z16-[area:highway=living_street],
{
fill-color: @pedestrian_area;
- fill-opacity: 0.3;
- z-index: 44;
fill-position: background;
+ fill-opacity: 0.3;
+ z-index: 550;
}
/* INDUSTRIAL */
-area|z15-[landuse=industrial],
+area|z15-[landuse=industrial]
area|z15-[landuse=construction]{
fill-color: @industrial;
fill-position: background;
fill-opacity: 1;
- z-index: 3;
+ z-index: -10;
}
+
/* CEMETRY */
area|z14[landuse=cemetery] {
fill-color: @park;
fill-opacity: 0.85;
- z-index: 43;
+ z-index: -5000;
fill-position: background;
}
area|z14[amenity=grave_yard] {
fill-color: @park;
fill-opacity: 0.85;
- z-index: 43;
+ z-index: -5000;
fill-position: background;
}
area|z15-[amenity=grave_yard],
area|z15-[landuse=cemetery] {
fill-color: @park;
fill-opacity: 1;
- z-index: 43;
+ z-index: -10000;
fill-position: background;
}
@@ -102,21 +99,18 @@ area|z14-15[amenity=university] {
fill-color: @unversity;
fill-opacity: 0.8;
fill-position: background;
- z-index: 1;
}
area|z16-17[amenity=university] {
fill-color: @unversity;
fill-opacity: 1;
fill-position: background;
- z-index: 1;
}
area|z18-[amenity=university] {
fill-color: @unversity;
- fill-opacity: 1;
fill-position: background;
- z-index: 1;
+ fill-opacity: 1;
}
area|z16-[leisure=pitch],
@@ -124,9 +118,9 @@ area|z16-[sport=soccer],
area|z15-[leisure=stadium],
area|z17-[leisure=playground] {
fill-color: @sport;
- fill-opacity: 1;
- z-index: 5;
fill-position: background;
+ fill-opacity: 1;
+ z-index: 150;
}
/* HOSPITALS */
@@ -134,5 +128,15 @@ area|z14-[amenity=hospital] {
fill-color: @hospital;
fill-opacity: 1;
fill-position: background;
- z-index: 2;
}
+
+/* PARKINGS*/
+
+
+/* MILITARY */
+/* area|z14[landuse=military] {
+ fill-color: ;
+ fill-opacity: 0.5;
+ z-index: 10;
+}
+*/
diff --git a/data/styles/clear/include/natural.mapcss b/data/styles/clear/include/natural.mapcss
index bdd73a2abd..bb72c65b0c 100644
--- a/data/styles/clear/include/natural.mapcss
+++ b/data/styles/clear/include/natural.mapcss
@@ -4,35 +4,31 @@
area|z0-9[natural=land]
{
fill-opacity: 1;
+ z-index: -100;
fill-color: @background;
- fill-position: background;
- z-index: 0;
}
area|z10-[natural=land]
{
fill-opacity: 1;
+ z-index: -100;
fill-color: @background;
- fill-position: background;
- z-index: 0;
}
/* glacier */
area|z0-[natural=glacier]
{
- fill-color: @glacier;
- fill-position: background;
- z-index: 1;
+ fill-color: @glacier;
}
-/*water */
+/* water */
area|z0-10[natural=coastline]
{
fill-color: @water;
fill-position: background;
opacity: 1;
- z-index: -10;
+ z-index: -10000;
}
area|z11-19[natural=coastline]
@@ -40,16 +36,15 @@ area|z11-19[natural=coastline]
fill-color: @water;
fill-position: background;
opacity: 1;
- z-index: -10;
+ z-index: -10000;
}
area|z10-19[natural=coastline]
{
fill-color: @water;
fill-position: background;
- z-index: -10;
+ z-index: -10000;
}
-
area|z16-[amenity=fountain],
area|z12-[landuse=basin],
area|z12-[landuse=reservoir],
@@ -63,17 +58,21 @@ area|z10-[waterway=river],
area|z10-[natural=bay],
{
fill-color: @water;
- z-index: 100;
- fill-position: background;
+ z-index: 250;
}
+area|z10-11[natural=lake],
+area|z10-11[landuse=reservoir],
+area|z10-11[natural=water]
+{
+ fill-color: @water;
+ z-index: 1000;
+}
-area|z11-[natural=wetland] {
- z-index: 49;
- fill-opacity: 0.3;
+area|z12-[natural=wetland] {
+ z-index: 15;
+ fill-opacity: 0.2;
fill-color: @water;
- fill-position: background;
-
}
/* rivers */
@@ -94,7 +93,8 @@ line|z11-12[waterway=riverbank] {
z-index: 50;
}
-line|z13-14[waterway=stream] {
+line|z13-14[waterway=stream],
+line|z13-14[waterway=canal]{
width: 0.1;
opacity: 0.6;
color: @river;
@@ -117,7 +117,9 @@ line|z13-14[waterway=riverbank] {
color: @river;
z-index: 50;
}
-line|z15-[waterway=stream] {
+line|z15-[waterway=stream],
+line|z15-[waterway=canal]
+ {
width: 1;
opacity: 1;
color: @river;
@@ -161,6 +163,12 @@ line|z15-[waterway=wair],
color: @bridge_casing;
z-index: 283;
}
+line|z16-[waterway=canal]
+{
+ width: 1.5;
+ color: @river;
+ z-index: 50;
+}
/* VEGETATION */
@@ -171,28 +179,27 @@ area|z10[landuse=forest],
area|z10[leisure=nature_reserve]
{
fill-color: @forest;
+ fill-position: background;
fill-opacity: 0.5;
z-index: 30;
- fill-position: background;
}
area|z11[natural=wood],
area|z11[landuse=forest],
area|z11[leisure=nature_reserve]
{
fill-color: @forest;
+ fill-position: background;
fill-opacity: 0.65;
z-index: 30;
- fill-position: background;
}
area|z12[natural=wood],
area|z12[landuse=forest],
area|z12[leisure=nature_reserve]
{
fill-color: @forest;
+ fill-position: background;
fill-opacity: 0.75;
z-index: 30;
- fill-position: background;
-
}
area|z13-14[natural=wood],
@@ -200,9 +207,9 @@ area|z13-14[landuse=forest],
area|z13-14[leisure=nature_reserve]
{
fill-color: @forest;
+ fill-position: background;
fill-opacity: 0.85;
z-index: 30;
- fill-position: background;
}
area|z15-[natural=wood],
@@ -210,77 +217,65 @@ area|z15-[landuse=forest],
area|z15-[leisure=nature_reserve]
{
fill-color: @forest;
+ fill-position: background;
fill-opacity: 1;
z-index: 30;
- fill-position: background;
}
area|z10[leisure=park] {
fill-color: @park;
+ fill-position: background;
fill-opacity: 0.4;
z-index: 40;
- fill-position: background;
}
area|z11[leisure=park] {
fill-color: @park;
+ fill-position: background;
fill-opacity: 0.5;
z-index: 40;
- fill-position: background;
}
area|z12[leisure=park], area|z12[leisure=garden] {
fill-color: @park;
+ fill-position: background;
fill-opacity: 0.7;
z-index: 40;
- fill-position: background;
}
area|z13[leisure=park], area|z13[leisure=garden] {
fill-color: @park;
+ fill-position: background;
fill-opacity: 0.8;
z-index: 40;
- fill-position: background;
}
area|z14[leisure=park], area|z14[leisure=garden] {
fill-color: @park;
+ fill-position: background;
fill-opacity: 0.85;
z-index: 40;
- fill-position: background;
}
area|z15-[leisure=park], area|z15-[leisure=garden] {
fill-color: @park;
+ fill-position: background;
fill-opacity: 1;
z-index: 40;
- fill-position: background;
}
area|z15-[landuse=grass]
{
fill-color: @forest;
fill-opacity: 1;
- z-index: 45;
- fill-position: background;
+ z-index: 15;
}
-area|z14-[landuse=farmland],
-area|z14-[landuse=allotments],
-area|z14-[natural=scrub],
-area|z14-[landuse=orchard],
-area|z14-[landuse=vineyard],
-area|z14-[landuse=meadow],
-area|z14-[landuse=recreation_ground],
-area|z14-[landuse=village_green],
-
-
+area|z15-[natural=scrub]
{
fill-color: @forest;
fill-opacity: 1;
- z-index: 42;
- fill-position: background;
+ z-index: 15;
}
-
/* BEACH */
@@ -288,23 +283,20 @@ area|z10-14[leisure=beach_resort],
area|z10-14[natural=beach],
{
fill-color: @beach;
- fill-opacity: 0.7;
- z-index: 1;
fill-position: background;
+ fill-opacity: 0.7;
}
area|z15-[leisure=beach_resort],
area|z15-[natural=beach],
{
fill-color: @beach;
- fill-opacity: 0.85;
- z-index: 1;
fill-position: background;
+ fill-opacity: 0.85;
}
area|z17-[leisure=beach_resort],
area|z17-[natural=beach],
{
fill-color: @beach;
fill-opacity: 1;
- z-index: 1;
fill-position: background;
}
diff --git a/data/styles/clear/include/roads.mapcss b/data/styles/clear/include/roads.mapcss
index d7e0a92dab..55bf352e4b 100644
--- a/data/styles/clear/include/roads.mapcss
+++ b/data/styles/clear/include/roads.mapcss
@@ -453,7 +453,7 @@ line|z14[highway=bridleway]
color: @bridleway;
opacity: 1;
width: 0.1;
- dashes: 0.1,0.1;
+ dashes: 0.1,2;
}
line|z14[highway=pedestrian]
@@ -486,7 +486,7 @@ line|z14[highway=cycleway]
color: @cycleway;
width: 0.4;
opacity: 0.8;
- z-index: 1000;
+ z-index: 2000;
}
/* ZOOM 15 */
@@ -578,7 +578,6 @@ line|z15[highway=tertiary],
color: @residential;
width: 3;
opacity: 1;
- z-index: 750;
}
line|z15[highway=tertiary_link] {
@@ -631,8 +630,8 @@ line|z15[highway=bridleway]
{
color: @bridleway;
opacity: 1;
- dashes: 2,0.5;
- width: 0.8;
+ dashes: 0.5,3.5;
+ width: 1;
z-index: 600;
}
@@ -658,7 +657,7 @@ line|z15[highway=cycleway]
color: @cycleway;
width: 0.6;
opacity: 0.9;
- z-index: 1000;
+ z-index: 2000;
}
line|z15[highway=construction]
@@ -820,7 +819,7 @@ line|z16[highway=bridleway]
{
color: @bridleway;
opacity: 1;
- dashes: 3,1.5;
+ dashes: 1,4;
width: 1.2;
}
@@ -870,7 +869,7 @@ line|z16[highway=cycleway]
color: @cycleway;
width: 1;
opacity: 1;
- z-index: 1000;
+ z-index: 2000;
}
@@ -1061,8 +1060,8 @@ line|z17[highway=bridleway]
{
color: @bridleway;
opacity: 1;
- dashes: 3.5,2;
- width: 2;
+ dashes: 1,4;
+ width: 1.6;
}
line|z17[highway=steps]
@@ -1085,7 +1084,7 @@ line|z17[highway=cycleway]
color: @cycleway;
width: 1.2;
opacity: 1;
- z-index: 700;
+ z-index: 2000;
}
@@ -1282,8 +1281,8 @@ line|z18[highway=bridleway]
{
color: @bridleway;
opacity: 1;
- dashes: 5,3;
- width: 3;
+ dashes: 2,5;
+ width: 2;
z-index: 600;
}
@@ -1307,7 +1306,7 @@ line|z18[highway=cycleway]
color: @cycleway;
width: 2;
opacity: 1;
- z-index: 700;
+ z-index: 2000;
}
/* ZOOM 19+ */
@@ -1501,8 +1500,8 @@ line|z19-[highway=bridleway]
{
color: @bridleway;
opacity: 1;
- dashes: 5,3;
- width: 3.8;
+ dashes: 3,6;
+ width: 3;
}
line|z19-[highway=steps]
@@ -1525,7 +1524,7 @@ line|z19-[highway=cycleway]
color: @cycleway;
width: 2;
opacity: 1;
- z-index: 700;
+ z-index: 2000;
}
diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss
index 56b0f99c15..37582e018e 100644
--- a/data/styles/clear/include/transport.mapcss
+++ b/data/styles/clear/include/transport.mapcss
@@ -240,22 +240,10 @@ area[railway=halt],
node|z14[railway=station],
node|z14[railway=halt] {
icon-image: train-s.svg;
- text-offset: 6;
- z-index: 5000;
- font-size: 11;
- text: name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
-node|z14[railway=station]::int_name,
-node|z14[railway=halt]::int_name {
text-offset: 6;
z-index: 5000;
font-size: 10;
- text: int_name;
+ text: name;
text-color: @label_dark;
text-halo-radius: 1;
text-halo-opacity: 0.5;
@@ -267,7 +255,7 @@ node|z15[railway=halt] {
icon-image: train-m.svg;
text-offset: 8;
z-index: 5000;
- font-size: 12;
+ font-size: 11;
text: name;
text-color: @label_dark;
text-halo-radius: 1;
@@ -275,18 +263,6 @@ node|z15[railway=halt] {
text-halo-color: @label_halo_light;
}
-node|z15[railway=station]::int_name,
-node|z15[railway=halt]::int_name {
- text-offset: 8;
- z-index: 5000;
- font-size: 10;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
node|z16[railway=station],
node|z16[railway=halt] {
icon-image: train-l.svg;
@@ -300,18 +276,6 @@ node|z16[railway=halt] {
text-halo-color: @label_halo_light;
}
-node|z16[railway=station]::int_name,
-node|z16[railway=halt]::int_name {
- text-offset: 8;
- font-size: 11;
- z-index: 5000;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
node|z17-[railway=station],
node|z17-[railway=halt] {
icon-image: train-l.svg;
@@ -325,18 +289,6 @@ node|z17-[railway=halt] {
text-halo-color: @label_halo_light;
}
-node|z17-[railway=station]::int_name,
-node|z17-[railway=halt]::int_name {
- text-offset: 18;
- font-size: 11;
- z-index: 10000;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
/* node|z16-[railway=level_crossing] { icon-image: railway-crossing.svg; } */
/* SUBWAY STATIONS - GENERIC STYLES */
@@ -352,7 +304,7 @@ node|z14[railway=station][transport=subway] {
icon-image: subway-s.svg;
text-offset: 6;
z-index: 15000;
- font-size: 11;
+ font-size: 10;
text: name;
text-color: @label_dark;
text-halo-radius: 1;
@@ -364,7 +316,7 @@ node|z15[railway=station][transport=subway] {
icon-image: subway-m.svg;
text-offset: 7;
z-index: 15000;
- font-size: 12;
+ font-size: 11;
text: name;
text-color: @label_dark;
text-halo-radius: 1;
@@ -372,19 +324,6 @@ node|z15[railway=station][transport=subway] {
text-halo-color: @label_halo_light;
}
-node|z15[railway=station][transport=subway]::int_name {
- icon-image: subway-m.svg;
- text-offset: 7;
- z-index: 15000;
- font-size: 10;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
-
node|z16[railway=station][transport=subway] {
icon-image: subway-m.svg;
text-offset: 7;
@@ -397,18 +336,6 @@ node|z16[railway=station][transport=subway] {
text-halo-color: @label_halo_light;
}
-node|z16[railway=station][transport=subway]::int_name {
- text-offset: 7;
- font-size: 11;
- z-index: 15000;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
-
node|z17-[railway=station][transport=subway] {
icon-image: subway-l.svg;
font-size: 13;
@@ -420,107 +347,58 @@ node|z17-[railway=station][transport=subway] {
text-halo-color: @label_halo_light;
}
-node|z17-[railway=station][transport=subway]::int_name {
- font-size: 11;
- z-index: 15000;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
node|z17[railway=subway_entrance] { icon-image: subway-entrance-s.svg; text-offset: 8; font-size: 13; z-index: 13000; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
-node|z17[railway=subway_entrance]::int_name { text-offset: 8; font-size: 13; z-index: 13000; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
-
node|z18-[railway=subway_entrance] { icon-image: subway-entrance-s.svg; text-offset: 8; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; z-index: 13000; }
-node|z18-[railway=subway_entrance]::int_name { text-offset: 8; font-size: 12; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; z-index: 13000; }
-
/* MOSCOW SUBWAY */
-node|z12[railway=station][transport=subway][city=moscow] {
- icon-image: subway-moscow-s.svg;
- z-index: 15000;
- text-offset: 5;
- z-index: 15000;
- font-size: 10;
- text: name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-
-}
+node|z12[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-s.svg; z-index: 15000; }
node|z13[railway=station][transport=subway][city=moscow] {
icon-image: subway-moscow-s.svg;
- text-offset: 5;
+ text-offset: 8;
z-index: 15000;
- font-size: 11;
+ font-size: 10;
text: name;
text-color: @label_dark;
text-halo-radius: 1;
- text-halo-opacity: 0.5;
+ text-halo-opacity: 1;
text-halo-color: @label_halo_light;
}
-node|z13[railway=station][transport=subway][city=moscow]::int_name {
- text-offset: 28;
- z-index: 15000;
- font-size: 10;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
+/*
+node|z13[railway=station][transport=subway][city=moscow]::int_name
+{
+ font-size: 7;
+ text-halo-radius: 2;
+ text: int_name;
+ text-color: @label_dark;
+ text-offset: 10;
+ text-halo-color: @white;
+ z-index: 15000;
}
+*/
-node|z14[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text-offset: 8; z-index: 15000; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light;}
-node|z14[railway=station][transport=subway][city=moscow]::int_name { z-index: 15000; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light;}
-
-node|z15[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; font-size: 12; }
-node|z15[railway=station][transport=subway][city=moscow]::int_name { font-size: 10; text: int_name; }
-
+node|z14[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text-offset: 8; z-index: 15000; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
+node|z15[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; font-size: 11; }
node|z16[railway=station][transport=subway][city=moscow] { icon-image: none.svg; text: name; font-size: 10; text-color: @district_label; text-halo-radius: 0; }
-node|z16[railway=station][transport=subway][city=moscow]::int_name { icon-image: none.svg; text: int_name; font-size: 9; text-color: @district_label; text-halo-radius: 0; }
-
node|z17-[railway=station][transport=subway][city=moscow] { icon-image: none.svg; text: name; font-size: 10; text-color: @district_label; text-halo-radius: 0; }
-node|z17-[railway=station][transport=subway][city=moscow]::int_name { text: int_name; font-size: 9; text-color: @district_label; text-halo-radius: 0; }
/* MOSCOW SUBWAY ENTRANCES */
-node|z16[railway=subway_entrance][city=moscow] { icon-image: subway-moscow-m.svg; text-offset: 8; z-index: 15000; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
-node|z16[railway=subway_entrance][city=moscow]::int_name { icon-image: subway-moscow-m.svg; text-offset: 8; z-index: 15000; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
-
-node|z17[railway=subway_entrance][city=moscow] { icon-image: subway-moscow-m.svg; font-size: 13; }
-node|z17[railway=subway_entrance][city=moscow] { font-size: 11; text: int_name; }
-
+node|z16[railway=subway_entrance][city=moscow] { icon-image: subway-moscow-m.svg; text-offset: 8; z-index: 15000; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; }
+node|z17[railway=subway_entrance][city=moscow] { icon-image: subway-moscow-m.svg; font-size: 12; }
node|z18-[railway=subway_entrance][city=moscow] { icon-image: subway-moscow-m.svg; font-size: 13; }
-node|z18[railway=subway_entrance][city=moscow] { font-size: 11; text: int_name; }
/* SAINT PETERSBURG SUBWAY */
-node|z12[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; text-offset: 5; z-index: 15000; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
-node|z13[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; text-offset: 5; z-index: 15000; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
-node|z13[railway=station][transport=subway][city=spb]::int_name { icon-image: subway-spb-s.svg; text-offset: 5; z-index: 15000; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
-
-node|z14[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; text-offset: 5; z-index: 15000; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
-node|z14[railway=station][transport=subway][city=spb]::int_name { icon-image: subway-spb-s.svg; text-offset: 5; z-index: 15000; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
-
-
+node|z12[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; z-index: 15000; }
+node|z13[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 15000; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
+node|z14[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 15000; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
node|z15[railway=station][transport=subway][city=spb] { icon-image: subway-spb-m.svg; }
-
node|z16[railway=station][transport=subway][city=spb] { icon-image: none.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; }
-node|z16[railway=station][transport=subway][city=spb]::int_name { font-size: 9; text: int_name; text-color: @district_label; text-halo-radius: 0; }
-
-
node|z17-[railway=station][transport=subway][city=spb] { icon-image: none.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; }
-node|z17-[railway=station][transport=subway][city=spb]::int_name { font-size: 9; text: int_name; text-color: @district_label; text-halo-radius: 0; }
-
node|z16-[railway=subway_entrance][city=spb] { icon-image: subway-spb-m.svg; text-offset: 8; z-index: 15000; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
-node|z16-[railway=subway_entrance][city=spb]::int_name { z-index: 15000; font-size: 11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
-
node|z17[railway=subway_entrance][city=spb] { icon-image: subway-spb-m.svg; }
node|z18-[railway=subway_entrance][city=spb] { icon-image: subway-spb-m.svg; }
@@ -535,9 +413,9 @@ node|z18-[railway=subway_entrance][city=london] { icon-image: subway-london-m.sv
/* PARIS ICONS */
node|z113[railway=station][transport=subway][city=paris] { icon-image: none.svg; }
node|z14[railway=station][transport=subway][city=paris] { icon-image: subway-paris-s.svg; }
-node|z15[railway=station][transport=subway][city=paris] { icon-image: subway-paris-m.svg;}
+node|z15[railway=station][transport=subway][city=paris] { icon-image: subway-paris-m.svg; }
node|z16-[railway=station][transport=subway][city=paris] { icon-image: subway-paris-l.svg; }
-node|z17-[railway=subway_entrance][city=paris] { icon-image: subway-paris-s.svg; z-index: }
+node|z17-[railway=subway_entrance][city=paris] { icon-image: subway-paris-s.svg; }
/* BARCELONA ICONS */
node|z14[railway=station][transport=subway][city=barcelona] { icon-image: subway-barcelona-s.svg; }
@@ -568,12 +446,12 @@ node|z17-[railway=station][transport=subway][city=roma] { icon-image: none.svg;
node|z17-[railway=subway_entrance][city=roma] { icon-image: subway-rome-m.svg; }
/* MINSK ICONS */
-node|z13[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-s.svg; text-offset: 4; z-index: 15000; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
+node|z13[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-s.svg; text-offset: 4; z-index: 15000; font-size: 9; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
node|z14[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-m.svg; text-offset: 5; }
node|z15[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-l.svg; text-offset: 5; }
node|z16[railway=station][transport=subway][city=minsk] { icon-image: none.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; }
node|z17-[railway=station][transport=subway][city=minsk] { icon-image: none.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; }
-node|z16-[railway=subway_entrance][city=minsk] { icon-image: subway-minsk-m.svg; text-offset: 6; z-index: 15000; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
+node|z16-[railway=subway_entrance][city=minsk] { icon-image: subway-minsk-m.svg; text-offset: 6; z-index: 15000; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
node|z17[railway=subway_entrance][city=minsk] { icon-image: subway-minsk-m.svg; font-size: 13; }
node|z18-[railway=subway_entrance][city=minsk] { icon-image: subway-minsk-m.svg; font-size: 13; }
@@ -583,7 +461,7 @@ node|z13[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev
node|z14[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-s.svg; }
node|z15[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-m.svg; }
node|z16-[railway=station][transport=subway][city=kiev] { icon-image: none.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; }
-node|z16-[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; text-offset: 6; z-index: 15000; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
+node|z16-[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; text-offset: 6; z-index: 15000; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
node|z17[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; font-size: 13; }
node|z18-[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; font-size: 13; }
@@ -608,25 +486,11 @@ node|z17[railway=tram_stop],
area|z17[railway=tram_stop]
{
icon-image: tram-l.svg;
- z-index: 4000;
- text-offset: 8;
- font-size: 11;
- z-index: 5000;
- text: name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
-node|z17[railway=tram_stop]::int_name,
-area|z17[railway=tram_stop]::int_name
-{
z-index: 4000;
text-offset: 8;
font-size: 10;
z-index: 5000;
- text: int_name;
+ text: name;
text-color: @label_dark;
text-halo-radius: 1;
text-halo-opacity: 0.5;
@@ -637,25 +501,11 @@ node|z18-[railway=tram_stop],
area|z18-[railway=tram_stop]
{
icon-image: tram-l.svg;
- z-index: 4000;
- text-offset: 8;
- font-size: 12;
- z-index: 5000;
- text: name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
-node|z18-[railway=tram_stop]::int_name,
-area|z18-[railway=tram_stop]::int_name
-{
z-index: 4000;
text-offset: 8;
font-size: 10;
z-index: 5000;
- text: int_name;
+ text: name;
text-color: @label_dark;
text-halo-radius: 1;
text-halo-opacity: 0.5;
@@ -679,7 +529,7 @@ area|z16-17[public_transport=station]
icon-image: bus-l.svg;
z-index: 9000;
text-offset: 10;
- font-size: 11;
+ font-size: 10;
z-index: 5000;
text: name;
text-color: @label_dark;
@@ -688,23 +538,6 @@ area|z16-17[public_transport=station]
text-halo-color: @label_halo_light;
}
-node|z18-19[highway=bus_stop]::int_name,
-area|z18-19[highway=bus_stop]::int_name,
-node|z16-17[public_transport=station]::int_name,
-area|z16-17[public_transport=station]::int_name
-{
- z-index: 9000;
- text-offset: 10;
- font-size: 9;
- z-index: 5000;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
-
node|z15[amenity=bus_station], area|z16-[amenity=bus_station] {
icon-image: bus-l.svg;
}
@@ -712,7 +545,7 @@ node|z16-17[amenity=bus_station], area|z16-[amenity=bus_station] {
icon-image: bus-l.svg;
z-index: 4000;
text-offset: 8;
- font-size: 11;
+ font-size: 10;
z-index: 5000;
text: name;
text-color: @label_dark;
@@ -721,23 +554,11 @@ node|z16-17[amenity=bus_station], area|z16-[amenity=bus_station] {
text-halo-color: @label_halo_light;
}
-node|z16-17[amenity=bus_station]::int_name, area|z16-[amenity=bus_station]::int_name {
- z-index: 4000;
- text-offset: 8;
- font-size: 9;
- z-index: 5000;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
node|z18[amenity=bus_station], area|z18[amenity=bus_station] {
icon-image: bus-l.svg;
z-index: 4000;
text-offset: 8;
- font-size: 12;
+ font-size: 10;
z-index: 5000;
text: name;
text-color: @label_dark;
@@ -746,38 +567,13 @@ node|z18[amenity=bus_station], area|z18[amenity=bus_station] {
text-halo-color: @label_halo_light;
}
-
-node|z18[amenity=bus_station]::int_name, area|z18[amenity=bus_station]::int_name {
- z-index: 4000;
- text-offset: 8;
- font-size: 9;
- z-index: 5000;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
node|z19-[amenity=bus_station], area|z19-[amenity=bus_station] {
icon-image: bus-l.svg;
- z-index: 9000;
- text-offset: 10;
- font-size: 12;
- z-index: 9000;
- text: name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
-}
-
-node|z19-[amenity=bus_station]::int_name, area|z19-[amenity=bus_station]::int_name {
z-index: 9000;
text-offset: 10;
font-size: 10;
z-index: 9000;
- text: int_name;
+ text: name;
text-color: @label_dark;
text-halo-radius: 1;
text-halo-opacity: 0.5;
@@ -796,7 +592,7 @@ node|z16-[amenity=ferry_terminal] {
icon-image: ship-m.svg;
z-index: 10000;
text-offset: 8;
- font-size: 11;
+ font-size: 10;
text: name;
text-color: @label_dark;
text-halo-radius: 1;
@@ -859,7 +655,7 @@ node|z11-14[aeroway=aerodrome][aerodrome=international]
{
icon-image: airport-m.svg;
text-offset: 7;
- font-size: 11;
+ font-size: 10;
text: name;
text-color: @label_dark;
text-halo-radius: 1;
@@ -868,20 +664,6 @@ node|z11-14[aeroway=aerodrome][aerodrome=international]
z-index: 10000;
}
-area|z11-14[aeroway=airport][aerodrome=international]::int_name,
-area|z11-14[aeroway=aerodrome][aerodrome=international]::int_name,
-node|z11-14[aeroway=airport][aerodrome=international]::int_name,
-node|z11-14[aeroway=aerodrome][aerodrome=international]::int_name
-{
- font-size: 9;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
- z-index: 10000;
-}
-
area|z15-[aeroway=airport],
area|z15-[aeroway=aerodrome],
node|z15-[aeroway=airport],
@@ -898,26 +680,12 @@ node|z15-[aeroway=aerodrome]
z-index: 10000;
}
-area|z15-[aeroway=airport]::int_name,
-area|z15-[aeroway=aerodrome]::int_name,
-node|z15-[aeroway=airport]::int_name,
-node|z15-[aeroway=aerodrome]::int_name
-{
- text-offset: 8;
- font-size: 14;
- text: int_name;
- text-color: @label_dark;
- text-halo-radius: 1;
- text-halo-opacity: 0.5;
- text-halo-color: @label_halo_light;
- z-index: 10000;
-}
-
area|z10-11[aeroway=airport][aerodrome=international],
area|z10-11[aeroway=aerodrome][aerodrome=international] {
fill-opacity: 0.7;
z-index: 100;
fill-color: @aerodrome;
+ fill-position: background;
}
area|z12[aeroway=airport][aerodrome=international],
@@ -925,6 +693,7 @@ area|z12[aeroway=aerodrome][aerodrome=international] {
fill-opacity: 0.6;
z-index: 100;
fill-color: @aerodrome;
+ fill-position: background;
}
area|z13[aeroway=airport][aerodrome=international],
@@ -932,21 +701,22 @@ area|z13[aeroway=aerodrome][aerodrome=international] {
fill-opacity: 0.5;
z-index: 100;
fill-color: @aerodrome;
+ fill-position: background;
}
area|z14-[aeroway=airport][aerodrome=international],
area|z14-[aeroway=aerodrome][aerodrome=international],
area|z14-[aeroway=airport],
-area|z14-[aeroway=aerodrome] { fill-opacity: 0.3; z-index: 100; fill-color: @aerodrome; }
+area|z14-[aeroway=aerodrome] { fill-opacity: 0.3; z-index: 100; fill-color: @aerodrome; fill-position: background;}
line|z12[aeroway=runway] { width: 1; opacity: 0.5; color: @unclassified; }
line|z13[aeroway=runway] { width: 1.5; opacity: 0.8; color: @unclassified; }
-line|z14-16[aeroway=runway] { opacity: 1; width: 5; color: @unclassified; }
-line|z17-[aeroway=runway] { width: 8; color: @unclassified; }
+line|z14-15[aeroway=runway] { opacity: 1; width: 2.4; color: @unclassified; }
+line|z16-[aeroway=runway] { width: 4; color: @unclassified; }
-line|z14[aeroway=taxiway] { width: 0.5; opacity: 0.6; color: @unclassified; }
-line|z15-[aeroway=taxiway] { width: 1; opacity: 0.6; color: @unclassified; }
+line|z14[aeroway=taxiway] { width: 0.6; opacity: 0.6; color: @unclassified; }
+line|z15-[aeroway=taxiway] { width: 1.2; opacity: 0.6; color: @unclassified; }
diff --git a/data/styles/clear/style-clear/6plus/route-arrow.png b/data/styles/clear/style-clear/6plus/route-arrow.png
index e073e8f9f6..59e4a8e7bd 100644
Binary files a/data/styles/clear/style-clear/6plus/route-arrow.png and b/data/styles/clear/style-clear/6plus/route-arrow.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-arrow.png b/data/styles/clear/style-clear/hdpi/route-arrow.png
index c54422803b..1961f84d94 100644
Binary files a/data/styles/clear/style-clear/hdpi/route-arrow.png and b/data/styles/clear/style-clear/hdpi/route-arrow.png differ
diff --git a/data/styles/clear/style-clear/ldpi/route-arrow.png b/data/styles/clear/style-clear/ldpi/route-arrow.png
index a1bd3fe78d..0bd2f6990a 100644
Binary files a/data/styles/clear/style-clear/ldpi/route-arrow.png and b/data/styles/clear/style-clear/ldpi/route-arrow.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-arrow.png b/data/styles/clear/style-clear/mdpi/route-arrow.png
index a68598e98c..3e0e083ba4 100644
Binary files a/data/styles/clear/style-clear/mdpi/route-arrow.png and b/data/styles/clear/style-clear/mdpi/route-arrow.png differ
diff --git a/data/styles/clear/style-clear/symbols/bcontrol-l.svg b/data/styles/clear/style-clear/symbols/bcontrol-l.svg
new file mode 100644
index 0000000000..05d8d1faa3
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/bcontrol-l.svg
@@ -0,0 +1,22 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/bcontrol-m.svg b/data/styles/clear/style-clear/symbols/bcontrol-m.svg
index 8244645cf9..bd2fbf45c1 100644
--- a/data/styles/clear/style-clear/symbols/bcontrol-m.svg
+++ b/data/styles/clear/style-clear/symbols/bcontrol-m.svg
@@ -5,7 +5,7 @@
Created with Sketch.
-
+
diff --git a/data/styles/clear/style-clear/symbols/bcontrol-s.svg b/data/styles/clear/style-clear/symbols/bcontrol-s.svg
new file mode 100644
index 0000000000..daae8381a6
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/bcontrol-s.svg
@@ -0,0 +1,21 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/picnic-l.svg b/data/styles/clear/style-clear/symbols/picnic-l.svg
new file mode 100644
index 0000000000..4c98810005
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/picnic-l.svg
@@ -0,0 +1,16 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/picnic-m.svg b/data/styles/clear/style-clear/symbols/picnic-m.svg
new file mode 100644
index 0000000000..f0a2adbdd8
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/picnic-m.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/picnic-s.svg b/data/styles/clear/style-clear/symbols/picnic-s.svg
new file mode 100644
index 0000000000..ec3150cf0d
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/picnic-s.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/remains-l.svg b/data/styles/clear/style-clear/symbols/remains-l.svg
new file mode 100644
index 0000000000..cd8a1c8dc7
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/remains-l.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/remains-m.svg b/data/styles/clear/style-clear/symbols/remains-m.svg
new file mode 100644
index 0000000000..126947d2ff
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/remains-m.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/remains-s.svg b/data/styles/clear/style-clear/symbols/remains-s.svg
new file mode 100644
index 0000000000..9ecaa87fb8
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/remains-s.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/xhdpi/route-arrow.png b/data/styles/clear/style-clear/xhdpi/route-arrow.png
index 1a0d0027a0..c6a62c47f9 100644
Binary files a/data/styles/clear/style-clear/xhdpi/route-arrow.png and b/data/styles/clear/style-clear/xhdpi/route-arrow.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-arrow.png b/data/styles/clear/style-clear/xxhdpi/route-arrow.png
index c56c043bb9..59201f3ceb 100644
Binary files a/data/styles/clear/style-clear/xxhdpi/route-arrow.png and b/data/styles/clear/style-clear/xxhdpi/route-arrow.png differ