SOS 2.0 and WaterML2.0 decoder

.travis.yml

@@ -14,7 +14,8 @@ install:
   - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install -r requirements-2.6.txt; fi
   - if [ "$LXML" == "true" ]; then pip install lxml; fi
 script:
-  - python -m pytest -s
+  - python -m pytest
+  - pep8 owslib/wmts.py
 notifications:
   irc:
     - "irc.freenode.org#geopython"

CREDITS.txt

@@ -10,3 +10,4 @@
  * Christian Ledermann <christian.ledermann@gmail.com>
  * Sean Cowan <scowan@asascience.com>
  * Kyle Wilcox <wilcox.kyle@gmail.com>
+ * Angelos Tzotsos <gcpp.kalxas@gmail.com>

LICENSE.txt

@@ -10,7 +10,7 @@ modification, are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of the University of North Carolina nor the names of
+    * Neither the name of the Ancient World Mapping Center nor the names of
       its contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
 

docs/en/index.rst

@@ -5,11 +5,11 @@ OWSLib |release| documentation
 .. toctree::
    :maxdepth: 2
 
-.. image:: http://www.ohloh.net/p/owslib/widgets/project_partner_badge.gif
+.. image:: https://www.openhub.net/p/owslib/widgets/project_partner_badge.gif
    :width: 193px
    :height: 33px
    :alt: OWSLib
-   :target: http://www.ohloh.net/p/owslib?ref=WidgetProjectPartnerBadge
+   :target: https://www.openhub.net/p/owslib?ref=WidgetProjectPartnerBadge
 
 :Author: Tom Kralidis
 :Contact: tomkralidis at gmail.com
@@ -62,7 +62,7 @@ Standards Support
 +-------------------+---------------------+
 | `WMTS`_           | 1.0.0               |
 +-------------------+---------------------+
-| `WaterML`_        | 1.0, 1.1            |
+| `WaterML`_        | 1.0, 1.1, 2.0       |
 +-------------------+---------------------+
 
 Installation
@@ -71,7 +71,7 @@ Installation
 Requirements
 ------------
 
-OWSLib requires a Python interpreter, as well as `ElementTree <http://effbot.org/zone/element-index.htm>`_ or `lxml <http://codespeak.net/lxml>`_ for XML parsing.
+OWSLib requires a Python interpreter, as well as `ElementTree <https://docs.python.org/2/library/xml.etree.elementtree.html>`_ or `lxml <http://lxml.de>`_ for XML parsing.
 
 Install
 -------
@@ -81,6 +81,8 @@ PyPI:
 .. code-block:: bash
 
   $ easy_install OWSLib
+  # pip works too
+  $ pip install OWSLib
 
 Git:
 
@@ -110,6 +112,15 @@ RedHat Enterprise Linux
   $ wget -O /etc/yum.repos.d/RHEL-CBS.repo http://download.opensuse.org/repositories/Application:/Geo/RHEL_6/Application:Geo.repo
   $ yum install owslib
 
+Fedora:
+
+.. note::
+
+  As of Fedora 20, OWSLib is part of the Fedora core package collection
+
+.. code-block:: bash
+  $ yum install OWSLib
+
 Usage
 =====
 
@@ -220,7 +231,9 @@ Search for bird data:
 
 .. code-block:: python
 
-  >>> csw.getrecords(keywords=['birds'], maxrecords=20)
+  >>> from owslib.fes import PropertyIsEqualTo, PropertyIsLike, BBox
+  >>> birds_query = PropertyIsEqualTo('csw:AnyText', 'birds')
+  >>> csw.getrecords(constraints=[birds_query], maxrecords=20)
   >>> csw.results    
   {'matches': 101, 'nextrecord': 21, 'returned': 20}
   >>> for rec in csw.records:
@@ -252,16 +265,19 @@ Search for bird data in Canada:
 
 .. code-block:: python
 
-  >>> csw.getrecords(keywords=['birds'],bbox=[-141,42,-52,84])
+  >>> bbox_query = BBox([-141,42,-52,84])
+  >>> csw.getrecords(constraints=[birds_query, bbox_query])
   >>> csw.results
   {'matches': 3, 'nextrecord': 0, 'returned': 3}
   >>> 
 
-Search for 'birds' or 'fowl'
+Search for keywords like 'birds' or 'fowl'
 
 .. code-block:: python
 
-  >>> csw.getrecords(keywords=['birds', 'fowl'])
+  >>> birds_query_like = PropertyIsLike('dc:subject', '%birds%')
+  >>> fowl_query_like = PropertyIsLike('dc:subject', '%fowl%')
+  >>> csw.getrecords(constraints=[birds_query_like, fowl_query_like])
   >>> csw.results
   {'matches': 107, 'nextrecord': 11, 'returned': 10}
   >>> 
@@ -503,8 +519,8 @@ You can also submit a pre-made request encoded as WPS XML:
 	Output URL=http://cida.usgs.gov/climate/gdp/process/RetrieveResultServlet?id=5103866488472745994OUTPUT.f80e2a78-96a9-4343-9777-be60fac5b256
 
 
-SOS
----
+SOS 1.0
+-------
 
 GetCapabilities
 
@@ -514,6 +530,16 @@ GetObservation
 
 .. include:: ../../tests/doctests/sos_10_ndbc_getobservation.txt
 
+SOS 2.0
+-------
+Examples of service metadata and GetObservation
+
+.. include:: ../../tests/doctests/sos_20_52n_geoviqua.txt
+
+Using the GetObservation response decoder for O&M and WaterML2.0 results
+
+.. include:: ../../tests/doctests/sos_20_timeseries_decoder_ioos.txt
+
 SensorML
 --------
 .. include:: ../../tests/doctests/sml_ndbc_station.txt
@@ -661,6 +687,8 @@ Credits
 .. _`OGC WMC`: http://www.opengeospatial.org/standards/wmc
 .. _`OGC WPS`: http://www.opengeospatial.org/standards/wps
 .. _`OGC SOS`: http://www.opengeospatial.org/standards/sos
+.. _`OGC O&M`: http://www.opengeospatial.org/standards/om
+.. _`OGC WaterML2.0`: http://www.opengeospatial.org/standards/waterml
 .. _`OGC SensorML`: http://www.opengeospatial.org/standards/sensorml
 .. _`OGC CSW`: http://www.opengeospatial.org/standards/cat
 .. _`OGC WMTS`: http://www.opengeospatial.org/standards/wmts
@@ -674,4 +702,4 @@ Credits
 .. _`freenode`: http://freenode.net/
 .. _`ohloh`: http://www.ohloh.net/p/OWSLib
 .. _`CIA.vc`: http://cia.vc/stats/project/OWSLib
-.. _`WaterML`: http://his.cuahsi.org/wofws.html#waterml
+.. _`WaterML1.0`: http://his.cuahsi.org/wofws.html#waterml

docs/publish.sh

@@ -4,13 +4,13 @@
 THIS_DIR=`pwd`
 
 make clean && make html
-git clone git@github.com:geopython/OWSLib.git /tmp/OWSLib
-cd /tmp/OWSLib
+git clone git@github.com:geopython/OWSLib.git /tmp/OWSLib-$$
+cd /tmp/OWSLib-$$
 git checkout gh-pages
 /bin/cp -rp $THIS_DIR/build/html/en/* .
 git add .
 git commit -am "update live docs [ci skip]"
 git push origin gh-pages
 
 cd $THIS_DIR
-rm -fr /tmp/OWSLib
+rm -fr /tmp/OWSLib-$$

owslib/csw.py

@@ -9,11 +9,13 @@
 
 """ CSW request and response processor """
 
+import base64
+import inspect
 import warnings
 import StringIO
 import random
 from urllib import urlencode
-from urllib2 import urlopen
+from urllib2 import Request, urlopen
 
 from owslib.util import OrderedDict
 
@@ -39,7 +41,8 @@ def get_namespaces():
 
 class CatalogueServiceWeb:
     """ csw request class """
-    def __init__(self, url, lang='en-US', version='2.0.2', timeout=10, skip_caps=False):
+    def __init__(self, url, lang='en-US', version='2.0.2', timeout=10, skip_caps=False,
+                 username=None, password=None):
         """
 
         Construct and process a GetCapabilities request
@@ -52,13 +55,17 @@ def __init__(self, url, lang='en-US', version='2.0.2', timeout=10, skip_caps=Fal
         - version: version (default is '2.0.2')
         - timeout: timeout in seconds
         - skip_caps: whether to skip GetCapabilities processing on init (default is False)
+        - username: username for HTTP basic authentication
+        - password: password for HTTP basic authentication
 
         """
 
         self.url = url
         self.lang = lang
         self.version = version
         self.timeout = timeout
+        self.username = username
+        self.password = password
         self.service = 'CSW'
         self.exceptionreport = None
         self.owscommon = ows.OwsCommon('1.0.0')
@@ -511,7 +518,7 @@ def _parseinsertresult(self):
 
     def _parserecords(self, outputschema, esn):
         if outputschema == namespaces['gmd']: # iso 19139
-            for i in self._exml.findall('.//'+util.nspath_eval('gmd:MD_Metadata', namespaces)):
+            for i in self._exml.findall('.//'+util.nspath_eval('gmd:MD_Metadata', namespaces)) or self._exml.findall('.//'+util.nspath_eval('gmi:MI_Metadata', namespaces)):
                 val = i.find(util.nspath_eval('gmd:fileIdentifier/gco:CharacterString', namespaces))
                 identifier = self._setidentifierkey(util.testXMLValue(val))
                 self.records[identifier] = MD_Metadata(i)
@@ -584,14 +591,21 @@ def _invoke(self):
         # do HTTP request
 
         if isinstance(self.request, basestring):  # GET KVP
-            self.response = urlopen(self.request, timeout=self.timeout).read()
+            req = Request(self.request)
+            if self.username is not None and self.password is not None:
+                base64string = base64.encodestring('%s:%s' % (self.username, self.password))[:-1]
+                req.add_header('Authorization', 'Basic %s' % base64string)
+            self.response = urlopen(req, timeout=self.timeout).read()
         else:
             xml_post_url = self.url
             # Get correct POST URL based on Operation list.
             # If skip_caps=True, then self.operations has not been set, so use
             # default URL.
             if hasattr(self, 'operations'):
-                for op in self.operations:
+                caller = inspect.stack()[1][3] 
+                if caller == 'getrecords2': caller = 'getrecords'
+                try:
+                    op = self.get_operation_by_name(caller)
                     post_verbs = filter(lambda x: x.get('type').lower() == 'post', op.methods)
                     if len(post_verbs) > 1:
                         # Filter by constraints.  We must match a PostEncoding of "XML"
@@ -602,6 +616,8 @@ def _invoke(self):
                             xml_post_url = post_verbs[0].get('url')
                     elif len(post_verbs) == 1:
                         xml_post_url = post_verbs[0].get('url')
+                except:  # no such luck, just go with xml_post_url
+                    pass
 
             self.request = cleanup_namespaces(self.request)
             # Add any namespaces used in the "typeNames" attribute of the
@@ -616,7 +632,7 @@ def _invoke(self):
 
             self.request = util.element_to_string(self.request, encoding='utf-8')
 
-            self.response = util.http_post(xml_post_url, self.request, self.lang, self.timeout)
+            self.response = util.http_post(xml_post_url, self.request, self.lang, self.timeout, self.username, self.password)
 
         # parse result see if it's XML
         self._exml = etree.parse(StringIO.StringIO(self.response))

owslib/feature/__init__.py

@@ -119,7 +119,10 @@ def getGETGetFeatureRequest(self, typename=None, filter=None, bbox=None, feature
             request['query'] = str(filter)
         if typename:
             typename = [typename] if type(typename) == type("") else typename
-            request['typename'] = ','.join(typename)
+            if self.version == "2.0.0":
+                request['typename'] = ','.join(typename)
+            else:
+                request['typenames'] = ','.join(typename)
         if propertyname: 
             request['propertyname'] = ','.join(propertyname)
         if featureversion: 

owslib/feature/wfs200.py

@@ -255,7 +255,7 @@ def _getStoredQueries(self, timeout=30):
 
         request = {'service': 'WFS', 'version': self.version, 'request': 'ListStoredQueries'}
         encoded_request = urlencode(request)
-        u = urlopen(base_url + encoded_request, timeout=timeout)
+        u = urlopen(base_url, data=encoded_request, timeout=timeout)
         tree=etree.fromstring(u.read())
         tempdict={}       
         for sqelem in tree[:]:
@@ -275,7 +275,7 @@ def _getStoredQueries(self, timeout=30):
             base_url = self.url
         request = {'service': 'WFS', 'version': self.version, 'request': 'DescribeStoredQueries'}
         encoded_request = urlencode(request)
-        u = urlopen(base_url + encoded_request, timeout=timeout)
+        u = urlopen(base_url, data=encoded_request, timeout=timeout)
         tree=etree.fromstring(u.read())
         tempdict2={} 
         for sqelem in tree[:]:

owslib/iso.py

@@ -247,9 +247,9 @@ def __init__(self, md=None, identtype=None):
             self.distance = []
             self.uom = []
             self.resourcelanguage = []
-            self.creator = None
-            self.publisher = None
-            self.originator = None
+            self.creator = []
+            self.publisher = []
+            self.contributor = []
             self.edition = None
             self.abstract = None
             self.purpose = None
@@ -347,17 +347,20 @@ def __init__(self, md=None, identtype=None):
                 if val is not None:
                     self.resourcelanguage.append(val)
 
-            val = md.find(util.nspath_eval('gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName', namespaces))
-            if val is not None:
-                val2 = val.find(util.nspath_eval('gmd:role/gmd:CI_RoleCode', namespaces)) 
-                if val2 is not None:
-                    clv = _testCodeListValue(val)
+            self.creator = []
+            self.publisher = []
+            self.contributor = []
+            for val in md.findall(util.nspath_eval('gmd:pointOfContact/gmd:CI_ResponsibleParty', namespaces)):
+                role = val.find(util.nspath_eval('gmd:role/gmd:CI_RoleCode', namespaces))
+                if role is not None:
+                    clv = _testCodeListValue(role)
+                    rp = CI_ResponsibleParty(val)
                     if clv == 'originator':
-                        self.creator = util.testXMLValue(val)
+                        self.creator.append(rp)
                     elif clv == 'publisher':
-                        self.publisher = util.testXMLValue(val)
-                    elif clv == 'contributor':
-                        self.originator = util.testXMLValue(val)
+                        self.publisher.append(rp)
+                    elif clv == 'author':
+                        self.contributor.append(rp)
 
             val = md.find(util.nspath_eval('gmd:edition/gco:CharacterString', namespaces))
             self.edition = util.testXMLValue(val)
@@ -545,6 +548,8 @@ def __init__(self, md=None):
             self.operations = []
             self.operateson = []
         else:
+            val=md.find(util.nspath_eval('gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString', namespaces))
+            self.title=util.testXMLValue(val)
             self.identtype = 'service'
             val = md.find(util.nspath_eval('srv:serviceType/gco:LocalName', namespaces))
             self.type = util.testXMLValue(val)
@@ -555,6 +560,9 @@ def __init__(self, md=None):
             val = md.find(util.nspath_eval('srv:accessProperties/gmd:MD_StandardOrderProcess/gmd:fees/gco:CharacterString', namespaces))
             self.fees = util.testXMLValue(val)
 
+            val = md.find(util.nspath_eval('srv:accessProperties/gmd:MD_StandardOrderProcess/gmd:fees/gco:CharacterString', namespaces))
+            self.fees = util.testXMLValue(val)
+
             val = md.find(util.nspath_eval('srv:extent/gmd:EX_Extent', namespaces))
 
             if val is not None:

owslib/namespaces.py

@@ -15,6 +15,7 @@ class Namespaces(object):
         'fgdc'  :   'http://www.opengis.net/cat/csw/csdgm',
         'gco'   :   'http://www.isotc211.org/2005/gco',
         'gmd'   :   'http://www.isotc211.org/2005/gmd',
+        'gmi'   :   'http://www.isotc211.org/2005/gmi',
         'gml'   :   'http://www.opengis.net/gml',
         'gml311':   'http://www.opengis.net/gml',
         'gml32' :   'http://www.opengis.net/gml/3.2',
@@ -42,6 +43,7 @@ class Namespaces(object):
         'swe20' :   'http://www.opengis.net/swe/2.0',
         'swes'  :   'http://www.opengis.net/swes/2.0',
         'tml'   :   'ttp://www.opengis.net/tml',
+        'wml2'  :   'http://www.opengis.net/waterml/2.0',
         'wfs'   :   'http://www.opengis.net/wfs',
         'wfs20' :   'http://www.opengis.net/wfs/2.0',
         'wcs'   :   'http://www.opengis.net/wcs',

owslib/ows.py

@@ -162,6 +162,8 @@ def __repr__(self):
 class OperationsMetadata(object):
     """Initialize an OWS OperationMetadata construct"""
     def __init__(self, elem, namespace=DEFAULT_OWS_NAMESPACE):
+        if 'name' not in elem.attrib: # This is not a valid element
+            return
         self.name = elem.attrib['name']
         self.formatOptions = ['text/xml']
         parameters = []