Apply suggestions from code review

jmikola · Nov 28, 2023 · 9f4b255 · 9f4b255
1 parent d7cafa8
commit 9f4b255
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/GeoJson.php b/src/GeoJson.php
@@ -23,7 +23,7 @@
  */
 abstract class GeoJson implements JsonSerializable, JsonUnserializable
 {
-    public const TYPE_LINESTRING = 'LineString';
+    public const TYPE_LINE_STRING = 'LineString';
     public const TYPE_MULTI_LINE_STRING = 'MultiLineString';
     public const TYPE_MULTI_POINT = 'MultiPoint';
     public const TYPE_MULTI_POLYGON = 'MultiPolygon';
@@ -97,7 +97,7 @@ final public static function jsonUnserialize($json): self
         $args = [];
 
         switch ($type) {
-            case self::TYPE_LINESTRING:
+            case self::TYPE_LINE_STRING:
             case self::TYPE_MULTI_LINE_STRING:
             case self::TYPE_MULTI_POINT:
             case self::TYPE_MULTI_POLYGON:
@@ -170,7 +170,7 @@ final public static function jsonUnserialize($json): self
             $args[] = CoordinateReferenceSystem::jsonUnserialize($json['crs']);
         }
 
-        $class = sprintf('GeoJson\%s\%s', (strncmp(self::TYPE_FEATURE, $type, 7) === 0 ? self::TYPE_FEATURE : 'Geometry'), $type);
+        $class = sprintf('GeoJson\%s\%s', (strncmp('Feature', $type, 7) === 0 ? 'Feature' : 'Geometry'), $type);
 
         return new $class(... $args);
     }

diff --git a/src/Geometry/LineString.php b/src/Geometry/LineString.php
@@ -20,7 +20,7 @@
  */
 class LineString extends MultiPoint
 {
-    protected string $type = self::TYPE_LINESTRING;
+    protected string $type = self::TYPE_LINE_STRING;
 
     /**
      * @param array<Point|array<float|int>> $positions

diff --git a/tests/GeoJsonTest.php b/tests/GeoJsonTest.php
@@ -180,7 +180,7 @@ public function provideJsonDecodeAssocOptions()
     public function provideGeoJsonTypesWithCoordinates()
     {
         return [
-            GeoJson::TYPE_LINESTRING => [GeoJson::TYPE_LINESTRING],
+            GeoJson::TYPE_LINE_STRING => [GeoJson::TYPE_LINE_STRING],
             GeoJson::TYPE_MULTI_LINE_STRING => [GeoJson::TYPE_MULTI_LINE_STRING],
             GeoJson::TYPE_MULTI_POINT => [GeoJson::TYPE_MULTI_POINT],
             GeoJson::TYPE_MULTI_POLYGON => [GeoJson::TYPE_MULTI_POLYGON],

diff --git a/tests/Geometry/LineStringTest.php b/tests/Geometry/LineStringTest.php
@@ -42,11 +42,11 @@ public function testSerialization(): void
         $lineString = new LineString($coordinates);
 
         $expected = [
-            'type' => GeoJson::TYPE_LINESTRING,
+            'type' => GeoJson::TYPE_LINE_STRING,
             'coordinates' => $coordinates,
         ];
 
-        $this->assertSame(GeoJson::TYPE_LINESTRING, $lineString->getType());
+        $this->assertSame(GeoJson::TYPE_LINE_STRING, $lineString->getType());
         $this->assertSame($coordinates, $lineString->getCoordinates());
         $this->assertSame($expected, $lineString->jsonSerialize());
     }
@@ -73,7 +73,7 @@ public function testUnserialization($assoc): void
         $expectedCoordinates = [[1, 1], [2, 2]];
 
         $this->assertInstanceOf(LineString::class, $lineString);
-        $this->assertSame(GeoJson::TYPE_LINESTRING, $lineString->getType());
+        $this->assertSame(GeoJson::TYPE_LINE_STRING, $lineString->getType());
         $this->assertSame($expectedCoordinates, $lineString->getCoordinates());
     }
 

diff --git a/tests/Geometry/LinearRingTest.php b/tests/Geometry/LinearRingTest.php
@@ -72,11 +72,11 @@ public function testSerialization(): void
         $linearRing = new LinearRing($coordinates);
 
         $expected = [
-            'type' => GeoJson::TYPE_LINESTRING,
+            'type' => GeoJson::TYPE_LINE_STRING,
             'coordinates' => $coordinates,
         ];
 
-        $this->assertSame(GeoJson::TYPE_LINESTRING, $linearRing->getType());
+        $this->assertSame(GeoJson::TYPE_LINE_STRING, $linearRing->getType());
         $this->assertSame($coordinates, $linearRing->getCoordinates());
         $this->assertSame($expected, $linearRing->jsonSerialize());
     }