From 7ab05ae877b2db5d882b4f8bba9d38a571eb7ed9 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 10 Feb 2020 12:08:07 +0100 Subject: [PATCH] Fix #7101, display passed favorites by default (change default value of appearance) --- OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java | 5 +++-- OsmAnd/src/net/osmand/plus/OsmandSettings.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java b/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java index 7d413a86a2..033beb3789 100644 --- a/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java +++ b/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java @@ -387,7 +387,7 @@ public class OsmandRegions { if("zh".equals(locale)) { if("TW".equalsIgnoreCase(country)) { this.locale2 = "zh-hant"; - } else { + } else if("CN".equalsIgnoreCase(country)) { this.locale2 = "zh-hans"; } } @@ -611,7 +611,8 @@ public class OsmandRegions { public static void main(String[] args) throws IOException { OsmandRegions or = new OsmandRegions(); Locale tw = Locale.CHINA; - or.setLocale(tw.getLanguage(), tw.getCountry()); + or.setLocale(tw.getLanguage(), null); +// or.setLocale(tw.getLanguage(), tw.getCountry()); or.prepareFile("/Users/victorshcherb/osmand/repos/resources/countries-info/regions.ocbf"); LinkedList lst = new LinkedList(); lst.add(or.getWorldRegion()); diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index e55bf36d49..4a8540f633 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -1261,7 +1261,7 @@ public class OsmandSettings { public final CommonPreference WIKI_ARTICLE_SHOW_IMAGES = new EnumIntPreference<>("wikivoyage_show_imgs", WikiArticleShowImages.OFF, WikiArticleShowImages.values()).makeGlobal(); public final CommonPreference SELECT_MARKER_ON_SINGLE_TAP = new BooleanPreference("select_marker_on_single_tap", false).makeProfile(); - public final CommonPreference KEEP_PASSED_MARKERS_ON_MAP = new BooleanPreference("keep_passed_markers_on_map", false).makeProfile(); + public final CommonPreference KEEP_PASSED_MARKERS_ON_MAP = new BooleanPreference("keep_passed_markers_on_map", true).makeProfile(); public final CommonPreference COORDS_INPUT_USE_RIGHT_SIDE = new BooleanPreference("coords_input_use_right_side", true).makeGlobal(); public final OsmandPreference COORDS_INPUT_FORMAT = new EnumIntPreference<>("coords_input_format", Format.DD_MM_MMM, Format.values()).makeGlobal();