Fix bug with colors in label/line styles, add utility functions for working with polygon coordinates

Author: NMe84

src/Model/Node/StyleNode.php

@@ -159,7 +159,7 @@ public function appendTo(\DOMDocument $document, \DOMElement $parent): void
             $styleElement->appendChild($labelStyle);
 
             if (null !== $this->getLabelStyle()->getColor()) {
-                $labelStyle->appendChild($document->createElement('Color', $this->getLabelStyle()->getColor()));
+                $labelStyle->appendChild($document->createElement('color', $this->getLabelStyle()->getColor()));
             }
             if (null !== $this->getLabelStyle()->getScale()) {
                 $labelStyle->appendChild($document->createElement('scale', (string) $this->getLabelStyle()->getScale()));
@@ -171,7 +171,7 @@ public function appendTo(\DOMDocument $document, \DOMElement $parent): void
             $styleElement->appendChild($lineStyle);
 
             if (null !== $this->getLineStyle()->getColor()) {
-                $lineStyle->appendChild($document->createElement('Color', $this->getLineStyle()->getColor()));
+                $lineStyle->appendChild($document->createElement('color', $this->getLineStyle()->getColor()));
             }
             if (null !== $this->getLineStyle()->getWidth()) {
                 $lineStyle->appendChild($document->createElement('Width', (string) $this->getLineStyle()->getWidth()));
@@ -183,7 +183,7 @@ public function appendTo(\DOMDocument $document, \DOMElement $parent): void
             $styleElement->appendChild($polyStyle);
 
             if (null !== $this->getPolyStyle()->getColor()) {
-                $polyStyle->appendChild($document->createElement('Color', $this->getPolyStyle()->getColor()));
+                $polyStyle->appendChild($document->createElement('color', $this->getPolyStyle()->getColor()));
             }
             if (null !== $this->getPolyStyle()->getFill()) {
                 $polyStyle->appendChild($document->createElement('fill', (string) $this->getPolyStyle()->getFill()));

src/Model/Polygon.php

@@ -135,4 +135,18 @@ public static function buildFromLinearRing(\SimpleXMLElement $ring): Polygon
 
         return $polygon;
     }
+
+    /** @param array<array<int, float>> $coordinates */
+    public function setCoordinatesFromFloatArray(array $coordinates): static
+    {
+        $this->coordinates = array_map(fn (array $coordinate) => new Coordinate($coordinate[0], $coordinate[1], $coordinate[2] ?? 0), $coordinates);
+
+        return $this;
+    }
+
+    /** @return array<array<int, float>> */
+    public function getCoordinatesAsFloatArray(): array
+    {
+        return array_map(fn (Coordinate $coordinate) => [$coordinate->getLatitude(), $coordinate->getLongitude(), $coordinate->getAltitude()], $this->coordinates);
+    }
 }

src/Model/Style/LabelStyle.php

@@ -46,8 +46,8 @@ public static function fromSimpleXmlElement(\SimpleXMLElement $node): ?self
     {
         $style = new self();
 
-        if (isset($node->Color)) {
-            $style->setColor((string) $node->Color);
+        if (isset($node->color)) {
+            $style->setColor((string) $node->color);
         }
         if (isset($node->scale)) {
             $style->setScale((int) $node->scale);

src/Model/Style/LineStyle.php

@@ -45,8 +45,8 @@ public function setWidth(?int $width): static
     public static function fromSimpleXmlElement(\SimpleXMLElement $node): ?self
     {
         $style = new self();
-        if (isset($node->Color)) {
-            $style->setColor((string) $node->Color);
+        if (isset($node->color)) {
+            $style->setColor((string) $node->color);
         }
 
         if (isset($node->width)) {

tests/Unit/PolygonTest.php

@@ -74,6 +74,18 @@ public function testSettingInvalidCoordinates(): void
         $polygon->setCoordinatesFromString('1,2,3 4,5,6,7');
     }
 
+    public function testCreateFromFloatArray(): void
+    {
+        $polygon = new Polygon();
+        $polygon->setCoordinatesFromFloatArray([[1, 2, 3], [4, 5, 6], [7, 8, 9]]);
+        $this->assertEquals([
+            new Coordinate(1, 2, 3),
+            new Coordinate(4, 5, 6),
+            new Coordinate(7, 8, 9),
+        ], $polygon->getCoordinates());
+        $this->assertEquals([[1, 2, 3], [4, 5, 6], [7, 8, 9]], $polygon->getCoordinatesAsFloatArray());
+    }
+
     public function testCreateFromLinearRing(): void
     {
         $polygon = Polygon::buildFromLinearRing(new SimpleXMLElement(<<<EOT

tests/Unit/StyleNodeTest.php

@@ -135,11 +135,11 @@ public function testFactory(): void
         </Icon>
     </IconStyle>
     <LabelStyle>
-        <Color>ff0000ff</Color>
+        <color>ff0000ff</color>
         <scale>2</scale>
     </LabelStyle>
     <LineStyle>
-        <Color>00ff00ff</Color>
+        <color>00ff00ff</color>
         <width>1</width>
     </LineStyle>
     <PolyStyle>
@@ -202,11 +202,11 @@ public function testFactory(): void
         $this->assertStringContainsStringIgnoringCase('<h>32</h>', $xml);
 
         $this->assertStringContainsStringIgnoringCase('<LabelStyle>', $xml);
-        $this->assertStringContainsStringIgnoringCase('<Color>ff0000ff</Color>', $xml);
+        $this->assertStringContainsStringIgnoringCase('<color>ff0000ff</color>', $xml);
         $this->assertStringContainsStringIgnoringCase('<scale>2</scale>', $xml);
 
         $this->assertStringContainsStringIgnoringCase('<LineStyle>', $xml);
-        $this->assertStringContainsStringIgnoringCase('<Color>00ff00ff</Color>', $xml);
+        $this->assertStringContainsStringIgnoringCase('<color>00ff00ff</color>', $xml);
         $this->assertStringContainsStringIgnoringCase('<width>1</width>', $xml);
 
         $this->assertStringContainsStringIgnoringCase('<PolyStyle>', $xml);
@@ -286,7 +286,7 @@ public function testLabelStyleWithMissingColor(): void
         $this->assertNotFalse($xml);
         $this->assertStringContainsStringIgnoringCase('<Style id="test">', $xml);
         $this->assertStringContainsStringIgnoringCase('<LabelStyle', $xml);
-        $this->assertStringNotContainsStringIgnoringCase('<Color>', $xml);
+        $this->assertStringNotContainsStringIgnoringCase('<color>', $xml);
         $this->assertStringContainsStringIgnoringCase('<scale>', $xml);
     }