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

Jump to bottom

PB-510: Fixing OperationsMetadataURL and ServiceMetadataURL #84

Merged
merged 1 commit into from
May 31, 2024
Merged

PB-510: Fixing OperationsMetadataURL and ServiceMetadataURL #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions app/templates/WmtsCapabilities.xml.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@
xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd"
version="1.0.0">
{% include 'StandardHeader.xml.jinja' +%}

{% set key_value_lang = '' if is_default_lang == "True" else '?lang=%s' % language %}
{% set url_path_epsg = '' if is_default_epsg == "True" else 'EPSG/%s/' % epsg %}

<ows:OperationsMetadata>
<ows:Operation name="GetCapabilities">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:href="{{ url_base }}1.0.0/WMTSCapabilities.xml">
<ows:Get xlink:href="{{ url_base }}{{ url_path_epsg }}1.0.0/WMTSCapabilities.xml{{ key_value_lang }}">
<ows:Constraint name="GetEncoding">
<ows:AllowedValues>
<ows:Value>REST</ows:Value>
Expand All @@ -24,7 +28,7 @@
<ows:Operation name="GetTile">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:href="{{ url_base }}">
<ows:Get xlink:href="{{ url_base }}{{ url_path_epsg }}">
<ows:Constraint name="GetEncoding">
<ows:AllowedValues>
<ows:Value>REST</ows:Value>
Expand All @@ -40,5 +44,5 @@
{% include 'TileMatrixSet.xml.jinja' +%}
</Contents>
{% include 'Themes.xml.jinja' +%}
<ServiceMetadataURL xlink:href="{{ url_base }}1.0.0/WMTSCapabilities.xml"/>
</Capabilities>
<ServiceMetadataURL xlink:href="{{ url_base }}{{ url_path_epsg }}1.0.0/WMTSCapabilities.xml{{ key_value_lang }}"/>
</Capabilities>
13 changes: 10 additions & 3 deletions app/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,14 @@ class GetCapabilities(View):
# pylint: disable=arguments-differ
def dispatch_request(self, version, epsg=None, lang=None):
validate_version()
is_default_epsg = (epsg is None)
is_default_lang = (lang is None)

epsg, lang = self.get_and_validate_args(epsg, lang)

context = self.get_context(self.get_models(lang), epsg, lang)
context = self.get_context(
self.get_models(lang), epsg, lang, is_default_lang, is_default_epsg
)
return (
render_template(
'WmtsCapabilities.xml.jinja',
Expand Down Expand Up @@ -87,7 +92,7 @@ def get_metadata(cls, model):
).first()

@classmethod
def get_context(cls, models, epsg, lang):
def get_context(cls, models, epsg, lang, is_default_lang, is_default_epsg):
start = time.time()
layers_capabilities = cls.get_layers_capabilities(models['GetCap'])
logger.debug('GetCap query done in %fs', time.time() - start)
Expand All @@ -111,7 +116,9 @@ def get_context(cls, models, epsg, lang):
'default_tile_matrix_set': get_default_tile_matrix_set(epsg),
'legend_base_url': app.config["LEGENDS_BASE_URL"],
'language': lang,
'standard_latitude': STANDARD_LATITUDE_FOR_SWITZERLAND
'standard_latitude': STANDARD_LATITUDE_FOR_SWITZERLAND,
'is_default_lang': is_default_lang,
'is_default_epsg': is_default_epsg
}
logger.debug('Data context created in %fs', time.time() - start)
return context