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

Fixed falsely determined wiki file

Browse source
This commit is contained in:
PaulStets 2018-05-06 11:48:25 +03:00
parent fee6cb27d1
commit 0db4ad0e10
2 changed files with 84 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -852,18 +852,20 @@ public class ResourceManager {
return map; return map;
} }
public List<AmenityIndexRepositoryBinary> getWikiAmenityRepository(double lat, double lon) { public AmenityIndexRepositoryBinary getWikiRepositoryByRegionName(String name) {
List<AmenityIndexRepositoryBinary> repos = new ArrayList<>(); if (name == null)
return null;
for (String filename : amenityRepositories.keySet()) { for (String filename : amenityRepositories.keySet()) {
if (filename.contains("_wiki") if ((filename.contains("_wiki")
|| filename.contains(IndexConstants.BINARY_WIKI_MAP_INDEX_EXT)) { || filename.contains(IndexConstants.BINARY_WIKI_MAP_INDEX_EXT))
&& filename.toLowerCase().contains(name)) {
AmenityIndexRepository repository = amenityRepositories.get(filename); AmenityIndexRepository repository = amenityRepositories.get(filename);
if (repository.checkContains(lat, lon) && repository instanceof AmenityIndexRepositoryBinary) { if (repository != null && repository instanceof AmenityIndexRepositoryBinary) {
repos.add((AmenityIndexRepositoryBinary) repository); return (AmenityIndexRepositoryBinary) repository;
} }
} }
} }
return repos; return null;
} }
////////////////////////////////////////////// Working with address /////////////////////////////////////////// ////////////////////////////////////////////// Working with address ///////////////////////////////////////////

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

@ -45,7 +45,7 @@ import static android.support.v4.app.FragmentManager.POP_BACK_STACK_INCLUSIVE;
interface RegionCallback { interface RegionCallback {
void onRegionFound(String s); void onRegionFound(String[] s);
} }
/** /**
* Custom WebView client to handle the internal links. * Custom WebView client to handle the internal links.
@ -61,6 +61,7 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
private TravelArticle article; private TravelArticle article;
private boolean nightMode; private boolean nightMode;
private String regionName; private String regionName;
private String regionDownloadName;
private static final String PREFIX_GEO = "geo:"; private static final String PREFIX_GEO = "geo:";
private static final String PAGE_PREFIX_HTTP = "http://"; private static final String PAGE_PREFIX_HTTP = "http://";
@ -184,21 +185,43 @@ 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<AmenityIndexRepositoryBinary> indexes = app.getResourceManager() articleSearchTask = new WikiArticleSearchTask(article, name, regionName, fragmentManager,
.getWikiAmenityRepository(article.getLat(), article.getLon()); lang, regionDownloadName, (MapActivity) context, nightMode, url);
if (indexes.isEmpty()) { articleSearchTask.execute();
WikivoyageArticleWikiLinkFragment.showInstance(fragmentManager, regionName == null ?
"" : regionName, url);
} else {
articleSearchTask = new WikiArticleSearchTask(name, lang, indexes, (MapActivity) context, nightMode, url);
articleSearchTask.execute();
}
} }
@Override @Override
public void onRegionFound(String s) { public void onRegionFound(String[] s) {
regionName = s; if (s != null) {
regionDownloadName = s[0];
regionName = s[1];
}
}
private static String getDownloadName(double lat, double lon, OsmandRegions regions) {
String downloadName = null;
if (regions != null) {
int x31 = MapUtils.get31TileNumberX(lon);
int y31 = MapUtils.get31TileNumberY(lat);
List<BinaryMapDataObject> dataObjects = null;
try {
dataObjects = regions.query(x31, y31);
} catch (IOException e) {
e.printStackTrace();
}
if (dataObjects != null) {
for (BinaryMapDataObject b : dataObjects) {
if (regions.contain(b, x31, y31)) {
downloadName = regions.getDownloadName(b);
if (downloadName != null && !downloadName.isEmpty()) {
break;
}
}
}
}
}
return downloadName;
} }
public void stopRunningAsyncTasks() { public void stopRunningAsyncTasks() {
@ -210,7 +233,7 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
} }
} }
private static class FetchWikiRegion extends AsyncTask<Void, Void, String> { private static class FetchWikiRegion extends AsyncTask<Void, Void, String[]> {
private RegionCallback callback; private RegionCallback callback;
private OsmandRegions osmandRegions; private OsmandRegions osmandRegions;
@ -225,35 +248,11 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
} }
@Override @Override
protected String doInBackground(Void... voids) { protected String[] doInBackground(Void... voids) {
if (osmandRegions != null) { String downloadName = getDownloadName(lat, lon, osmandRegions);
int x31 = MapUtils.get31TileNumberX(lon); downloadName = downloadName == null ? "" : downloadName;
int y31 = MapUtils.get31TileNumberY(lat); return new String[]{downloadName,
List<BinaryMapDataObject> dataObjects = null; osmandRegions.getLocaleName(downloadName, false)};
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) {
return "";
}
return osmandRegions.getLocaleName(downloadName, false);
}
}
}
}
return "";
} }
@Override @Override
@ -262,7 +261,7 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
} }
@Override @Override
protected void onPostExecute(String result) { protected void onPostExecute(String[] result) {
if (callback != null) { if (callback != null) {
callback.onRegionFound(result); callback.onRegionFound(result);
} }
@ -272,21 +271,33 @@ 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 String name; private String name;
private List<AmenityIndexRepositoryBinary> indexes; private String regionDownloadName;
private String regionName;
private OsmandRegions regions;
private WeakReference<MapActivity> weakContext; private WeakReference<MapActivity> weakContext;
private WeakReference<OsmandApplication> applicationReference;
private boolean isNightMode; private boolean isNightMode;
private String url; private String url;
private String lang; private String lang;
private TravelArticle article;
private FragmentManager fragmentManager;
WikiArticleSearchTask(String articleName, String lang, List<AmenityIndexRepositoryBinary> indexes, WikiArticleSearchTask(TravelArticle article, String articleName, String regionName, FragmentManager fragmentManager,
MapActivity context, boolean isNightMode, String url) { String lang, String regionDownloadName,
MapActivity context, boolean nightMode, String url) {
this.fragmentManager = fragmentManager;
this.regionName = regionName;
name = articleName; name = articleName;
this.lang = lang; this.lang = lang;
this.indexes = indexes;
weakContext = new WeakReference<>(context); weakContext = new WeakReference<>(context);
OsmandApplication app = (OsmandApplication) context.getApplication();
applicationReference = new WeakReference<>(app);
regions = app.getRegions();
dialog = createProgressDialog(); dialog = createProgressDialog();
this.isNightMode = isNightMode; this.isNightMode = nightMode;
this.url = url; this.url = url;
this.regionDownloadName = regionDownloadName;
this.article = article;
} }
@Override @Override
@ -298,21 +309,24 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
@Override @Override
protected List<Amenity> doInBackground(Void... voids) { protected List<Amenity> doInBackground(Void... voids) {
List<Amenity> found = new ArrayList<>(); if (regionDownloadName == null && article != null && !isCancelled()) {
for (AmenityIndexRepositoryBinary repo : indexes) { regionDownloadName = getDownloadName(article.getLat(), article.getLon(), regions);
if (isCancelled()) {
break;
}
found.addAll(repo.searchAmenitiesByName(0, 0, 0, 0,
Integer.MAX_VALUE, Integer.MAX_VALUE, name, null));
} }
return found; OsmandApplication application = applicationReference.get();
if (application != null && !isCancelled()) {
AmenityIndexRepositoryBinary index = application.getResourceManager()
.getWikiRepositoryByRegionName(regionDownloadName);
if (index != null && !isCancelled()) {
return new ArrayList<>(index.searchAmenitiesByName(0, 0, 0, 0,
Integer.MAX_VALUE, Integer.MAX_VALUE, name, null));
}
}
return null;
} }
@Override @Override
protected void onCancelled(){ protected void onCancelled(){
dialog = null; dialog = null;
indexes.clear();
} }
@Override @Override
@ -320,7 +334,10 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
MapActivity activity = weakContext.get(); MapActivity activity = weakContext.get();
if (activity != null && !activity.isActivityDestroyed() && dialog != null) { if (activity != null && !activity.isActivityDestroyed() && dialog != null) {
dialog.dismiss(); dialog.dismiss();
if (!found.isEmpty()) { if (found == null) {
WikivoyageArticleWikiLinkFragment.showInstance(fragmentManager, regionName == null ?
"" : regionName, url);
} else if (!found.isEmpty()) {
WikipediaDialogFragment.showInstance(activity, found.get(0), lang); WikipediaDialogFragment.showInstance(activity, found.get(0), lang);
} else { } else {
warnAboutExternalLoad(url, weakContext.get(), isNightMode); warnAboutExternalLoad(url, weakContext.get(), isNightMode);