Fix empty point behaviour in wkb, ewkb, and hexewkb formats

(merges PR phayes#187)
itamair · Feb 4, 2023 · 7de893d · 7de893d
1 parent 12cd124
commit 7de893d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/lib/adapters/WKB.class.php b/lib/adapters/WKB.class.php
@@ -203,12 +203,11 @@ public function write(Geometry $geometry, $write_as_hex = FALSE) {
 
   function writePoint($point) {
     // Set the coords
-    if (!$point->isEmpty()) {
-      $wkb = pack('dd',$point->x(), $point->y());
-      return $wkb;
-    } else {
-      return '';
+    if ($point->isEmpty()) {
+      return pack('dd', NAN, NAN);
     }
+
+    return pack('dd', $point->x(), $point->y());
   }
 
   function writeLineString($line) {

diff --git a/lib/geometry/Point.class.php b/lib/geometry/Point.class.php
@@ -20,7 +20,7 @@ class Point extends Geometry
   public function __construct($x = NULL, $y = NULL, $z = NULL) {
 
     // Check if it's an empty point
-    if ($x === NULL && $y === NULL) {
+    if (($x === NULL || is_nan($x)) && ($y === NULL || is_nan($y))) {
       $this->coords = array(NULL, NULL);
       $this->dimension = 0;
       return;

diff --git a/tests/input/empty_point.ewkb b/tests/input/empty_point.ewkb