[bknr-cvs] hans changed trunk/projects/bos/web/kml-

[BKNR Commits]

Revision: 4327
Author: hans
URL: http://bknr.net/trac/changeset/4327

changes to make generated kml conform to the XML schema
U   trunk/projects/bos/web/kml-handlers.lisp
U   trunk/projects/bos/web/kml-utils.lisp

Modified: trunk/projects/bos/web/kml-handlers.lisp
===================================================================
--- trunk/projects/bos/web/kml-handlers.lisp	2009-03-03 21:36:05 UTC (rev 4326)
+++ trunk/projects/bos/web/kml-handlers.lisp	2009-03-03 22:02:12 UTC (rev 4327)
@@ -229,12 +229,12 @@
             (with-element "longitude" (text "116.975859"))
             (with-element "latitude" (text "-1.044691"))
             (with-element "altitude" (text "0"))
-            (with-element "range" (text "11000"))
+            (with-element "heading" (text "0"))
             (with-element "tilt" (text "0"))
-            (with-element "heading" (text "0")))
+            (with-element "range" (text "11000")))
           (with-element "Folder"
-            (attribute "name" (dictionary-entry "Sat-Images" lang))
-            (attribute "open" "1")
+            (with-element "name" (text (dictionary-entry "Sat-Images" lang)))
+            (with-element "open" (text "1"))
             (dolist (sat-layer (sort (copy-list (class-instances 'sat-layer))
                                      #'< :key #'year))
               (kml-network-link (format nil "http://~a/sat-root-kml?name=~A" (website-host) (name sat-layer))

Modified: trunk/projects/bos/web/kml-utils.lisp
===================================================================
--- trunk/projects/bos/web/kml-utils.lisp	2009-03-03 21:36:05 UTC (rev 4326)
+++ trunk/projects/bos/web/kml-utils.lisp	2009-03-03 22:02:12 UTC (rev 4327)
@@ -281,10 +281,10 @@
   ;; http-query could be added to &key args
   (with-element "NetworkLink"
     (when name (with-element "name" (text name)))
+    (when hide-children
+      (kml-hide-children-style))
     (when rect (kml-region rect lod))
     (when look-at (funcall look-at))
-    (when hide-children
-      (kml-hide-children-style))
     (when fly-to-view (with-element "flyToView" (text "1")))
     (kml-link href :refresh-on-region (and rect t))))