From f82fd5bf4a85b94108db5395d784bb3ebbb3e67a Mon Sep 17 00:00:00 2001 From: MadWasp79 Date: Mon, 18 May 2020 18:31:43 +0300 Subject: [PATCH] add detailed basemap --- OsmAnd/res/values/strings.xml | 2 +- .../helpers/FileNameTranslationHelper.java | 2 ++ .../plus/resources/ResourceManager.java | 20 ++++++++++++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 0dd4168b29..190461e9ee 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -10,7 +10,7 @@ - For wording and consistency, please note https://osmand.net/help-online?id=technical-articles#Creating_a_Consistent_User_Experience Thx - Hardy ---> +--> World overview map (detailed) Profiles selected for this action not found. Change application profile Add profile diff --git a/OsmAnd/src/net/osmand/plus/helpers/FileNameTranslationHelper.java b/OsmAnd/src/net/osmand/plus/helpers/FileNameTranslationHelper.java index 775b412eac..539eceb622 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/FileNameTranslationHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/FileNameTranslationHelper.java @@ -219,6 +219,8 @@ public class FileNameTranslationHelper { return ctx.getString(R.string.index_item_world_altitude_correction); } else if (basename.equals("world_basemap")) { return ctx.getString(R.string.index_item_world_basemap); + } else if (basename.equals("world_basemap_detailed")){ + return ctx.getString(R.string.index_item_world_basemap_detailed); } else if (basename.equals("world_bitcoin_payments")) { return ctx.getString(R.string.index_item_world_bitcoin_payments); } else if (basename.equals(DownloadResources.WORLD_SEAMARKS_KEY) || diff --git a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java index 44a50c880c..055f9811d5 100644 --- a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java +++ b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java @@ -664,19 +664,33 @@ public class ResourceManager { } File liveDir = context.getAppPath(IndexConstants.LIVE_INDEX_DIR); depthContours = false; - boolean hasWorldBasemap = false; + File worldBasemapStd = null; + File worldBasemapDetailed = null; File worldBasemapMini = null; for (File f : files) { if (f.getName().equals("World_basemap.obf")) { - hasWorldBasemap = true; + worldBasemapStd = f; } if (f.getName().startsWith("World_basemap_mini")) { worldBasemapMini = f; } + if (f.getName().startsWith("World_basemap_detailed")) { + worldBasemapDetailed = f; + } } - if (hasWorldBasemap && worldBasemapMini != null) { + + if (worldBasemapDetailed != null) { + if (worldBasemapStd != null) { + files.remove(worldBasemapStd); + } + if (worldBasemapMini != null) { + files.remove(worldBasemapMini); + } + + } else if (worldBasemapStd != null && worldBasemapMini != null) { files.remove(worldBasemapMini); } + java.text.DateFormat dateFormat = getDateFormat(); for (File f : files) { progress.startTask(context.getString(R.string.indexing_map) + " " + f.getName(), -1); //$NON-NLS-1$