bchapuis commented on code in PR #780: URL: https://github.com/apache/incubator-baremaps/pull/780#discussion_r1322876078
########## baremaps-core/src/main/java/org/apache/baremaps/geocoderosm/GeocoderOSMConsumerEntity.java: ########## @@ -0,0 +1,42 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.baremaps.geocoderosm; + +import java.io.IOException; +import java.util.function.Consumer; +import org.apache.baremaps.openstreetmap.model.Element; +import org.apache.baremaps.openstreetmap.model.Entity; +import org.apache.baremaps.stream.StreamException; +import org.apache.lucene.index.IndexWriter; + +public class GeocoderOSMConsumerEntity implements Consumer<Entity> { Review Comment: The parser (OsmReader) use camelcase for Osm, I guess we should use the same accronym everywhere: OpenStreetMap and OSM become Osm. ########## baremaps-core/src/main/java/org/apache/baremaps/geocoderosm/GeocoderOSMDocumentMapper.java: ########## @@ -0,0 +1,98 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.baremaps.geocoderosm; + + + +import java.util.function.Function; +import org.apache.baremaps.openstreetmap.model.Element; +import org.apache.baremaps.openstreetmap.model.Node; +import org.apache.lucene.document.Document; +import org.apache.lucene.document.Field; +import org.apache.lucene.document.LatLonShape; +import org.apache.lucene.document.NumericDocValuesField; +import org.apache.lucene.document.StoredField; +import org.apache.lucene.document.TextField; +import org.apache.lucene.geo.Polygon; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.io.geojson.GeoJsonWriter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class GeocoderOSMDocumentMapper implements Function<Element, Document> { + private static final Logger logger = LoggerFactory.getLogger(GeocoderOSMDocumentMapper.class); + + @Override + public Document apply(Element element) { + var document = new Document(); + document.add(new StoredField("osm_id", element.id())); + document.add(new StoredField("osm_type", element.getClass().getSimpleName())); + + if (element.getTags().containsKey(OSMTags.NAME.key())) { + document.add( + new TextField(OSMTags.NAME.key(), element.getTags().get(OSMTags.NAME.key()).toString(), + Field.Store.YES)); + } + + if (element instanceof Node node) { + document.add(LatLonShape.createIndexableFields("polygon", node.getLat(), node.getLon())[0]); + document.add(new StoredField("latitude", node.getLat())); + document.add(new StoredField("longitude", node.getLon())); + } + if (element.getGeometry() != null + && element.getGeometry().getGeometryType().equals(Geometry.TYPENAME_LINESTRING)) { + logger.debug("Geometry linestring ignored as not supported by Lucene Polygon.fromGeoJson: {}", + element); + } + if (element.getGeometry() != null + && !element.getGeometry().getGeometryType().equals(Geometry.TYPENAME_POINT) + && !element.getGeometry().getGeometryType().equals(Geometry.TYPENAME_LINESTRING)) { + // JTS to GeoJSON + var geojsonWriter = new GeoJsonWriter(); + // Remove crs field in GeoJSON as Lucene parsing is very strict. + // Avoid "crs must be CRS84 from OGC, but saw: EPSG:4326" + // See: + // https://github.com/apache/lucene/blob/ef42af65f27f7f078b1ab426de9f2b2fa214ad86/lucene/core/src/java/org/apache/lucene/geo/SimpleGeoJSONPolygonParser.java#L180 + geojsonWriter.setEncodeCRS(false); Review Comment: Could we use the target projection and encode the CRS? ########## baremaps-core/src/test/resources/log4j2-test.yaml: ########## @@ -0,0 +1,13 @@ +Configuration: Review Comment: Do we need this configuration file? ########## baremaps-core/src/main/java/org/apache/baremaps/geocoderosm/GeocoderOSMDocumentMapper.java: ########## @@ -0,0 +1,98 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.baremaps.geocoderosm; + + + +import java.util.function.Function; +import org.apache.baremaps.openstreetmap.model.Element; +import org.apache.baremaps.openstreetmap.model.Node; +import org.apache.lucene.document.Document; +import org.apache.lucene.document.Field; +import org.apache.lucene.document.LatLonShape; +import org.apache.lucene.document.NumericDocValuesField; +import org.apache.lucene.document.StoredField; +import org.apache.lucene.document.TextField; +import org.apache.lucene.geo.Polygon; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.io.geojson.GeoJsonWriter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class GeocoderOSMDocumentMapper implements Function<Element, Document> { + private static final Logger logger = LoggerFactory.getLogger(GeocoderOSMDocumentMapper.class); + + @Override + public Document apply(Element element) { + var document = new Document(); + document.add(new StoredField("osm_id", element.id())); + document.add(new StoredField("osm_type", element.getClass().getSimpleName())); + + if (element.getTags().containsKey(OSMTags.NAME.key())) { + document.add( + new TextField(OSMTags.NAME.key(), element.getTags().get(OSMTags.NAME.key()).toString(), + Field.Store.YES)); + } + + if (element instanceof Node node) { + document.add(LatLonShape.createIndexableFields("polygon", node.getLat(), node.getLon())[0]); Review Comment: The node has a Geometry of type Point in the correct projection. We should probably do the instanceOf on the geometry instead of the element. What do you think? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
