[types] Add tree rows

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

android/app/build.gradle

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

android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java

@@ -42,7 +42,7 @@ public class ChooseBookmarkCategoryFragment
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
   {
     View root = inflater.inflate(R.layout.choose_bookmark_category_fragment, container, false);
-    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+    getDialog().getWindow().setBackgroundDrawableResource(R.drawable.bg_transparent_dlg);
     mRecycler = root.findViewById(R.id.recycler);
     mRecycler.setLayoutManager(new LinearLayoutManager(requireActivity()));
     return root;

android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java

@@ -77,7 +77,7 @@ public class ChooseBookmarksSortingTypeFragment
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
   {
     super.onViewCreated(view, savedInstanceState);
-    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+    getDialog().getWindow().setBackgroundDrawableResource(R.drawable.bg_transparent_dlg);
 
     final Bundle args = getArguments();
     if (args == null)

android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java

@@ -61,7 +61,7 @@ public class StackedButtonsDialog extends AppCompatDialog implements View.OnClic
     setCancelable(mCancelable);
     setOnCancelListener(mCancelListener);
     setContentView(R.layout.dialog_stacked_buttons);
-    getWindow().setBackgroundDrawableResource(android.R.color.transparent);
+    getWindow().setBackgroundDrawableResource(R.drawable.bg_transparent_dlg);
 
     TextView title = findViewById(R.id.tv__title);
     UiUtils.setTextAndHideIfEmpty(title, mTitle);

android/app/src/main/res/drawable/bg_transparent_dlg.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@android:color/transparent"/>
+    <corners android:radius="28dp"/>
+</shape>

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

@@ -13,6 +13,7 @@
     <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" />

configure.sh

@@ -8,11 +8,9 @@ echo "Configuring the repository for development..."
 SKIP_MAP_DOWNLOAD="${SKIP_MAP_DOWNLOAD:-}"
 SKIP_GENERATE_SYMBOLS="${SKIP_GENERATE_SYMBOLS:-}"
 SKIP_GENERATE_DRULES="${SKIP_GENERATE_DRULES:-}"
-SKIP_GENERATE_STRINGS="${SKIP_GENERATE_STRINGS:-}"
 
 DRULES_NOT_GENERATED=
 SYMBOLS_NOT_GENERATED=
-STRINGS_NOT_GENERATED=
 
 DRULES_FILES=(drules_proto.bin drules_proto_default_dark.bin drules_proto_default_light.bin drules_proto_outdoors_dark.bin drules_proto_outdoors_light.bin drules_proto_vehicle_dark.bin drules_proto_vehicle_light.bin classificator.txt types.txt visibility.txt colors.txt patterns.txt)
 SYMBOLS_FILES=(xhdpi/light/symbols.png xhdpi/light/symbols.sdf xhdpi/dark/symbols.png xhdpi/dark/symbols.sdf mdpi/light/symbols.png mdpi/light/symbols.sdf mdpi/dark/symbols.png mdpi/dark/symbols.sdf 6plus/light/symbols.png 6plus/light/symbols.sdf 6plus/dark/symbols.png 6plus/dark/symbols.sdf xxxhdpi/light/symbols.png xxxhdpi/light/symbols.sdf xxxhdpi/dark/symbols.png xxxhdpi/dark/symbols.sdf hdpi/light/symbols.png hdpi/light/symbols.sdf hdpi/dark/symbols.png hdpi/dark/symbols.sdf xxhdpi/light/symbols.png xxhdpi/light/symbols.sdf xxhdpi/dark/symbols.png xxhdpi/dark/symbols.sdf)
@@ -31,11 +29,6 @@ for f in ${SYMBOLS_FILES[*]}; do
   fi
 done
 
-if [ ! -f "libs/indexer/localized_types_map.cpp" ]; then
-  STRINGS_NOT_GENERATED=1
-  break
-fi
-
 ############################# PROCESS OPTIONS ################################
 
 TEMP=$(getopt -o ms --long skip-map-download,skip-generate-symbols,skip-generate-drules \
@@ -50,7 +43,6 @@ while true; do
     -m | --skip-map-download ) SKIP_MAP_DOWNLOAD=1; shift ;;
     -s | --skip-generate-symbols ) SKIP_GENERATE_SYMBOLS=1; shift ;;
     -d | --skip-generate-drules ) SKIP_GENERATE_DRULES=1; shift ;;
-    -S | --skip-generate-strings ) SKIP_GENERATE_STRINGS=1; shift ;;
     * ) break ;;
   esac
 done
@@ -124,14 +116,8 @@ fi
 echo "Generating search categories / synonyms..."
 ./tools/unix/generate_categories.sh
 
-if [ -z "$SKIP_GENERATE_STRINGS" ]; then
-  if Diff data/strings_hash iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings || [ ! -z "$STRINGS_NOT_GENERATED" ]; then
-    echo "Generating Desktop UI strings..."
-    ./tools/unix/generate_desktop_ui_strings.sh
-  fi
-else
-  echo "Skipping generate Desktop UI strings..."
-fi
+echo "Generating Desktop UI strings..."
+./tools/unix/generate_desktop_ui_strings.sh
 
 if [ -z "$SKIP_GENERATE_SYMBOLS" ]; then
   if Diff data/symbols_hash data/styles/*/*/symbols/* || [ ! -z "$SYMBOLS_NOT_GENERATED" ]; then

data/styles/default/include/Icons.mapcss

@@ -207,6 +207,13 @@ 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],
@@ -1293,7 +1300,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: sports_centre-m.svg;icon-min-distance: 10;}
+{icon-image: pitch-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,3 +479,6 @@ 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,6 +1401,9 @@ 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.
@@ -2460,8 +2463,8 @@ emergency-life_ring                                 # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
-natural-tree                                        # icon z17- (also has caption(optional) z17-)
-=== -9991
+# natural-tree                                      # caption(optional) z17- (also has icon z17-)
+# === -9994
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
 # amenity-bench-backless                            # caption(optional) z19- (also has icon z18-)
@@ -2499,7 +2502,6 @@ 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,3 +488,6 @@ 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,6 +1404,9 @@ 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.
@@ -2466,8 +2469,8 @@ emergency-life_ring                                 # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
-natural-tree                                        # icon z16- (also has caption(optional) z16-)
-=== -9991
+# natural-tree                                      # caption(optional) z16- (also has icon z16-)
+# === -9994
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
 # amenity-bench-backless                            # caption(optional) z19- (also has icon z18-)
@@ -2505,7 +2508,6 @@ 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,6 +1402,7 @@
 "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,6 +423,7 @@ 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 */)