Changeset 5965

Timestamp:

Jan 21, 2016 8:11:54 AM (8 years ago)

Author:

dkearney

Message:

adding fixes for differences between blt2.4 and blt4 tree copy and dump function calls

Location:

branches/blt4_geovis/gui

Files:

• scripts/map.tcl (modified) (1 diff)
• test/geomapdataprovider.test (modified) (1 diff)
• test/geomapdataprovidercolorramp.test (modified) (1 diff)
• test/geomapdataprovidergdal.test (modified) (1 diff)
• test/geomapdataproviderogr.test (modified) (1 diff)
• test/geomapdataprovidertfs.test (modified) (1 diff)
• test/geomapdataprovidertms.test (modified) (1 diff)
• test/geomapdataproviderwfs.test (modified) (1 diff)
• test/geomapdataproviderwms.test (modified) (1 diff)
• test/geomapdataproviderxyz.test (modified) (1 diff)

branches/blt4_geovis/gui/scripts/map.tcl

@@ -512 +512 @@
             }
             # copy the incomming layer data into our map object
-            set id [$layerObj copy root $_tree root->"layers"]
+            set id [$_tree copy root->"layers" $layerObj root]
             # give the layer a searchable layer name
             $_tree label $id $layerName

branches/blt4_geovis/gui/test/geomapdataprovider.test

@@ -305 +305 @@
     $dp exportToBltTree $tree
     $tree dump root
-} {-1 0 ::tree0 {type image driver xyz cache true attribution {}} {}
+} {-1 0 {{}} {type image driver xyz cache true attribution {}} {}
 }
 

branches/blt4_geovis/gui/test/geomapdataprovidercolorramp.test

@@ -217 +217 @@
     $dp exportToBltTree $tree
     $tree dump root
-} {-1 0 ::tree0 {type image driver colorramp cache true attribution {} colorramp.url file:///myimage.tif colorramp.colormap {0 0 0 0 1 1 1 1 1 1} colorramp.elevdriver gdal profile geodetic} {}
+} {-1 0 {{}} {type image driver colorramp cache true attribution {} colorramp.url file:///myimage.tif colorramp.colormap {0 0 0 0 1 1 1 1 1 1} colorramp.elevdriver gdal profile geodetic} {}
 }
 

branches/blt4_geovis/gui/test/geomapdataprovidergdal.test

@@ -79 +79 @@
     $dp exportToBltTree $tree
     $tree dump root
-} {-1 0 ::tree0 {type image driver gdal cache true attribution {} gdal.url http://myurl.com/} {}
+} {-1 0 {{}} {type image driver gdal cache true attribution {} gdal.url http://myurl.com/} {}
 }
 

branches/blt4_geovis/gui/test/geomapdataproviderogr.test

@@ -151 +151 @@
     $dp exportToBltTree $tree
     $tree dump root
-} {-1 0 ::tree0 {type line driver ogr cache true attribution {} ogr.url http://myurl.com/} {}
+} {-1 0 {{}} {type line driver ogr cache true attribution {} ogr.url http://myurl.com/} {}
 }
 

branches/blt4_geovis/gui/test/geomapdataprovidertfs.test

@@ -177 +177 @@
     $dp exportToBltTree $tree
     $tree dump root
-} {-1 0 ::tree0 {type line driver tfs cache true attribution {} tfs.url http://myurl.com/ tfs.format json} {}
+} {-1 0 {{}} {type line driver tfs cache true attribution {} tfs.url http://myurl.com/ tfs.format json} {}
 }
 

branches/blt4_geovis/gui/test/geomapdataprovidertms.test

@@ -79 +79 @@
     $dp exportToBltTree $tree
     $tree dump root
-} {-1 0 ::tree0 {type image driver tms cache true attribution {} tms.url http://myurl.com/} {}
+} {-1 0 {{}} {type image driver tms cache true attribution {} tms.url http://myurl.com/} {}
 }
 

branches/blt4_geovis/gui/test/geomapdataproviderwfs.test

@@ -203 +203 @@
     $dp exportToBltTree $tree
     $tree dump root
-} {-1 0 ::tree0 {type line driver wfs cache true attribution {} wfs.url http://myurl.com/ wfs.typename ns:fs wfs.format json} {}
+} {-1 0 {{}} {type line driver wfs cache true attribution {} wfs.url http://myurl.com/ wfs.typename ns:fs wfs.format json} {}
 }
 

branches/blt4_geovis/gui/test/geomapdataproviderwms.test

@@ -129 +129 @@
     $dp exportToBltTree $tree
     $tree dump root
-} {-1 0 ::tree0 {type image driver wms cache true attribution {} wms.url http://myurl.com/ wms.layers foo:bar wms.format jpeg wms.transparent false} {}
+} {-1 0 {{}} {type image driver wms cache true attribution {} wms.url http://myurl.com/ wms.layers foo:bar wms.format jpeg wms.transparent false} {}
 }
 

branches/blt4_geovis/gui/test/geomapdataproviderxyz.test

@@ -79 +79 @@
     $dp exportToBltTree $tree
     $tree dump root
-} {-1 0 ::tree0 {type image driver xyz cache true attribution {} xyz.url http://myurl.com/} {}
+} {-1 0 {{}} {type image driver xyz cache true attribution {} xyz.url http://myurl.com/} {}
 }