Permalink
Browse files

GetCapabilities Version Update fro wms, Removed The Question Mark bef…

…ore the Resource Type (#213)
  • Loading branch information...
VincentBougie authored and tomkralidis committed Sep 14, 2018
1 parent 878cd79 commit 8e40f49ad30aaab8265daec77aada0856148c686
Showing with 10 additions and 9 deletions.
  1. +8 −8 GeoHealthCheck/enums.py
  2. +2 −1 GeoHealthCheck/models.py
View
@@ -30,13 +30,13 @@
RESOURCE_TYPES = {
'OGC:WMS': {
'label': 'Web Map Service (WMS)',
'versions': ['1.1.1'],
'capabilities': '?service=WMS&version=1.1.1&request=GetCapabilities'
'versions': ['1.3.0'],
'capabilities': 'service=WMS&version=1.3.0&request=GetCapabilities'
},
'OGC:WMTS': {
'label': 'Web Map Tile Service (WMTS)',
'versions': ['1.0.0'],
'capabilities': '?service=WMTS&version=1.0.0&request=GetCapabilities'
'capabilities': 'service=WMTS&version=1.0.0&request=GetCapabilities'
},
'OSGeo:TMS': {
'label': 'Tile Map Service (TMS)',
@@ -45,27 +45,27 @@
'OGC:WFS': {
'label': 'Web Feature Service (WFS)',
'versions': ['1.1.0'],
'capabilities': '?service=WFS&version=1.1.0&request=GetCapabilities'
'capabilities': 'service=WFS&version=1.1.0&request=GetCapabilities'
},
'OGC:WCS': {
'label': 'Web Coverage Service (WCS)',
'versions': ['1.1.0'],
'capabilities': '?service=WCS&version=1.1.0&request=GetCapabilities'
'capabilities': 'service=WCS&version=1.1.0&request=GetCapabilities'
},
'OGC:WPS': {
'label': 'Web Processing Service (WPS)',
'versions': ['1.0.0'],
'capabilities': '?service=WPS&version=1.0.0&request=GetCapabilities'
'capabilities': 'service=WPS&version=1.0.0&request=GetCapabilities'
},
'OGC:CSW': {
'label': 'Catalogue Service (CSW)',
'versions': ['2.0.2'],
'capabilities': '?service=CSW&version=2.0.2&request=GetCapabilities'
'capabilities': 'service=CSW&version=2.0.2&request=GetCapabilities'
},
'OGC:SOS': {
'label': 'Sensor Observation Service (SOS)',
'versions': ['1.0.0'],
'capabilities': '?service=SOS&version=1.0.0&request=GetCapabilities'
'capabilities': 'service=SOS&version=1.0.0&request=GetCapabilities'
},
'OGC:STA': {
'label': 'SensorThings API (STA)',
View
@@ -43,6 +43,7 @@
from init import App
from notifications import notify
from wtforms.validators import Email, ValidationError
from owslib.util import bind_url
DB = App.get_db()
LOGGER = logging.getLogger(__name__)
@@ -371,7 +372,7 @@ def __repr__(self):
def get_capabilities_url(self):
if self.resource_type.startswith('OGC:') \
and self.resource_type != 'OGC:STA':
url = '%s%s' % (self.url,
url = '%s%s' % (bind_url(self.url),
RESOURCE_TYPES[self.resource_type]['capabilities'])
else:
url = self.url

0 comments on commit 8e40f49

Please sign in to comment.