Changeset 1316

Timestamp:

06/26/09 02:08:05 (9 months ago)

Author:

domlowe

Message:

Version parameter now optional in WebCoverageService? init as per spec - patch from Goyo

Location:

OWSLib/trunk

Files:

• owslib/coverage/wcsBase.py (modified) (2 diffs)
• owslib/wcs.py (modified) (1 diff)
• tests/wcs_idee.txt (modified) (1 diff)

OWSLib/trunk/owslib/coverage/wcsBase.py

@@ -67 +67 @@
     """
 
-    def __init__(self, version):
+    def __init__(self, version=None):
         """Initialize
         @type version: string
@@ -92 +92 @@
         if 'request' not in params:
             qs.append(('request', 'GetCapabilities'))
-        if 'version' not in params:
+        if ('version' not in params) and (self.version is not None):
             qs.append(('version', self.version))
 

OWSLib/trunk/owslib/wcs.py

@@ -14 +14 @@
 """
 
-from coverage import wcs100, wcs110 
-def WebCoverageService(url, version='1.1.0', xml=None):
+
+import urllib2
+import etree
+from coverage import wcs100, wcs110, wcsBase
+
+def WebCoverageService(url, version=None, xml=None):
     ''' wcs factory function, returns a version specific WebCoverageService object '''
+    if xml is None:
+        reader = wcsBase.WCSCapabilitiesReader()
+        request = reader.capabilities_url(url)
+        xml = urllib2.urlopen(request).read()
+
+    if version is None:
+        capabilities = etree.etree.fromstring(xml)
+        version = capabilities.get('version')
+        del capabilities
+    
     if version == '1.0.0':
         return wcs100.WebCoverageService_1_0_0.__new__(wcs100.WebCoverageService_1_0_0, url, xml)

OWSLib/trunk/tests/wcs_idee.txt

@@ -7 +7 @@
 
     >>> from owslib.wcs import WebCoverageService
-    >>> wcs=WebCoverageService('http://www.idee.es/wcs/IDEE-WCS-UTM30N/wcsServlet', version='1.0.0')
+    >>> wcs=WebCoverageService('http://www.idee.es/wcs/IDEE-WCS-UTM30N/wcsServlet')
+    >>> wcs.version
+    '1.0.0'
     >>> wcs.url
     'http://www.idee.es/wcs/IDEE-WCS-UTM30N/wcsServlet'
-    >>> wcs.version
-    '1.0.0'
     >>> wcs.identification.service
     'IDEE-WCS-UTM30N'
     >>> wcs.provider.name
-    'IAAA Laboratory, University of Zaragoza'
-    >>> wcs.provider.contact.organization
-    'IAAA Laboratory, University of Zaragoza'
+    u'Instituto Geogr\xe1fico Nacional'
     >>> wcs.contents.keys()
     ['MDT25_peninsula_pendientes', 'MDT_peninsula_baleares_aspecto', 'MDT1000_peninsula_baleares', 'MDT500_peninsula_baleares', 'MDT_peninsula_baleares', 'MDT500_peninsula_baleares_pendientes', 'MDT1000_peninsula_baleares_pendientes', 'MDT_peninsula_baleares_pendientes', 'MDT25_peninsula_ZIP', 'MDT25_peninsula_aspecto', 'MDT500_peninsula_baleares_aspecto', 'MDT1000_peninsula_baleares_aspecto']