Merge remote-tracking branch 'upstream/main' into date-refactor

Author: Wout Gevaert

src/Literals/Literal.php

@@ -742,7 +742,6 @@ public static function point2d($x, $y): PointType
         ];
 
         $map["crs"] = self::string("cartesian");
-        $map["srid"] = self::decimal(7203);
 
         return FunctionCall::point(Query::map($map));
     }
@@ -778,7 +777,6 @@ public static function point3d($x, $y, $z): PointType
         ];
 
         $map["crs"] = self::string("cartesian-3D");
-        $map["srid"] = self::decimal(9157);
 
         return FunctionCall::point(Query::map($map));
     }
@@ -808,7 +806,6 @@ public static function point2dWGS84($longitude, $latitude): PointType
         ];
 
         $map["crs"] = self::string("WGS-84");
-        $map["srid"] = self::decimal(4326);
 
         return FunctionCall::point(Query::map($map));
     }
@@ -844,7 +841,6 @@ public static function point3dWGS84($longitude, $latitude, $height): PointType
         ];
 
         $map["crs"] = self::string("WGS-84-3D");
-        $map["srid"] = self::decimal(4979);
 
         return FunctionCall::point(Query::map($map));
     }

tests/Unit/Literals/LiteralTest.php

@@ -116,58 +116,58 @@ public function testPoint2d(): void
     {
         $point = Literal::point2d(1, 2);
 
-        $this->assertEquals(new Point(new PropertyMap(["x" => new Decimal(1), "y" => new Decimal(2), "crs" => new StringLiteral("cartesian"), "srid" => new Decimal(7203)])), $point);
+        $this->assertEquals(new Point(new PropertyMap(["x" => new Decimal(1), "y" => new Decimal(2), "crs" => new StringLiteral("cartesian")])), $point);
 
         $point = Literal::point2d(
             new Decimal(1),
             new Decimal(2)
         );
 
-        $this->assertEquals(new Point(new PropertyMap(["x" => new Decimal(1), "y" => new Decimal(2), "crs" => new StringLiteral("cartesian"), "srid" => new Decimal(7203)])), $point);
+        $this->assertEquals(new Point(new PropertyMap(["x" => new Decimal(1), "y" => new Decimal(2), "crs" => new StringLiteral("cartesian")])), $point);
     }
 
     public function testPoint3d(): void
     {
         $point = Literal::point3d(1, 2, 3);
 
-        $this->assertEquals(new Point(new PropertyMap(["x" => new Decimal(1), "y" => new Decimal(2), "z" => new Decimal(3), "crs" => new StringLiteral("cartesian-3D"), "srid" => new Decimal(9157)])), $point);
+        $this->assertEquals(new Point(new PropertyMap(["x" => new Decimal(1), "y" => new Decimal(2), "z" => new Decimal(3), "crs" => new StringLiteral("cartesian-3D")])), $point);
 
         $point = Literal::point3d(
             new Decimal(1),
             new Decimal(2),
             new Decimal(3)
         );
 
-        $this->assertEquals(new Point(new PropertyMap(["x" => new Decimal(1), "y" => new Decimal(2), "z" => new Decimal(3), "crs" => new StringLiteral("cartesian-3D"), "srid" => new Decimal(9157)])), $point);
+        $this->assertEquals(new Point(new PropertyMap(["x" => new Decimal(1), "y" => new Decimal(2), "z" => new Decimal(3), "crs" => new StringLiteral("cartesian-3D")])), $point);
     }
 
     public function testPoint2dWGS84(): void
     {
         $point = Literal::point2dWGS84(1, 2);
 
-        $this->assertEquals(new Point(new PropertyMap(["longitude" => new Decimal(1), "latitude" => new Decimal(2), "crs" => new StringLiteral("WGS-84"), "srid" => new Decimal(4326)])), $point);
+        $this->assertEquals(new Point(new PropertyMap(["longitude" => new Decimal(1), "latitude" => new Decimal(2), "crs" => new StringLiteral("WGS-84")])), $point);
 
         $point = Literal::point2dWGS84(
             new Decimal(1),
             new Decimal(2)
         );
 
-        $this->assertEquals(new Point(new PropertyMap(["longitude" => new Decimal(1), "latitude" => new Decimal(2), "crs" => new StringLiteral("WGS-84"), "srid" => new Decimal(4326)])), $point);
+        $this->assertEquals(new Point(new PropertyMap(["longitude" => new Decimal(1), "latitude" => new Decimal(2), "crs" => new StringLiteral("WGS-84")])), $point);
     }
 
     public function testPoint3dWGS84(): void
     {
         $point = Literal::point3dWGS84(1, 2, 3);
 
-        $this->assertEquals(new Point(new PropertyMap(["longitude" => new Decimal(1), "latitude" => new Decimal(2), "height" => new Decimal(3), "crs" => new StringLiteral("WGS-84-3D"), "srid" => new Decimal(4979)])), $point);
+        $this->assertEquals(new Point(new PropertyMap(["longitude" => new Decimal(1), "latitude" => new Decimal(2), "height" => new Decimal(3), "crs" => new StringLiteral("WGS-84-3D")])), $point);
 
         $point = Literal::point3dWGS84(
             new Decimal(1),
             new Decimal(2),
             new Decimal(3)
         );
 
-        $this->assertEquals(new Point(new PropertyMap(["longitude" => new Decimal(1), "latitude" => new Decimal(2), "height" => new Decimal(3), "crs" => new StringLiteral("WGS-84-3D"), "srid" => new Decimal(4979)])), $point);
+        $this->assertEquals(new Point(new PropertyMap(["longitude" => new Decimal(1), "latitude" => new Decimal(2), "height" => new Decimal(3), "crs" => new StringLiteral("WGS-84-3D")])), $point);
     }
 
     public function testDate(): void