Merge pull request #30 from geo-engine/no-cartopy

remove cartopy and add its usage only to the WMS example

Author: michaelmattig

cartopy_test_output/test_wms/result-wms.png

@@ -13,11 +13,8 @@
 
 import requests as req
 import geopandas as gpd
-import matplotlib.pyplot as plt
-import cartopy.crs as ccrs
 from owslib.util import Authentication
 from owslib.wcs import WebCoverageService
-from owslib.wms import WebMapService
 import rasterio.io
 from vega import VegaLite
 import numpy as np
@@ -192,56 +189,6 @@ def geo_json_with_time_to_geopandas(geo_json):
 
         return geo_json_with_time_to_geopandas(data)
 
-    def plot_image(self, bbox: QueryRectangle, ax: plt.Axes = None, timeout=3600) -> plt.Axes:
-        '''
-        Query a workflow and return the WMS result as a matplotlib image
-
-        Params:
-        timeout - - HTTP request timeout in seconds
-        '''
-
-        if not self.__result_descriptor.is_raster_result():
-            raise MethodNotCalledOnRasterException()
-
-        session = get_session()
-
-        wms_url = f'{session.server_url}/wms/{str(self)}'
-
-        def srs_to_projection(srs: str) -> ccrs.Projection:
-            fallback = ccrs.PlateCarree()
-
-            [authority, code] = srs.split(':')
-
-            if authority != 'EPSG':
-                return fallback
-            try:
-                return ccrs.epsg(code)
-            except ValueError:
-                return fallback
-
-        if ax is None:
-            ax = plt.axes(projection=srs_to_projection(bbox.srs))
-
-        wms = WebMapService(wms_url,
-                            version='1.3.0',
-                            auth=Authentication(auth_delegate=session.requests_bearer_auth()),
-                            timeout=timeout)
-
-        # TODO: incorporate spatial resolution (?)
-
-        ax.add_wms(wms,
-                   layers=[str(self)],
-                   wms_kwargs={
-                       'time': urllib.parse.quote(bbox.time_str),
-                       # 'bbox': bbox.bbox_str
-                       'crs': bbox.srs
-                   })
-
-        ax.set_xlim(bbox.xmin, bbox.xmax)
-        ax.set_ylim(bbox.ymin, bbox.ymax)
-
-        return ax
-
     def wms_get_map_as_image(self, bbox: QueryRectangle, colorizer_min_max: Tuple[float, float] = None) -> Image:
         '''Return the result of a WMS request as a PIL Image'''
 

examples/wms.ipynb

@@ -1,11 +1,11 @@
 build
-filelock # for cartopy mpl tests
-flufl.lock # for cartopy mpl tests
+cartopy==0.19.0.post1  # for WMS example
+matplotlib
 pycodestyle # formatter
 pylint # code linter
 pytest
 requests_mock
-responses # mocking urllib3 requests
 setuptools
+scipy # for WMS example
 twine # PyPI
 wheel

geoengine/workflow.py

@@ -18,16 +18,12 @@ package_dir =
 packages = find:
 python_requires = >=3.7
 install_requires =
-    cartopy==0.19.0.post1
     geopandas
-    matplotlib
     numpy
     owslib
     pillow
-    pyepsg # for cartopy
     rasterio
     requests
-    scipy # for cartopy and xarray
     vega
     xarray
 

requirements.txt

@@ -6,9 +6,6 @@
 from PIL import Image
 
 import requests_mock
-import cartopy.mpl.geoaxes
-from cartopy.tests.mpl import ImageTesting
-import responses
 
 from geoengine.types import QueryRectangle
 import geoengine as ge
@@ -20,93 +17,6 @@ class WmsTests(unittest.TestCase):
     def setUp(self) -> None:
         ge.reset()
 
-    @responses.activate
-    @ImageTesting(['wms'], tolerance=0)
-    def test_ndvi(self):
-        with requests_mock.Mocker() as m, open("tests/responses/4326.gml", "rb") as epsg4326_gml:
-            m.post('http://mock-instance/anonymous', json={
-                "id": "c4983c3e-9b53-47ae-bda9-382223bd5081",
-                "project": None,
-                "view": None
-            })
-
-            m.post('http://mock-instance/workflow',
-                   json={
-                       "id": "5b9508a8-bd34-5a1c-acd6-75bb832d2d38"
-                   },
-                   request_headers={'Authorization': 'Bearer c4983c3e-9b53-47ae-bda9-382223bd5081'})
-
-            m.get('http://mock-instance/workflow/5b9508a8-bd34-5a1c-acd6-75bb832d2d38/metadata',
-                  json={
-                      "type": "raster",
-                      "dataType": "U8",
-                      "spatialReference": "EPSG:4326",
-                      "measurement": {
-                              "type": "unitless"
-                      },
-                      "noDataValue": 0.0
-                  },
-                  request_headers={'Authorization': 'Bearer c4983c3e-9b53-47ae-bda9-382223bd5081'})
-
-            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/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'
-                )
-
-            ge.initialize("http://mock-instance")
-
-            workflow_definition = {
-                "type": "Raster",
-                "operator": {
-                    "type": "GdalSource",
-                    "params": {
-                        "dataset": {
-                            "type": "internal",
-                            "datasetId": "36574dc3-560a-4b09-9d22-d5945f2b8093"
-                        }
-                    }
-                }
-            }
-
-            time = datetime.strptime(
-                '2014-04-01T12:00:00.000Z', "%Y-%m-%dT%H:%M:%S.%f%z")
-
-            workflow = ge.register_workflow(workflow_definition)
-
-            ax = workflow.plot_image(
-                QueryRectangle(
-                    [-180.0, -90.0, 180.0, 90.0],
-                    [time, time]
-                )
-            )
-
-            ax.plot()
-
-            self.assertEqual(type(ax), cartopy.mpl.geoaxes.GeoAxesSubplot)
-
-            # Check requests from the mocker
-            self.assertEqual(len(m.request_history), 5)
-
-            workflow_request = m.request_history[1]
-            self.assertEqual(workflow_request.method, "POST")
-            self.assertEqual(workflow_request.url,
-                             "http://mock-instance/workflow")
-            self.assertEqual(workflow_request.json(), workflow_definition)
-
     def test_ndvi_image(self):
         with requests_mock.Mocker() as m,\
                 open("tests/responses/wms-ndvi.png", "rb") as ndvi_png,\