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

suggestion for implementing wms/wmts/wfs/... links in record.geojson #815

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

suggestion for implementing wms/wmts/wfs/... links in record.geojson #815

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
78 changes: 63 additions & 15 deletions pycsw/ogc/api/records.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
from pycsw.core.pygeofilter_evaluate import to_filter
from pycsw.core.util import bind_url, get_today_and_now, jsonify_links, load_custom_repo_mappings, wkt2geom
from pycsw.ogc.api.oapi import gen_oapi
from pycsw.ogc.api.util import match_env_var, render_j2_template, to_json
from pycsw.ogc.api.util import match_env_var, render_j2_template, to_json, merge_qs

LOGGER = logging.getLogger(__name__)

Expand Down Expand Up @@ -1048,22 +1048,70 @@ def record2json(record, url, collection, stac_item=False):

if record.links:
rdl = record_dict['links']

for link in jsonify_links(record.links):
link2 = {
'href': link['url'],
'name': link['name'],
link2 = {
'type': link['protocol'],
'description': link['description'],
'type': link['protocol']
}
if 'rel' in link:
link2['rel'] = link['rel']
elif link['protocol'] == 'WWW:LINK-1.0-http--image-thumbnail':
link2['rel'] = 'preview'
elif 'function' in link:
link2['rel'] = link['function']

rdl.append(link2)
'title': link['name'],
'href': link['url']
}
if link['protocol']:
if 'OGC:WMS' in link['protocol'].upper():
link2['rel'] = 'map'
link2['templated'] = 'true'
# assumes link['url'] includes '&layers=...', else link['name'] contains layername(s)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alternative would be to use owslib.wms130.__build_getmap_request (but challenge to replace bbox array for {bbox})

link2['href'] = merge_qs(link['url'], {
'request': 'GetMap', 'service': 'WMS',
'width': '{width}', 'height': '{height}', 'bbox': '{bbox}'}, {
'version': '1.3.0', 'crs': 'epsg:4326',
'layers': link['name'], 'format': 'image/png'})
link2['variables'] = {
'bbox': {
'type': 'array',
'items': {'type': 'number', 'format': 'double'},
'minItems': 4, 'maxItems': 4
},
'width': {'type': 'number', 'format': 'integer'},
'height': {'type': 'number', 'format': 'integer'}
}
link2['type'] = 'image/png'

elif 'OGC:WMTS' in link['protocol'].upper():
link2['rel'] = 'map'
link2['templated'] = 'true'
link2['href'] = merge_qs(link['url'], {
'service': 'WMTS', 'request': 'GetTile', 'version': '1.0.0',
'TileMatrix': '{TileMatrix}', 'TileRow': '{TileRow}', 'TileCol': '{TileCol}'}, {
'TileMatrixSet': 'default', 'Layer': link['name'],
'Style': 'default', 'Format': 'image/png'})
link2['variables'] = {
'TileMatrix': {'type': 'number', 'format': 'integer'},
'TileRow': {'type': 'number', 'format': 'integer'},
'TileCol': {'type': 'number', 'format': 'integer'}
}
link2['type'] = 'image/png'

elif 'OGC:WFS' in link['protocol'].upper():
link2['rel'] = 'map'
link2['templated'] = 'true'
link2['href'] = merge_qs(link['url'], {
'version': '2.0.0', 'request': 'GetFeature', 'service': 'WFS', 'count': '{count}'}, {
'typenames': link['name'], 'srsName': 'urn:ogc:def:crs:EPSG::4326',
'outputFormat':'application/gml+xml'})
link2['variables'] = {
'count': {'type': 'number', 'format': 'integer'}}
link2['type'] = 'application/gml+xml'

#elif 'OSGEO:TMS' in link['protocol'].upper():
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or better/also to use xyz (both not in catinterop yet, see OSGeo/Cat-Interop#42)

#elif 'OGC:CSW' in link['protocol'].upper():
#elif 'OGC:WCS' in link['protocol'].upper():

elif 'rel' in link:
link2['rel'] = link['rel']
elif 'function' in link:
link2['rel'] = link['function']

rdl.append(link2)

record_dict['links'].append({
'rel': 'collection',
Expand Down
23 changes: 23 additions & 0 deletions pycsw/ogc/api/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import mimetypes
import os
import re
from urllib.parse import urlparse, parse_qsl, urlencode

from jinja2 import Environment, FileSystemLoader
from jinja2.exceptions import TemplateNotFound
Expand Down Expand Up @@ -139,6 +140,28 @@ class EnvVarLoader(yaml.SafeLoader):

return yaml.load(fh, Loader=EnvVarLoader)

def merge_qs(url, req, opt):
"""
Merge required and optional parameters into a querystring.
Typically replaces https://example.com/mapserver?map=foo.map&service=wms&request=GetCapabilities&layers=trees for
https://example.com/mapserver?map=foo.map&service=WMS&request=GetMap&version=1.3.0&layers=trees&bbox={bbox}&format=...

:param url: The original url to be substituted
:param req: These arguments will be sustituted
:param opt: These arguments are substituted if they don't exist

:returns: url
"""

parsed_url = urlparse(url)
args = dict(parse_qsl(parsed_url.query))
for k,v in req.items():
args[k] = v
for k,v in opt.items():
if k not in args.keys() or args[k] == '':
args[k] = v

return url.split('?')[0] + '?' + urlencode(args)

def to_json(dict_, pretty=False):
"""
Expand Down