Changeset 4290

Timestamp:

Mar 28, 2014, 4:41:07 PM (11 years ago)

Author:

ldelgass

Message:

Validate that map extents always require a projection to be specified

File:

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

trunk/gui/scripts/map.tcl

@@ -50 +50 @@
         # defined below 
     }
+
+    public method isGeocentric {} 
     public method layers {}
     public method layer { name }
@@ -122 +124 @@
         set child [$_tree insert $parent -label $name]
         $_tree set $child "title" [$layers get $layer.label]
-        set type [$layers get $layer.type] 
-        if { ![info exists _layerTypes($type)] } {
-            error "invalid layer type \"$type\": should be one of [array names _layerTypes]"
-        }
-        $_tree set $child "type" $type
+        set layerType [$layers get $layer.type] 
+        if { ![info exists _layerTypes($layerType)] } {
+            error "invalid layer type \"$layerType\": should be one of [array names _layerTypes]"
+        }
+        $_tree set $child "type" $layerType
         foreach key { label description url } {
             $_tree set $child $key [$layers get $layer.$key] 
@@ -137 +139 @@
     }
     $_tree set root "label"       [$map get "about.label"]
-    $_tree set root "extents"     [$map get "extents"]
 
     set projection [$map get "projection"]
+    set extents    [$map get "extents"]
     if { $projection  == "" } {
+        if {$extents != ""} {
+            error "cannot specify extents without a projection"
+        }
         set projection "global-mercator"; # Default projection.
     }
     # FIXME: Verify projection is valid.
     $_tree set root "projection" $projection
-
-    set type [$map get "type"]
-    if { $type == "" } {
-        set type "projected";           # Default type is "projected".
+    $_tree set root "extents"    $extents
+
+    set mapType [$map get "type"]
+    if { $mapType == "" } {
+        set mapType "projected";           # Default type is "projected".
     } 
-    if { ![info exists _mapTypes($type)] } {
+    if { ![info exists _mapTypes($mapType)] } {
         error "unknown map type \"$mapType\": should be one of [array names _mapTypes]"
     }
-    $_tree set root "type" $type
+    $_tree set root "type" $mapType
 
     foreach {key path} {
@@ -198 +204 @@
 }
 
+# ---------------------------------------------------------------------- 
+# Returns if the map is geocentric (1) or projected (0) 
+# ---------------------------------------------------------------------- 
+itcl::body Rappture::Map::isGeocentric {} { 
+    return [expr {[hints "type"] eq "geocentric"}]
+}