make OsmlineRowMapper a full class

Author: lonvia

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

@@ -3,6 +3,7 @@
 import de.komoot.photon.PhotonDoc;
 import de.komoot.photon.nominatim.model.AddressRow;
 import de.komoot.photon.nominatim.model.AddressType;
+import de.komoot.photon.nominatim.model.OsmlineRowMapper;
 import de.komoot.photon.nominatim.model.PlaceRowMapper;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.locationtech.jts.geom.Geometry;
@@ -82,47 +83,28 @@ public NominatimConnector(String host, int port, String database, String usernam
             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 (hasNewStyleInterpolation) {
-            // new-style interpolations
-            osmlineToNominatimResult = (rs, rownum) -> {
-                Geometry geometry = dbutils.extractGeometry(rs, "linegeo");
-
-                PhotonDoc doc = 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"));
+        // new-style interpolations
+        hasNewStyleInterpolation = dbutils.hasColumn(template, "location_property_osmline", "step");
+        final OsmlineRowMapper osmlineRowMapper = new OsmlineRowMapper();
+        osmlineToNominatimResult = (rs, rownum) -> {
+            PhotonDoc doc = osmlineRowMapper.mapRow(rs, rownum);
 
-                completePlace(doc);
+            completePlace(doc);
+            doc.setCountry(countryNames.get(rs.getString("country_code")));
 
-                doc.setCountry(countryNames.get(rs.getString("country_code")));
+            Geometry geometry = dbutils.extractGeometry(rs, "linegeo");
 
+            if (hasNewStyleInterpolation) {
                 return NominatimResult.fromInterpolation(
                         doc, rs.getLong("startnumber"), rs.getLong("endnumber"),
                         rs.getLong("step"), geometry);
-            };
-        } else {
-            // old-style interpolations
-            osmlineToNominatimResult = (rs, rownum) -> {
-                Geometry geometry = dbutils.extractGeometry(rs, "linegeo");
-
-                PhotonDoc doc = 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"));
-
-                completePlace(doc);
-
-                doc.setCountry(countryNames.get(rs.getString("country_code")));
+            }
 
-                return NominatimResult.fromInterpolation(
-                        doc, rs.getLong("startnumber"), rs.getLong("endnumber"),
-                        rs.getString("interpolationtype"), geometry);
-            };
-        }
+            return NominatimResult.fromInterpolation(
+                    doc, rs.getLong("startnumber"), rs.getLong("endnumber"),
+                    rs.getString("interpolationtype"), geometry);
+        };
     }
 
 
@@ -250,9 +232,24 @@ public void readCountry(String countryCode, ImportThread importThread) {
                 }
             };
 
+        final OsmlineRowMapper osmlineRowMapper = new OsmlineRowMapper();
         final RowCallbackHandler osmlineMapper = rs -> {
-            NominatimResult docs = osmlineToNominatimResult.mapRow(rs, 0);
-            assert (docs != null);
+            final PhotonDoc doc = osmlineRowMapper.mapRow(rs, 0);
+
+            completePlace(doc);
+            doc.setCountry(cnames);
+
+            final Geometry geometry = dbutils.extractGeometry(rs, "linegeo");
+            final NominatimResult docs;
+            if (hasNewStyleInterpolation) {
+                docs = NominatimResult.fromInterpolation(
+                        doc, rs.getLong("startnumber"), rs.getLong("endnumber"),
+                        rs.getLong("step"), geometry);
+            } else {
+                docs = NominatimResult.fromInterpolation(
+                        doc, rs.getLong("startnumber"), rs.getLong("endnumber"),
+                        rs.getString("interpolationtype"), geometry);
+            }
 
             if (docs.isUsefulForIndex()) {
                 importThread.addDocument(docs);

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

@@ -5,7 +5,6 @@
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.Point;
 import org.locationtech.jts.linearref.LengthIndexedLine;
-import org.slf4j.Logger;
 
 import java.util.*;
 import java.util.regex.Pattern;