fix WMSWebTile.to_dict() method

mesa_geo/tile_layers.py

@@ -54,4 +54,4 @@ class WMSWebTile(RasterWebTile):
  The available options can be found at: https://leafletjs.com/reference.html#tilelayer-wms
  """
 
- kind = "wms_web_tile"
+ kind: str = "wms_web_tile"

mesa_geo/visualization/modules/MapVisualization.py

@@ -101,9 +101,13 @@ def _render_layers(self, model):
  for layer in model.space.layers:
  if isinstance(layer, RasterBase):
  if isinstance(layer, RasterLayer):
- layer = layer.to_image(colormap=self.portrayal_method)
+ layer_to_render = layer.to_image(
+ colormap=self.portrayal_method
+ ).to_crs(self._crs)
+ else:
+ layer_to_render = layer.to_crs(self._crs)
  layers["rasters"].append(
- image_to_url(layer.to_crs(self._crs).values.transpose([1, 2, 0]))
+ image_to_url(layer_to_render.values.transpose([1, 2, 0]))
  )
  elif isinstance(layer, gpd.GeoDataFrame):
  layers["vectors"].append(

pyproject.toml

@@ -47,6 +47,7 @@ extend-ignore = [
  "PGH004", # Use specific rule codes when using `noqa` TODO
  "B905", # `zip()` without an explicit `strict=` parameter
  "N802", # Function name should be lowercase
+ "N999", # Invalid module name
 ]
 extend-exclude = ["docs", "build"]
 # Hardcode to Python 3.8.

tests/test_MapModule.py

@@ -2,6 +2,7 @@
 import uuid
 
 import mesa
+import numpy as np
 import xyzservices.providers as xyz
 from shapely.geometry import LineString, Point, Polygon
 
@@ -30,6 +31,10 @@ def setUp(self) -> None:
  self.agent_creator.create_agent(polygon, unique_id=uuid.uuid4().int)
  for polygon in self.polygons
  ]
+ self.raster_layer = mg.RasterLayer(
+ 1, 1, crs="epsg:4326", total_bounds=[0, 0, 1, 1]
+ )
+ self.raster_layer.apply_raster(np.array([[[0]]]))
 
  def tearDown(self) -> None:
  pass
@@ -216,3 +221,23 @@ def test_js_code(self):
  map_module.js_code,
  "elements.push(new MapModule((11.1, 22.2), 20, 500, 500, null, {'position': 'bottomleft', 'imperial': true}));",
  )
+
+ def test_render_raster_layers(self):
+ map_module = mg.visualization.MapModule(
+ portrayal_method=lambda x: (255, 255, 255, 0.5)
+ )
+ self.model.space.add_layer(self.raster_layer)
+ self.model.space.add_layer(
+ self.raster_layer.to_image(colormap=lambda x: (0, 0, 0, 1))
+ )
+ self.assertDictEqual(
+ map_module.render(self.model).get("layers"),
+ {
+ "rasters": [
+ "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVR42mP4DwQACfsD/Wj6HMwAAAAASUVORK5CYII=",
+ "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNgYGD4DwABBAEAgLvRWwAAAABJRU5ErkJggg==",
+ ],
+ "total_bounds": [[0.0, 0.0], [1.0, 1.0]],
+ "vectors": [],
+ },
+ )

tests/test_WMSWebTile.py

@@ -0,0 +1,40 @@
+import unittest
+
+import mesa_geo as mg
+
+
+class TestWMSWebTile(unittest.TestCase):
+ def setUp(self) -> None:
+ self.map_tile_url = "https://gis.charttools.noaa.gov/arcgis/rest/services/MCS/NOAAChartDisplay/MapServer/exts/MaritimeChartService/WMSServer/"
+
+ def test_to_dict(self):
+ map_tile = mg.WMSWebTile(
+ url=self.map_tile_url,
+ options={
+ "layers": "0,1,2,3,4,5,6,7,8,9,10,11,12",
+ "version": "1.3.0",
+ "format": "image/png",
+ },
+ )
+ self.assertEqual(
+ map_tile.to_dict(),
+ {
+ "kind": "wms_web_tile",
+ "url": self.map_tile_url,
+ "options": {
+ "layers": "0,1,2,3,4,5,6,7,8,9,10,11,12",
+ "version": "1.3.0",
+ "format": "image/png",
+ },
+ },
+ )
+
+ map_tile = mg.WMSWebTile(url=self.map_tile_url)
+ self.assertEqual(
+ map_tile.to_dict(),
+ {
+ "kind": "wms_web_tile",
+ "url": self.map_tile_url,
+ "options": None,
+ },
+ )