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

Add RouteArticleFilter

Browse source
This commit is contained in:
Dima-1 2020-12-18 13:01:49 +02:00
parent 87312b955d
commit d7a1212705
1 changed files with 22 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
View file

@ -12,6 +12,7 @@ import net.osmand.ResultMatcher;
import net.osmand.binary.BinaryMapIndexReader; import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.data.Amenity; import net.osmand.data.Amenity;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.osm.PoiCategory;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils; import net.osmand.util.MapUtils;
@ -28,7 +29,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import static net.osmand.CollatorStringMatcher.StringMatcherMode.*; import static net.osmand.CollatorStringMatcher.StringMatcherMode.*;
import static net.osmand.binary.BinaryMapIndexReader.ACCEPT_ALL_POI_TYPE_FILTER;
public class TravelObfHelper implements TravelHelper { public class TravelObfHelper implements TravelHelper {
@ -67,33 +67,13 @@ public class TravelObfHelper implements TravelHelper {
public List<TravelArticle> loadPopularArticles() { public List<TravelArticle> loadPopularArticles() {
String language = app.getLanguage(); String language = app.getLanguage();
popularArticles.clear(); popularArticles.clear();
final List<Amenity> amenities = new ArrayList<>(); List<Amenity> amenities;
for (BinaryMapIndexReader travelBookReader : getTravelBookReaders()) { for (BinaryMapIndexReader travelBookReader : getTravelBookReaders()) {
try { try {
if (travelBookReader == null) {
popularArticles = new ArrayList<>();
return popularArticles;
}
final LatLon location = app.getMapViewTrackingUtilities().getMapLocation(); final LatLon location = app.getMapViewTrackingUtilities().getMapLocation();
BinaryMapIndexReader.SearchRequest<Amenity> req = BinaryMapIndexReader.SearchRequest<Amenity> req = BinaryMapIndexReader.buildSearchPoiRequest(
BinaryMapIndexReader.buildSearchPoiRequest(location, SEARCH_RADIUS, -1, location, SEARCH_RADIUS, -1, getSearchRouteArticleFilter(), null);
ACCEPT_ALL_POI_TYPE_FILTER, amenities = travelBookReader.searchPoi(req);
new ResultMatcher<Amenity>() {
@Override
public boolean publish(Amenity amenity) {
if (amenity.getSubType().equals(ROUTE_ARTICLE)) {
amenities.add(amenity);
}
return false;
}
@Override
public boolean isCancelled() {
return false;
}
});
travelBookReader.searchPoi(req);
if (amenities.size() > 0) { if (amenities.size() > 0) {
for (Amenity a : amenities) { for (Amenity a : amenities) {
if (!Algorithms.isEmpty(a.getName(language))) { if (!Algorithms.isEmpty(a.getName(language))) {
@ -116,7 +96,6 @@ public class TravelObfHelper implements TravelHelper {
} }
}); });
} }
} catch (Exception e) { } catch (Exception e) {
LOG.error(e.getMessage()); LOG.error(e.getMessage());
} }
@ -124,6 +103,20 @@ public class TravelObfHelper implements TravelHelper {
return popularArticles; return popularArticles;
} }
BinaryMapIndexReader.SearchPoiTypeFilter getSearchRouteArticleFilter() {
return new BinaryMapIndexReader.SearchPoiTypeFilter() {
@Override
public boolean accept(PoiCategory type, String subcategory) {
return subcategory.equals(ROUTE_ARTICLE);
}
@Override
public boolean isEmpty() {
return false;
}
};
}
private TravelArticle readArticle(Amenity amenity, String lang) { private TravelArticle readArticle(Amenity amenity, String lang) {
TravelArticle res = new TravelArticle(); TravelArticle res = new TravelArticle();
res.title = Algorithms.isEmpty(amenity.getName(lang)) ? amenity.getName() : amenity.getName(lang); res.title = Algorithms.isEmpty(amenity.getName(lang)) ? amenity.getName() : amenity.getName(lang);
@ -191,12 +184,11 @@ public class TravelObfHelper implements TravelHelper {
int top = 0; int top = 0;
int bottom = Integer.MAX_VALUE; int bottom = Integer.MAX_VALUE;
BinaryMapIndexReader.SearchRequest<Amenity> req = BinaryMapIndexReader.buildSearchPoiRequest( BinaryMapIndexReader.SearchRequest<Amenity> req = BinaryMapIndexReader.buildSearchPoiRequest(
left, right, top, bottom, -1, ACCEPT_ALL_POI_TYPE_FILTER, left, right, top, bottom, -1, getSearchRouteArticleFilter(),
new ResultMatcher<Amenity>() { new ResultMatcher<Amenity>() {
@Override @Override
public boolean publish(Amenity amenity) { public boolean publish(Amenity amenity) {
if (amenity.getSubType().equals(ROUTE_ARTICLE) if (getRouteId(amenity).equals(routeId)) {
&& getRouteId(amenity).equals(routeId)) {
amenities.add(amenity); amenities.add(amenity);
} }
return false; return false;
@ -208,7 +200,7 @@ public class TravelObfHelper implements TravelHelper {
} }
}); });
travelBookReader.searchPoiByName(req); travelBookReader.searchPoi(req);
} catch (IOException e) { } catch (IOException e) {
LOG.error(e.getMessage()); LOG.error(e.getMessage());
} }