[mapproxy] 01/07: New upstream version 1.10.2

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapproxy.

commit 51e799927b4d0af70a064723eb8628f079f38345
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jun 21 18:02:45 2017 +0200

    New upstream version 1.10.2
---
 CHANGES.txt            | 7 +++++++
 doc/conf.py            | 2 +-
 mapproxy/cache/tile.py | 9 ++++++++-
 setup.py               | 2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d09e704..ca91d31 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,10 @@
+1.10.2 2017-06-21
+~~~~~~~~~~~~~~~~~
+
+Fixes:
+
+- Fix coverage clipping for caches with a single source
+
 1.10.1 2017-06-06
 ~~~~~~~~~~~~~~~~~
 
diff --git a/doc/conf.py b/doc/conf.py
index 335a1d3..cb05ca7 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -51,7 +51,7 @@ copyright = u'Oliver Tonnhofer, Omniscale'
 # The short X.Y version.
 version = '1.10'
 # The full version, including alpha/beta/rc tags.
-release = '1.10.1'
+release = '1.10.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/mapproxy/cache/tile.py b/mapproxy/cache/tile.py
index 0362848..560c415 100644
--- a/mapproxy/cache/tile.py
+++ b/mapproxy/cache/tile.py
@@ -283,7 +283,14 @@ class TileCreator(object):
         Query all sources and return the results as a single ImageSource.
         Multiple sources will be merged into a single image.
         """
-        if len(self.sources) == 1 and not self.image_merger:
+
+        # directly return get_map without merge if ...
+        if (len(self.sources) == 1 and
+            not self.image_merger and # no special image_merger (like BandMerger)
+            not (self.sources[0].coverage and  # no clipping coverage
+                 self.sources[0].coverage.clip and
+                 self.sources[0].coverage.intersects(query.bbox, query.srs))
+        ):
             try:
                 return self.sources[0].get_map(query)
             except BlankImage:
diff --git a/setup.py b/setup.py
index 80b9c5a..7ec76d5 100644
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ def long_description(changelog_releases=10):
 
 setup(
     name='MapProxy',
-    version="1.10.1",
+    version="1.10.2",
     description='An accelerating proxy for web map services',
     long_description=long_description(7),
     author='Oliver Tonnhofer',

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