Changeset 5163

Timestamp:

Mar 22, 2015, 11:42:50 PM (9 years ago)

Author:

ldelgass

Message:

Fixes for map viewpoints

Location:

trunk/gui/scripts

Files:

• map.tcl (modified) (1 diff)
• mapviewer.tcl (modified) (2 diffs)

trunk/gui/scripts/map.tcl

@@ -248 +248 @@
             set child [$_tree insert $parent -label $name]
             $_tree set $child "name" $viewpoint
+            set haveX 0
+            set haveZ 0
+            set haveSRS 0
+            set haveVertDatum 0
             foreach key { label description x y z distance heading pitch srs verticalDatum } {
                 set val [$viewpoints get $viewpoint.$key]
-                $_tree set $child $key $val
+                if {$val != ""} {
+                    if {$key == "x"} {
+                        set haveX 1
+                    } elseif {$key == "z"} {
+                        set haveZ 1
+                    } elseif {$key == "srs"} {
+                        set haveSRS 1
+                    } elseif {$key == "verticalDatum"} {
+                        set haveVertDatum 1
+                    }
+                    $_tree set $child $key $val
+                }
+            }
+            if {!$haveX} {
+                set lat [$viewpoints get $viewpoint.latitude]
+                set long [$viewpoints get $viewpoint.longitude]
+                $_tree set $child x $long
+                $_tree set $child y $lat
+                if {!$haveSRS} {
+                    $_tree set $child srs wgs84
+                }
+                if {!$haveVertDatum} {
+                    $_tree set $child verticalDatum ""
+                }
+            }
+            if {!$haveZ} {
+                set z [$viewpoints get $viewpoint.altitude]
+                if {$z != ""} {
+                    $_tree set $child z $z
+                }
             }
         }

trunk/gui/scripts/mapviewer.tcl

@@ -2173 +2173 @@
 
 itcl::body Rappture::MapViewer::GoToViewpoint { dataobj viewpoint } {
-    if 0 {
-    array set view {
+    array set view [subst {
         x 0
         y 0
         z 0
         heading 0
-        pitch -89.999
-        distance 0
-        srs ""
-        verticalDatum ""
-    }
-    }
+        pitch -90
+        distance $_view(distance)
+        srs $_view(srs)
+        verticalDatum $_view(verticalDatum)
+    }]
     array set view [$dataobj viewpoint $viewpoint]
     foreach key {x y z heading pitch distance srs verticalDatum} {
@@ -2190 +2188 @@
             set _view($key) $view($key)
         }
+    }
+    # If map is projected, ignore pitch
+    if {![MapIsGeocentric]} {
+        set _view(pitch) -90
     }
     set duration 2.0