Changeset 3747 for TI05-delivery/ows_framework

Timestamp:

03/04/08 15:43:09 (12 years ago)

Author:

cbyrom

Message:

Fix Con Terra integration of web client:
Added new template, conterra_xmlconfig.kid to do the creation of
the xmlConfig data to POST.
Changed conterra_aggregate to contain a form which automatically
POSTs a request with the xmlConfig data, when the template is rendered.
Extended selectedItems to include conterra_aggegrage.kid - so that
the selections page is redrawn following a POST to the conterra client.
Also updated the wms_util and WMC python scripts to extract the
required data for the new Con Terra input formats.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• lib/wmc_util.py (modified) (3 diffs)
• models/WMC.py (modified) (1 diff)
• templates/conterra_aggregate.kid (added)
• templates/conterra_xmlconfig.kid (added)
• templates/selectedItems.kid (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/wmc_util.py

@@ -19 +19 @@
 def getConTerraDoc(wmcURLs):
     """
-    Construct an aggregated XML file and POST this data to the Con Terra mapClient to visualise
+    Construct an aggregated XML file and display this as a temporary webpage; this will automatically be
+    POSTED so that the data is sent via POST to the Con Terra mapClient to visualise (as required by this client)
     @param wmcURLS: An array of URLs pointing to WMC docs to visualise
     """
-    c.wmcDocs = []
+    # firstly, retrieve each WMC doc
+    wmcDocs = []
     for wmcURL in wmcURLs:
-        c.wmcDocs.append(WMC(wmcURL)) 
-
-        # need to send the aggregated data as POST data - so change the request method
-    request.method = "POST"
-
-    # now add the required data, using the aggregate template   
-    logger.info('Creating XML Config doc for use with Con Terra mapClient')
-    request.POST.add('xmlConfig', "<?xml version='1.0' encoding='UTF-8'?><pos:IMCPostConfig SRS='EPSG:4326' xmlns:pos='http://www.conterra.de/mapclient/businesstier/configuration/postinit'><pos:Map ImageFormat='image/png'><pos:WMService url='http://ogc.bgs.ac.uk/cgi-bin/GBR_625k_BGS_Bedrock_and_Superficial_Geology/wms?'></pos:WMService><pos:InitialExtent MinX='-100' MinY='-50' MaxX='100' MaxY='50'></pos:InitialExtent></pos:Map><pos:OverviewMap ImageFormat='image/png'><pos:WMService url='http://www.geographynetwork.com/servlet/com.esri.wms.Esrimap'><pos:AddLayer visible='true'>Continents</pos:AddLayer></pos:WMService></pos:OverviewMap></pos:IMCPostConfig>")#render('conterra_aggregate', format='xml'))
-    logger.info('Posting request to mapClient for visualisation')
-    h.redirect_to('http://www.gis.bgs.ac.uk:8080/mapClient/postInit.do')#http://www.conterra.de/mapclient/businesstier/configuration/postinit') 
+        wmcDocs.append(WMC(wmcURL))
     
-#    response.headers['Content-Type'] = 'text/xml'
-#    response.headers['Content-Disposition'] = 'attachment;filename=wmcAggregate.xml'
-#    return render('conterra_aggregate', format='xml')
+    # now create a dictionary of WMS/layer from these docs - to avoid duplicate layers
+    c.wms = {}
+    for wmcDoc in wmcDocs:
+        for layer in wmcDoc.layers:
+            if layer.wmsURL not in c.wms:
+                c.wms[layer.wmsURL] = [layer.name]
+            else:
+                if layer.name not in c.wms[layer.wmsURL]:
+                    c.wms[layer.wmsURL].append(layer.name)
+    
+    # now create the form to post this data
+    logger.info('Creating form doc with data to post to Con Terra mapClient')
+    c.redirectToConterra = True;
+    response.write(render('selectedItems'))
+    
 
     
@@ -45 +50 @@
     """
     # retrieve context data from the specifiled url
-    endpoint = self.inputs['ENDPOINT']
-    if not endpoint:
-        raise exceptions.MissingParameterValue, "ENDPOINT parameter required"
-    logger.info('Getting WebMapContext from endpoint: ' + endpoint)
-
-    try:
-        filehandle = urllib2.urlopen(endpoint)
-    except IOError:
-        raise exceptions.URLUnavailable, "Could not access WMC endpoint: %s" % endpoint
-        
+    wmcDoc = RetrieveWebMapContext(self, self.inputs['ENDPOINT'])
+    
     response.headers['Content-Type'] = 'text/xml'
-    response.write(filehandle.read())
+    response.write(wmcDoc)
     
 
@@ -76 +73 @@
     response.headers['Content-Type'] = 'text/xml'
     response.write(filehandle.read())
+    
+def RetrieveWebMapContext(self, endpoint):
+    """
+    Get a WMC doc from a specified endpoint
+    @param endpoint: endpoint to retrieve WMC doc from
+    """
+    if not endpoint:
+        raise exceptions.MissingParameterValue, "ENDPOINT parameter required"
+    logger.info('Getting WebMapContext from endpoint: ' + endpoint)
+
+    try:
+        filehandle = urllib2.urlopen(endpoint)
+    except IOError:
+        raise exceptions.URLUnavailable, "Could not access WMC endpoint: %s" % endpoint
+
+    return filehandle.read()
         

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/WMC.py

@@ -57 +57 @@
         helper=nsdumb(self.xml)
         self.name = helper.getText(self.xml, 'Name')
-        
+        # NB, there may be a better way of getting the href, but the nsdumb doesn't currently
+        # support XPATH attribute functionality
+        elem = helper.find(self.xml, 'Server/OnlineResource')
+        for attribute in elem.attrib:
+            if attribute.find('href') > -1:
+                self.wmsURL = elem.attrib.get(attribute)
+            
 
 

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

@@ -4 +4 @@
       <script src="$g.server/js/ndgJavascript.js"/>
     </head>
-    <body>
+    <?python
+        onloadAttribute = ""
+        if c.redirectToConterra:
+                onloadAttribute = "document.forms.ConTerraForm.submit();"
+    ?>
+    <body onload="${onloadAttribute}">
+    <div id="redirectForm" py:if="c.redirectToConterra">
+        <div py:replace="XML(render('conterra_aggregate',fragment=True, format='xml'))"/>
+    </div>
     <div id="entirepage">
         <div py:replace="header()"/>