Fix ListStyle issues

Author: xavier

libKML/KMLBuilder.php

@@ -411,13 +411,12 @@ function buildListItemType($listItemTypeXMLObject) {
   function buildItemIcon($itemIconXMLObject) {
     $itemIcon = new ItemIcon();
 
-    $itemIconContent = $itemIconXMLObject->children();
-    foreach($itemIconContent as $key => $value) {
+    foreach($itemIconXMLObject as $key => $value) {
       if ($key == 'state') {
-        
+        $itemIcon->setState(new ItemIconState((string)$value));
       } elseif ($key == 'href') {
-        $itemIcon->setHref($value->__toString());
-      }
+        $itemIcon->setHref((string)$value);
+      } 
     }
 
     return $itemIcon;
@@ -433,21 +432,10 @@ function buildListStyle($listStyleXMLObject) {
         $listStyle->setListItemType(buildListItemType($value));
       } elseif ($key == 'bgColor') {
         $listStyle->setBgColor($value->__toString());
-      } elseif ($key == 'ItemIcon') {
-//        foreach($value as $item) {
-//          $listStyle->addItemIcon();
-//        }
-        $itemIcon = new ItemIcon();
-        
-        if (isset($value->state)) {
-          $itemIcon->setState((string)$value->state);
-        }
-        
-        if (isset($value->href)) {
-          $itemIcon->setHref((string)$value->href);
-        }
-        
-        $listStyle->addItemIcon($itemIcon);        
+      } elseif ($key == 'ItemIcon') {        
+        $listStyle->addItemIcon(buildItemIcon($value));        
+      } elseif ($key == 'maxSnippetLines') {
+        $listStyle->setMaxSnippetLines((string)$value);
       }
     }
 

libKML/field_types/ItemIconState.php

@@ -1,4 +1,5 @@
 <?php
+namespace libKML;
 
 /*
  * To change this template, choose Tools | Templates
@@ -12,6 +13,36 @@
  */
 class ItemIconState {
 
+  public static $ITEM_ICON_STATE_OPEN = 0;
+  public static $ITEM_ICON_STATE_CLOSED = 1;
+  public static $ITEM_ICON_STATE_ERROR = 2;
+  public static $ITEM_ICON_STATE_FETCHING0 = 3;
+  public static $ITEM_ICON_STATE_FETCHING1 = 4;
+  public static $ITEM_ICON_STATE_FETCHING2 = 5;
+  
+  public static $ITEM_ICON_STATE = array('open','closed','error','fetching0','fetching1','fetching2');
+  
+  private $state = 0;
+  
+  public function __construct($state) {
+    $this->setStateFromString($state);
+  }
+  
+  public function setState($state) {
+    $this->state = $state;
+  }
+  
+  public function getState() {
+    return $this->state;
+  }
+  
+  public function setStateFromString($string) {
+    $this->state = array_search($string, ItemIconState::$ITEM_ICON_STATE);
+  }
+  
+  public function __toString() {
+    return (string) ItemIconState::$ITEM_ICON_STATE[$this->state];
+  }
 }
 
 ?>

libKML/sub_styles/ItemIcon.php

@@ -2,7 +2,7 @@
 namespace libKML;
 
 /**
- *  Icon class
+ *  ItemIcon class
  */
 
 class ItemIcon extends KMLObject {
@@ -13,7 +13,7 @@ class ItemIcon extends KMLObject {
   public function __toString() {
 
     $output = array();
-    
+     
     $output[] = sprintf("<ItemIcon%s>",
                         isset($this->id)?sprintf(" id=\"%s\"", $this->id):"");
 
@@ -25,6 +25,8 @@ public function __toString() {
       $output[] = sprintf("\t<state>%s</state>", $this->state->__toString());
     }
 
+    $output[] = "</ItemIcon>";
+    
     return implode("\n", $output);
   }
 

libKML/sub_styles/ListStyle.php

@@ -10,6 +10,8 @@ class ListStyle extends SubStyle {
   private $listItemType;
   private $bgColor;
   private $itemIcons = array();
+  private $maxSnippetLines;
+  
 
   public function addItemIcon($itemIcon) {
     $this->itemIcons[] = $itemIcon;
@@ -33,6 +35,10 @@ public function __toString() {
       $output[] = sprintf("<bgColor>%s</bgColor>", $this->bgColor);
     }
 
+    if (isset($this->maxSnippetLines)) {
+      $output[] = sprintf("<maxSnippetLines>%s</maxSnippetLines>", $this->maxSnippetLines);
+    }
+    
     if (count($this->itemIcons)) {
       foreach($this->itemIcons as $itemIcon) {
         $output[] = $itemIcon->__toString();
@@ -68,5 +74,13 @@ public function setItemIcons($itemIcons) {
     $this->itemIcons = $itemIcons;
   }
 
+  public function setMaxSnippetLines($maxSnippetLines) {
+    $this->maxSnippetLines = $maxSnippetLines;
+  }
+  
+  public function getMaxSnippetLines() {
+    return $this->maxSnippetLines;
+  }
+  
 }
 ?>