Changeset 6519 for trunk/gui/scripts

Timestamp:

Aug 31, 2016, 5:48:44 PM (8 years ago)

Author:

ldelgass

Message:

Client-side of new protocol: terrainPatch, wkt geometry, rotations for models.

Location:

trunk/gui/scripts

Files:

• map.tcl (modified) (7 diffs)
• mapviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/map.tcl

@@ -264 +264 @@
         # We want to know if they have been set by the user or not
         # Not all layer types use these
-        foreach key { coverage opacity content priority style } {
+        foreach key { coverage opacity content priority style terrainPatch } {
             set val [$layers get $layer.$key]
             if {$val != ""} {
@@ -276 +276 @@
                 }
                 if {$key eq "opacity" && $layerType eq "elevation"} {
-                    puts stderr  "ERROR: <opacity> is not valid for layers of type \"elevation\""
+                    puts stderr "ERROR: <opacity> is not valid for layers of type \"elevation\""
+                }
+                if {$key eq "terrainPatch" && $layerType ne "feature" &&
+                    $layerType ne "model" && $layerType ne "polygon"} {
+                    puts stderr "ERROR: <terrainPatch> is only valid for layers of type \"feature\", \"model\" or \"polygon\""
                 }
                 $_tree set $child $key $val
@@ -379 +383 @@
                 $_tree set $child "ogr.url" $file
             }
-            foreach key { connection geometry geometry_url layer ogr_driver build_spatial_index } {
+            foreach key { connection geometry geometryUrl layer ogrDriver buildSpatialIndex } {
                 set value [$layers get $layer.ogr.$key]
                 if { $value != "" } {
@@ -400 +404 @@
             $_tree set $child "osg.y" 0.0
             $_tree set $child "osg.z" 0.0
+            $_tree set $child "osg.rotx" 0.0
+            $_tree set $child "osg.roty" 0.0
+            $_tree set $child "osg.rotz" 0.0
             foreach key { x y z rotx roty rotz paged } {
                 set value [$layers get $layer.osg.$key]
@@ -652 +659 @@
     # We want to know if they have been set by the user or not
     # Not all layer types use these
-    foreach key { coverage opacity content priority style } {
+    foreach key { coverage opacity content priority style terrainPatch } {
         if {[info exists params($key)]} {
             set val $params($key)
@@ -666 +673 @@
                 if {$key eq "opacity" && $type eq "elevation"} {
                     error  "opacity is not valid for layers of type \"elevation\""
+                }
+                if {$key eq "terrainPatch" && $type ne "feature" &&
+                    $type ne "model" && $type ne "polygon"} {
+                    puts stderr "ERROR: <terrainPatch> is only valid for layers of type \"feature\", \"model\" or \"polygon\""
                 }
                 $_tree set $child $key $val
@@ -755 +766 @@
                 $_tree set $child "ogr.$key" $value
             }
-            foreach key { connection geometry geometry_url layer ogr_driver build_spatial_index } {
+            foreach key { connection geometry geometryUrl layer ogrDriver buildSpatialIndex } {
                 if {[info exists params($key)]} {
                     set value $params($key)

trunk/gui/scripts/mapviewer.tcl

@@ -2856 +2856 @@
             set scriptSize [string length $script]
             set selectorsSize [string length $selectors]
+            set terrainPatch 0
+            if {[info exists info(terrainPatch)] && $info(terrainPatch)} {
+                set terrainPatch 1
+            }
             switch -- $info(driver) {
                 "ogr" {
                     if { [info exists info(ogr.connection)] } {
-                        set cmd [list map layer add $tag feature db {} $info(ogr.layer) $info(ogr.connection) $info(cache) $ssSize $scriptSize $selectorsSize]
+                        set cmd [list map layer add $tag feature db {} $info(ogr.layer) $info(ogr.connection) $info(cache) $ssSize $scriptSize $selectorsSize $terrainPatch]
                         if {[info exists style(-minrange)] && [info exists style(-maxrange)]} {
                             lappend cmd $style(-minrange) $style(-maxrange)
                         }
                     } else {
-                        set cmd [list map layer add $tag feature $info(driver) {} {} $info(ogr.url) $info(cache) $ssSize $scriptSize $selectorsSize]
+                        set cmd [list map layer add $tag feature $info(driver) {} {} $info(ogr.url) $info(cache) $ssSize $scriptSize $selectorsSize $terrainPatch]
                         if {[info exists style(-minrange)] && [info exists style(-maxrange)]} {
                             lappend cmd $style(-minrange) $style(-maxrange)
@@ -2876 +2880 @@
                         set format $info(tfs.format)
                     }
-                    set cmd [list map layer add $tag feature $info(driver) $format {} $info(tfs.url) $info(cache) $ssSize $scriptSize $selectorsSize]
+                    set cmd [list map layer add $tag feature $info(driver) $format {} $info(tfs.url) $info(cache) $ssSize $scriptSize $selectorsSize $terrainPatch]
                     if {[info exists style(-minrange)] && [info exists style(-maxrange)]} {
                         lappend cmd $style(-minrange) $style(-maxrange)
@@ -2890 +2894 @@
                         set wfsType $info(wfs.typename)
                     }
-                    set cmd [list map layer add $tag feature $info(driver) $format $wfsType $info(wfs.url) $info(cache) $ssSize $scriptSize $selectorsSize]
+                    set cmd [list map layer add $tag feature $info(driver) $format $wfsType $info(wfs.url) $info(cache) $ssSize $scriptSize $selectorsSize $terrainPatch]
                     if {[info exists style(-minrange)] && [info exists style(-maxrange)]} {
                         lappend cmd $style(-minrange) $style(-maxrange)
@@ -2908 +2912 @@
                     if { [info exists info(ogr.connection)] } {
                         SendCmd [list map layer add $tag mask db {} $info(ogr.layer) $info(ogr.connection) $minLOD]
+                    } elseif {[info exists info(ogr.geometryUrl)]} {
+                        SendFiles $info(ogr.geometryUrl)
+                        SendCmd [list map layer add $tag mask wkt_file {} {} $info(ogr.geometryUrl) $minLOD]
+                    } elseif {[info exists info(ogr.geometry)]} {
+                        set len [string length $info(ogr.geometry)]
+                        SendCmd [list map layer add $tag mask wkt {} {} $len $minLOD]
+                        if {$len > 0} { SendData $info(ogr.geometry) }
                     } else {
                         SendFiles $info(ogr.url)
@@ -2934 +2945 @@
         }
         "model" {
+            set terrainPatch 0
+            if {[info exists info(terrainPatch)] && $info(terrainPatch)} {
+                set terrainPatch 1
+            }
             switch -- $info(driver) {
                 "osg" {
                     SendFiles $info(osg.url)
-                    SendCmd [list map layer add $tag model simple $info(osg.url) $info(osg.x) $info(osg.y) $info(osg.z)]
+                    SendCmd [list map layer add $tag model simple $info(osg.url) $info(osg.x) $info(osg.y) $info(osg.z) $info(osg.rotx) $info(osg.roty) $info(osg.rotz) $terrainPatch]
                 }
             }