Changeset 3547 for TI05-delivery/ows_framework

Timestamp:

28/02/08 17:07:29 (13 years ago)

Author:

cbyrom

Message:

Adjust js code to allow WMC documents to be displayed as tree view nodes

• with their layers being displayed upon expansion + display the layers

when these children are selected.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• public/js/capabilities.js (modified) (1 diff)
• public/js/vis-app.js (modified) (1 diff)
• public/js/wmscControl.js (modified) (5 diffs)
• templates/viewItems.kid (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/js/capabilities.js

@@ -111 +111 @@
     getAbstract: function() {
         var el = WMSC.traverseWMSDom(this.node, ['Abstract']);
+        // NB, WMC layers may not have abstracts
+        if (!el)
+                return "";
+                
         if (el.textContent) {
             return el.textContent;

TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/js/vis-app.js

@@ -106 +106 @@
                 {
                         // if this is a wmc layer, use the url in the layer
-                        endpoint = this.layerControl._selectedLayer.getEndpoint();
+//                      endpoint = this.layerControl._selectedLayer.getEndpoint();
+                        endpoint = this.layerControl._selectedLayer.data.wmcEndpoint;
                         if (endpoint == null)
                                 endpoint = this.layerControl.wmsEndpoint;

TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/js/wmscControl.js

@@ -77 +77 @@
                 {
                 var cap = new WMSC.Capabilities(xhr.responseXML.documentElement);
-                var tree = this._addLayerTree(cap.getRootLayer(), 
+                var tree = this._addLayerTree(
+                        cap.getRootLayer(), 
                         treeNode.data, 
                         this.tree.getRoot(), 
@@ -107 +108 @@
                 {
                 var wmc = new WMSC.WebMapContext(xhr.responseXML.documentElement);
+                var tree = this._addWMCTree(wmc, 
+                        treeNode.data, 
+                        this.tree.getRoot(), 
+                        treeNode);
+/*
                         treeNode.data.label = wmc.getTitle();
                         treeNode.label = wmc.getTitle();
                         treeNode.data.abstract = wmc.getTitle();
+*/                      
                 this.tree.draw();
                 };
@@ -153 +160 @@
                 return treeNode;
     },
+    
+    _addWMCTree: function(wmc, nodeData, parentNode, treeNode) 
+    {
+                nodeData.label = wmc.getTitle();
+                nodeData.layer = wmc.getTitle();
+                nodeData.abstract = wmc.getTitle();
+
+                var subLayers = wmc.getSubLayers();
+
+                // When initialising a top-level node it will 
+                // already exist (showing loading indicator).
+                // In this case replace data, otherwise create a new node.
+                if (treeNode == null) 
+                {
+                var treeNode = new YAHOO.widget.MenuNode(
+                        nodeData, parentNode, false);
+                }
+                else 
+                {
+                treeNode.data = nodeData;
+                treeNode.label = nodeData.label;
+                }
+                
+                for (var i=0; i<subLayers.length; i++) 
+                {
+                this._addLayerTree(
+                        subLayers[i], 
+                        {endpoint: nodeData.endpoint,
+                        wmcEndpoint: subLayers[i].getEndpoint()},
+                            treeNode);
+                }
+                return treeNode;
+    },
 
 
@@ -217 +257 @@
                         }
                 
+/*              
                 new Ajax.Request(this.wmsEndpoint, 
                 {
@@ -223 +264 @@
                                 onSuccess: this._updateLeafLayer.bindAsEventListener(this)
                 });
+*/
+                
+                // set the selected layer
+                this._selectedLayer = node;
+                        this.wmsParams.layers = node.data.layer;
+                this.events.triggerEvent('changeWMS');
+                
                 }
                 else 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/viewItems.kid

@@ -46 +46 @@
     control = new WMSC.Control('layerTree', 'layerLeaves', 'dims');
     <for py:for="i in session['viewItems']" class="dataset" py:strip="True">
-        control.addWebMapContext('viewItems', '${i.wmcURL}');
+        <span py:if="i.wmcURL" py:strip="True">
+                control.addWebMapContext('viewItems', '${i.wmcURL}');
+            </span>
     </for>