Fix ListStyle issues

Author: xavier

libKML/KMLBuilder.php

@@ -145,6 +145,22 @@ function buildScreenOverlay($screenOverlayXMLObject) {
 
     processOverlay($screenOverlay, $screenOverlayXMLObject);
 
+    $screenOverlayContent = $screenOverlayXMLObject->children();
+    
+    foreach($screenOverlayContent as $key => $value) {
+      if ($key == 'rotation') {
+        $screenOverlay->setRotation((string)$value);
+      } elseif ($key == 'overlayXY') {
+        $screenOverlay->setOverlayXY(buildVec2Type($value));
+      } elseif ($key == 'screenXY') {
+        $screenOverlay->setScreenXY(buildVec2Type($value));
+      } elseif ($key == 'rotationXY') {
+        $screenOverlay->setRotationXY(buildVec2Type($value));
+      } elseif ($key == 'size') {
+        $screenOverlay->setSize(buildVec2Type($value));
+      }
+    }
+    
     return $screenOverlay;    
   }
 

libKML/features/Feature.php

@@ -69,7 +69,7 @@ public function __toString() {
     $output = array();
 
     if (isset($this->name)) {
-      $output[] = sprintf("\t<name>%s</name>", $this->name);
+      $output[] = sprintf("\t<name>%s</name>", htmlentities($this->name));
     }
 
     if (isset($this->visibility)) {
@@ -105,7 +105,7 @@ public function __toString() {
     }
 
     if (isset($this->description)) {
-      $output[] = sprintf("\t<description>%s</description>", $this->description);
+      $output[] = sprintf("\t<description><![CDATA[\n%s\n]]></description>", $this->description);
     }
 
     if (isset($this->abstractView)) {

libKML/features/overlays/ScreenOverlay.php

@@ -23,8 +23,23 @@ public function __toString() {
     $output[] = $parent_string;
 
     if (isset($this->rotation)) {
-      $output[] = sprintf("\t<rotation>%f</rotation>", $this->rotation);
-      
+      $output[] = sprintf("\t<rotation>%s</rotation>", $this->rotation);
+    }
+    
+    if (isset($this->overlayXY)) {
+      $output[] = sprintf("\t<overlayXY %s />", $this->overlayXY);
+    }
+    
+    if (isset($this->screenXY)) {
+      $output[] = sprintf("\t<screenXY %s />", $this->screenXY);
+    }
+    
+    if (isset($this->rotationXY)) {
+      $output[] = sprintf("\t<rotationXY %s />", $this->rotationXY);
+    }
+    
+    if (isset($this->size)) {
+      $output[] = sprintf("\t<size %s />", $this->size);
     }
 
     $output[] = "</ScreenOverlay>";

libkml.php

@@ -43,7 +43,7 @@
 /*
  * Objects
  */
-include_once('libKML/KMLBuilder.php');
+
 include_once('libKML/KMLObject.php');
 include_once('libKML/Icon.php');
 include_once('libKML/features/AltitudeMode.php');
@@ -58,6 +58,7 @@
 include_once('libKML/features/overlays/GroundOverlay.php');
 include_once('libKML/features/overlays/ScreenOverlay.php');
 include_once('libKML/field_types/Coordinates.php');
+include_once('libKML/field_types/ItemIconState.php');
 include_once('libKML/field_types/RefreshMode.php');
 include_once('libKML/field_types/ColorMode.php');
 include_once('libKML/field_types/ListItemType.php');
@@ -84,6 +85,7 @@
 include_once('libKML/views/AbstractView.php');
 include_once('libKML/views/Camera.php');
 include_once('libKML/views/LookAt.php');
+include_once('libKML/KMLBuilder.php');
 
 
 function parseKML($data) {

test/parse.php

@@ -345,13 +345,6 @@ function init_original_kml() {
       </div>
     </div>
 
-    <div id="generatedJSON" class="block">
-      <h2>All features</h2>
-      <div class="content">
-        <pre><?php print_r($kml->getAllFeatures()); ?></pre>
-      </div>
-    </div>
-    
     <?php endif; ?>
 
 </body>