[test] update test cases to handle input source as xyzservices.TileProvider

events/payload_multiprompt_api_request_body.json

@@ -44,5 +44,5 @@
         }
     ],
     "zoom": 17,
-    "source_type": "OpenStreetMap"
+    "source_type": "OpenStreetMap.Mapnik"
 }

tests/events/get_parsed_bbox_prompts_multi_prompt.json

@@ -54,7 +54,7 @@
       }
     ],
     "zoom": 12,
-    "source_type": "OpenStreetMap"
+    "source_type": "OpenStreetMap.Mapnik"
   },
   "output": {
     "bbox": [
@@ -102,7 +102,13 @@
         ]
       }
     ],
-    "url_tile": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "source": {
+      "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+      "max_zoom": 19,
+      "html_attribution": "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
+      "attribution": "(C) OpenStreetMap contributors",
+      "name": "OpenStreetMap.Mapnik"
+    },
     "zoom": 12
   }
 }

tests/events/get_parsed_bbox_prompts_single_point.json

@@ -48,7 +48,13 @@
           "label": 0
         }
       ],
-      "url_tile": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+      "source": {
+        "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+        "max_zoom": 19,
+        "html_attribution": "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
+        "attribution": "(C) OpenStreetMap contributors",
+        "name": "OpenStreetMap.Mapnik"
+      },
       "zoom": 10
     }
   },
@@ -100,7 +106,13 @@
           "label": 0
         }
       ],
-      "url_tile": "https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png",
+      "source": {
+        "url": "https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png",
+        "max_zoom": 19,
+        "html_attribution": "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors, Tiles style by <a href=\"https://www.hotosm.org/\" target=\"_blank\">Humanitarian OpenStreetMap Team</a> hosted by <a href=\"https://openstreetmap.fr/\" target=\"_blank\">OpenStreetMap France</a>",
+        "attribution": "(C) OpenStreetMap contributors, Tiles style by Humanitarian OpenStreetMap Team hosted by OpenStreetMap France",
+        "name": "OpenStreetMap.HOT"
+      },
       "zoom": 7
     }
   },
@@ -128,7 +140,7 @@
           }
         ],
         "zoom": 4,
-        "source_type": "OpenStreetMap"
+        "source_type": "OpenStreetMap.Mapnik"
       }
     },
     "output": {
@@ -152,7 +164,13 @@
           "label": 0
         }
       ],
-      "url_tile": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+      "source": {
+        "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+        "max_zoom": 19,
+        "html_attribution": "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
+        "attribution": "(C) OpenStreetMap contributors",
+        "name": "OpenStreetMap.Mapnik"
+      },
       "zoom": 4
     }
   },
@@ -180,7 +198,7 @@
           }
         ],
         "zoom": 7,
-        "source_type": "OpenStreetMap"
+        "source_type": "OpenStreetMap.Mapnik"
       }
     },
     "output": {
@@ -204,7 +222,13 @@
           "label": 0
         }
       ],
-      "url_tile": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+      "source": {
+        "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+        "max_zoom": 19,
+        "html_attribution": "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
+        "attribution": "(C) OpenStreetMap contributors",
+        "name": "OpenStreetMap.Mapnik"
+      },
       "zoom": 7
     }
   }

tests/events/get_parsed_bbox_prompts_single_rectangle.json

@@ -27,7 +27,7 @@
       }
     ],
     "zoom": 5,
-    "source_type": "OpenStreetMap"
+    "source_type": "OpenStreetMap.Mapnik"
   },
   "output": {
     "bbox": [
@@ -51,7 +51,13 @@
         "type": "rectangle"
       }
     ],
-    "url_tile": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "source": {
+      "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
+      "max_zoom": 19,
+      "html_attribution": "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
+      "attribution": "(C) OpenStreetMap contributors",
+      "name": "OpenStreetMap.Mapnik"
+    },
     "zoom": 5
   }
 }

tests/io/test_lambda_helpers.py

@@ -2,6 +2,8 @@ import json
 import time
 from http import HTTPStatus
 from unittest.mock import patch
+
+from src.io import lambda_helpers
 from src.io.lambda_helpers import get_parsed_bbox_points, get_parsed_request_body, get_response
 from src.utilities.type_hints import ApiRequestBody
 from src.utilities import utilities
@@ -13,7 +15,7 @@ def test_get_response(time_mocked):
     time_diff = 108
     end_run = 1000
     time_mocked.return_value = end_run
-    start_time = end_run-time_diff
+    start_time = end_run - time_diff
     aws_request_id = "test_invoke_id"
 
     with open(TEST_EVENTS_FOLDER / "get_response.json") as tst_json:
@@ -64,7 +66,7 @@ def test_get_parsed_request_body():
                 "sw": {"lat": 37.455509218936974, "lng": 14.632807441554068}
             },
             "prompt": [{"type": "point", "data": {"lat": 37.0, "lng": 15.0}, "label": 0}],
-            "zoom": 10, "source_type": "Satellite", "debug": True
+            "zoom": 10, "source_type": "OpenStreetMap.Mapnik", "debug": True
         }
     }
     expected_output_dict = {
@@ -73,7 +75,7 @@ def test_get_parsed_request_body():
             "sw": {"lat": 37.455509218936974, "lng": 14.632807441554068}
         },
         "prompt": [{"type": "point", "data": {"lat": 37.0, "lng": 15.0}, "label": 0}],
-        "zoom": 10, "source_type": "Satellite", "debug": True
+        "zoom": 10, "source_type": "OpenStreetMap.Mapnik", "debug": True
     }
     output = get_parsed_request_body(input_event["event"])
     assert output == ApiRequestBody.model_validate(input_event["event"])
@@ -87,9 +89,45 @@ def test_get_parsed_request_body():
     assert output == ApiRequestBody.model_validate(expected_output_dict)
 
 
-def test_get_url_tile():
+@patch.object(lambda_helpers, "providers")
+def test_get_url_tile(providers_mocked):
+    import xyzservices
+    from src.io.lambda_helpers import get_url_tile
+
+    from tests import LOCAL_URL_TILE
+
+    local_tile_provider = xyzservices.TileProvider(name="local_tile_provider", url=LOCAL_URL_TILE, attribution="")
+    expected_output = {'name': 'local_tile_provider', 'url': LOCAL_URL_TILE, 'attribution': ''}
+    providers_mocked.query_name.return_value = local_tile_provider
+    assert get_url_tile("OpenStreetMap") == expected_output
+
+    local_url = 'http://localhost:8000/{parameter}/{z}/{x}/{y}.png'
+    local_tile_provider = xyzservices.TileProvider(
+        name="local_tile_provider_param", url=local_url, attribution="", parameter="lamda_handler"
+    )
+    providers_mocked.query_name.return_value = local_tile_provider
+    assert get_url_tile("OpenStreetMap.HOT") == {
+        "parameter": "lamda_handler", 'name': 'local_tile_provider_param', 'url': local_url, 'attribution': ''
+    }
+
+
+def test_get_url_tile_real():
     from src.io.lambda_helpers import get_url_tile
-    from src.utilities.constants import DEFAULT_TMS
 
-    assert get_url_tile("OpenStreetMap") == DEFAULT_TMS
-    assert get_url_tile("OpenStreetMap.HOT") == 'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png'
+    assert get_url_tile("OpenStreetMap") == {
+        'url': 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', 'max_zoom': 19,
+        'html_attribution': '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+        'attribution': '(C) OpenStreetMap contributors',
+        'name': 'OpenStreetMap.Mapnik'}
+
+    html_attribution_hot = '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, '
+    html_attribution_hot += 'Tiles style by <a href="https://www.hotosm.org/" target="_blank">Humanitarian '
+    html_attribution_hot += 'OpenStreetMap Team</a> hosted by <a href="https://openstreetmap.fr/" target="_blank">'
+    html_attribution_hot += 'OpenStreetMap France</a>'
+    attribution_hot = '(C) OpenStreetMap contributors, Tiles style by Humanitarian OpenStreetMap Team hosted by '
+    attribution_hot += 'OpenStreetMap France'
+    assert get_url_tile("OpenStreetMap.HOT") == {
+        'url': 'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png', 'max_zoom': 19,
+        'html_attribution': html_attribution_hot, 'attribution': attribution_hot, 'name': 'OpenStreetMap.HOT'
+    }
+

tests/io/test_tms2geotiff.py

@@ -11,8 +11,9 @@ input_bbox = [[39.036252959636606, 15.040283203125002], [38.302869955150044, 13.
 
 
 class TestTms2geotiff(unittest.TestCase):
-    def test_download_extent(self):
+    def test_download_extent_simple_source(self):
         from rasterio import Affine
+        from xyzservices import TileProvider
         from tests.local_tiles_http_server import LocalTilesHttpServer
 
         listen_port = 8000
@@ -26,7 +27,8 @@ class TestTms2geotiff(unittest.TestCase):
             s_lat = pt1[0]
             w_lng = pt1[1]
 
-            img, matrix = download_extent(w=w_lng, s=s_lat, e=e_lng, n=n_lat, zoom=zoom, source=LOCAL_URL_TILE)
+            source = TileProvider(name="local_tile_provider", url=LOCAL_URL_TILE, attribution="")
+            img, matrix = download_extent(w=w_lng, s=s_lat, e=e_lng, n=n_lat, zoom=zoom, source=source)
             app_logger.info(f"# DOWNLOAD ENDED, shape: {img.shape} #")
             np_img = np.ascontiguousarray(img)
             output_hash = hash_calculate(np_img)
@@ -34,6 +36,53 @@ class TestTms2geotiff(unittest.TestCase):
             assert Affine.to_gdal(matrix) == (
                 1517657.1966021745, 152.8740565703525, 0.0, 4726942.266183584, 0.0, -152.87405657034955)
 
+    def test_download_extent_source_with_parameter(self):
+        from rasterio import Affine
+        from xyzservices import TileProvider
+        from tests.local_tiles_http_server import LocalTilesHttpServer
+
+        listen_port = 8000
+
+        with LocalTilesHttpServer.http_server("localhost", listen_port, directory=TEST_EVENTS_FOLDER):
+            pt0, pt1 = input_bbox
+            zoom = 10
+
+            n_lat = pt0[0]
+            e_lng = pt0[1]
+            s_lat = pt1[0]
+            w_lng = pt1[1]
+
+            local_url_tile2 = "http://localhost:8000/{parameter}/{z}/{x}/{y}.png"
+            source = TileProvider(
+                name="local_tile_provider", url=local_url_tile2, attribution="", parameter="lambda_handler")
+            img, matrix = download_extent(w=w_lng, s=s_lat, e=e_lng, n=n_lat, zoom=zoom, source=source)
+            app_logger.info(f"# DOWNLOAD ENDED, shape: {img.shape} #")
+            np_img = np.ascontiguousarray(img)
+            output_hash = hash_calculate(np_img)
+            assert output_hash == b'UmbkwbPJpRT1XXcLnLUapUDP320w7YhS/AmT3H7u+b4='
+            assert Affine.to_gdal(matrix) == (
+                1517657.1966021745, 152.8740565703525, 0.0, 4726942.266183584, 0.0, -152.87405657034955)
+
+    def test_download_extent_source_with_parameter_key_error(self):
+        from xyzservices import TileProvider
+
+        with self.assertRaises(KeyError):
+            try:
+                pt0, pt1 = input_bbox
+                zoom = 10
+
+                n_lat = pt0[0]
+                e_lng = pt0[1]
+                s_lat = pt1[0]
+                w_lng = pt1[1]
+
+                local_url_tile2 = "http://localhost:8000/{parameter}/{z}/{x}/{y}.png"
+                source = TileProvider(name="local_tile_provider", url=local_url_tile2, attribution="")
+                download_extent(w=w_lng, s=s_lat, e=e_lng, n=n_lat, zoom=zoom, source=source)
+            except KeyError as ke:
+                assert str(ke) == "'parameter'"
+                raise ke
+
     def test_download_extent_io_error1(self):
 
         with self.assertRaises(Exception):

tests/test_app.py

@@ -108,18 +108,18 @@ class TestAppFailures(unittest.TestCase):
             get_response_io = json.load(tst_json_get_response)
 
         input_200 = {
-          "bbox": {
-            "ne": {"lat": 38.03932961278458, "lng": 15.36808069832851},
-            "sw": {"lat": 37.455509218936974, "lng":  14.632807441554068}
-          },
-          "prompt": [{
-            "type": "point",
-            "data": {"lat": 37.0, "lng": 15.0},
-            "label": 0
-          }],
-          "zoom": 10,
-          "source_type": "Satellite",
-          "debug": True
+            "bbox": {
+                "ne": {"lat": 38.03932961278458, "lng": 15.36808069832851},
+                "sw": {"lat": 37.455509218936974, "lng": 14.632807441554068}
+            },
+            "prompt": [{
+                "type": "point",
+                "data": {"lat": 37.0, "lng": 15.0},
+                "label": 0
+            }],
+            "zoom": 10,
+            "source_type": "OpenStreetMap.Mapnik",
+            "debug": True
         }
 
         samexporter_predict_output = get_response_io[response_type]["input"]
@@ -143,20 +143,22 @@ class TestAppFailures(unittest.TestCase):
 
     @patch.object(lambda_helpers, "get_url_tile")
     def test_lambda_handler_200_real_single_multi_point(self, get_url_tile_mocked):
+        import xyzservices
         import shapely
 
         from src.app import lambda_handler
         from tests import LOCAL_URL_TILE, TEST_EVENTS_FOLDER
 
-        get_url_tile_mocked.return_value = LOCAL_URL_TILE
+        local_tile_provider = xyzservices.TileProvider(name="local_tile_provider", url=LOCAL_URL_TILE, attribution="")
+        get_url_tile_mocked.return_value = local_tile_provider
         fn_name = "lambda_handler"
         invoke_id = "test_invoke_id"
 
         for json_filename in [
-                "single_point",
-                "multi_prompt",
-                "single_rectangle"
-            ]:
+            "single_point",
+            "multi_prompt",
+            "single_rectangle"
+        ]:
             with open(TEST_EVENTS_FOLDER / f"{fn_name}_{json_filename}.json") as tst_json:
                 inputs_outputs = json.load(tst_json)
                 lambda_context = LambdaContext(
@@ -187,3 +189,24 @@ class TestAppFailures(unittest.TestCase):
                 print("output_geojson::", type(output_geojson))
                 assert isinstance(output_geojson, shapely.GeometryCollection)
                 assert len(output_geojson.geoms) == expected_response_body["n_shapes_geojson"]
+
+    def test_debug(self):
+        from src.app import lambda_handler
+
+        input_event = {
+            'bbox': {
+                'ne': {'lat': 46.302592089330524, 'lng': 9.49493408203125},
+                'sw': {'lat': 46.14011755129237, 'lng': 9.143371582031252}},
+            'prompt': [
+                {'id': 166, 'type': 'point', 'data': {'lat': 46.18244521829928, 'lng': 9.418544769287111}, 'label': 1}
+            ],
+            'zoom': 12, 'source_type': 'OpenStreetMap'
+        }
+        lambda_context = LambdaContext(
+            invoke_id="test_invoke_id",
+            client_context=None,
+            cognito_identity=None,
+            epoch_deadline_time_in_ms=time.time()
+        )
+        response = lambda_handler(event=input_event, context=lambda_context)
+        print(response)