Fix geopandas import

Author: stfnkth

maplibre/__future__/controls.py

@@ -2,10 +2,10 @@
 
 from enum import Enum
 
-from ..controls import Control
-
 from pydantic import Field
 
+from ..controls import Control
+
 
 class GeocoderType(Enum):
     MAPTILTER = "maptiler"

maplibre/__future__/datasets.py

@@ -1,10 +1,10 @@
 from typing import Optional, Union
 
 import geopandas as gpd
+from pydantic import BaseModel
 
 # from geopandas import read_file
 from maplibre.sources import GeoJSONSource
-from pydantic import BaseModel
 
 
 class DataSet(BaseModel):

maplibre/__future__/ipywidget.py

@@ -2,9 +2,9 @@
 
 from pathlib import Path
 
+from ..ipywidget import MapWidget as BaseWidget
 from .controls import GeocoderType
 
-from ..ipywidget import MapWidget as BaseWidget
 
 class MapWidget(BaseWidget):
     _geocoder_type = GeocoderType.MAPTILTER

maplibre/__future__/pandas_ext.py

@@ -1,7 +1,8 @@
 import geopandas as gpd
-import maplibre.express as mx
 import pandas as pd
 
+import maplibre.express as mx
+
 from ..sources import GeoJSONSource, SimpleFeatures
 
 

maplibre/_constants.py

@@ -6,11 +6,7 @@
 _points = "https://raw.githubusercontent.com/visgl/deck.gl-data/master/examples/scatterplot/manhattan.json"
 _geojson = "https://docs.mapbox.com/mapbox-gl-js/assets/indoor-3d-map.geojson"
 _urban_areas = "https://d2ad6b4ur7yvpq.cloudfront.net/naturalearth-3.3.0/ne_50m_urban_areas.geojson"
-_highway_lines = (
-    "https://github.com/visgl/deck.gl-data/raw/master/examples/highway/roads.json"
-)
+_highway_lines = "https://github.com/visgl/deck.gl-data/raw/master/examples/highway/roads.json"
 
-_airports = (
-    "https://github.com/visgl/deck.gl-data/raw/master/examples/line/airports.json"
-)
+_airports = "https://github.com/visgl/deck.gl-data/raw/master/examples/line/airports.json"
 _flights = "https://github.com/visgl/deck.gl-data/raw/master/examples/line/heathrow-flights.json"

maplibre/anywidget.py

@@ -38,9 +38,11 @@ class MapWidget(AnyWidget, Map):
     _css = Path(__file__).parent / "srcjs" / "maplibre.anywidget.css"
 
     _use_message_queue = True
-    _rendered = traitlets.Bool(False).tag(config=True).tag(sync=True)
+    # _rendered = traitlets.Bool(False).tag(config=True).tag(sync=True)
+    load = traitlets.Bool(False).tag(sync=True)
     map_options = traitlets.Dict().tag(sync=True)
     calls = traitlets.List().tag(sync=True)
+    msg = traitlets.List().tag(sync=True)
     height = traitlets.Union([traitlets.Int(), traitlets.Unicode()]).tag(sync=True)
 
     # Interactions Map
@@ -63,8 +65,8 @@ def __init__(
         height: int | str = 400,
         **kwargs,
     ) -> None:
-        self._rendered = False
-        self.calls = []
+        # self._rendered = False
+        # self.calls = []
         AnyWidget.__init__(self, height=height, **kwargs)
         Map.__init__(self, map_options, sources, layers, controls, **kwargs)
 
@@ -76,15 +78,33 @@ def _validate_height(self, proposal):
 
         return height
 
+    """
     @traitlets.observe("_rendered")
     def _on_rendered(self, change):
         self.send({"calls": self._message_queue, "msg": "init"})
         self._message_queue = []
+    """
 
+    """ 
     def use_message_queue(self, value: bool = True) -> None:
         self._use_message_queue = value
+    """
+
+    # @traitlets.observe("load")
+    # def _(self, change) -> None:
+    #    self.send({"calls": self.calls, "msg": "observe load"})
 
     def add_call(self, method_name: str, *args) -> None:
+        call = [method_name, args]
+        if self.load:
+            # self.send({"calls": [call], "msg": "custom call"})
+            self.msg = call
+            return
+
+        # Initial calls
+        self.calls = self.calls + [call]
+
+    def _add_call(self, method_name: str, *args) -> None:
         call = [method_name, args]
         if not self._rendered:
             if not self._use_message_queue:

maplibre/config.py

@@ -26,9 +26,7 @@ class Config(BaseModel):
 
     maptiler_api_key_env_var: Optional[str] = "MAPTILER_API_KEY"
 
-    layer_types: Optional[dict] = dict(
-        Polygon="fill", LineString="line", Point="circle"
-    )
+    layer_types: Optional[dict] = dict(Polygon="fill", LineString="line", Point="circle")
 
     @property
     def maptiler_api_key(self) -> str:

maplibre/experimental.py

@@ -5,14 +5,7 @@
 from typing import Literal
 
 from geopandas import GeoDataFrame
-from pydantic import (
-    BaseModel,
-    ConfigDict,
-    Field,
-    computed_field,
-    field_validator,
-    model_serializer,
-)
+from pydantic import BaseModel, ConfigDict, Field, computed_field, field_validator, model_serializer
 
 from maplibre import Layer, LayerType
 from maplibre.utils import geopandas_to_geojson

maplibre/express.py

@@ -77,25 +77,19 @@ def color_quantile(
         probs: list = [0.1, 0.25, 0.5, 0.75],
         cmap: str = config.cmap,
     ) -> Self:
-        expr = color_quantile_step_expr(
-            column, probs, values=self.sf.data[column], cmap=cmap
-        )
+        expr = color_quantile_step_expr(column, probs, values=self.sf.data[column], cmap=cmap)
         self._set_paint_property("color", expr)
         return self
 
-    def color_bin(
-        self, column: str, stops: list = None, n: int = None, cmap=config.cmap
-    ) -> Self:
+    def color_bin(self, column: str, stops: list = None, n: int = None, cmap=config.cmap) -> Self:
         if stops is None and n is None:
             pass
 
         expr = color_step_expr(column, stops, cmap)
         self._set_paint_property("color", expr)
         return self
 
-    def interpolate_color(
-        self, column: str, stops=None, colors=("yellow", "red")
-    ) -> Self:
+    def interpolate_color(self, column: str, stops=None, colors=("yellow", "red")) -> Self:
         stops = stops or [f(self.sf.data[column]) for f in [min, max]]
         expr = interpolate(column, stops, colors)
         self._set_paint_property("color", expr)
@@ -164,9 +158,7 @@ def fill_extrusion(
     **kwargs,
 ) -> SimpleLayer:
     if "paint" not in kwargs:
-        kwargs["paint"] = config.paint_props[
-            LayerType.FILL_EXTRUSION.value.replace("-", "_")
-        ]
+        kwargs["paint"] = config.paint_props[LayerType.FILL_EXTRUSION.value.replace("-", "_")]
 
     if fill_extrusion_base is not None:
         kwargs["paint"]["fill-extrusion-base"] = fill_extrusion_base
@@ -190,9 +182,7 @@ def fill_line_circle(source_id: str, colors: list = None) -> list:
         type=LayerType.FILL,
         source=source_id,
         filter=geometry_type_filter(GeometryType.POLYGON),
-    ).set_paint_props(
-        fill_color=fill_color, fill_outline_color=config.fill_outline_color
-    )
+    ).set_paint_props(fill_color=fill_color, fill_outline_color=config.fill_outline_color)
 
     line_layer = Layer(
         type=LayerType.LINE,

maplibre/expressions.py

@@ -27,30 +27,20 @@ def geometry_type_filter(geom_type: GeometryType | str) -> list:
     return ["==", get_geometry_type(), GeometryType(geom_type).value]
 
 
-def interpolate(
-    property: str | list, stops: list, outputs: list, type: list = ["linear"]
-) -> list:
+def interpolate(property: str | list, stops: list, outputs: list, type: list = ["linear"]) -> list:
     assert len(stops) == len(outputs)
     return [
         "interpolate",
         type,
         get_column(property) if isinstance(property, str) else property,
-    ] + list(
-        itertools.chain.from_iterable(
-            [[stop, output] for stop, output in zip(stops, outputs)]
-        )
-    )
+    ] + list(itertools.chain.from_iterable([[stop, output] for stop, output in zip(stops, outputs)]))
 
 
 def match_expr(column: str, categories: list, outputs: list[T], fallback: T) -> list:
     assert len(categories) == len(outputs)
     return (
         ["match", get_column(column)]
-        + list(
-            itertools.chain.from_iterable(
-                [[category, output] for category, output in zip(categories, outputs)]
-            )
-        )
+        + list(itertools.chain.from_iterable([[category, output] for category, output in zip(categories, outputs)]))
         + [fallback]
     )
 
@@ -70,18 +60,12 @@ def step_expr(
             "step",
             get_column(property) if isinstance(property, str) else property,
         ]
-        + list(
-            itertools.chain.from_iterable(
-                [[output, stop] for output, stop in zip(outputs, stops)]
-            )
-        )
+        + list(itertools.chain.from_iterable([[output, stop] for output, stop in zip(outputs, stops)]))
         + [fallback]
     )
 
 
-def quantile_step_expr(
-    column: str, probs: list, outputs: list[T], fallback: T, values: list
-) -> list:
+def quantile_step_expr(column: str, probs: list, outputs: list[T], fallback: T, values: list) -> list:
     assert len(probs) == len(outputs)
     try:
         import numpy as np
@@ -98,14 +82,10 @@ def quantile_step_expr(
 # -----
 
 
-def color_quantile_step_expr(
-    column: str, probs: list, values: Any, cmap="viridis"
-) -> list:
+def color_quantile_step_expr(column: str, probs: list, values: Any, cmap="viridis") -> list:
     n = len(probs)
     colors = color_brewer(cmap, n + 1)
-    return quantile_step_expr(
-        column, probs, outputs=colors[0:n], fallback=colors[-1], values=values
-    )
+    return quantile_step_expr(column, probs, outputs=colors[0:n], fallback=colors[-1], values=values)
 
 
 def color_step_expr(column: str, stops: list, cmap="viridis") -> list:
@@ -143,8 +123,6 @@ def filter_expr(column: str, operator: str, value: Any) -> list:
     return [operator, get_column(column), value]
 
 
-def range_filter(
-    column, values: tuple | list, operators: tuple | list = (">=", "<=")
-) -> list:
+def range_filter(column, values: tuple | list, operators: tuple | list = (">=", "<=")) -> list:
     assert len(values) == len(operators) == 2
     return ["all"] + [[operators[i], get_column(column), values[i]] for i in range(2)]