[ci] Update paths

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>

.forgejo/workflows/android-beta.yaml

@@ -14,22 +14,22 @@ on:
       - LICENSE
       - NOTICE
       - README.md
+      - android/app/src/fdroid/**
+      - android/app/src/google/**
       - iphone/**
-      - data/strings/**
+      - data/*-strings/**
       - docs/**
       - generator/**
       - packaging/**
-      - platform/*apple*
-      - platform/*_ios*
-      - platform/*_linux* 
-      - platform/*_mac* 
-      - platform/*qt* 
-      - platform/*_win* 
-      - pyhelpers/**
+      - libs/platform/*apple*
+      - libs/platform/*_ios*
+      - libs/platform/*_linux*
+      - libs/platform/*_mac*
+      - libs/platform/*qt*
+      - libs/platform/*_win*
+      - libs/pyhelpers/**
       - qt*/**
-      - skin_generator/**
       - tools/**
-      - track_generator/**
       - xcode/**
 
 jobs:

.forgejo/workflows/android-check.yaml

@@ -17,21 +17,19 @@ on:
       - android/app/src/fdroid/**
       - android/app/src/google/**
       - iphone/**
-      - data/strings/**
+      - data/*-strings/**
       - docs/**
       - generator/**
       - packaging/**
-      - platform/*apple*
-      - platform/*_ios*
-      - platform/*_linux*
-      - platform/*_mac*
-      - platform/*qt*
-      - platform/*_win*
-      - pyhelpers/**
+      - libs/platform/*apple*
+      - libs/platform/*_ios*
+      - libs/platform/*_linux*
+      - libs/platform/*_mac*
+      - libs/platform/*qt*
+      - libs/platform/*_win*
+      - libs/pyhelpers/**
       - qt*/**
-      - skin_generator/**
       - tools/**
-      - track_generator/**
       - xcode/**
 
 env:

.forgejo/workflows/coverage-check.yaml

@@ -15,12 +15,12 @@ on:
       - README.md
       - docs/**
       - packaging/**
-      - platform/*apple*
-      - platform/*_android*
-      - platform/*_ios*
-      - platform/*_mac*
-      - platform/*_win*
-      - pyhelpers/**
+      - libs/platform/*apple*
+      - libs/platform/*_android*
+      - libs/platform/*_ios*
+      - libs/platform/*_mac*
+      - libs/platform/*_win*
+      - libs/pyhelpers/**
       - tools/**
       - '!tools/python/test_server/**'
       - xcode/**

.forgejo/workflows/linux-check.yaml

@@ -15,15 +15,15 @@ on:
       - README.md
       - android/**
       - iphone/**
-      - data/strings/**
+      - data/*-strings/**
       - docs/**
       - packaging/**
-      - platform/*apple*
-      - platform/*_android*
-      - platform/*_ios*
-      - platform/*_mac*
-      - platform/*_win*
-      - pyhelpers/**
+      - libs/platform/*apple*
+      - libs/platform/*_android*
+      - libs/platform/*_ios*
+      - libs/platform/*_mac*
+      - libs/platform/*_win*
+      - libs/pyhelpers/**
       - tools/**
       - '!tools/python/test_server/**'
       - xcode/**

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/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],

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/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-)

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 */)