Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Be able to have a query layer without any scale bounds #2588

Merged
merged 2 commits into from
Oct 24, 2016
Merged

Be able to have a query layer without any scale bounds #2588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52bd839
Be able to have a query layer without any scale bounds
sbrunner Oct 17, 2016
d279bac
Don't use textile 1.3
sbrunner Oct 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions c2cgeoportal/views/entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,15 +454,14 @@ def _fill_wmts_v1(self, l, layer, wms, wms_layers, errors):
ql = {"name": query_layer}
resolutions = self._get_layer_resolution_hint(query_layer_obj)

if resolutions[0] <= resolutions[1]:
if resolutions[0] != float("Inf"):
ql["minResolutionHint"] = float(
"%0.2f" % resolutions[0])
if resolutions[1] != 0:
ql["maxResolutionHint"] = float(
"%0.2f" % resolutions[1])

if "minResolutionHint" in ql or \
"maxResolutionHint" in ql:
l["queryLayers"].append(ql)
l["queryLayers"].append(ql)

# FIXME we do not support WMTS layers associated to
# MapServer layer groups for now.
Expand Down
2 changes: 2 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
"pyramid_closure",
"lingua",
"PyYAML",
# Issue on branch 1.6 with version 2.3.x
"textile<2.3",
]

setup_requires = [
Expand Down