[styles] Improve direction arrows

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>

android/app/build.gradle

@@ -268,7 +268,6 @@ android {
             "da",
             "de",
             "el",
-            "en-rAU",
             "en-rGB",
             "es",
             "es-rMX",

android/app/src/main/res/xml/locales_config.xml

@@ -13,7 +13,6 @@
     <locale android:name="da" />
     <locale android:name="de" />
     <locale android:name="el" />
-    <locale android:name="en-AU" />
     <locale android:name="en-GB" />
     <locale android:name="es" />
     <locale android:name="es-MX" />

data/styles/default/dark/symbols/arrow-m.svg

@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 21 8" width="16" height="6" xmlns="http://www.w3.org/2000/svg">
- <path transform="matrix(-1 0 0 1 21 0)" d="m8.4108 3h12.589v2h-12.611l0.61119 3-9-4 9-4-0.58921 3z" fill="#FFF" fill-rule="evenodd" opacity=".6"/>
-</svg>
+<svg height="7" viewBox="0 0 17 7" width="17" xmlns="http://www.w3.org/2000/svg"><path d="m6.40838857 2.28571429h9.59161903v1.52380952h-9.60838093l.46566857 2.28571429-6.85714286-3.04761905 6.85714286-3.04761905-.44892191 2.28571429z" fill="#fff" fill-opacity=".6" fill-rule="evenodd" transform="matrix(-1 0 0 1 16.908 .6667)"/></svg>

data/styles/default/dark/symbols/arrow-s.svg

@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 15 5" width="11" height="4" xmlns="http://www.w3.org/2000/svg">
- <path transform="matrix(-1 0 0 1 15 0)" d="m6.1036 2h8.8964v1h-8.9041l0.2134 2-6.3093-2.5 6.3093-2.5-0.20572 2z" fill="#FFF" fill-rule="evenodd" opacity=".6"/>
-</svg>
+<svg height="5" viewBox="0 0 12 5" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m4.47597333 1.46666667h6.52402667v.73333333h-6.52967333l.15649333 1.46666667-4.62682-1.83333334 4.62682-1.83333333-.15086133 1.46666667z" fill="#fff" fill-opacity=".6" fill-rule="evenodd" transform="matrix(-1 0 0 1 11.9078 .6667)"/></svg>

data/styles/default/dark/symbols/arrow-xs.svg

@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 9 3" width="7" height="2" xmlns="http://www.w3.org/2000/svg">
- <path transform="matrix(-1 0 0 1 9 0)" d="m2.5 1h6.5v1h-6.5v-1zm-2.5 0.5 2.5-1.5v3l-2.5-1.5z" fill="#FFF" fill-rule="evenodd" opacity=".6"/>
-</svg>
+<svg height="3" viewBox="0 0 8 3" width="8" xmlns="http://www.w3.org/2000/svg"><path d="m1.94444444.77777778h5.05555556v.77777778h-5.05555556zm-1.94444444.38888889 1.94444444-1.16666667v2.33333333z" fill="#fff" fill-opacity=".6" fill-rule="evenodd" transform="matrix(-1 0 0 1 7.9078 .6667)"/></svg>

data/styles/default/include/Icons.mapcss

@@ -207,13 +207,6 @@ node|z19-[man_made=water_well][drinking_water=not],
 node|z19-[amenity=water_point][drinking_water=not],
 {icon-image: drinking-water-no-m.svg;}
 
-line|z18-[natural=tree_row],
-{pattern-image: tree-m.svg;pattern-spacing: 60;}
-line|z19[natural=tree_row],
-{pattern-spacing: 70;}
-line|z19[natural=tree_row],
-{pattern-spacing: 80;}
-
 node|z17-[natural=tree][name],
 {icon-image: tree-special-m.svg;}
 node|z18-[natural=tree][!name],
@@ -1300,7 +1293,7 @@ node|z17-[leisure=fitness_station]
 node|z16-[leisure=sports_centre],
 {icon-image: sports_centre-m.svg;icon-min-distance: 9;}
 node|z17-[leisure=sports_hall]
-{icon-image: pitch-m.svg;icon-min-distance: 10;}
+{icon-image: sports_centre-m.svg;icon-min-distance: 10;}
 node|z16-[leisure=dance]
 {icon-image: dance-m.svg;icon-min-distance: 10;}
 node|z16-[leisure=fitness_centre]

data/styles/default/include/priorities_3_FG.prio.txt

@@ -479,6 +479,3 @@ piste:type-snow_park                                # area z14- (also has captio
 
 man_made-bridge                                     # area z14-
 === 10
-
-natural-tree_row                                    # line z18-
-=== 5

data/styles/default/include/priorities_4_overlays.prio.txt

@@ -1401,9 +1401,6 @@ leisure-park-private                                # icon z14- (also has captio
 leisure-swimming_pool-private                       # icon z17- (also has caption(optional) z17-, area z13-)
 === 100
 
-natural-tree                                        # icon z17- (also has caption(optional) z17-)
-=== 6
-
 #
 # All automatic optional captions priorities are below 0.
 # They follow the order of their correspoding icons.
@@ -2463,8 +2460,8 @@ emergency-life_ring                                 # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
-# natural-tree                                      # caption(optional) z17- (also has icon z17-)
-# === -9994
+natural-tree                                        # icon z17- (also has caption(optional) z17-)
+=== -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
 # amenity-bench-backless                            # caption(optional) z19- (also has icon z18-)
@@ -2502,6 +2499,7 @@ entrance-service                                    # icon z19- (also has captio
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
 # man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
+# natural-tree                                      # caption(optional) z17- (also has icon z17-)
 # power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z16- (also has icon z16-)
 # tourism-information-board                         # caption(optional) z16- (also has icon z16-)

data/styles/default/light/symbols/arrow-m.svg

@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 21 8" width="16" height="6" xmlns="http://www.w3.org/2000/svg">
- <path transform="matrix(-1 0 0 1 21 0)" d="m8.4108 3h12.589v2h-12.611l0.61119 3-9-4 9-4-0.58921 3z" fill="#747E86" fill-rule="evenodd"/>
-</svg>
+<svg height="7" viewBox="0 0 16 7" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m6.40838857 2.28571429h9.59161903v1.52380952h-9.60838093l.46566857 2.28571429-6.85714286-3.04761905 6.85714286-3.04761905-.44892191 2.28571429z" fill="#46361e" fill-opacity=".4" fill-rule="evenodd" transform="matrix(-1 0 0 1 16.0002 0)"/></svg>

data/styles/default/light/symbols/arrow-s.svg

@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 15 5" width="11" height="4" xmlns="http://www.w3.org/2000/svg">
- <path transform="matrix(-1 0 0 1 15 0)" d="m6.1036 2h8.8964v1h-8.9041l0.2134 2-6.3093-2.5 6.3093-2.5-0.20572 2z" fill="#747E86" fill-rule="evenodd"/>
-</svg>
+<svg height="4" viewBox="0 0 11 4" width="11" xmlns="http://www.w3.org/2000/svg"><path d="m4.47597333 1.46666667h6.52402667v.73333333h-6.52967333l.15649333 1.46666667-4.62682-1.83333334 4.62682-1.83333333-.15086133 1.46666667z" fill="#46361e" fill-opacity=".4" fill-rule="evenodd" transform="matrix(-1 0 0 1 11 0)"/></svg>

data/styles/default/light/symbols/arrow-xs.svg

@@ -1,3 +1 @@
-<svg version="1.1" viewBox="0 0 9 3" width="7" height="2" xmlns="http://www.w3.org/2000/svg">
- <path transform="matrix(-1 0 0 1 9 0)" d="m2.5 1h6.5v1h-6.5v-1zm-2.5 0.5 2.5-1.5v3l-2.5-1.5z" fill="#747E86" fill-rule="evenodd"/>
-</svg>
+<svg height="3" viewBox="0 0 7 3" width="7" xmlns="http://www.w3.org/2000/svg"><path d="m1.94444444.77777778h5.05555556v.77777778h-5.05555556zm-1.94444444.38888889 1.94444444-1.16666667v2.33333333z" fill="#46361e" fill-opacity=".4" fill-rule="evenodd" transform="matrix(-1 0 0 1 7 0)"/></svg>

data/styles/outdoors/include/priorities_3_FG.prio.txt

@@ -488,6 +488,3 @@ piste:type-snow_park                                # area z13- (also has captio
 
 man_made-bridge                                     # area z14-
 === 10
-
-natural-tree_row                                    # line z18-
-=== 5

data/styles/outdoors/include/priorities_4_overlays.prio.txt

@@ -1404,9 +1404,6 @@ leisure-park-private                                # icon z14- (also has captio
 leisure-swimming_pool-private                       # icon z17- (also has caption(optional) z17-, area z13-)
 === 100
 
-natural-tree                                        # icon z16- (also has caption(optional) z16-)
-=== 6
-
 #
 # All automatic optional captions priorities are below 0.
 # They follow the order of their correspoding icons.
@@ -2469,8 +2466,8 @@ emergency-life_ring                                 # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
-# natural-tree                                      # caption(optional) z16- (also has icon z16-)
-# === -9994
+natural-tree                                        # icon z16- (also has caption(optional) z16-)
+=== -9991
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
 # amenity-bench-backless                            # caption(optional) z19- (also has icon z18-)
@@ -2508,6 +2505,7 @@ entrance-service                                    # icon z19- (also has captio
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
 # man_made-telescope-optical                        # caption(optional) z17- (also has icon z17-)
+# natural-tree                                      # caption(optional) z16- (also has icon z16-)
 # power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z15- (also has icon z15-)
 # tourism-information-board                         # caption(optional) z15- (also has icon z15-)

iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings

@@ -1402,7 +1402,6 @@
 "type.shop.watches" = "Watch Shop";
 "type.shop.wholesale" = "Wholesale Shop";
 "type.sport" = "Sport";
-"type.sport.multi" = "Various Sports";
 "type.sport.9pin" = "Bowling";
 "type.sport.10pin" = "Bowling";
 "type.sport.american_football" = "American Football";

libs/indexer/ftypes_matcher.cpp

@@ -423,7 +423,6 @@ IsUnderBuildingChecker::IsUnderBuildingChecker()
 {
   Classificator const & c = classif();
   m_types.push_back(c.GetTypeByPath({"natural", "tree"}));
-  m_types.push_back(c.GetTypeByPath({"natural", "tree_row"}));
 }
 
 IsIsolineChecker::IsIsolineChecker() : BaseChecker(1 /* level */)