0.10.9: Fix for colour coding of map icons for Google's aabbggrr format

classaxe · Oct 24, 2018 · ea341ee · ea341ee
1 parent 9d7bbc2
commit ea341ee
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/Controller/Web/Listener/Export/SignalsKml.php b/src/Controller/Web/Listener/Export/SignalsKml.php
@@ -32,7 +32,7 @@ public function signalsKmlController(
             return $this->redirectToRoute('listeners', ['system' => $system]);
         }
         $parameters = [
-            'colors' =>             $typeRepository->getColorsForCodes(),
+            'colors' =>             $typeRepository->getMapIconColorForCodes(),
             'description' =>        "Generated by ".strToUpper($system)." on ".date('Y-m-d'),
             'signals' =>            $listenerRepository->getSignalsForListener($id),
             'title' =>              strToUpper($system).' stations received by '.$listener->getName()

diff --git a/src/Repository/TypeRepository.php b/src/Repository/TypeRepository.php
@@ -27,6 +27,20 @@ public function getColorsForCodes()
         return $out;
     }
 
+    public function getMapIconColorForCodes()
+    {
+        // Format is aabbggrr - alpha, blue, green, red NOT rrggbb as more usually seen
+        $out = static::getColorsForCodes();
+        foreach ($out as $key => &$value) {
+            $value =
+                "00"
+                .substr($value, 4, 2)
+                .substr($value, 2, 2)
+                .substr($value, 0, 2);
+        }
+        return $out;
+    }
+
     public function getTypeForCode($code)
     {
         switch ($code) {

diff --git a/templates/listener/export/signals.kml.twig b/templates/listener/export/signals.kml.twig
@@ -7,14 +7,14 @@
     <Style id="type_{{ type }}">
         <IconStyle>
             <scale>0.5</scale>
-            <color>{{ color }}00</color>
+            <color>{{ color }}</color>
             <Icon><href>http://maps.google.com/mapfiles/kml/paddle/wht-circle.png</href></Icon>
         </IconStyle>
     </Style>
     <Style id="type_{{ type }}_ex">
         <IconStyle>
             <scale>0.5</scale>
-            <color>{{ color }}00</color>
+            <color>{{ color }}</color>
             <Icon><href>http://maps.google.com/mapfiles/kml/paddle/wht-blank.png</href></Icon>
         </IconStyle>
     </Style>