Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Search issues #989

Merged
merged 2 commits into from
Dec 3, 2024
+19 −8
Merged

Search issues #989

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c04b375
add icon for brand
alisa911 Nov 29, 2024
cb5e8e4
add search by brands
alisa911 Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions java-tools/OsmAndServer/src/main/java/net/osmand/server/api/services/SearchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,15 @@
import net.osmand.osm.*;
import net.osmand.osm.edit.Entity;
import net.osmand.search.SearchUICore;
import net.osmand.search.core.ObjectType;
import net.osmand.search.core.SearchCoreFactory;
import net.osmand.search.core.SearchResult;
import net.osmand.search.core.SearchSettings;
import net.osmand.search.core.*;
import net.osmand.server.utils.MapPoiTypesTranslator;
import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
Expand Down Expand Up @@ -214,11 +208,26 @@ public PoiSearchResult searchPoi(SearchService.PoiSearchData data, String locale
settings.setRegions(osmandRegions);
settings.setOfflineIndexes(usedMapList);
searchUICore.updateSettings(settings.setSearchBBox31(searchBbox));

List<BinaryMapPoiReaderAdapter.PoiSubType> brands = new ArrayList<>();
for (BinaryMapIndexReader map : usedMapList) {
brands.addAll(map.getTopIndexSubTypes());
}
for (String category : data.categories) {
if (data.prevSearchRes != null && data.prevSearchCategory.equals(category)) {
SearchResult prevResult = new SearchResult();
prevResult.object = mapPoiTypes.getAnyPoiTypeByKey(data.prevSearchRes, false);
if (prevResult.object == null) {
// try to find in brands
for (BinaryMapPoiReaderAdapter.PoiSubType brand : brands) {
if (brand.possibleValues.contains(data.prevSearchRes)) {
prevResult.object = new TopIndexFilter(brand, mapPoiTypes, category);
break;
}
}
}
if (prevResult.object == null) {
searchUICore.resetPhrase();
}
prevResult.localeName = category;
prevResult.objectType = ObjectType.POI_TYPE;
searchUICore.resetPhrase(prevResult);
Expand Down Expand Up @@ -574,6 +583,8 @@ private Map<String, String> getPoiTypeFields(Object obj) {
tags.put(POI_ADD_CATEGORY_NAME, additionalCategory);
}
});
} else if (obj instanceof TopIndexFilter type) {
tags.put(CATEGORY_ICON, type.getTag());
} else if (obj instanceof AbstractPoiType type) {
tags.put(KEY_NAME, type.getKeyName());
tags.put(ICON_NAME, type.getIconKeyName());
Expand Down