[types] Add tree rows

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

android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java

@@ -69,7 +69,6 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     initAutoDownloadPrefsCallbacks();
     initLargeFontSizePrefsCallbacks();
     initTransliterationPrefsCallbacks();
-    initOnlyUseSysLangsInTheirRegionCallbacks();
     init3dModePrefsCallbacks();
     initPerspectivePrefsCallbacks();
     initAutoZoomPrefsCallbacks();
@@ -224,20 +223,6 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     });
   }
 
-  private void initOnlyUseSysLangsInTheirRegionCallbacks()
-  {
-    final Preference pref = getPreference(getString(R.string.pref_set_only_use_syslangs_in_their_region));
-    ((TwoStatePreference) pref).setChecked(Config.isOnlyUseSysLangsInTheirRegion());
-    pref.setOnPreferenceChangeListener((preference, newValue) -> {
-      final boolean oldVal = Config.isOnlyUseSysLangsInTheirRegion();
-      final boolean newVal = (Boolean) newValue;
-      if (oldVal != newVal)
-        Config.setOnlyUseSysLangsInTheirRegion(newVal);
-
-      return true;
-    });
-  }
-
   private void initTransliterationPrefsCallbacks()
   {
     final Preference pref = getPreference(getString(R.string.pref_transliteration));

android/app/src/main/res/values/donottranslate.xml

@@ -40,7 +40,6 @@
   <string name="pref_keep_screen_on" translatable="false">KeepScreenOn</string>
   <string name="pref_show_on_lock_screen" translatable="false">ShowOnLockScreen</string>
   <string name="pref_map_locale" translatable="false">MapLanguage</string>
-  <string name="pref_set_only_use_syslangs_in_their_region" translatable="false">OnlyUseSysLangsInTheirRegion</string>
   <string name="pref_backup" translatable="false">Backup</string>
   <string name="pref_left_button" translatable="false">LeftButton</string>
   <string name="pref_power" translatable="false">pref_power</string>

android/app/src/main/res/values/strings.xml

@@ -975,5 +975,4 @@
     <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
     <string name="download_resources_custom_url_summary_none">Not set</string>
     <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
-    <string name="only_use_syslangs_in_their_region">Only use other system languages in their region</string>
 </resources>

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

@@ -65,14 +65,6 @@
        app:singleLineTitle="false"
        android:persistent="false"
        android:order="7"/>
-    <SwitchPreferenceCompat
-      android:key="@string/pref_set_only_use_syslangs_in_their_region"
-      android:title="@string/only_use_syslangs_in_their_region"
-      app:singleLineTitle="false"
-      app:icon="@drawable/ic_translate"
-      android:defaultValue="false"
-      android:widgetLayout="@layout/preference_switch"
-      android:order="8"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_transliteration"
       android:title="@string/transliteration_title"
@@ -80,14 +72,14 @@
       app:icon="@drawable/ic_translate_indic"
       android:defaultValue="false"
       android:widgetLayout="@layout/preference_switch"
-      android:order="9"/>
+      android:order="8"/>
     <Preference
       android:key="@string/pref_storage"
       android:title="@string/maps_storage"
       app:icon="@drawable/ic_sd_card"
       app:singleLineTitle="false"
       android:summary="@string/maps_storage_summary"
-      android:order="10"/>
+      android:order="9"/>
     <Preference
        android:key="@string/pref_backup"
        android:title="@string/pref_backup_title"
@@ -95,7 +87,7 @@
        app:icon="@drawable/ic_settings_backup_restore"
        app:singleLineTitle="false"
        android:persistent="false"
-       android:order="11"/>
+       android:order="10"/>
     <SwitchPreferenceCompat
        android:key="@string/pref_enable_logging"
        android:title="@string/enable_logging"
@@ -104,7 +96,7 @@
        android:summary="@string/enable_logging_warning_message"
        android:defaultValue="false"
        android:widgetLayout="@layout/preference_switch"
-       android:order="12"/>
+       android:order="11"/>
     <SwitchPreferenceCompat
        android:key="@string/pref_emulate_bad_external_storage"
        android:title="@string/setting_emulate_bad_storage"
@@ -112,7 +104,7 @@
        android:defaultValue="false"
        app:isPreferenceVisible="false"
        android:widgetLayout="@layout/preference_switch"
-       android:order="13"/>
+       android:order="12"/>
   </androidx.preference.PreferenceCategory>
 
   <androidx.preference.PreferenceCategory

android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp

@@ -4,18 +4,21 @@
 
 extern "C"
 {
-JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeHasConfigValue(JNIEnv * env, jclass thiz, jstring name)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeHasConfigValue(JNIEnv * env, jclass thiz,
+                                                                                     jstring name)
 {
   std::string value;
   return settings::Get(jni::ToNativeString(env, name), value);
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeDeleteConfigValue(JNIEnv * env, jclass thiz, jstring name)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeDeleteConfigValue(JNIEnv * env, jclass thiz,
+                                                                                    jstring name)
 {
   settings::Delete(jni::ToNativeString(env, name));
 }
 
-JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean defaultVal)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetBoolean(JNIEnv * env, jclass thiz,
+                                                                                 jstring name, jboolean defaultVal)
 {
   bool val;
   if (settings::Get(jni::ToNativeString(env, name), val))
@@ -24,12 +27,14 @@ JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetBoolean
   return defaultVal;
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean val)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetBoolean(JNIEnv * env, jclass thiz, jstring name,
+                                                                             jboolean val)
 {
   (void)settings::Set(jni::ToNativeString(env, name), static_cast<bool>(val));
 }
 
-JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetInt(JNIEnv * env, jclass thiz, jstring name, jint defaultValue)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetInt(JNIEnv * env, jclass thiz, jstring name,
+                                                                         jint defaultValue)
 {
   int32_t value;
   if (settings::Get(jni::ToNativeString(env, name), value))
@@ -38,12 +43,14 @@ JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetInt(JNIEnv
   return defaultValue;
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetInt(JNIEnv * env, jclass thiz, jstring name, jint value)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetInt(JNIEnv * env, jclass thiz, jstring name,
+                                                                         jint value)
 {
   (void)settings::Set(jni::ToNativeString(env, name), static_cast<int32_t>(value));
 }
 
-JNIEXPORT jlong JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetLong(JNIEnv * env, jclass thiz, jstring name, jlong defaultValue)
+JNIEXPORT jlong JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetLong(JNIEnv * env, jclass thiz, jstring name,
+                                                                           jlong defaultValue)
 {
   int64_t value;
   if (settings::Get(jni::ToNativeString(env, name), value))
@@ -52,12 +59,14 @@ JNIEXPORT jlong JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetLong(JNIEn
   return defaultValue;
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetLong(JNIEnv * env, jclass thiz, jstring name, jlong value)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetLong(JNIEnv * env, jclass thiz, jstring name,
+                                                                          jlong value)
 {
   (void)settings::Set(jni::ToNativeString(env, name), static_cast<int64_t>(value));
 }
 
-JNIEXPORT jdouble JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble defaultValue)
+JNIEXPORT jdouble JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetDouble(JNIEnv * env, jclass thiz, jstring name,
+                                                                               jdouble defaultValue)
 {
   double value;
   if (settings::Get(jni::ToNativeString(env, name), value))
@@ -66,12 +75,14 @@ JNIEXPORT jdouble JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetDouble(J
   return defaultValue;
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble value)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetDouble(JNIEnv * env, jclass thiz, jstring name,
+                                                                            jdouble value)
 {
   (void)settings::Set(jni::ToNativeString(env, name), static_cast<double>(value));
 }
 
-JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetString(JNIEnv * env, jclass thiz, jstring name, jstring defaultValue)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetString(JNIEnv * env, jclass thiz, jstring name,
+                                                                               jstring defaultValue)
 {
   std::string value;
   if (settings::Get(jni::ToNativeString(env, name), value))
@@ -80,7 +91,8 @@ JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetString(J
   return defaultValue;
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetString(JNIEnv * env, jclass thiz, jstring name, jstring value)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetString(JNIEnv * env, jclass thiz, jstring name,
+                                                                            jstring value)
 {
   (void)settings::Set(jni::ToNativeString(env, name), jni::ToNativeString(env, value));
 }
@@ -90,31 +102,19 @@ JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetLargeFo
   return frm()->LoadLargeFontsSize();
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetLargeFontsSize(JNIEnv * env, jclass thiz, jboolean value)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetLargeFontsSize(JNIEnv * env, jclass thiz,
+                                                                                    jboolean value)
 {
   frm()->SetLargeFontsSize(value);
 }
 
-JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetOnlyUseSysLangsInTheirRegion(JNIEnv * env, jclass thiz)
-{
-  bool enabled = true;
-  UNUSED_VALUE(settings::Get(settings::kMapLanguageLimitAlternativesToLocal, enabled));
-  return enabled;
-}
-
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetOnlyUseSysLangsInTheirRegion(JNIEnv * env, jclass thiz, jboolean value)
-{
-  settings::Set(settings::kMapLanguageLimitAlternativesToLocal, static_cast<bool>(value));
-  //reload render
-  frm()->InvalidateRect(frm()->GetCurrentViewport());
-}
-
 JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetTransliteration(JNIEnv * env, jclass thiz)
 {
   return frm()->LoadTransliteration();
 }
 
-JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetTransliteration(JNIEnv * env, jclass thiz, jboolean value)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetTransliteration(JNIEnv * env, jclass thiz,
+                                                                                     jboolean value)
 {
   frm()->SaveTransliteration(value);
   frm()->AllowTransliteration(value);

android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java

@@ -383,16 +383,6 @@ public final class Config
     return getLong(KEY_MISC_AGPS_TIMESTAMP, 0L);
   }
 
-  public static boolean isOnlyUseSysLangsInTheirRegion()
-  {
-    return nativeGetOnlyUseSysLangsInTheirRegion();
-  }
-
-  public static void setOnlyUseSysLangsInTheirRegion(boolean enabled)
-  {
-    nativeSetOnlyUseSysLangsInTheirRegion(enabled);
-  }
-
   public static boolean isTransliteration()
   {
     return nativeGetTransliteration();
@@ -531,7 +521,7 @@ public final class Config
   }
 
   private static native boolean nativeHasConfigValue(String name);
-  private static native void nativeDeleteConfigValue(String name);
+  private static native boolean nativeDeleteConfigValue(String name);
   private static native boolean nativeGetBoolean(String name, boolean defaultValue);
   private static native void nativeSetBoolean(String name, boolean value);
   private static native int nativeGetInt(String name, int defaultValue);
@@ -544,8 +534,6 @@ public final class Config
   private static native void nativeSetString(String name, String value);
   private static native boolean nativeGetLargeFontsSize();
   private static native void nativeSetLargeFontsSize(boolean value);
-  private static native boolean nativeGetOnlyUseSysLangsInTheirRegion();
-  private static native void nativeSetOnlyUseSysLangsInTheirRegion(boolean value);
   private static native boolean nativeGetTransliteration();
   private static native void nativeSetTransliteration(boolean value);
 }

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

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

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