Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed the wiki link searching algorithm

Browse source
This commit is contained in:
PaulStets 2018-05-07 10:03:14 +03:00
parent 71fe05730c
commit 7f496bc1d7
2 changed files with 37 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
View file

@ -852,7 +852,7 @@ public class ResourceManager {
return map; return map;
} }
public AmenityIndexRepositoryBinary getWikiRepositoryByRegionName(String filename) { public AmenityIndexRepositoryBinary getAmenityRepositoryByFileName(String filename) {
return (AmenityIndexRepositoryBinary) amenityRepositories.get(filename); return (AmenityIndexRepositoryBinary) amenityRepositories.get(filename);
} }

93
OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java
View file

@ -17,12 +17,10 @@ import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
import net.osmand.binary.BinaryMapDataObject;
import net.osmand.data.Amenity; import net.osmand.data.Amenity;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
import net.osmand.map.OsmandRegions; import net.osmand.map.OsmandRegions;
import net.osmand.map.WorldRegion;
import net.osmand.plus.GPXUtilities; import net.osmand.plus.GPXUtilities;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
@ -31,15 +29,12 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.download.DownloadActivityType; import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.DownloadResources; import net.osmand.plus.download.DownloadResources;
import net.osmand.plus.download.IndexItem; import net.osmand.plus.download.IndexItem;
import net.osmand.plus.resources.AmenityIndexRepository;
import net.osmand.plus.wikipedia.WikipediaDialogFragment; import net.osmand.plus.wikipedia.WikipediaDialogFragment;
import net.osmand.plus.resources.AmenityIndexRepositoryBinary; import net.osmand.plus.resources.AmenityIndexRepositoryBinary;
import net.osmand.plus.wikivoyage.article.WikivoyageArticleDialogFragment; import net.osmand.plus.wikivoyage.article.WikivoyageArticleDialogFragment;
import net.osmand.plus.wikivoyage.article.WikivoyageArticleWikiLinkFragment; import net.osmand.plus.wikivoyage.article.WikivoyageArticleWikiLinkFragment;
import net.osmand.plus.wikivoyage.data.TravelArticle; import net.osmand.plus.wikivoyage.data.TravelArticle;
import net.osmand.plus.wikivoyage.explore.WikivoyageExploreDialogFragment; import net.osmand.plus.wikivoyage.explore.WikivoyageExploreDialogFragment;
import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -189,14 +184,7 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
} }
private void getWikiArticle(String name, String lang, String url) { private void getWikiArticle(String name, String lang, String url) {
List<IndexItem> items = null; articleSearchTask = new WikiArticleSearchTask(this, article, name, regionName, fragmentManager,
try {
items = DownloadResources.findIndexItemsAt(app,
new LatLon(article.getLat(), article.getLon()), DownloadActivityType.WIKIPEDIA_FILE, true);
} catch (IOException e) {
e.printStackTrace();
}
articleSearchTask = new WikiArticleSearchTask(article, name, regionName, fragmentManager,
lang, (MapActivity) context, nightMode, url); lang, (MapActivity) context, nightMode, url);
articleSearchTask.execute(); articleSearchTask.execute();
@ -215,10 +203,9 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
private static class WikiArticleSearchTask extends AsyncTask<Void, Void, List<Amenity>> { private static class WikiArticleSearchTask extends AsyncTask<Void, Void, List<Amenity>> {
private ProgressDialog dialog; private ProgressDialog dialog;
private RegionCallback callback;
private String name; private String name;
private List<String> regionDownloadNames;
private String regionName; private String regionName;
private OsmandRegions regions;
private WeakReference<MapActivity> weakContext; private WeakReference<MapActivity> weakContext;
private WeakReference<OsmandApplication> applicationReference; private WeakReference<OsmandApplication> applicationReference;
private boolean isNightMode; private boolean isNightMode;
@ -227,7 +214,7 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
private TravelArticle article; private TravelArticle article;
private FragmentManager fragmentManager; private FragmentManager fragmentManager;
WikiArticleSearchTask(TravelArticle article, String articleName, String regionName, FragmentManager fragmentManager, WikiArticleSearchTask(RegionCallback callback, TravelArticle article, String articleName, String regionName, FragmentManager fragmentManager,
String lang, MapActivity context, boolean nightMode, String url) { String lang, MapActivity context, boolean nightMode, String url) {
this.fragmentManager = fragmentManager; this.fragmentManager = fragmentManager;
this.regionName = regionName; this.regionName = regionName;
@ -236,11 +223,11 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
weakContext = new WeakReference<>(context); weakContext = new WeakReference<>(context);
OsmandApplication app = (OsmandApplication) context.getApplication(); OsmandApplication app = (OsmandApplication) context.getApplication();
applicationReference = new WeakReference<>(app); applicationReference = new WeakReference<>(app);
regions = app.getRegions();
dialog = createProgressDialog(); dialog = createProgressDialog();
this.isNightMode = nightMode; this.isNightMode = nightMode;
this.url = url; this.url = url;
this.article = article; this.article = article;
this.callback = callback;
} }
@Override @Override
@ -260,7 +247,7 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
items = DownloadResources.findIndexItemsAt(application, items = DownloadResources.findIndexItemsAt(application,
new LatLon(article.getLat(), article.getLon()), DownloadActivityType.WIKIPEDIA_FILE, true); new LatLon(article.getLat(), article.getLon()), DownloadActivityType.WIKIPEDIA_FILE, true);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); Log.e(TAG, e.getMessage(), e);
} }
List<String> downloadedItems = new ArrayList<>(); List<String> downloadedItems = new ArrayList<>();
if (items != null) { if (items != null) {
@ -271,24 +258,39 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
} }
}); });
for (IndexItem i : items) { for (IndexItem i : items) {
if (isCancelled()) {
break;
}
if (i.isDownloaded()) { if (i.isDownloaded()) {
downloadedItems.add(i.getFileName().replace("_2", "")); downloadedItems.add(i.getFileName()
.replace("_" + IndexConstants.BINARY_MAP_VERSION, "")
.replace(".zip", ""));
} }
} }
} }
List<AmenityIndexRepositoryBinary> repos = new ArrayList<>(); List<AmenityIndexRepositoryBinary> repos = new ArrayList<>();
for (String s : downloadedItems) { for (String s : downloadedItems) {
if (isCancelled()) {
break;
}
AmenityIndexRepositoryBinary repository = application.getResourceManager() AmenityIndexRepositoryBinary repository = application.getResourceManager()
.getWikiRepositoryByRegionName(s); .getAmenityRepositoryByFileName(s);
if (repository != null) { if (repository != null) {
repos.add(repository); repos.add(repository);
} }
} }
if (repos.isEmpty()) { if (repos.isEmpty()) {
regionName = (items == null || items.isEmpty()) ? "" : getRegionName(items.get(0), application.getRegions()); if (regionName == null || regionName.isEmpty()) {
regionName = (items == null || items.isEmpty()) ? "" :
getRegionName(items.get(0), application.getRegions());
callback.onRegionFound(regionName);
}
return null; return null;
} }
for (AmenityIndexRepositoryBinary repo : repos) { for (AmenityIndexRepositoryBinary repo : repos) {
if (isCancelled()) {
break;
}
results.addAll(repo.searchAmenitiesByName(0, 0, 0, 0, results.addAll(repo.searchAmenitiesByName(0, 0, 0, 0,
Integer.MAX_VALUE, Integer.MAX_VALUE, name, null)); Integer.MAX_VALUE, Integer.MAX_VALUE, name, null));
} }
@ -296,44 +298,10 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
return results; return results;
} }
private String getRegionName(IndexItem indexItem, OsmandRegions osmandRegions) {
if (osmandRegions != null) {
String regionName = indexItem.getFileName().replace("_2", "")
.replace(IndexConstants.BINARY_WIKI_MAP_INDEX_EXT, "").toLowerCase();
int x31 = MapUtils.get31TileNumberX(article.getLat());
int y31 = MapUtils.get31TileNumberY(article.getLon());
List<BinaryMapDataObject> dataObjects = null;
try {
if (isCancelled()) {
return null;
}
dataObjects = osmandRegions.query(x31, y31);
} catch (IOException e) {
e.printStackTrace();
}
if (dataObjects != null) {
for (BinaryMapDataObject b : dataObjects) {
if (isCancelled()) {
break;
}
if(osmandRegions.contain(b, x31, y31)) {
String downloadName = osmandRegions.getDownloadName(b);
if (downloadName == null) {
continue;
}
if (downloadName.equals(regionName)) {
return osmandRegions.getLocaleName(downloadName, false);
}
}
}
}
}
return "";
}
@Override @Override
protected void onCancelled(){ protected void onCancelled() {
dialog = null; dialog = null;
callback = null;
} }
@Override @Override
@ -352,6 +320,17 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
} }
} }
private String getRegionName(IndexItem indexItem, OsmandRegions osmandRegions) {
if (osmandRegions != null) {
String regionName = indexItem.getFileName()
.replace("_" + IndexConstants.BINARY_MAP_VERSION, "")
.replace(IndexConstants.BINARY_WIKI_MAP_INDEX_EXT_ZIP, "")
.toLowerCase();
return osmandRegions.getLocaleName(regionName, false);
}
return "";
}
private ProgressDialog createProgressDialog() { private ProgressDialog createProgressDialog() {
MapActivity activity = weakContext.get(); MapActivity activity = weakContext.get();
if (activity != null && !activity.isActivityDestroyed()) { if (activity != null && !activity.isActivityDestroyed()) {