add property to Feature: isSuggestion

Author: westnordost

library/src/main/java/de/westnordost/osmfeatures/BaseFeature.java

@@ -22,6 +22,7 @@ class BaseFeature implements Feature
 	private final double matchScore;
 	private final Map<String,String> addTags;
 	private final Map<String,String> removeTags;
+	private final boolean isSuggestion;
 
 	private final List<String> canonicalNames;
 	private final List<String> canonicalTerms;
@@ -30,7 +31,7 @@ public BaseFeature(
 			String id, Map<String, String> tags, List<GeometryType> geometry,
 			String icon, String imageURL, List<String> names, List<String> terms,
 			List<String> includeCountryCodes, List<String> excludeCountryCodes,
-			boolean searchable, double matchScore,
+			boolean searchable, double matchScore, boolean isSuggestion,
 			Map<String, String> addTags, Map<String, String> removeTags)
 	{
 		this.id = id;
@@ -44,6 +45,7 @@ public BaseFeature(
 		this.excludeCountryCodes = excludeCountryCodes;
 		this.searchable = searchable;
 		this.matchScore = matchScore;
+		this.isSuggestion = isSuggestion;
 		this.addTags = addTags;
 		this.removeTags = removeTags;
 
@@ -78,6 +80,7 @@ public BaseFeature(
 	@Override public Map<String, String> getRemoveTags() { return removeTags; }
 	@Override public List<String> getCanonicalNames() { return canonicalNames; }
 	@Override public List<String> getCanonicalTerms() { return canonicalTerms; }
+	@Override public boolean isSuggestion() { return isSuggestion; }
 	@Override public Locale getLocale() { return null; }
 
 	@Override public String toString() { return getId(); }

library/src/main/java/de/westnordost/osmfeatures/Feature.java

@@ -25,6 +25,7 @@ public interface Feature {
     Map<String,String> getRemoveTags();
     List<String> getCanonicalNames();
     List<String> getCanonicalTerms();
+    boolean isSuggestion();
 
     Locale getLocale();
 }

library/src/main/java/de/westnordost/osmfeatures/IDBrandPresetsFeatureCollection.java

@@ -69,7 +69,7 @@ private List<BaseFeature> loadFeatures(String countryCode) {
         try {
             if (!fileAccess.exists(filename)) return Collections.emptyList();
             try (InputStream is = fileAccess.open(filename)) {
-                return new IDPresetsJsonParser().parse(is);
+                return new IDPresetsJsonParser(true).parse(is);
             }
         }
         catch (IOException | JSONException e) {

library/src/main/java/de/westnordost/osmfeatures/IDPresetsJsonParser.java

@@ -22,6 +22,15 @@
  *  into map of id -> Feature. */
 class IDPresetsJsonParser {
 
+    private boolean isSuggestions = false;
+
+    public IDPresetsJsonParser() {}
+
+    public IDPresetsJsonParser(boolean isSuggestions)
+    {
+        this.isSuggestions = isSuggestions;
+    }
+
     public List<BaseFeature> parse(InputStream is) throws JSONException, IOException
     {
         JSONObject object = createFromInputStream(is);
@@ -83,7 +92,7 @@ private BaseFeature parseFeature(String id, JSONObject p)
                 Collections.unmodifiableList(terms),
                 Collections.unmodifiableList(includeCountryCodes),
                 Collections.unmodifiableList(excludeCountryCodes),
-                searchable, matchScore,
+                searchable, matchScore, isSuggestions,
                 Collections.unmodifiableMap(addTags),
                 Collections.unmodifiableMap(removeTags)
         );

library/src/main/java/de/westnordost/osmfeatures/LocalizedFeature.java

@@ -56,6 +56,7 @@ public LocalizedFeature(BaseFeature p, Locale locale, List<String> names, List<S
     @Override public Map<String, String> getRemoveTags() { return p.getRemoveTags(); }
     @Override public List<String> getCanonicalNames() { return canonicalNames; }
     @Override public List<String> getCanonicalTerms() { return canonicalTerms; }
+    @Override public boolean isSuggestion() { return p.isSuggestion(); }
     @Override public Locale getLocale() { return locale; }
 
     @Override public String toString() { return getId(); }

library/src/test/java/de/westnordost/osmfeatures/FeatureDictionaryTest.java

@@ -662,7 +662,7 @@ excludeCountryCodes, searchable, matchScore, addTags, mapOf()
 		} else {
 			BaseFeature f = new BaseFeature(
 					id, tags, POINT, null, null, names, terms, countryCodes,
-					excludeCountryCodes, searchable, matchScore, addTags, mapOf()
+					excludeCountryCodes, searchable, matchScore, false, addTags, mapOf()
 			);
 			if (locale != null) {
 				return new LocalizedFeature(f, locale, f.getNames(), f.getTerms());
@@ -688,7 +688,7 @@ public SuggestionFeature(
 				Map<String, String> addTags,
 				Map<String, String> removeTags
 		) {
-			super(id, tags, geometry, icon, imageURL, names, terms, includeCountryCodes, excludeCountryCodes, searchable, matchScore, addTags, removeTags);
+			super(id, tags, geometry, icon, imageURL, names, terms, includeCountryCodes, excludeCountryCodes, searchable, matchScore, true, addTags, removeTags);
 		}
 	}
 }

library/src/test/java/de/westnordost/osmfeatures/FeatureTagsIndexTest.java

@@ -56,6 +56,7 @@ private static Feature feature(MapEntry... mapEntries)
                 listOf(),
                 true,
                 1.0,
+                false,
                 mapOf(),
                 mapOf()
         );

library/src/test/java/de/westnordost/osmfeatures/FeatureTermIndexTest.java

@@ -80,6 +80,7 @@ private static Feature feature(String... terms)
                 listOf(),
                 true,
                 1.0,
+                false,
                 mapOf(),
                 mapOf()
         );

library/src/test/java/de/westnordost/osmfeatures/IDBrandPresetsFeatureCollectionTest.java

@@ -1,6 +1,7 @@
 package de.westnordost.osmfeatures;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static de.westnordost.osmfeatures.TestUtils.assertEqualsIgnoreOrder;
 import static de.westnordost.osmfeatures.TestUtils.listOf;
 
@@ -53,6 +54,7 @@ public class IDBrandPresetsFeatureCollectionTest {
 
         assertEqualsIgnoreOrder(listOf("Talespin"), getNames(c.getAll(listOf("DE"))));
         assertEquals("Talespin", c.get("yet_another/brand", listOf("DE")).getName());
+        assertTrue(c.get("yet_another/brand", listOf("DE")).isSuggestion());
     }
 
     private InputStream getStream(String file)