Changeset 5955 for branches/geomap

Timestamp:

Jan 14, 2016, 7:08:06 PM (9 years ago)

Author:

dkearney

Message:

merging changesets r5928 through r5954 from trunk

Location:

branches/geomap

Files:

• . (modified) (1 prop)
• gui/scripts/map.tcl (modified) (5 diffs)
• gui/scripts/mapviewer.tcl (modified) (13 diffs)

branches/geomap/gui/scripts/map.tcl

@@ -43 +43 @@
     public method setAttribution { attribution }
     public method setCamera { camera }
-    public method setExtents { xmin ymin xmax ymax }
+    public method setExtents { xmin ymin xmax ymax {srs "wgs84"} }
     public method setLabel { label }
     public method setProjection { projection }
@@ -259 +259 @@
                 # FIXME: Add test for valid file path
                 $_tree set $child "ogr.url" $file
+            }
+            foreach key { connection geometry geometry_url layer ogr_driver build_spatial_index } {
+                set value [$layers get $layer.ogr.$key]
+                if { $value != "" } {
+                    $_tree set $child "ogr.$key" $value
+                }
             }
             $_tree set $child "driver" "ogr"
@@ -431 +437 @@
 }
 
-itcl::body Rappture::Map::setExtents { xmin ymin xmax ymax } {
-    $_tree set root "extents" "$xmin $ymin $xmax $ymax"
+itcl::body Rappture::Map::setExtents { xmin ymin xmax ymax {srs "wgs84"} } {
+    $_tree set root "extents" [list $xmin $ymin $xmax $ymax $srs]
 }
 
@@ -458 +464 @@
 itcl::body Rappture::Map::viewpoints {} {
     set list {}
-    foreach node [$_tree children root->"viewpoints"] {
-        lappend list [$_tree label $node]
+    catch {
+        foreach node [$_tree children root->"viewpoints"] {
+            lappend list [$_tree label $node]
+        }
     }
     return $list
@@ -601 +609 @@
 itcl::body Rappture::Map::selectors { layerName } {
     set list {}
-    foreach node [$_tree children root->"layers"->"$layerName"->"selectors"] {
-        lappend list [$_tree label $node]
+    catch {
+        foreach node [$_tree children root->"layers"->"$layerName"->"selectors"] {
+            lappend list [$_tree label $node]
+        }
     }
     return $list

branches/geomap/gui/scripts/mapviewer.tcl

@@ -63 +63 @@
     public method scale {args}
     public method select {option {args ""}}
+    public method setSelectCallback {cmd}
 
     public method send { cmd }
@@ -94 +95 @@
     private method DoRotate {}
     private method DoSelect {}
+    private method DoSelectCallback {option {args ""}}
     private method DrawLegend { colormap min max }
     private method EarthFile {}
@@ -116 +118 @@
     private method ReceiveMapInfo { args }
     private method ReceiveScreenInfo { args }
+    private method ReceiveSelect { option {args ""} }
     private method RequestLegend { colormap w h }
     private method Rotate {option x y}
@@ -142 +145 @@
                                         # layer in the server.
     private variable _viewpoints;
+    private variable _selectCallback "";
     private variable _click;            # info used for rotate operations
     private variable _view;             # view params for 3D view
@@ -218 +222 @@
     $_parser alias camera   [itcl::code $this camera]
     $_parser alias screen   [itcl::code $this ReceiveScreenInfo]
-    $_parser alias select   [itcl::code $this select]
+    $_parser alias select   [itcl::code $this ReceiveSelect]
 
     # Millisecond delay before animated wait dialog appears
@@ -267 +271 @@
     }
 
-    # Note: grid types are "geodetic", "utm" and "mgrs"
+    # Note: grid types are "shader", "geodetic", "utm" and "mgrs"
     # Currently only work in geocentric maps
     array set _settings [subst {
@@ -275 +279 @@
         coords-visible         1
         grid                   0
-        grid-type              "geodetic"
+        grid-type              "shader"
         legend                 1
         terrain-ambient        0.03
@@ -938 +942 @@
 }
 
-# ----------------------------------------------------------------------
-# USAGE: select clear
-# USAGE: select feature
-# USAGE: select annotation
-# ----------------------------------------------------------------------
-itcl::body Rappture::MapViewer::select {option {args ""}} {
+itcl::body Rappture::MapViewer::setSelectCallback {cmd} {
+    set _selectCallback $cmd
+}
+
+itcl::body Rappture::MapViewer::DoSelectCallback {option {args ""}} {
+    if { $_selectCallback != "" } {
+        set cmd [concat $_selectCallback $option $args]
+        uplevel #0 $cmd
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: ReceiveSelect clear
+# USAGE: ReceiveSelect feature <args...>
+# USAGE: ReceiveSelect annotation <args...>
+# ----------------------------------------------------------------------
+itcl::body Rappture::MapViewer::ReceiveSelect {option {args ""}} {
     DebugTrace "Enter"
     switch $option {
@@ -950 +965 @@
         }
         "clear" {
-             puts stderr "select clear"
+            puts stderr "select clear"
         }
         "feature" {
-             puts stderr "select feature $args"
+            puts stderr "select feature $args"
+        }
+    }
+    eval DoSelectCallback $option $args
+}
+
+# ----------------------------------------------------------------------
+# USAGE: select clear
+# USAGE: select feature <args...>
+# USAGE: select annotation <args...>
+#
+# Clients use this method to notify the map widget of a selection event
+# originating from outside the map
+# ----------------------------------------------------------------------
+itcl::body Rappture::MapViewer::select {option {args ""}} {
+    switch $option {
+        "annotation" {
+            SendCmd "select annotation $args"
+        }
+        "clear" {
+            SendCmd "select clear"
+        }
+        "feature" {
+            SendCmd "select feature $args"
+        }
+        default {
+            puts stderr "Unknown select option \"$option\""
         }
     }
@@ -1315 +1356 @@
     set _first ""
     set haveTerrain 0
+    #SendCmd "map layer visible 0"
     foreach dataobj [get -objects] {
         if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
@@ -2540 +2582 @@
             set selectors [list]
             foreach selector [$dataobj selectors $layer] {
-               array set sinfo [$dataobj selector $layer $selector]
+                array set sinfo [$dataobj selector $layer $selector]
                 DebugTrace "$selector: [array get sinfo]"
                 lappend selectors [array get sinfo]
@@ -2553 +2595 @@
             }
             set format ""
-            set tmsType ""
-            set cmd [list map layer add $layer feature $info(driver) $format $tmsType $info(ogr.url) $info(cache) $info(stylesheet) $script $selectors]
-            if {[info exists style(-minrange)] && [info exists style(-maxrange)]} {
-                lappend cmd $style(-minrange) $style(-maxrange)
-            }
-            SendFiles $info(ogr.url)
+            set wfsType ""
+            if { [info exists info(ogr.connection)] } {
+                set cmd [list map layer add $layer feature db $format $info(ogr.layer) $info(ogr.connection) $info(cache) $info(stylesheet) $script $selectors]
+                if {[info exists style(-minrange)] && [info exists style(-maxrange)]} {
+                    lappend cmd $style(-minrange) $style(-maxrange)
+                }
+            } else {
+                set cmd [list map layer add $layer feature $info(driver) $format $wfsType $info(ogr.url) $info(cache) $info(stylesheet) $script $selectors]
+                if {[info exists style(-minrange)] && [info exists style(-maxrange)]} {
+                    lappend cmd $style(-minrange) $style(-maxrange)
+                }
+                SendFiles $info(ogr.url)
+            }
             SendCmd $cmd
         }
@@ -2720 +2769 @@
             array set style {
                 -clamping terrain
-                -clamptechnique gpu
+                -clamptechnique drape
                 -color white
                 -minbias 1000