committed by
GitHub
parent
ba3bf1621f
commit
b478f4f4b6
@@ -33,7 +33,7 @@ import requests
|
||||
from pathlib import Path
|
||||
from urllib.parse import urlparse, urljoin
|
||||
|
||||
from pygeoapi.util import is_url
|
||||
from pygeoapi.util import is_url, url_join
|
||||
from pygeoapi.provider.tile import (
|
||||
BaseTileProvider, ProviderTileNotFoundError)
|
||||
from pygeoapi.provider.base import ProviderConnectionError
|
||||
@@ -69,7 +69,7 @@ class MVTProvider(BaseTileProvider):
|
||||
'tileCol',
|
||||
param_type)
|
||||
|
||||
self._service_url = urljoin(baseurl, servicepath)
|
||||
self._service_url = url_join(baseurl, servicepath)
|
||||
self._service_metadata_url = urljoin(
|
||||
self.service_url.split('{tileMatrix}/{tileRow}/{tileCol}')[0],
|
||||
'metadata')
|
||||
@@ -149,7 +149,7 @@ class MVTProvider(BaseTileProvider):
|
||||
'tileCol',
|
||||
tile_type)
|
||||
|
||||
self._service_url = urljoin(baseurl, servicepath)
|
||||
self._service_url = url_join(baseurl, servicepath)
|
||||
self._service_metadata_url = urljoin(
|
||||
self.service_url.split('{tileMatrix}/{tileRow}/{tileCol}')[0],
|
||||
'metadata')
|
||||
|
||||
@@ -485,3 +485,7 @@ def read_data(path):
|
||||
LOGGER.debug('network file')
|
||||
with urlopen(path) as r:
|
||||
return r.read()
|
||||
|
||||
|
||||
def url_join(*parts):
|
||||
return '/'.join([p.strip().strip('/') for p in parts])
|
||||
|
||||
Reference in New Issue
Block a user