Add forest to search results, remove POIs that has only wikidata.

Author: HarelM

src/main/java/il/org/osm/israelhiking/PlanetSearchProfile.java

@@ -412,11 +412,14 @@ private boolean processOtherSourceFeature(SourceFeature feature, FeatureCollecto
 
     setIconColorCategory(pointDocument, feature);
 
-    if (pointDocument.poiIcon == "icon-search" || 
-      (pointDocument.poiIcon == "icon-home" && (!isInterestingPoint(pointDocument) || !feature.isPoint()))) {
+    if (pointDocument.poiIcon == "icon-search") {
         return false;
     }
 
+    if (pointDocument.poiIcon == "icon-home" && !feature.isPoint()) {
+        return true;
+    }
+
     insertPointToElasticsearch(pointDocument, docId);
 
     if ((pointDocument.poiIcon == "icon-peak" || pointDocument.poiIcon == "icon-waterfall") && !isInterestingPoint(pointDocument)) {
@@ -458,6 +461,17 @@ private void addNonIconFeaturesToElasricseach(SourceFeature feature) throws Geom
       pointDocument.poiIconColor = "green";
       pointDocument.poiCategory = "Bicycle";
     }
+    if (feature.hasTag("landuse", "forest")) {
+      pointDocument.poiIcon = "icon-tree";
+      pointDocument.poiIconColor = "#008000";
+      pointDocument.poiCategory = "Other";
+    }
+    if ((feature.getString("wikidata") != null || feature.getString("wikipedia") != null)) {
+        pointDocument.poiIconColor = "black";
+        pointDocument.poiIcon = "icon-wikipedia-w";
+        pointDocument.poiCategory = "Wikipedia";
+        return;
+    }
 
     if (pointDocument.poiIcon == null) {
       return;
@@ -546,8 +560,7 @@ private Point getFirstPointOfLineRelation(MergedLinesHelper mergedLines) throws
   }
 
   private boolean isInterestingPoint(PointDocument pointDocument) {
-    return !pointDocument.description.isEmpty() || 
-      pointDocument.wikidata != null ||
+    return !pointDocument.description.isEmpty() ||
       pointDocument.image != null;
   }
 
@@ -793,13 +806,6 @@ private void setIconColorCategory(PointDocument pointDocument, WithTags feature)
         return;
     }
 
-    if ((feature.getString("wikidata") != null || feature.getString("wikipedia") != null) &&
-      feature.getString("highway") == null && feature.getString("boundary") == null) {
-        pointDocument.poiIconColor = "black";
-        pointDocument.poiIcon = "icon-wikipedia-w";
-        pointDocument.poiCategory = "Wikipedia";
-        return;
-    }
 
     pointDocument.poiIconColor = "black";
     pointDocument.poiIcon = "icon-search";