Changeset 5948 for trunk/gui/scripts/map.tcl

Timestamp:

Dec 16, 2015 1:19:34 PM (8 years ago)

Author:

ldelgass

Message:

Add deleteLayer, hasLayer methods. Use XML id attribute for layer names.

File:

• trunk/gui/scripts/map.tcl (modified) (7 diffs)

trunk/gui/scripts/map.tcl

@@ -32 +32 @@
     public method addLayer { type name paramArray driver driverParamArray {stylesheet {}} {script {}} {selectors {}} }
     public method addViewpoint { name props }
+    public method deleteLayer { layerName }
     public method earthfile {}
+    public method hasLayer { layerName }
     public method hints { args }
     public method isGeocentric {}
@@ -58 +60 @@
     private variable _tree "";         # Tree of information about the map.
     private variable _isValid 0;
-    private common _nextLayer 0;       # Counter used to generate unique
-                                       # layer names.
     private common _nextSelector 0;
     private common _nextViewpoint 0;   # Counter used to generate unique
@@ -147 +147 @@
     foreach layer [$layers children -type layer] {
         # Unique identifier for layer.
-        set name "layer[incr _nextLayer]"
+        set name [$map element -as id "layers.$layer"]
+        if {[hasLayer $name]} {
+            puts stderr "ERROR: Duplicate layer ID '$name', skipping"
+            continue
+        }
         set child [$_tree insert $parent -label $name]
         set layerType [$layers get $layer.type]
@@ -153 +157 @@
             error "invalid layer type \"$layerType\": should be one of [array names _layerTypes]"
         }
-        $_tree set $child "name" $layer
+        $_tree set $child "name" $name
         $_tree set $child "type" $layerType
         foreach key { label description attribution profile srs verticalDatum } {
@@ -453 +457 @@
 
 itcl::body Rappture::Map::addLayer { type name paramArray driver driverParamArray {stylesheet {}} {script {}} {selectors {}} } {
-    set id "layer[incr _nextLayer]"
+    set id "$name"
+    if {[hasLayer $id]} {
+        error "Layer '$id' already exists"
+    }
     set parent [$_tree findchild root "layers"]
     set child [$_tree insert $parent -label $id]
@@ -616 +623 @@
         }
     }
+    return $id
+}
+
+itcl::body Rappture::Map::deleteLayer { layerName } {
+    set id [$_tree findchild root->"layers" $layerName]
+    if { $id < 0 } {
+        error "unknown layer \"$layerName\""
+    }
+    $_tree delete $id
 }
 
@@ -657 +673 @@
     }
     return [$_tree get $id]
+}
+
+itcl::body Rappture::Map::hasLayer { layerName } {
+    set id [$_tree findchild root->"layers" $layerName]
+    if { $id < 0 } {
+        return 0
+    } else {
+        return 1
+    }
 }