Changeset 6102

Timestamp:

Mar 4, 2016, 7:01:39 AM (9 years ago)

Author:

ldelgass

Message:

Adding validation to addLayer

File:

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

trunk/gui/scripts/map.tcl

@@ -531 +531 @@
         error "Layer '$id' already exists"
     }
+    if { ![info exists _layerTypes($type)] } {
+        error "Invalid layer type \"$type\": should be one of: [join [array names _layerTypes] {, }]"
+    }
     set parent [$_tree findchild root "layers"]
     set child [$_tree insert $parent -label $id]
@@ -560 +563 @@
             set val $params($key)
             if {$val != ""} {
+                if {$key eq "coverage" && $type ne "image"} {
+                    error "Coverage is only valid for layers of type \"image\""
+                }
+                if {$key eq "content" || $key eq "priority"} {
+                    if {$type ne "label"} {
+                        error "content and priority are only valid in layers of type \"label\""
+                    }
+                }
+                if {$key eq "opacity" && $type eq "elevation"} {
+                    error  "opacity is not valid for layers of type \"elevation\""
+                }
                 $_tree set $child $key $val
             }
@@ -706 +720 @@
                 }
             }
+        }
+        default {
+            error "Unknown driver \"$driver\""
         }
     }