[qgis] 01/06: New upstream version 2.14.22+dfsg

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qgis.

commit 6fa9dfdde7f00ea4dd19a23036fa95ba10563d1b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jan 20 08:45:28 2018 +0100

    New upstream version 2.14.22+dfsg
---
 CMakeLists.txt                                  |  2 +-
 ChangeLog                                       |  8 ++++++++
 debian/changelog                                | 10 ++++++++--
 python/ext-libs/owslib/fes.py                   |  5 ++++-
 python/plugins/MetaSearch/dialogs/maindialog.py |  5 ++++-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e136f0..58357bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "14")
-SET(CPACK_PACKAGE_VERSION_PATCH "21")
+SET(CPACK_PACKAGE_VERSION_PATCH "22")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Essen")
 IF (POLICY CMP0048) # in CMake 3.0.0+
diff --git a/ChangeLog b/ChangeLog
index 7dbcfac..29c404f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tom Kralidis <tomkralidis at gmail.com>	2017-12-22
+
+    [bugfix] [MetaSearch] make gml:Envelope CRS explicit for spatial queries (fixes #17739)
+
+Juergen E. Fischer <jef at norbit.de>	2017-12-08
+
+    Release of 2.14.21
+
 rldhont <rldhont at gmail.com>	2017-11-06
 
     [Server] GetFeatureInfo: enhance raster data values displayed
diff --git a/debian/changelog b/debian/changelog
index 63a9f40..bb51b7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-qgis (2.14.21) UNRELEASED; urgency=medium
+qgis (2.14.22) UNRELEASED; urgency=medium
+
+  * Release of 2.14.22
+
+ -- Jürgen E. Fischer <jef at norbit.de>  Fri, 19 Jan 2018 14:13:45 +0100
+
+qgis (2.14.21) unstable; urgency=medium
 
   * Release of 2.14.21
 
- -- Jürgen E. Fischer <jef at norbit.de>  Fri, 08 Dec 2017 14:00:15 +0100
+ -- Jürgen E. Fischer <jef at norbit.de>  Fri, 19 Jan 2018 14:13:45 +0100
 
 qgis (2.14.20) unstable; urgency=medium
 
diff --git a/python/ext-libs/owslib/fes.py b/python/ext-libs/owslib/fes.py
index 5fb9816..30a4e06 100644
--- a/python/ext-libs/owslib/fes.py
+++ b/python/ext-libs/owslib/fes.py
@@ -340,12 +340,15 @@ class PropertyIsBetween(OgcExpression):
         
 class BBox(OgcExpression):
     """Construct a BBox, two pairs of coordinates (west-south and east-north)"""
-    def __init__(self, bbox):
+    def __init__(self, bbox, crs=None):
         self.bbox = bbox
+        self.crs = crs
     def toXML(self):
         tmp = etree.Element(util.nspath_eval('ogc:BBOX', namespaces))
         etree.SubElement(tmp, util.nspath_eval('ogc:PropertyName', namespaces)).text = 'ows:BoundingBox'
         tmp2 = etree.SubElement(tmp, util.nspath_eval('gml:Envelope', namespaces))
+        if self.crs is not None:
+            tmp2.set('srsName', self.crs)
         etree.SubElement(tmp2, util.nspath_eval('gml:lowerCorner', namespaces)).text = '%s %s' % (self.bbox[0], self.bbox[1])
         etree.SubElement(tmp2, util.nspath_eval('gml:upperCorner', namespaces)).text = '%s %s' % (self.bbox[2], self.bbox[3])
         return tmp
diff --git a/python/plugins/MetaSearch/dialogs/maindialog.py b/python/plugins/MetaSearch/dialogs/maindialog.py
index 4814c8b..10b119e 100644
--- a/python/plugins/MetaSearch/dialogs/maindialog.py
+++ b/python/plugins/MetaSearch/dialogs/maindialog.py
@@ -438,6 +438,8 @@ class MetaSearchDialog(QDialog, BASE_CLASS):
         self.timeout = self.spnTimeout.value()
 
         # bbox
+        # CRS is WGS84 with axis order longitude, latitude
+        # defined by 'urn:ogc:def:crs:OGC:1.3:CRS84'
         minx = self.leWest.text()
         miny = self.leSouth.text()
         maxx = self.leEast.text()
@@ -448,7 +450,8 @@ class MetaSearchDialog(QDialog, BASE_CLASS):
         # even for a global bbox, if a spatial filter is applied, then
         # the CSW server will skip records without a bbox
         if bbox != ['-180', '-90', '180', '90']:
-            self.constraints.append(BBox(bbox))
+            self.constraints.append(BBox(bbox,
+                                         crs='urn:ogc:def:crs:OGC:1.3:CRS84'))
 
         # keywords
         if self.leKeywords.text():

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git