enable reading of pbfs with node location for ways

core/src/main/protobuf/osmformat.proto

@@ -236,6 +236,9 @@ message Way {
    optional Info info = 4;
 
    repeated sint64 refs = 8 [packed = true];  // DELTA coded
+
+  repeated sint64 lat = 9 [packed = true]; // DELTA coded, optional
+  repeated sint64 lon = 10 [packed = true]; // DELTA coded, optional
 }
 
 message Relation {

core/src/main/scala/com/acervera/osm4scala/DenseNodesIterator.scala

@@ -26,6 +26,7 @@
 package com.acervera.osm4scala
 
 import com.acervera.osm4scala.model.{Info, NodeEntity}
+import com.acervera.osm4scala.utilities.CoordUtils.decompressCoord
 import com.acervera.osm4scala.utilities.StringTableUtils._
 import org.openstreetmap.osmosis.osmbinary.osmformat.{DenseInfo, DenseNodes, StringTable}
 
@@ -76,8 +77,8 @@ class DenseNodesIterator(osmosisStringTable: StringTable,
 
     // Calculate new values base in deltas and update deltas
     lastId = idIterator.next() + lastId
-    lastLatitude = decompressCoord(latOffset, latIterator.next(), lastLatitude)
-    lastLongitude = decompressCoord(lonOffset, lonIterator.next(), lastLongitude)
+    lastLatitude = decompressCoord(latOffset, latIterator.next(), lastLatitude, granularity)
+    lastLongitude = decompressCoord(lonOffset, lonIterator.next(), lastLongitude, granularity)
 
     // Create node
     NodeEntity(
@@ -90,18 +91,6 @@ class DenseNodesIterator(osmosisStringTable: StringTable,
 
   }
 
-  /**
-    * Calculate coordinate applying offset, granularity and delta.
-    *
-    * @param offSet
-    * @param delta
-    * @param currentValue
-    * @return
-    */
-  def decompressCoord(offSet: Long, delta: Long, currentValue: Double): Double = {
-    (.000000001 * (offSet + (granularity * delta))) + currentValue
-  }
-
   // Decode DenseInfo
 
   trait InfoIterator extends Iterator[Option[Info]]

core/src/main/scala/com/acervera/osm4scala/model/model.scala

@@ -25,6 +25,7 @@
 
 package com.acervera.osm4scala.model
 
+import com.acervera.osm4scala.utilities.CoordUtils.convertToMicroDegrees
 import com.acervera.osm4scala.utilities.StringTableUtils._
 import org.openstreetmap.osmosis.osmbinary.osmformat
 
@@ -88,7 +89,9 @@ case class WayEntity(
     id: Long,
     nodes: Seq[Long],
     tags: Map[String, String],
-    info: Option[Info] = None
+    info: Option[Info] = None,
+    lat: Seq[Double],
+    lgn: Seq[Double]
 ) extends OSMEntity {
   override val osmModel: OSMTypes.Value = OSMTypes.Way
 }
@@ -101,7 +104,13 @@ object WayEntity {
         .scanLeft(0L) { _ + _ }
         .drop(1), // Calculate nodes references in stored in delta compression. TODO: extract to utility class.
       osmosisStringTable.extractTags(osmosisWay.keys, osmosisWay.vals),
-      Info(osmosisStringTable, osmosisWay.info)
+      Info(osmosisStringTable, osmosisWay.info),
+      osmosisWay.lat
+        .scanLeft(0L) { _ + _ }
+        .drop(1).map(x=> convertToMicroDegrees(x)),
+      osmosisWay.lon
+        .scanLeft(0L) { _ + _ }
+        .drop(1).map(x => convertToMicroDegrees(x))
     )
 }
 

core/src/main/scala/com/acervera/osm4scala/utilities/CoordUtils.scala

@@ -0,0 +1,68 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2023 Ángel Cervera Claudio
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package com.acervera.osm4scala.utilities
+
+import scala.math.BigDecimal.RoundingMode
+
+/**
+ * Utility to manage coordinates
+ */
+object CoordUtils {
+
+  private val COORDINATE_PRECISION = 7
+
+  /**
+   * Calculate coordinate applying offset, granularity and delta.
+   * The floating precision is 7 with Half Even rounding
+   * mode
+   *
+   * @param offSet
+   * @param delta
+   * @param currentValue
+   * @return
+   */
+  def decompressCoord(offSet: Long, delta: Long, currentValue: Double, granularity: Int): Double = {
+    BigDecimal.valueOf(offSet + (granularity * delta))
+      .*(BigDecimal.valueOf(1E-9))
+      .+(BigDecimal.valueOf(currentValue))
+      .setScale(COORDINATE_PRECISION, RoundingMode.HALF_EVEN)
+      .doubleValue();
+  }
+
+  /**
+   * Calculate coordinate applying offset, granularity and delta.
+   * The floating precision is 7 with Half Even rounding
+   *
+   * @param coordValue
+   * @return
+   */
+  def convertToMicroDegrees(coordValue: Double): Double = {
+    BigDecimal.valueOf(coordValue)
+      .*(1E-7)
+      .setScale(COORDINATE_PRECISION, RoundingMode.HALF_EVEN)
+      .doubleValue();
+  }
+}

core/src/test/scala/com/acervera/osm4scala/DenseNodesIteratorSpec.scala

@@ -61,8 +61,8 @@ class DenseNodesIteratorSpec extends AnyWordSpec with Matchers with TableDrivenP
           .find(_.id == 4020124946L) shouldBe Some(
           NodeEntity(
             id = 4020124946L,
-            latitude = 43.732560499999984,
-            longitude = 7.418018399999998,
+            latitude = 43.7325605,
+            longitude = 7.4180184,
             tags = Map("entrance" -> "yes", "addr:street" -> "Rue de la Colle", "addr:housenumber" -> "4"),
             info = Some(
               Info(

core/src/test/scala/com/acervera/osm4scala/model/WayEntitySuite.scala

@@ -47,7 +47,27 @@ class WayEntitySuite extends AnyFunSuite with Matchers {
 
     // Test
     val way = WayEntity(strTable, osmosisWay)
-    way shouldBe WayEntity(
+    way shouldBe expectedWayEntity(Vector(), Vector())
+  }
+
+  test("read a real osmosis Way, with geometry.") {
+
+    val strTable = StringTable parseFrom new FileInputStream(
+      "core/src/test/resources/com/acervera/osm4scala/primitives/way/strTable")
+    val osmosisWay = Way parseFrom new FileInputStream(
+      "core/src/test/resources/com/acervera/osm4scala/primitives/way/way-with-geo")
+
+    // Test
+    val way = WayEntity(strTable, osmosisWay)
+    way shouldBe expectedWayEntity(Vector(43.7389436, 43.7392238, 43.7393298, 43.7395534, 43.7397211, 43.7390370,
+      43.7391636, 43.7390849, 43.7394273, 43.7395025, 43.7392768, 43.7391243, 43.7394671, 43.7395255, 43.7389997,
+      43.7393746, 43.7390601, 43.7395762),
+      Vector(7.4259531, 7.4256611, 7.4256563, 7.4256163, 7.4251382, 7.4257964, 7.4256818, 7.4257430, 7.4257083,
+        7.4256947, 7.4256536, 7.4257083, 7.4257117, 7.4256666, 7.4258602, 7.4256802, 7.4257682, 7.4255146))
+  }
+
+  private def expectedWayEntity(latitude: Vector[Double], longitude: Vector[Double]) = {
+    WayEntity(
       4097656,
       Vector(
         21912089L, 7265761724L, 1079750744L, 2104793864L, 6340961560L, 1110560507L, 21912093L, 6340961559L, 21912095L,
@@ -70,8 +90,9 @@ class WayEntitySuite extends AnyFunSuite with Matchers {
           Some(""),
           None
         )
-      )
+      ),
+      latitude,
+      longitude,
     )
   }
-
 }

examples/spark-utilities/src/test/scala/com/acervera/osm4scala/examples/spark/SparkSuitesUtilities.scala

@@ -37,5 +37,10 @@ object SparkSuitesUtilities {
   def monaco: DataFrame = spark.sqlContext.read
     .format("osm.pbf")
     .load("core/src/test/resources/com/acervera/osm4scala/monaco-anonymized.osm.pbf")
+
+  def monacoWithGeometry: DataFrame = spark.sqlContext.read
+    .format("osm.pbf")
+    .option("wayWithGeometry", "true")
+    .load("core/src/test/resources/com/acervera/osm4scala/monaco-anonymized-with-geo.osm.pbf")
 }
 

examples/spark-utilities/src/test/scala/com/acervera/osm4scala/examples/spark/tagkeys/JobSpec.scala

@@ -32,37 +32,38 @@ import org.scalatest.wordspec.AnyWordSpecLike
 
 class JobSpec extends AnyWordSpecLike with Matchers {
 
-  "TagKeys" should {
-    "extracting keys without filter" in {
-      monaco.createOrReplaceTempView("tag_keys_no_filter")
-      val result = Job.run(monaco, "tag_keys_no_filter", Config(tagKeysConfig = Some(TagKeysCfg())))
-        .count()
-      result shouldBe 833
-    }
+  for (dataFrame <- Seq(("withoutGeometry", monaco), ("withGeometry", monacoWithGeometry))) {
+    "TagKeys" should {
+      s"extracting keys without filter - ${dataFrame._1}" in {
+        dataFrame._2.createOrReplaceTempView("tag_keys_no_filter")
+        val result = Job.run(monaco, "tag_keys_no_filter", Config(tagKeysConfig = Some(TagKeysCfg())))
+          .count()
+        result shouldBe 833
+      }
 
-    "extracting keys filtering by nodes" in {
-      monaco.createOrReplaceTempView("tag_keys_nodes_filter")
-      val result = Job.run(monaco, "tag_keys_nodes_filter", Config(tagKeysConfig = Some(TagKeysCfg(osmType = Some(0)))))
-        .count()
+      s"extracting keys filtering by nodes - ${dataFrame._1}" in {
+        dataFrame._2.createOrReplaceTempView("tag_keys_nodes_filter")
+        val result = Job.run(monaco, "tag_keys_nodes_filter", Config(tagKeysConfig = Some(TagKeysCfg(osmType = Some(0)))))
+          .count()
 
-      result shouldBe 513
-    }
+        result shouldBe 513
+      }
 
-    "extracting keys filtering by ways" in {
-      monaco.createOrReplaceTempView("tag_keys_ways_filter")
-      val result = Job.run(monaco, "tag_keys_ways_filter", Config(tagKeysConfig = Some(TagKeysCfg(osmType = Some(1)))))
-        .count()
+      s"extracting keys filtering by ways - ${dataFrame._1}" in {
+        dataFrame._2.createOrReplaceTempView("tag_keys_ways_filter")
+        val result = Job.run(monaco, "tag_keys_ways_filter", Config(tagKeysConfig = Some(TagKeysCfg(osmType = Some(1)))))
+          .count()
 
-      result shouldBe 329
-    }
+        result shouldBe 329
+      }
 
-    "extracting keys filtering by relations" in {
-      monaco.createOrReplaceTempView("tag_keys_relations_filter")
-      val result = Job.run(monaco, "tag_keys_relations_filter", Config(tagKeysConfig = Some(TagKeysCfg(osmType = Some(2)))))
-        .count()
+      s"extracting keys filtering by relations - ${dataFrame._1}" in {
+        dataFrame._2.createOrReplaceTempView("tag_keys_relations_filter")
+        val result = Job.run(monaco, "tag_keys_relations_filter", Config(tagKeysConfig = Some(TagKeysCfg(osmType = Some(2)))))
+          .count()
 
-      result shouldBe 485
+        result shouldBe 485
+      }
     }
   }
-
 }

spark/src/main/scala/com/acervera/osm4scala/spark/OsmPbfFormat.scala

@@ -122,7 +122,12 @@ class OsmPbfFormat extends FileFormat with DataSourceRegister {
 
   override def inferSchema(sparkSession: SparkSession,
                            options: Map[String, String],
-                           files: Seq[FileStatus]): Option[StructType] = Some(OsmSqlEntity.schema)
+                           files: Seq[FileStatus]): Option[StructType] =
+    if (options.getOrElse("wayWithGeometry","false").toLowerCase().equals("true")) {
+      Some(OsmSqlEntity.schemaWithGeo)
+    } else {
+      Some(OsmSqlEntity.schema)
+    }
 
   override def prepareWrite(sparkSession: SparkSession,
                             job: Job,

spark/src/main/scala/com/acervera/osm4scala/spark/OsmPbfRowIterator.scala

@@ -31,7 +31,7 @@ import com.acervera.osm4scala.spark.OsmSqlEntity._
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.catalyst.expressions.UnsafeArrayData
 import org.apache.spark.sql.catalyst.util._
-import org.apache.spark.sql.types.{ArrayType, StructField, StructType}
+import org.apache.spark.sql.types.{ArrayType, LongType, StructField, StructType}
 import org.apache.spark.unsafe.types.UTF8String
 
 class OsmPbfRowIterator(osmEntityIterator: Iterator[OSMEntity], requiredSchema: StructType)
@@ -88,18 +88,57 @@ object OsmPbfRowIterator {
       case fieldName            => throw new Exception(s"Field $fieldName not valid for Info.")
     })
 
-    private def populateWay(entity: WayEntity, structType: StructType): Seq[Any] = structType.fieldNames.map {
-      case FIELD_ID        => entity.id
-      case FIELD_TYPE      => ENTITY_TYPE_WAY
-      case FIELD_LATITUDE  => null
-      case FIELD_LONGITUDE => null
-      case FIELD_NODES     => UnsafeArrayData.fromPrimitiveArray(entity.nodes.toArray)
-      case FIELD_RELATIONS => new GenericArrayData(Seq.empty)
-      case FIELD_TAGS      => calculateTags(entity.tags)
-      case FIELD_INFO      => entity.info.map(populateInfo).orNull
-      case fieldName       => throw new Exception(s"Field $fieldName not valid for a Way.")
+    private def populateWay(entity: WayEntity, structType: StructType): Seq[Any] = structType.fields.map(f =>
+      f.name match {
+        case FIELD_ID        => entity.id
+        case FIELD_TYPE      => ENTITY_TYPE_WAY
+        case FIELD_LATITUDE  => null
+        case FIELD_LONGITUDE => null
+        case FIELD_NODES     => calculateWayNodes(entity.nodes, entity.lat, entity.lgn, f)
+        case FIELD_RELATIONS => new GenericArrayData(Seq.empty)
+        case FIELD_TAGS      => calculateTags(entity.tags)
+        case FIELD_INFO      => entity.info.map(populateInfo).orNull
+        case fieldName       => throw new Exception(s"Field $fieldName not valid for a Way.")
+      }
+    )
+
+    private def calculateWayNodes(nodeIds: Seq[Long], lat: Seq[Double], lgn: Seq[Double], structField: StructField)
+    : ArrayData = {
+      if (structField.dataType.asInstanceOf[ArrayType].elementType == LongType) {
+        //way nodes without geometry
+        UnsafeArrayData.fromPrimitiveArray(nodeIds.toArray)
+      } else {
+        //way nodes with geometry
+        calculateWayNodeWithGeometry(nodeIds, lat, lgn, structField)
+      }
+    }
+
+    private def calculateWayNodeWithGeometry(nodeIds: Seq[Long], lat: Seq[Double], lgn: Seq[Double], structField: StructField) = {
+      val nodes: Seq[(Long, (Double, Double))] = (nodeIds zip (lat, lgn).zipped.toList)
+      new GenericArrayData(
+        structField.dataType match {
+          case ArrayType(elementType, _) =>
+            elementType match {
+              case s: StructType => nodes.map(r => InternalRow.fromSeq(calculateWayNode(r, s)))
+              case s             =>
+                throw new UnsupportedOperationException(
+                  s"Schema ${s} isn't supported. Only arrays of StructType are allowed for way nodes.")
+            }
+          case s                         =>
+            throw new UnsupportedOperationException(
+              s"Schema ${s} isn't supported. Only arrays of StructType are allowed for way nodes.")
+        }
+      )
     }
 
+    private def calculateWayNode(wayNode: (Long, (Double, Double)), structType: StructType): Seq[Any] =
+      structType.fieldNames.map {
+        case FIELD_ID        => wayNode._1
+        case FIELD_LATITUDE  => wayNode._2._1
+        case FIELD_LONGITUDE => wayNode._2._2
+        case fieldName       => throw new Exception(s"Field $fieldName not valid for a way node.")
+      }
+
     private def populateRelation(entity: RelationEntity, structType: StructType): Seq[Any] =
       structType.fields.map(f =>
         f.name match {

spark/src/main/scala/com/acervera/osm4scala/spark/OsmSqlEntity.scala

@@ -81,6 +81,12 @@ object OsmSqlEntity {
       StructField(FIELD_INFO_VISIBLE, BooleanType, true)
     ))
 
+  lazy val wayNodeSchema = StructType(
+    Seq(
+      StructField(FIELD_ID, LongType, true),
+      StructField(FIELD_LATITUDE, DoubleType, true),
+      StructField(FIELD_LONGITUDE, DoubleType, true)
+    ))
 
   lazy val schema = StructType(
     Seq(
@@ -94,4 +100,16 @@ object OsmSqlEntity {
       StructField(FIELD_INFO, StructType(infoSchema), true)
     ))
 
+  lazy val schemaWithGeo = StructType(
+    Seq(
+      StructField(FIELD_ID, LongType, false),
+      StructField(FIELD_TYPE, ByteType, false),
+      StructField(FIELD_LATITUDE, DoubleType, true),
+      StructField(FIELD_LONGITUDE, DoubleType, true),
+      StructField(FIELD_NODES, ArrayType(StructType(wayNodeSchema), false), true),
+      StructField(FIELD_RELATIONS, ArrayType(relationSchema, false), true),
+      StructField(FIELD_TAGS, MapType(StringType, StringType, false), true),
+      StructField(FIELD_INFO, StructType(infoSchema), true)
+    ))
+
 }