Changeset 4380 for trunk/gui

Timestamp:

Jun 10, 2014, 9:23:02 PM (10 years ago)

Author:

ldelgass

Message:

Use <gdal> element for GDAL layer driver

Location:

trunk/gui/scripts

Files:

• map.tcl (modified) (4 diffs)
• mapviewer.tcl (modified) (2 diffs)

trunk/gui/scripts/map.tcl

@@ -125 +125 @@
         $_tree set $child "name" $layer
         $_tree set $child "type" $layerType
-        foreach key { label description url } {
+        foreach key { label description } {
             $_tree set $child $key [$layers get $layer.$key] 
         }
         # Common settings (for all layer types) with defaults
-        foreach {key defval} { visible true } {
+        foreach { key defval } { visible true } {
             $_tree set $child $key $defval
             set val [$layers get $layer.$key]
@@ -145 +145 @@
             }
         }
-        set file [$layers get $layer.file] 
-        if { $file != "" } {
-            # FIXME: Add test for valid file path
-            $_tree set $child "url" $file
-        }
-        $_tree set $child "driver" "gdal"
-        set tms [$layers get $layer.tms.url]
+        $_tree set $child "driver" "debug"
+        set gdal [$layers element -as type $layer.gdal]
+        if { $gdal != "" } {
+            foreach key { url } {
+                set value [$layers get $layer.gdal.$key]
+                $_tree set $child "gdal.$key" $value
+            }
+            set file [$layers get $layer.gdal.file] 
+            if { $file != "" } {
+                # FIXME: Add test for valid file path
+                $_tree set $child "url" $file
+            }
+            $_tree set $child "driver" "gdal"
+        }
+        set tms [$layers element -as type $layer.tms]
         if { $tms != "" } {
             foreach key { url tmsType format } {
@@ -159 +167 @@
             $_tree set $child "driver" "tms"
         }
-        set wms [$layers get $layer.wms.url]
+        set wms [$layers element -as type $layer.wms]
         if { $wms != "" } {
             foreach key { url layers format transparent } {
@@ -167 +175 @@
             $_tree set $child "driver" "wms"
         }
-        set xyz [$layers get $layer.xyz.url]
+        set xyz [$layers element -as type $layer.xyz]
         if { $xyz != "" } {
             foreach key { url } {

trunk/gui/scripts/mapviewer.tcl

@@ -985 +985 @@
             array set info [$dataobj layer $layer]
             if { ![info exists _layers($layer)] } {
-                if { ![info exists info(url)] }  {
-                    continue
-                }
+                if { ![info exists info(url)] }  {
+                    if { $info(driver) != "debug" } {
+                        continue
+                    }
+                }
                 if { $_reportClientInfo }  {
                     set cinfo {}
@@ -1726 +1728 @@
             if {!$_sendEarthFile} {
                 switch -- $info(driver)  {
+                    "debug" {
+                        SendCmd [list map layer add image debug $layer]
+                    }
                     "gdal" {
                         SendCmd [list map layer add image gdal \