replaces \d in with [+-]?([0-9]+([.][0-9]*)?|[.][0-9]+) to support floating point values

Author: opengisdev

src/Geometries/MultiPoint.php

@@ -45,13 +45,13 @@ public static function fromString($wktArgument)
     {
         if (!strpos(trim($wktArgument), '(')) {
             $points = explode(',', $wktArgument);
-            $wktArgument = implode(", ", array_map(function ($pair) {
+            $wktArgument = implode(',', array_map(function ($pair) {
                 return '(' . trim($pair) . ')';
             }, $points));
         };
 
         $matches = [];
-        preg_match_all('/\(\s*(\d+\s+\d+(\s+\d+)?)\s*\)/', trim($wktArgument), $matches);
+        preg_match_all('/\(\s*([+-]?([0-9]+([.][0-9]*)?|[.][0-9]+)+\s+[+-]?([0-9]+([.][0-9]*)?|[.][0-9]+)+(\s+[+-]?([0-9]+([.][0-9]*)?|[.][0-9]+)+)?)\s*\)/', trim($wktArgument), $matches);
 
         if (count($matches) < 2) {
             return new static([]);

tests/Geometries/MultiPointTest.php

@@ -16,6 +16,14 @@ public function testFromWKT()
         $this->assertEquals(3, $multipoint->count());
     }
 
+    public function testFromWKTWithFloatingPoint()
+    {
+        $multipoint = MultiPoint::fromWKT('MULTIPOINT((1.0 1.0),(2.0 1.0),(2.0 2.0))');
+        $this->assertInstanceOf(MultiPoint::class, $multipoint);
+
+        $this->assertEquals(3, $multipoint->count());
+    }
+
     public function testFromWKTWithoutNestedParentesis()
     {
         $multipoint = MultiPoint::fromWKT('MULTIPOINT(1 1, 2 1, 2 2)');