OGC API: handle URLs with URIs as ids (#964)

* OGC API: handle URLs with URIs as ids

* fix tests

Author: tomkralidis

owslib/ogcapi/__init__.py

@@ -129,13 +129,19 @@ def _build_url(self, path: str = None, params: dict = {}) -> str:
         @returns: fully constructed URL path
         """
 
+        def urljoin_(url2, path2):
+            if '//' not in path2:
+                return urljoin(url2, path2)
+            else:
+                return '/'.join([url2.rstrip('/'), path2])
+
         url = self.url
         if self.url_query_string is not None:
             LOGGER.debug('base URL has a query string')
-            url = urljoin(url, path)
+            url = urljoin_(url, path)
             url = '?'.join([url, self.url_query_string])
         else:
-            url = urljoin(url, path)
+            url = urljoin_(url, path)
 
         if params:
             url = '?'.join([url, urlencode(params)])

tests/test_ogcapi_records_pycsw.py

@@ -40,7 +40,7 @@ def test_ogcapi_records_pycsw():
     assert isinstance(w.response, dict)
 
     pycsw_cite_demo_queryables = w.collection_queryables('metadata:main')
-    assert len(pycsw_cite_demo_queryables['properties'].keys()) == 13
+    assert len(pycsw_cite_demo_queryables['properties'].keys()) == 14
 
     # Minimum of limit param is 1
     with pytest.raises(RuntimeError):
@@ -67,3 +67,12 @@ def test_ogcapi_records_pycsw():
     assert pycsw_cite_demo_query['numberMatched'] == 1
     assert pycsw_cite_demo_query['numberReturned'] == 1
     assert len(pycsw_cite_demo_query['features']) == 1
+
+
+@pytest.mark.parametrize("path, expected", [
+    ('collections/foo/1', 'https://demo.pycsw.org/cite/collections/foo/1'),
+    ('collections/foo/https://example.org/11', 'https://demo.pycsw.org/cite/collections/foo/https://example.org/11')  # noqa
+])
+def test_ogcapi_build_url(path, expected):
+    w = Records(SERVICE_URL)
+    assert w._build_url(path) == expected