Changeset 6659

Timestamp:

Dec 6, 2016 12:50:57 PM (8 years ago)

Author:

ldelgass

Message:

Recognize camera parameters as XML tags. For now, retain deprecated usage of
name/value array in <camera> tag CDATA.

File:

• trunk/gui/scripts/map.tcl (modified) (1 diff)

trunk/gui/scripts/map.tcl

@@ -242 +242 @@
         puts stderr "ERROR: $msg"
     }
-    if {[catch {setCamera [$map get "camera"]} msg] != 0} {
-        puts stderr "ERROR: $msg"
+
+    set camnode [$map element -as object "camera"]
+    if {$camnode != ""} {
+        # For backwards compat with camera name/value list string in CDATA
+        set caminfo [string trim [$map get "camera"]]
+        if {$caminfo == ""} {
+            # No CDATA, check for tags
+            foreach camparam {layer x y latitude longitude z heading pitch distance xmin ymin xmax ymax srs verticalDatum} {
+                # Tags can have empty content, so check for node first
+                set params [$camnode children -type $camparam]
+                foreach param $params {
+                    lappend caminfo $camparam [$camnode get $param]
+                }
+            }
+        }
+        if {[catch {setCamera $caminfo} msg] != 0} {
+            puts stderr "ERROR: $msg"
+        }
     }