Add layers and sources parameter to Map

_experimental/add_geopandas_source.py

@@ -7,8 +7,11 @@
 
 data = read_file(path)
 
-m = Map(MapOptions(style=Carto.POSITRON, bounds=data.total_bounds))
+m = Map(
+    MapOptions(style=Carto.POSITRON, bounds=data.total_bounds),
+    layers=[Layer(type=LayerType.LINE, source=data)],
+)
 # m.add_source("states", data)
 # m.add_layer(Layer(type=LayerType.LINE, source="states"))
-m.add_layer(Layer(type=LayerType.LINE, source=data))
+# m.add_layer(Layer(type=LayerType.LINE, source=data))
 m.save("/tmp/py-maplibre-express.html")

maplibre/map.py

@@ -83,9 +83,16 @@ class Map(object):
 
     MESSAGE = "not implemented yet"
 
-    def __init__(self, map_options: MapOptions = MapOptions(), **kwargs):
+    def __init__(
+        self,
+        map_options: MapOptions = MapOptions(),
+        sources: dict = None,
+        layers: list = None,
+        **kwargs,
+    ):
         self.map_options = map_options.to_dict() | kwargs
         self._message_queue = []
+        self.add_layers(layers, sources)
 
     def __iter__(self):
         for k, v in self.to_dict().items():
@@ -170,7 +177,9 @@ def add_layer(self, layer: [Layer | dict], before_id: str = None) -> None:
 
         self.add_call("addLayer", layer, before_id)
 
-    def add_layers(self, layers: list, sources: dict = None):
+    def add_layers(self, layers: list = None, sources: dict = None):
+        layers = layers or []
+        sources = sources or dict()
         for source_id, source in sources.items():
             self.add_source(source_id, source)