Merge pull request #33 from flitsmeister/improv

Improved query results. Use distance factor of 2.0
flitsmeister · Dec 27, 2019 · bbfa5ba · bbfa5ba
2 parents 836e082 + 13e9262
commit bbfa5ba
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/main/java/de/komoot/photon/query/PhotonQueryBuilder.java b/src/main/java/de/komoot/photon/query/PhotonQueryBuilder.java
@@ -91,18 +91,14 @@ private PhotonQueryBuilder(String query, String language) {
                         .should(QueryBuilders.boolQuery().mustNot(QueryBuilders.boolQuery()
                             .must(QueryBuilders.matchQuery("osm_key", "place"))
                             .must(QueryBuilders.matchQuery("osm_value", "house"))
-                            .mustNot(QueryBuilders.existsQuery(String.format("name.%s.raw", language)))
+                            .mustNot(QueryBuilders.existsQuery("name.default.raw"))
                         ).mustNot(QueryBuilders.boolQuery()
                             .must(QueryBuilders.matchQuery("osm_key", "building"))
                             .must(QueryBuilders.matchQuery("osm_value", "yes"))
-                            .mustNot(QueryBuilders.existsQuery(String.format("name.%s.raw", language)))
+                            .mustNot(QueryBuilders.existsQuery("name.default.raw"))
                         ))
                     )
-                    .should(QueryBuilders.matchQuery(String.format("collector.%s.raw", language), query).boost(100)
-                            .analyzer("search_raw").minimumShouldMatch("100%"))
-                    .should(QueryBuilders.matchQuery(String.format("name.%s.raw", language), query).boost(200)
-                            .analyzer("search_raw").minimumShouldMatch("100%"))
-                    .should(QueryBuilders.matchQuery("name.default.raw", query).boost(1)
+                    .should(QueryBuilders.matchQuery("name.default.raw", query).boost(10)
                            .analyzer("search_raw").minimumShouldMatch("100%"));
             // @formatter:on
         }