initialise NominatimResult through static functions

Author: lonvia

src/main/java/de/komoot/photon/nominatim/ImportThread.java

@@ -15,7 +15,7 @@ public class ImportThread {
     private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(ImportThread.class);
 
     private static final int PROGRESS_INTERVAL = 50000;
-    private static final NominatimResult FINAL_DOCUMENT = new NominatimResult(new PhotonDoc(0, null, 0, null, null));
+    private static final NominatimResult FINAL_DOCUMENT = NominatimResult.fromAddress(new PhotonDoc(0, null, 0, null, null), null);
     private final BlockingQueue<NominatimResult> documents = new LinkedBlockingDeque<>(100);
     private final AtomicLong counter = new AtomicLong();
     private final Importer importer;

src/main/java/de/komoot/photon/nominatim/NominatimConnector.java

@@ -23,6 +23,8 @@ public class NominatimConnector {
 
     private static final String SELECT_COLS_PLACEX = "SELECT place_id, osm_type, osm_id, class, type, name, postcode, address, extratags, ST_Envelope(geometry) AS bbox, parent_place_id, linked_place_id, rank_address, rank_search, importance, country_code, centroid";
     private static final String SELECT_COLS_ADDRESS = "SELECT p.name, p.class, p.type, p.rank_address";
+    private static final String SELECT_OSMLINE_OLD_STYLE = "SELECT place_id, osm_id, parent_place_id, startnumber, endnumber, interpolationtype, postcode, country_code, linegeo";
+    private static final String SELECT_OSMLINE_NEW_STYLE = "SELECT place_id, osm_id, parent_place_id, startnumber, endnumber, step, postcode, country_code, linegeo";
 
     private final DBDataAdapter dbutils;
     private final JdbcTemplate template;
@@ -33,8 +35,8 @@ public class NominatimConnector {
      * This may be old-style interpolation (using interpolationtype) or
      * new-style interpolation (using step).
      */
-    private final RowMapper<NominatimResult> osmlineRowMapper;
-    private final String selectOsmlineSql;
+    private final RowMapper<NominatimResult> osmlineToNominatimResult;
+    private final boolean hasNewStyleInterpolation;
 
 
     /**
@@ -77,17 +79,14 @@ public NominatimConnector(String host, int port, String database, String usernam
 
             doc.setCountry(countryNames.get(rs.getString("country_code")));
 
-            NominatimResult result = new NominatimResult(doc);
-            result.addHousenumbersFromAddress(address);
-
-            return result;
+            return NominatimResult.fromAddress(doc, address);
         };
 
+        hasNewStyleInterpolation = dbutils.hasColumn(template, "location_property_osmline", "step");
         // Setup handling of interpolation table. There are two different formats depending on the Nominatim version.
-        if (dbutils.hasColumn(template, "location_property_osmline", "step")) {
+        if (hasNewStyleInterpolation) {
             // new-style interpolations
-            selectOsmlineSql = "SELECT place_id, osm_id, parent_place_id, startnumber, endnumber, step, postcode, country_code, linegeo";
-            osmlineRowMapper = (rs, rownum) -> {
+            osmlineToNominatimResult = (rs, rownum) -> {
                 Geometry geometry = dbutils.extractGeometry(rs, "linegeo");
 
                 PhotonDoc doc = new PhotonDoc(rs.getLong("place_id"), "W", rs.getLong("osm_id"),
@@ -100,16 +99,13 @@ public NominatimConnector(String host, int port, String database, String usernam
 
                 doc.setCountry(countryNames.get(rs.getString("country_code")));
 
-                NominatimResult result = new NominatimResult(doc);
-                result.addHouseNumbersFromInterpolation(rs.getLong("startnumber"), rs.getLong("endnumber"),
+                return NominatimResult.fromInterpolation(
+                        doc, rs.getLong("startnumber"), rs.getLong("endnumber"),
                         rs.getLong("step"), geometry);
-
-                return result;
             };
         } else {
             // old-style interpolations
-            selectOsmlineSql = "SELECT place_id, osm_id, parent_place_id, startnumber, endnumber, interpolationtype, postcode, country_code, linegeo";
-            osmlineRowMapper = (rs, rownum) -> {
+            osmlineToNominatimResult = (rs, rownum) -> {
                 Geometry geometry = dbutils.extractGeometry(rs, "linegeo");
 
                 PhotonDoc doc = new PhotonDoc(rs.getLong("place_id"), "W", rs.getLong("osm_id"),
@@ -122,11 +118,9 @@ public NominatimConnector(String host, int port, String database, String usernam
 
                 doc.setCountry(countryNames.get(rs.getString("country_code")));
 
-                NominatimResult result = new NominatimResult(doc);
-                result.addHouseNumbersFromInterpolation(rs.getLong("startnumber"), rs.getLong("endnumber"),
+                return NominatimResult.fromInterpolation(
+                        doc, rs.getLong("startnumber"), rs.getLong("endnumber"),
                         rs.getString("interpolationtype"), geometry);
-
-                return result;
             };
         }
     }
@@ -165,9 +159,10 @@ public List<PhotonDoc> getByPlaceId(long placeId) {
     }
 
     public List<PhotonDoc> getInterpolationsByPlaceId(long placeId) {
-        List<NominatimResult> result = template.query(selectOsmlineSql
-                                                          + " FROM location_property_osmline WHERE place_id = ? and indexed_status = 0",
-                                                          osmlineRowMapper, placeId);
+        List<NominatimResult> result = template.query(
+                (hasNewStyleInterpolation ? SELECT_OSMLINE_NEW_STYLE : SELECT_OSMLINE_OLD_STYLE)
+                        + " FROM location_property_osmline WHERE place_id = ? and indexed_status = 0",
+                osmlineToNominatimResult, placeId);
 
         return result.isEmpty() ? null : result.get(0).getDocsWithHousenumber();
     }
@@ -248,16 +243,15 @@ public void readCountry(String countryCode, ImportThread importThread) {
 
                 doc.setCountry(cnames);
 
-                NominatimResult result = new NominatimResult(doc);
-                result.addHousenumbersFromAddress(address);
+                var result = NominatimResult.fromAddress(doc, address);
 
                 if (result.isUsefulForIndex()) {
                     importThread.addDocument(result);
                 }
             };
 
         final RowCallbackHandler osmlineMapper = rs -> {
-            NominatimResult docs = osmlineRowMapper.mapRow(rs, 0);
+            NominatimResult docs = osmlineToNominatimResult.mapRow(rs, 0);
             assert (docs != null);
 
             if (docs.isUsefulForIndex()) {
@@ -270,16 +264,18 @@ public void readCountry(String countryCode, ImportThread importThread) {
                     " WHERE linked_place_id IS NULL AND centroid IS NOT NULL AND country_code is null" +
                     " ORDER BY geometry_sector, parent_place_id; ", placeMapper);
 
-            template.query(selectOsmlineSql + " FROM location_property_osmline " +
-                    "WHERE startnumber is not null AND country_code is null " +
+            template.query((hasNewStyleInterpolation ? SELECT_OSMLINE_NEW_STYLE : SELECT_OSMLINE_OLD_STYLE) +
+                    " FROM location_property_osmline" +
+                    " WHERE startnumber is not null AND country_code is null" +
                     " ORDER BY geometry_sector, parent_place_id; ", osmlineMapper);
         } else {
             template.query(SELECT_COLS_PLACEX + " FROM placex " +
                     " WHERE linked_place_id IS NULL AND centroid IS NOT NULL AND country_code = ?" +
                     " ORDER BY geometry_sector, parent_place_id; ", placeMapper, countryCode);
 
-            template.query(selectOsmlineSql + " FROM location_property_osmline " +
-                    "WHERE startnumber is not null AND country_code = ?" +
+            template.query((hasNewStyleInterpolation ? SELECT_OSMLINE_NEW_STYLE : SELECT_OSMLINE_OLD_STYLE) +
+                    " FROM location_property_osmline" +
+                    " WHERE startnumber is not null AND country_code = ?" +
                     " ORDER BY geometry_sector, parent_place_id; ", osmlineMapper, countryCode);
 
         }

src/main/java/de/komoot/photon/nominatim/NominatimResult.java

@@ -1,10 +1,11 @@
 package de.komoot.photon.nominatim;
 
+import de.komoot.photon.PhotonDoc;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.Point;
 import org.locationtech.jts.linearref.LengthIndexedLine;
-import de.komoot.photon.PhotonDoc;
+import org.slf4j.Logger;
 
 import java.util.*;
 import java.util.regex.Pattern;
@@ -20,7 +21,7 @@ class NominatimResult {
     private static final Pattern HOUSENUMBER_CHECK = Pattern.compile("(\\A|.*,)[^\\d,]{3,}(,.*|\\Z)");
     private static final Pattern HOUSENUMBER_SPLIT = Pattern.compile("\\s*[;,]\\s*");
 
-    public NominatimResult(PhotonDoc baseobj) {
+    private NominatimResult(PhotonDoc baseobj) {
         doc = baseobj;
         housenumbers = null;
     }
@@ -58,7 +59,7 @@ List<PhotonDoc> getDocsWithHousenumber() {
      *
      * @param str House number string. May be null, in which case nothing is added.
      */
-    public void addHousenumbersFromString(String str) {
+    private void addHousenumbersFromString(String str) {
         if (str == null || str.isEmpty())
             return;
 
@@ -68,9 +69,6 @@ public void addHousenumbersFromString(String str) {
             return;
         }
 
-        if (housenumbers == null)
-            housenumbers = new HashMap<>();
-
         String[] parts = HOUSENUMBER_SPLIT.split(str);
         for (String part : parts) {
             String h = part.trim();
@@ -79,14 +77,17 @@ public void addHousenumbersFromString(String str) {
         }
     }
 
-    public void addHousenumbersFromAddress(Map<String, String> address) {
-        if (address == null) {
-            return;
+    public static NominatimResult fromAddress(PhotonDoc doc, Map<String, String> address) {
+        NominatimResult result = new NominatimResult(doc);
+
+        if (address != null) {
+            result.housenumbers = new HashMap<>();
+            result.addHousenumbersFromString(address.get("housenumber"));
+            result.addHousenumbersFromString(address.get("streetnumber"));
+            result.addHousenumbersFromString(address.get("conscriptionnumber"));
         }
 
-        addHousenumbersFromString(address.get("housenumber"));
-        addHousenumbersFromString(address.get("streetnumber"));
-        addHousenumbersFromString(address.get("conscriptionnumber"));
+        return result;
     }
 
     /**
@@ -101,35 +102,36 @@ public void addHousenumbersFromAddress(Map<String, String> address) {
      * @param interpoltype Kind of interpolation (odd, even or all).
      * @param geom Geometry of the interpolation line.
      */
-    public void addHouseNumbersFromInterpolation(long first, long last, String interpoltype, Geometry geom) {
-        if (last <= first || (last - first) > 1000)
-            return;
+    public static NominatimResult fromInterpolation(PhotonDoc doc, long first, long last, String interpoltype, Geometry geom) {
+        NominatimResult result = new NominatimResult(doc);
+        if (last > first && (last - first) < 1000) {
+            result.housenumbers = new HashMap<>();
 
-        if (housenumbers == null)
-            housenumbers = new HashMap<>();
-
-        LengthIndexedLine line = new LengthIndexedLine(geom);
-        double si = line.getStartIndex();
-        double ei = line.getEndIndex();
-        double lstep = (ei - si) / (last - first);
-
-        // leave out first and last, they have a distinct OSM node that is already indexed
-        long step = 2;
-        long num = 1;
-        if (interpoltype.equals("odd")) {
-            if (first % 2 == 1)
-                ++num;
-        } else if (interpoltype.equals("even")) {
-            if (first % 2 == 0)
-                ++num;
-        } else {
-            step = 1;
-        }
+            LengthIndexedLine line = new LengthIndexedLine(geom);
+            double si = line.getStartIndex();
+            double ei = line.getEndIndex();
+            double lstep = (ei - si) / (last - first);
 
-        GeometryFactory fac = geom.getFactory();
-        for (; first + num < last; num += step) {
-            housenumbers.put(String.valueOf(num + first), fac.createPoint(line.extractPoint(si + lstep * num)));
+            // leave out first and last, they have a distinct OSM node that is already indexed
+            long step = 2;
+            long num = 1;
+            if (interpoltype.equals("odd")) {
+                if (first % 2 == 1)
+                    ++num;
+            } else if (interpoltype.equals("even")) {
+                if (first % 2 == 0)
+                    ++num;
+            } else {
+                step = 1;
+            }
+
+            GeometryFactory fac = geom.getFactory();
+            for (; first + num < last; num += step) {
+                result.housenumbers.put(String.valueOf(num + first), fac.createPoint(line.extractPoint(si + lstep * num)));
+            }
         }
+
+        return result;
     }
 
     /**
@@ -143,25 +145,27 @@ public void addHouseNumbersFromInterpolation(long first, long last, String inter
      * @param step Gap to leave between each interpolated house number.
      * @param geom Geometry of the interpolation line.
      */
-    public void addHouseNumbersFromInterpolation(long first, long last, long step, Geometry geom) {
-         if (last < first || (last - first) > 1000)
-            return;
-
-        if (housenumbers == null)
-            housenumbers = new HashMap<>();
-
-        if (last == first) {
-            housenumbers.put(String.valueOf(first), geom.getCentroid());
-        } else {
-            LengthIndexedLine line = new LengthIndexedLine(geom);
-            double si = line.getStartIndex();
-            double ei = line.getEndIndex();
-            double lstep = (ei - si) / (last - first);
-
-            GeometryFactory fac = geom.getFactory();
-            for (long num = 0; first + num <= last; num += step) {
-                housenumbers.put(String.valueOf(num + first), fac.createPoint(line.extractPoint(si + lstep * num)));
+    public static NominatimResult fromInterpolation(PhotonDoc doc, long first, long last, long step, Geometry geom) {
+        NominatimResult result = new NominatimResult(doc);
+        if (last >= first && (last - first) < 1000) {
+            result.housenumbers = new HashMap<>();
+
+            if (last == first) {
+                result.housenumbers.put(String.valueOf(first), geom.getCentroid());
+            } else {
+                LengthIndexedLine line = new LengthIndexedLine(geom);
+                double si = line.getStartIndex();
+                double ei = line.getEndIndex();
+                double lstep = (ei - si) / (last - first);
+
+                GeometryFactory fac = geom.getFactory();
+                for (long num = 0; first + num <= last; num += step) {
+                    result.housenumbers.put(String.valueOf(num + first), fac.createPoint(line.extractPoint(si + lstep * num)));
+                }
             }
+
         }
+
+        return result;
     }
 }

src/main/java/de/komoot/photon/nominatim/model/OsmlineRowMapper.java

@@ -0,0 +1,20 @@
+package de.komoot.photon.nominatim.model;
+
+import de.komoot.photon.PhotonDoc;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class OsmlineRowMapper implements RowMapper<PhotonDoc> {
+    @Override
+    public PhotonDoc mapRow(ResultSet rs, int rowNum) throws SQLException {
+        return new PhotonDoc(
+                rs.getLong("place_id"),
+                "W", rs.getLong("osm_id"),
+                "place", "house_number")
+                .parentPlaceId(rs.getLong("parent_place_id"))
+                .countryCode(rs.getString("country_code"))
+                .postcode(rs.getString("postcode"));
+    }
+}