Changeset 5324

Timestamp:

12/01/07 18:21:11 (1 year ago)

Author:

ominiverdi

Message:

OWSManager
added WMC Format
extended features for wmc.read and wmc.write; not yet complete.
enhancments to layerSwitcher
added WMC presets

Files:

• sandbox/ominiverdi/ows/OWSManager/examples/catalogue (added)
• sandbox/ominiverdi/ows/OWSManager/examples/catalogue/fake_catalogue_response.xml (added)
• sandbox/ominiverdi/ows/OWSManager/examples/wms_manager_stile.html (modified) (7 diffs)
• sandbox/ominiverdi/ows/OWSManager/lib/OpenLayers/Control/WMSManager.js (modified) (7 diffs)
• sandbox/ominiverdi/ows/OWSManager/lib/OpenLayers/Format/WMC.js (modified) (5 diffs)
• sandbox/ominiverdi/ows/OWSManager/theme/OWSManager/owsmanager.css (modified) (2 diffs)

sandbox/ominiverdi/ows/OWSManager/examples/wms_manager_stile.html

@@ -4 +4 @@
-        #map {
-            width: 800px;
-375
+500
-            border: 1px solid black;
-            position:relative;
@@ -17 +17 @@
-            overflow:auto;
-        }
+        #text {
+            position:absolute;
+            left:820px;
+            width:200px;
+            height: 480px;
+            top:8px;
+            border: 1px solid black;
+            overflow:auto;
+            padding:10px;
+            
+        }
+        #output{
+            width:200px;
+            height:300px;
+        }
-    </style>
-
@@ -39 +54 @@
-    <script src="../lib/OpenLayers/Control/SLDManager.js"></script>
-    <script src="../lib/OpenLayers/Format/SLD.js"></script>
+    <script src="../lib/OpenLayers/Format/WMC.js" type="text/javascript"></script>
-    
-    <script type="text/javascript">
@@ -61 +77 @@
-                //["OpenLayers WMS-C",  "http://labs.metacarta.com/wms-c/Basic.py?"],
-                ['OpenLayers WMS','http://labs.metacarta.com/cgi-bin/mapserv?map=/www/labs/map/vmap0.map'],//content type: application/vnd.ogc.wms_xml
-
-
+
+
+
-                ['World - Demis World Map','http://www2.demis.nl/mapserver/Request.asp?'],
-
-
+//
+//
-                ['NATO','http://geos2.nurc.nato.int/geoserver/wms'],
-
+//
-                //[ 'Mumbay - freemap','http://mumbai.freemap.in/tiles?'],
-                ['CubeWerx','http://demo.cubewerx.com/demo/cubeserv/cubeserv.cgi?config=main&'],
-
+//
-                ['AU - Aims Australia','http://adc.aims.gov.au:9555/atlas/SstWmsServer?'],
-                ['BR - Unidades de Conservacao do Brasil (dados preliminares)','http://mapas.mma.gov.br/cgi-bin/mapserv?map=/opt/www/html/webservices/ucs.map&'],
-
+//
-                ['SP - Catalunya - ICC Web Map Service','http://shagrat.icc.es/lizardtech/iserv/ows?'],
-                ['SP - Junta Andalucia','http://www.andaluciajunta.es/IDEAndalucia/IDEAwms/wms/MTA100v?'],
-
-
-,
-
+//
+//
+
+//
-                //['SP - La Rioja','http://wms.larioja.org/request.asp']
-                
@@ -97 +114 @@
-            
-            //map.addControl(new OpenLayers.Control.NavToolbar());
-
-
-
+
+
+
+
-            //alert(WMSToolbar.div.id);
-            //WMSToolbar.style.display = "none";
-
-
+//
+//
-            //map.addControl(new OpenLayers.Control.WMCExporter());
-            
-$('queryOut')
+
-            
-            //map.addControl(new OpenLayers.Control.OverviewMap());
@@ -113 +131 @@
-        }
-        
+        //MAP CONTEXT
+        var olon = new OpenLayers.Format.OLON();
+        var wmc = new OpenLayers.Format.WMC();
+        
+        function setContext(name){
+            switch(name)
+                {
+                case 'us':
+                  var ows_url = 'http://www.ominiverdi.org/ogc/wmc/usa.xml';
+                  OpenLayers.loadURL(ows_url, null, null, loadSuccess, loadFailure);
+                  break;    
+                case 'europa':
+                  var ows_url = 'http://www.ominiverdi.org/ogc/wmc/europa.xml';
+                  OpenLayers.loadURL(ows_url, null, null, loadSuccess, loadFailure);
+                  break;    
+                case 'tasmania':
+                  var ows_url = 'http://www.ominiverdi.org/ogc/wmc/tasmania.xml';
+                  OpenLayers.loadURL(ows_url, null, null, loadSuccess, loadFailure);
+                  break;
+                default:
+                  return alert('no context has that name');
+                }
+        }
+        var olon_str;
+        var obj;
+        function loadSuccess(request) {
+            
+            //load the WMC output
+            updateStatus("loaded");
+            updateStatus(request.responseText);
+            olon_str = wmc.read(request.responseText);
+            //updateStatus(request.responseText);
+            
+            
+            //Read WMC 
+            //var olon = wmc.write(wmc_str);
+            
+            //Transform WMC to OLON
+            obj = olon.read(olon_str);
+            
+            
+            //ADD Map to OL
+            if(obj.projection){
+                map.projection = obj.projection;
+            }
+            
+            //console.log(obj);
+            //console.log('proj: '+obj.projection + ' '+ map.projection);
+            var bLayer = null;
+            //clean actual map
+            for(var i=0; i < map.getNumLayers(); i++) {
+                if(map.layers[i]){
+                    
+                    if(map.layers[i].isBaseLayer) {
+                        //bLayer = map.layers[i];
+                        console.log(map.layers[i].name + ' ' + i + ' blayer');
+                    } else {
+                        //map.layers[i].destroy(true);
+                        console.log(map.layers[i].name + ' ' + i + 'non  blayer');
+                    }
+                    map.layers[i].destroy(true);
+                }
+                
+                
+                //map.removeLayer(layer);
+            }
+            
+            console.log(map.layers);
+            for(var i=0; i < map.getNumLayers(); i++) {
+                if(map.layers[i]){
+                    
+                    if(map.layers[i].isBaseLayer) {
+                        //bLayer = map.layers[i];
+                        console.log(map.layers[i].name + ' ' + i + ' blayer');
+                    } else {
+                        //map.layers[i].destroy(true);
+                        console.log(map.layers[i].name + ' ' + i + 'non  blayer');
+                    }
+                    map.layers[i].destroy(true);
+                }
+                
+                
+                //map.removeLayer(layer);
+            }
+            
+            console.log(map.layers);
+            //this.layer.map.removeLayer(this.layer);
+            //updateStatus(map.layers.length);
+            //add new layers
+            map.addLayers(obj.layers);
+            //if(!map.baseLayer)map.setBaseLayer(map.layers[0]);
+            
+            //zoom to context extent
+            map.zoomToExtent(obj.bounds);
+            
+            if(obj.resolution && obj.center) {
+                //zoom = map.getZoomForResolution(obj.resolution, true);
+                //map.setCenter(obj.center, zoom);
+            }
+            myObj = obj;
+            
+        }
+        
+        function loadFailure(request) {
+            updateStatus("failed to load");
+        }
+        function updateStatus(msg) {
+            var element = document.getElementById('output');
+            element.value = msg;
+        }
-        
-        // -->
@@ -119 +247 @@
-  <body onload="init()">
-    <div id="map"></div>
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-  </body>

sandbox/ominiverdi/ows/OWSManager/lib/OpenLayers/Control/WMSManager.js

@@ -169 +169 @@
-        this.switchPanel();
-        this.maximizeControl();
+        
+        //forcing panel height and scroll
+        this.div.style.height = this.map.size.h - 100;
+        
-        return this.div;
-    },
@@ -267 +271 @@
-                for(j=0;j<aLayersName.length;j++){
-                    var selectedLayer = aLayersName[j];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                    }
@@ -447 +453 @@
-                for(j=0;j<aLayersName.length;j++){
-                    var selectedLayer = aLayersName[j];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                            
-                            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                                
-                                
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-
-
+
+
+
-                legendTools.appendChild(legendImages);
-                
@@ -682 +689 @@
-
-        //HACK HACK HACK - find a way to auto-size this layerswitcher
-2
+3
-        this.div.style.height = "";
-
@@ -795 +802 @@
-        this.olCatalogue = document.createElement("div");
-        this.olCatalogue.className = "olCatalogue";
+        this.olCatalogue.style.height = this.map.size.h - 130;
-        
-        this.catalogueLog  = document.createElement('p');
@@ -848 +856 @@
-        this.olServerList = document.createElement("div");
-        this.olServerList.className = "olServerList";
+        this.olServerList.style.height = this.map.size.h - 130;
+        
-        var p = document.createElement('p');
-        //p.innerHTML = 'Use the select box here below to choose a server. Wait for remote response.';
@@ -930 +940 @@
-        this.olLegend = document.createElement("div");
-        this.olLegend.className = "olLegend";
+        this.olLegend.style.height = this.map.size.h - 130;
+        
-        
-        this.layersDiv.appendChild(this.olLayerManagerHeader);

sandbox/ominiverdi/ows/OWSManager/lib/OpenLayers/Format/WMC.js

@@ -24 +24 @@
-     * {String} default Name Space for OGC WMC version 1.1
-     */
-eospatial.net/context
+is.net/context context.xsd
-    
-    /**
@@ -73 +73 @@
-        //PARSE MAP
-        console.log('parse map');
+        console.log(context);
-                                                       
-        OLContext.id = context.getAttribute('id');
@@ -126 +127 @@
-            srs = srss[0];//bad choice - forcing to first srs available
-            
+            //get format value <FormatList>
+            var formatList = this.findChildByName(layer,'FormatList');
+            //var formats = this.findChildrenByName(formatList,'Format');
+            var format = 'image/png';
+            if(formatList) format = this.concatChildValues(this.findChildByName(formatList,'Format'));
+            /*if(formats){
+                for(aa=0;aa<formats.length;aa++){
+                    var mFormat = formats[aa];
+                    if(mFormat.getAttribute('current')=='1'){
+                        format = this.concatChildValues(mFormat);
+                    }
+                }
+            }*/
+            
-            //GET server values
-            var server = this.findChildByName(layer,'Server');
@@ -140 +155 @@
-            layer.params = {}; 
-            layer.params.LAYERS = name;
-'png'
+format
-            layer.params.SERVICE = 'WMS';
-            layer.params.VERSION = version;
@@ -173 +188 @@
-        var OLON = OpenLayers.Class.serialize(map);
-        
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        wmc.setAttribute('id', 'hardcoded id');
-        wmc.setAttribute('version', 'hardcoded version');
+        wmc.setAttribute('xmlns','http://www.opengis.net/context');
+        wmc.setAttribute('xmlns:xlink','http://www.w3.org/1999/xlink');
+        wmc.setAttribute('xmlns:xsi','http://www.w3.org/2001/XMLSchema-instance');
+        wmc.setAttribute('xsi:schemaLocation',this.WMC_NS);
+        
-            
-        //GENERAL SECTION

sandbox/ominiverdi/ows/OWSManager/theme/OWSManager/owsmanager.css

@@ -32 +32 @@
-        /*width:100%;
-        height:100%;*/
-
+
+
+
-
-}
@@ -101 +103 @@
-    border-top:2px solid white;
-    border-bottom:2px solid white;
-
+
+
-}
-.olLegendLegendImages th{