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

Merge pull request #5406 from osmandapp/PaulsBranch

Browse source 
Pauls branch
This commit is contained in:
Alexey 2018-05-15 16:06:43 +03:00 committed by GitHub
commit 42a4632d05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleHelper.java
View file

@ -12,6 +12,7 @@ import android.text.Html;
import android.util.Log; import android.util.Log;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
import net.osmand.ResultMatcher;
import net.osmand.data.Amenity; import net.osmand.data.Amenity;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.map.OsmandRegions; import net.osmand.map.OsmandRegions;
@ -39,7 +40,6 @@ public class WikiArticleHelper {
private static final String TAG = WikiArticleHelper.class.getSimpleName(); private static final String TAG = WikiArticleHelper.class.getSimpleName();
private static final int PARTIAL_CONTENT_PHRASES = 3; private static final int PARTIAL_CONTENT_PHRASES = 3;
private static final String ZIP_EXT = ".zip";
private static final String PAGE_PREFIX_HTTP = "http://"; private static final String PAGE_PREFIX_HTTP = "http://";
private static final String PAGE_PREFIX_HTTPS = "https://"; private static final String PAGE_PREFIX_HTTPS = "https://";
private static final String WIKIVOAYAGE_DOMAIN = ".wikivoyage.org/wiki/"; private static final String WIKIVOAYAGE_DOMAIN = ".wikivoyage.org/wiki/";
@ -126,8 +126,26 @@ public class WikiArticleHelper {
if (isCancelled()) { if (isCancelled()) {
return null; return null;
} }
results.addAll(repository.searchAmenitiesByName(0, 0, 0, 0, ResultMatcher<Amenity> matcher = new ResultMatcher<Amenity>() {
Integer.MAX_VALUE, Integer.MAX_VALUE, name, null)); @Override
public boolean publish(Amenity amenity) {
List<String> allNames = amenity.getAllNames(false);
for (String amenityName : allNames) {
if (name.equalsIgnoreCase(amenityName)) {
results.add(amenity);
break;
}
}
return false;
}
@Override
public boolean isCancelled() {
return false;
}
};
repository.searchAmenitiesByName(0, 0, 0, 0,
Integer.MAX_VALUE, Integer.MAX_VALUE, name, matcher);
} }
} }
} }
@ -177,12 +195,6 @@ public class WikiArticleHelper {
} }
} }
private static String getFilenameFromIndex(String fileName) {
return fileName
.replace("_" + IndexConstants.BINARY_MAP_VERSION, "")
.replace(ZIP_EXT, "");
}
private static String getRegionName(String filename, OsmandRegions osmandRegions) { private static String getRegionName(String filename, OsmandRegions osmandRegions) {
if (osmandRegions != null && filename != null) { if (osmandRegions != null && filename != null) {
String regionName = filename String regionName = filename