Changeset 3548 for TI05-delivery/ows_framework

Timestamp:

29/02/08 13:58:46 (13 years ago)

Author:

spascoe

Message:

Added a simple data interface for WMS. This may not live in ows_common
in the long term but is the most convenient place to put it for now.

Location:

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common

Files:

• pylons/model.py (added)
• pylons/ows_controller.py (modified) (7 diffs)
• pylons/templates/wms_capabilities_1_1_1.xml (modified) (7 diffs)
• pylons/wms_controller.py (added)
• service (added)
• service/__init__.py (added)
• service/wms_iface.py (added)

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/ows_controller.py

@@ -32 +32 @@
 
 # Instantiate Genshi template loader
-genshiLoader = TemplateLoader(
+templateLoader = TemplateLoader(
     resource_filename('ows_common.pylons', 'templates'),
     auto_reload=True,
@@ -44 +44 @@
 
 
-class OwsControllerBase(WSGIController):
+class OWSControllerBase(WSGIController):
     """
     @ivar owsParams: A dictionary of parameters passed to the service.
@@ -63 +63 @@
         if 'pylons' in EXCEPTION_TYPE:
             self._fixOwsAction(environ)
-            return super(OwsControllerBase, self).__call__(environ, start_response)
+            return super(OWSControllerBase, self).__call__(environ, start_response)
         else:
             try:
                 self._fixOwsAction(environ)
-                return super(OwsControllerBase, self).__call__(environ, start_response)
+                return super(OWSControllerBase, self).__call__(environ, start_response)
             except OWS_E.OwsError, e:
                 logger.exception(e)
 
-                tmpl = genshiLoader.load('exception_report.xml')
+                tmpl = templateLoader.load('exception_report.xml')
                 response.write(tmpl.generate(report=e.report).render('xml'))
                 response.headers['content-type'] = 'text/xml'
@@ -116 +116 @@
 def addOperation(opName, formats=[]):
     ops = c.capabilities.operationsMetadata.operationDict
-    ops[opName] = helpers.operation(url_for(), formats=formats)
-
-def addLayer(name, title, abstract, srs, bbox, dimensions={}):
+    ops[opName] = helpers.operation(url_for(qualified=True, action="index")+'?', formats=formats)
+
+def addLayer(name, title, abstract, srss, bbox, dimensions={}):
     """
     @param dimensions: Dictionary of dictionaries D[k1][k2]=val where
@@ -131 +131 @@
         c.capabilities.contents = Contents()
 
-    layer = helpers.wms_layer(name, title, srs, bbox, abstract)
+    layer = helpers.wms_layer(name, title, srss, bbox, abstract)
 
     for k1, kwargs in dimensions.items():
@@ -159 +159 @@
 #-----------------------------------------------------------------------------
 
-class OwsController(OwsControllerBase):
-    """
-    Adds basic GetCapabilities response to OwsControllerBase.
+class OWSController(OWSControllerBase):
+    """
+    Adds basic GetCapabilities response to OWSControllerBase.
 
     @cvar service: If None does not enforce the SERVICE parameter.  Otherwise
@@ -175 +175 @@
     owsOperations = ['GetCapabilities']
 
-    # Override these attributes to control how OwsController responds to
+    # Override these attributes to control how OWSController responds to
     # GetCapabilities
     service = None

TI05-delivery/ows_framework/branches/ows_framework-refactor/ows_common/ows_common/pylons/templates/wms_capabilities_1_1_1.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <!DOCTYPE WMT_MS_Capabilities SYSTEM
- "http://www.digitalearth.gov/wmt/xml/capabilities_1_1_1.dtd">
+ "http://schemas.opengis.net/wms/1.1.1/WMS_MS_Capabilities.dtd">
 
 <?python
@@ -8 +8 @@
 from ows_common.pylons.genshi_util import RenameElementFilter
 from genshi import QName
+import webhelpers as h
 
 ?>
 
 <WMT_MS_Capabilities xmlns:py="http://genshi.edgewall.org/"
-                     xmlns:xlink="http://www.w3.org/1999/xlink"
                      version="1.1.1">
 
@@ -24 +24 @@
     <Format py:for="f in op.parameters['Format'].possibleValues.allowedValues" py:content="f"/>
     <DCPType><HTTP>
-      <Get><OnlineResource xlink:href="${op.get.href}"/></Get>
+      <Get>
+        <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" 
+                        xlink:href="${op.get.href}"/>
+      </Get>
     </HTTP></DCPType>
   </Operation>
@@ -60 +63 @@
       <Dimension name="${d_n}" units="${d.valuesUnit}"
                  unitSymbol="${d.unitSymbol}"/>
-      <Extent name="${d_n}" default="${d.defaultValue}" nearestValue="${d.nearestValue}"
-              py:content="' '.join(d.possibleValues.allowedValues)"/>
+      <Extent name="${d_n}" default="${d.defaultValue}" nearestValue="${int(d.nearestValue)}"
+              py:content="','.join(d.possibleValues.allowedValues)"/>
     </py:for>
   </Layer>
@@ -76 +79 @@
                py:content="kw"/>
     </KeywordList>
-    <!--! <OnlineResource xlink:type="simple" xlink:href="${h.url_for()}"/> -->
+    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" 
+                    xlink:href="${h.url_for(qualified=True, action='index')}?"/>
     
     <ContactInformation py:if="sm.serviceProvider is not None"
@@ -82 +86 @@
       <ContactPersonPrimary>
         <ContactPerson py:if="rp is not None" py:content="rp.individualName"/>
-        <ContactOrganisation py:content="sm.serviceProvider.providerName"/>
+        <ContactOrganization py:content="sm.serviceProvider.providerName"/>
       </ContactPersonPrimary>
       <ContactPosition py:content="rp.positionName"/>
@@ -113 +117 @@
   <Capability py:with="sm=c.capabilities; om=sm.operationsMetadata">
     <py:if test="om is not None">
-      <py:for each="opName, op in om.operationDict.items()">
-        <Request py:content="markupOperation(opName, op)"/>
-        <?python exceptions = op.parameters.get('ExceptionFormat') ?>
-        <Exception py:if="exceptions is not None">
-          <Format py:for="e in exceptions.possibleValues.allowedValues"
-                  py:content="e"/>
-        </Exception>
-      </py:for>
+      <?python ops = ['GetCapabilities', 'GetMap', 'GetFeatureInfo'] ?>
+      <Request>
+        <py:for each="opName in ops" py:if="opName in om.operationDict.keys()">
+          <span py:content="markupOperation(opName, om.operationDict[opName])" py:strip="True"/>
+        </py:for>
+        <py:for each="opName in ops" py:if="opName in om.operationDict.keys()">
+          <?python exceptions = om.operationDict[opName].parameters.get('ExceptionFormat') ?>
+          <Exception py:if="exceptions is not None">
+            <Format py:for="e in exceptions.possibleValues.allowedValues"
+                    py:content="e"/>
+          </Exception>
+        </py:for>
+      </Request>
     </py:if>
     
+    <!--!TODO:  capability exceptions -->
+    <Exception><Format>text/xml</Format></Exception>
+
     <Layer py:if="sm.contents is not None">
       <Title>Contents</Title>
       <Layer py:for="ds in sm.contents.datasetSummaries"
-             py:replace="markupLayer(ds)"/>
+             py:replace="markupLayer(ds)">
+      </Layer>
     </Layer>
   </Capability>