Merge pull request #27 from geo-engine/unify-ogc-endpoints

ChristianBeilschmidt · web-flow · commit 8c8b6103fcbf · 2021-10-20T18:20:48.000+02:00
unify ogc endpoints
diff --git a/geoengine/workflow.py b/geoengine/workflow.py
@@ -120,15 +120,15 @@ def __get_wfs_url(self, bbox: QueryRectangle) -> str:
             version="2.0.0",
             request='GetFeature',
             outputFormat='application/json',
-            typeNames=f'registry:{self.__workflow_id}',
+            typeNames=f'{self.__workflow_id}',
             bbox=bbox.bbox_str,
             time=bbox.time_str,
             srsName=bbox.srs,
             queryResolution=f'{bbox.resolution[0]},{bbox.resolution[1]}'
         )
 
         wfs_url = req.Request(
-            'GET', url=f'{session.server_url}/wfs', params=params).prepare().url
+            'GET', url=f'{session.server_url}/wfs/{self.__workflow_id}', params=params).prepare().url
 
         debug(f'WFS URL:\n{wfs_url}')
 
@@ -201,7 +201,7 @@ def plot_image(self, bbox: QueryRectangle, ax: plt.Axes = None, timeout=3600) ->
 
         session = get_session()
 
-        wms_url = f'{session.server_url}/wms'
+        wms_url = f'{session.server_url}/wms/{str(self)}'
 
         def srs_to_projection(srs: str) -> ccrs.Projection:
             fallback = ccrs.PlateCarree()
@@ -220,7 +220,6 @@ def srs_to_projection(srs: str) -> ccrs.Projection:
 
         wms = WebMapService(wms_url,
                             version='1.3.0',
-                            xml=self.__faux_capabilities(wms_url, str(self), bbox),
                             auth=Authentication(auth_delegate=session.requests_bearer_auth()),
                             timeout=timeout)
 
@@ -291,7 +290,7 @@ def __wms_get_map_request(self,
 
         return req.Request(
             'GET',
-            url=f'{session.server_url}/wms',
+            url=f'{session.server_url}/wms/{str(self)}',
             params=params,
             headers=session.auth_header
         ).prepare()
@@ -306,56 +305,6 @@ def wms_get_map_curl(self, bbox: QueryRectangle, colorizer_min_max: Tuple[float,
         headers = " -H ".join(headers)
         return command.format(method=wms_request.method, headers=headers, uri=wms_request.url)
 
-    @classmethod
-    def __faux_capabilities(cls, wms_url: str, layer_name: str, bbox: QueryRectangle) -> str:
-        '''Create an XML file with faux capabilities to list the layer with `layer_name`'''
-
-        return '''
-        <WMS_Capabilities xmlns="http://www.opengis.net/wms" xmlns:sld="http://www.opengis.net/sld" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.3.0" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
-            <Service>
-                <Name>WMS</Name>
-                <Title>Geo Engine WMS</Title>
-            </Service>
-            <Capability>
-                <Request>
-                    <GetCapabilities>
-                        <Format>text/xml</Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get>
-                                    <OnlineResource xlink:href="{wms_url}"/>
-                                </Get>
-                            </HTTP>
-                        </DCPType>
-                    </GetCapabilities>
-                    <GetMap>
-                        <Format>image/png</Format>
-                        <DCPType>
-                            <HTTP>
-                                <Get>
-                                    <OnlineResource xlink:href="{wms_url}"/>
-                                </Get>
-                            </HTTP>
-                        </DCPType>
-                    </GetMap>
-                </Request>
-                <Exception>
-                    <Format>XML</Format>
-                    <Format>INIMAGE</Format>
-                    <Format>BLANK</Format>
-                </Exception>
-                <Layer queryable="1">
-                    <Name>{layer_name}</Name>
-                    <Title>{layer_name}</Title>
-                    <CRS>{crs}</CRS>
-                    <BoundingBox CRS="EPSG:4326" minx="-90.0" miny="-180.0" maxx="90.0" maxy="180.0"/>
-                </Layer>
-            </Capability>
-        </WMS_Capabilities>
-        '''.format(wms_url=wms_url,
-                   layer_name=layer_name,
-                   crs=bbox.srs)
-
     def plot_chart(self, bbox: QueryRectangle) -> VegaLite:
         '''
         Query a workflow and return the plot chart result as a vega plot
diff --git a/tests/responses/wms_capabilities.xml b/tests/responses/wms_capabilities.xml
@@ -0,0 +1,50 @@
+<WMS_Capabilities xmlns="http://www.opengis.net/wms"
+    xmlns:sld="http://www.opengis.net/sld"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.3.0" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd">
+    <Service>
+        <Name>WMS</Name>
+        <Title>Geo Engine WMS</Title>
+        <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost"/>
+    </Service>
+    <Capability>
+        <Request>
+            <GetCapabilities>
+                <Format>text/xml</Format>
+                <DCPType>
+                    <HTTP>
+                        <Get>
+                            <OnlineResource xlink:href="http://mock-instance/wms/5b9508a8-bd34-5a1c-acd6-75bb832d2d38"/>
+                        </Get>
+                    </HTTP>
+                </DCPType>
+            </GetCapabilities>
+            <GetMap>
+                <Format>image/png</Format>
+                <DCPType>
+                    <HTTP>
+                        <Get>
+                            <OnlineResource xlink:href="http://mock-instance/wms/5b9508a8-bd34-5a1c-acd6-75bb832d2d38"/>
+                        </Get>
+                    </HTTP>
+                </DCPType>
+            </GetMap>
+        </Request>
+        <Exception>
+            <Format>XML</Format>
+            <Format>INIMAGE</Format>
+            <Format>BLANK</Format>
+        </Exception>
+        <Layer queryable="1">
+            <Name>5b9508a8-bd34-5a1c-acd6-75bb832d2d38</Name>
+            <Title>Workflow 5b9508a8-bd34-5a1c-acd6-75bb832d2d38</Title>
+            <EX_GeographicBoundingBox>
+                <westBoundLongitude>-180</westBoundLongitude>
+                <eastBoundLongitude>180</eastBoundLongitude>
+                <southBoundLatitude>-90</southBoundLatitude>
+                <northBoundLatitude>90</northBoundLatitude>
+            </EX_GeographicBoundingBox>
+            <BoundingBox CRS="EPSG:4326" minx="-90.0" miny="-180.0" maxx="90.0" maxy="180.0"/>
+        </Layer>
+    </Capability>
+</WMS_Capabilities>
diff --git a/tests/test_wfs.py b/tests/test_wfs.py
@@ -55,7 +55,7 @@ def test_geopandas(self):
                   },
                   request_headers={'Authorization': 'Bearer e327d9c3-a4f3-4bd7-a5e1-30b26cae8064'})
 
-            m.get('http://mock-instance/wfs',
+            m.get('http://mock-instance/wfs/956d3656-2d14-5951-96a0-f962b92371cd',
                   json={
                       "type": "FeatureCollection",
                       "features": [
@@ -286,7 +286,7 @@ def test_geopandas(self):
             self.assertEqual(
                 # pylint: disable=line-too-long
                 wfs_request.url,
-                "http://mock-instance/wfs?service=WFS&version=2.0.0&request=GetFeature&outputFormat=application%2Fjson&typeNames=registry%3A956d3656-2d14-5951-96a0-f962b92371cd&bbox=-60.0%2C5.0%2C61.0%2C6.0&time=2014-04-01T12%3A00%3A00.000%2B00%3A00&srsName=EPSG%3A4326&queryResolution=0.1%2C0.1"
+                "http://mock-instance/wfs/956d3656-2d14-5951-96a0-f962b92371cd?service=WFS&version=2.0.0&request=GetFeature&outputFormat=application%2Fjson&typeNames=956d3656-2d14-5951-96a0-f962b92371cd&bbox=-60.0%2C5.0%2C61.0%2C6.0&time=2014-04-01T12%3A00%3A00.000%2B00%3A00&srsName=EPSG%3A4326&queryResolution=0.1%2C0.1"
             )
 
             expected_df = gpd.GeoDataFrame(
@@ -401,7 +401,7 @@ def test_wfs_curl(self):
             self.assertEqual(
                 # pylint: disable=line-too-long
                 wfs_curl,
-                """curl -X GET -H "Authorization: Bearer e327d9c3-a4f3-4bd7-a5e1-30b26cae8064" 'http://mock-instance/wfs?service=WFS&version=2.0.0&request=GetFeature&outputFormat=application%2Fjson&typeNames=registry%3A956d3656-2d14-5951-96a0-f962b92371cd&bbox=-60.0%2C5.0%2C61.0%2C6.0&time=2014-04-01T12%3A00%3A00.000%2B00%3A00&srsName=EPSG%3A4326&queryResolution=0.1%2C0.1'"""
+                """curl -X GET -H "Authorization: Bearer e327d9c3-a4f3-4bd7-a5e1-30b26cae8064" 'http://mock-instance/wfs/956d3656-2d14-5951-96a0-f962b92371cd?service=WFS&version=2.0.0&request=GetFeature&outputFormat=application%2Fjson&typeNames=956d3656-2d14-5951-96a0-f962b92371cd&bbox=-60.0%2C5.0%2C61.0%2C6.0&time=2014-04-01T12%3A00%3A00.000%2B00%3A00&srsName=EPSG%3A4326&queryResolution=0.1%2C0.1'"""
             )
 
     def test_repr(self):
diff --git a/tests/test_wms.py b/tests/test_wms.py
@@ -51,11 +51,17 @@ def test_ndvi(self):
             m.get('http://epsg.io/4326.gml?download', body=epsg4326_gml)
 
             # Unfortunately, we need a separate library to catch the request from the WMS call
+            with open("tests/responses/wms_capabilities.xml", "r", encoding="utf-8") as wms_capabilities:
+                m.get(
+                    # pylint: disable=line-too-long
+                    'http://mock-instance/wms/5b9508a8-bd34-5a1c-acd6-75bb832d2d38?service=WMS&request=GetCapabilities&version=1.3.0',
+                    text=wms_capabilities.read())
+
             with open("tests/responses/wms-ndvi.png", "rb") as wms_ndvi:
                 responses.add(
                     # pylint: disable=line-too-long
                     'GET',
-                    'http://mock-instance/wms?service=WMS&version=1.3.0&request=GetMap&layers=5b9508a8-bd34-5a1c-acd6-75bb832d2d38&styles=&width=620&height=310&crs=EPSG:4326&bbox=-90.0,-180.0,90.0,180.0&format=image/png&transparent=FALSE&bgcolor=0xFFFFFF&exceptions=XML&time=2014-04-01T12%3A00%3A00.000%2B00%3A00',
+                    'http://mock-instance/wms/5b9508a8-bd34-5a1c-acd6-75bb832d2d38?service=WMS&version=1.3.0&request=GetMap&layers=5b9508a8-bd34-5a1c-acd6-75bb832d2d38&styles=&width=620&height=310&crs=EPSG:4326&bbox=-90.0,-180.0,90.0,180.0&format=image/png&transparent=FALSE&bgcolor=0xFFFFFF&exceptions=XML&time=2014-04-01T12%3A00%3A00.000%2B00%3A00',
                     match_querystring=True,
                     body=wms_ndvi.read(),
                     content_type='image/png'
@@ -93,7 +99,7 @@ def test_ndvi(self):
             self.assertEqual(type(ax), cartopy.mpl.geoaxes.GeoAxesSubplot)
 
             # Check requests from the mocker
-            self.assertEqual(len(m.request_history), 4)
+            self.assertEqual(len(m.request_history), 5)
 
             workflow_request = m.request_history[1]
             self.assertEqual(workflow_request.method, "POST")
@@ -132,9 +138,15 @@ def test_ndvi_image(self):
             m.get('http://epsg.io/4326.gml?download', body=epsg4326_gml)
 
             # Unfortunately, we need a separate library to catch the request from the WMS call
+            with open("tests/responses/wms_capabilities.xml", "r", encoding="utf-8") as wms_capabilities:
+                m.get(
+                    # pylint: disable=line-too-long
+                    'http://mock-instance/wms/5b9508a8-bd34-5a1c-acd6-75bb832d2d38?service=WMS&request=GetCapabilities&version=1.3.0',
+                    text=wms_capabilities.read())
+
             m.get(
                 # pylint: disable=line-too-long
-                'http://mock-instance/wms?service=WMS&version=1.3.0&request=GetMap&layers=5b9508a8-bd34-5a1c-acd6-75bb832d2d38&time=2014-04-01T12%3A00%3A00.000%2B00%3A00&crs=EPSG%3A4326&bbox=-90.0%2C-180.0%2C90.0%2C180.0&width=200&height=100&format=image%2Fpng&styles=custom%3A%7B%22type%22%3A+%22linearGradient%22%2C+%22breakpoints%22%3A+%5B%7B%22value%22%3A+0%2C+%22color%22%3A+%5B0%2C+0%2C+0%2C+255%5D%7D%2C+%7B%22value%22%3A+255%2C+%22color%22%3A+%5B255%2C+255%2C+255%2C+255%5D%7D%5D%2C+%22noDataColor%22%3A+%5B0%2C+0%2C+0%2C+0%5D%2C+%22defaultColor%22%3A+%5B0%2C+0%2C+0%2C+0%5D%7D',
+                'http://mock-instance/wms/5b9508a8-bd34-5a1c-acd6-75bb832d2d38?service=WMS&version=1.3.0&request=GetMap&layers=5b9508a8-bd34-5a1c-acd6-75bb832d2d38&time=2014-04-01T12%3A00%3A00.000%2B00%3A00&crs=EPSG%3A4326&bbox=-90.0%2C-180.0%2C90.0%2C180.0&width=200&height=100&format=image%2Fpng&styles=custom%3A%7B%22type%22%3A+%22linearGradient%22%2C+%22breakpoints%22%3A+%5B%7B%22value%22%3A+0%2C+%22color%22%3A+%5B0%2C+0%2C+0%2C+255%5D%7D%2C+%7B%22value%22%3A+255%2C+%22color%22%3A+%5B255%2C+255%2C+255%2C+255%5D%7D%5D%2C+%22noDataColor%22%3A+%5B0%2C+0%2C+0%2C+0%5D%2C+%22defaultColor%22%3A+%5B0%2C+0%2C+0%2C+0%5D%7D',
                 body=ndvi_png,
             )
 
@@ -226,7 +238,7 @@ def test_wms_url(self):
             self.assertEqual(
                 # pylint: disable=line-too-long
                 wms_curl,
-                """curl -X GET -H "Authorization: Bearer c4983c3e-9b53-47ae-bda9-382223bd5081" 'http://mock-instance/wms?service=WMS&version=1.3.0&request=GetMap&layers=5b9508a8-bd34-5a1c-acd6-75bb832d2d38&time=2014-04-01T12%3A00%3A00.000%2B00%3A00&crs=EPSG%3A4326&bbox=-90.0%2C-180.0%2C90.0%2C180.0&width=360&height=180&format=image%2Fpng&styles='"""
+                """curl -X GET -H "Authorization: Bearer c4983c3e-9b53-47ae-bda9-382223bd5081" 'http://mock-instance/wms/5b9508a8-bd34-5a1c-acd6-75bb832d2d38?service=WMS&version=1.3.0&request=GetMap&layers=5b9508a8-bd34-5a1c-acd6-75bb832d2d38&time=2014-04-01T12%3A00%3A00.000%2B00%3A00&crs=EPSG%3A4326&bbox=-90.0%2C-180.0%2C90.0%2C180.0&width=360&height=180&format=image%2Fpng&styles='"""
             )
 
     def test_result_descriptor(self):
