Merge tag 'upstream/1.10.2'
Upstream version 1.10.2
Bas Couwenberg
6 years ago
|
0 |
1.10.2 2017-06-21
|
|
1 |
~~~~~~~~~~~~~~~~~
|
|
2 |
|
|
3 |
Fixes:
|
|
4 |
|
|
5 |
- Fix coverage clipping for caches with a single source
|
|
6 |
|
| 0 | 7 |
1.10.1 2017-06-06
|
| 1 | 8 |
~~~~~~~~~~~~~~~~~
|
| 2 | 9 |
|
| 50 | 50 |
# The short X.Y version.
|
| 51 | 51 |
version = '1.10'
|
| 52 | 52 |
# The full version, including alpha/beta/rc tags.
|
| 53 | |
release = '1.10.1'
|
|
53 |
release = '1.10.2'
|
| 54 | 54 |
|
| 55 | 55 |
# The language for content autogenerated by Sphinx. Refer to documentation
|
| 56 | 56 |
# for a list of supported languages.
|
| 282 | 282 |
Query all sources and return the results as a single ImageSource.
|
| 283 | 283 |
Multiple sources will be merged into a single image.
|
| 284 | 284 |
"""
|
| 285 | |
if len(self.sources) == 1 and not self.image_merger:
|
|
285 |
|
|
286 |
# directly return get_map without merge if ...
|
|
287 |
if (len(self.sources) == 1 and
|
|
288 |
not self.image_merger and # no special image_merger (like BandMerger)
|
|
289 |
not (self.sources[0].coverage and # no clipping coverage
|
|
290 |
self.sources[0].coverage.clip and
|
|
291 |
self.sources[0].coverage.intersects(query.bbox, query.srs))
|
|
292 |
):
|
| 286 | 293 |
try:
|
| 287 | 294 |
return self.sources[0].get_map(query)
|
| 288 | 295 |
except BlankImage:
|
| 53 | 53 |
|
| 54 | 54 |
setup(
|
| 55 | 55 |
name='MapProxy',
|
| 56 | |
version="1.10.1",
|
|
56 |
version="1.10.2",
|
| 57 | 57 |
description='An accelerating proxy for web map services',
|
| 58 | 58 |
long_description=long_description(7),
|
| 59 | 59 |
author='Oliver Tonnhofer',
|