Write all dimensions of coord (#30)

georust · Nov 17, 2024 · 0abebb1 · 0abebb1
1 parent 24a861f
commit 0abebb1
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 28 deletions.
diff --git a/src/writer/coord.rs b/src/writer/coord.rs
@@ -0,0 +1,18 @@
+use std::io::Write;
+
+use byteorder::{ByteOrder, WriteBytesExt};
+use geo_traits::CoordTrait;
+
+use crate::error::WKBResult;
+
+/// Write a coordinate to a Writer encoded as WKB
+pub(crate) fn write_coord<W: Write, B: ByteOrder>(
+    writer: &mut W,
+    coord: &impl CoordTrait<T = f64>,
+) -> WKBResult<()> {
+    for i in 0..coord.dim().size() {
+        writer.write_f64::<B>(coord.nth_unchecked(i))?;
+    }
+
+    Ok(())
+}
diff --git a/src/writer/linestring.rs b/src/writer/linestring.rs
@@ -1,8 +1,9 @@
 use crate::common::WKBType;
 use crate::error::WKBResult;
+use crate::writer::coord::write_coord;
 use crate::Endianness;
 use byteorder::{BigEndian, ByteOrder, LittleEndian, WriteBytesExt};
-use geo_traits::{CoordTrait, LineStringTrait};
+use geo_traits::LineStringTrait;
 use std::io::Write;
 
 /// The byte length of a LineString
@@ -42,12 +43,7 @@ fn write_line_string_content<W: Write, B: ByteOrder>(
         .unwrap();
 
     for coord in geom.coords() {
-        writer.write_f64::<B>(coord.x()).unwrap();
-        writer.write_f64::<B>(coord.y()).unwrap();
-
-        if geom.dim().size() == 3 {
-            writer.write_f64::<B>(coord.nth_unchecked(2)).unwrap();
-        }
+        write_coord::<W, B>(writer, &coord)?;
     }
 
     Ok(())

diff --git a/src/writer/mod.rs b/src/writer/mod.rs
@@ -1,3 +1,4 @@
+mod coord;
 mod geometry;
 mod geometrycollection;
 mod linestring;

diff --git a/src/writer/point.rs b/src/writer/point.rs
@@ -1,9 +1,10 @@
 use crate::common::WKBType;
 use crate::error::WKBResult;
+use crate::writer::coord::write_coord;
 use crate::Endianness;
 use byteorder::{BigEndian, ByteOrder, LittleEndian, WriteBytesExt};
 use core::f64;
-use geo_traits::{CoordTrait, PointTrait};
+use geo_traits::PointTrait;
 use std::io::Write;
 
 /// The byte length of a Point
@@ -38,15 +39,7 @@ fn write_point_content<W: Write, B: ByteOrder>(
     writer.write_u32::<LittleEndian>(wkb_type.into())?;
 
     if let Some(coord) = geom.coord() {
-        writer.write_f64::<B>(coord.x())?;
-        writer.write_f64::<B>(coord.y())?;
-
-        if coord.dim().size() >= 3 {
-            writer.write_f64::<B>(coord.nth_unchecked(2))?;
-        }
-        if coord.dim().size() >= 4 {
-            writer.write_f64::<B>(coord.nth_unchecked(3))?;
-        }
+        write_coord::<W, B>(writer, &coord)?;
     } else {
         // Write POINT EMPTY as f64::NAN values
         for _ in 0..geom.dim().size() {

diff --git a/src/writer/polygon.rs b/src/writer/polygon.rs
@@ -1,8 +1,9 @@
 use crate::common::WKBType;
 use crate::error::WKBResult;
+use crate::writer::coord::write_coord;
 use crate::Endianness;
 use byteorder::{BigEndian, ByteOrder, LittleEndian, WriteBytesExt};
-use geo_traits::{CoordTrait, LineStringTrait, PolygonTrait};
+use geo_traits::{LineStringTrait, PolygonTrait};
 use std::io::Write;
 
 /// The byte length of a Polygon
@@ -57,23 +58,15 @@ fn write_polygon_content<W: Write, B: ByteOrder>(
         writer.write_u32::<B>(ext_ring.num_coords().try_into().unwrap())?;
 
         for coord in ext_ring.coords() {
-            writer.write_f64::<B>(coord.x())?;
-            writer.write_f64::<B>(coord.y())?;
-            if geom.dim().size() == 3 {
-                writer.write_f64::<B>(coord.nth_unchecked(2))?;
-            }
+            write_coord::<W, B>(writer, &coord)?;
         }
     }
 
     for int_ring in geom.interiors() {
         writer.write_u32::<B>(int_ring.num_coords().try_into().unwrap())?;
 
         for coord in int_ring.coords() {
-            writer.write_f64::<B>(coord.x())?;
-            writer.write_f64::<B>(coord.y())?;
-            if geom.dim().size() == 3 {
-                writer.write_f64::<B>(coord.nth_unchecked(2))?;
-            }
+            write_coord::<W, B>(writer, &coord)?;
         }
     }