diff --git a/.mergify.yml b/.mergify.yml index 57852015eb..1a2a410085 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,40 +1,40 @@ pull_request_rules: - - name: CI automerge when passing all test - conditions: - # If the requirement are satisfied - # The bot will trigger automerge - - label=ready-to-merge - - check-success=CodeQL - - check-success=test-ubuntu (3.9) - - check-success=test-ubuntu (3.10) - - check-success=test-ubuntu (3.11) - - check-success=test-ubuntu (3.12) - - check-success=test-windows (3.11) - - check-success=macOS-latest (3.11) - # Approval by reviewer at least one maintainer - - "#approved-reviews-by>=1" - - base=master - actions: - comment: - # message if the pull request success to merge - message: Thanks for the contribution @{{author}} 🤩 - label: - # adding label to merged pull request - add: - - already reviewed - merge: - method: squash + - name: CI automerge when passing all test + conditions: + # If the requirement are satisfied + # The bot will trigger automerge + - label=ready-to-merge + - check-success=CodeQL + - check-success=test-ubuntu (3.9) + - check-success=test-ubuntu (3.10) + - check-success=test-ubuntu (3.11) + - check-success=test-ubuntu (3.12) + - check-success=test-windows (3.11) + - check-success=macOS-latest (3.11) + # Approval by reviewer at least one maintainer + # - "#approved-reviews-by>=1" + - base=master + actions: + comment: + # message if the pull request success to merge + message: Thanks for the contribution @{{author}} 🤩 + label: + # adding label to merged pull request + add: + - already reviewed + merge: + method: squash - - name: information about conflicts pull request - conditions: - # If the requirement are satisfied - # The bot will trigger conflict process - - conflict - actions: - comment: - # Message if there's conflict on pull request - message: your pull request are conflict @{{author}}, please fix it ! - label: - # adding label on pull request if get trigger - add: - - conflicts pull request + - name: information about conflicts pull request + conditions: + # If the requirement are satisfied + # The bot will trigger conflict process + - conflict + actions: + comment: + # Message if there's conflict on pull request + message: your pull request are conflict @{{author}}, please fix it ! + label: + # adding label on pull request if get trigger + add: + - conflicts pull request diff --git a/docs/notebooks/97_overture_data.ipynb b/docs/notebooks/97_overture_data.ipynb index 4888da35c9..ffb19c3a27 100644 --- a/docs/notebooks/97_overture_data.ipynb +++ b/docs/notebooks/97_overture_data.ipynb @@ -31,7 +31,7 @@ "metadata": {}, "outputs": [], "source": [ - "from leafmap import leafmap" + "import leafmap" ] }, { @@ -104,6 +104,8 @@ "metadata": {}, "outputs": [], "source": [ + "m = leafmap.Map(center=[36.120725, -115.203795], zoom=17)\n", + "m.add_basemap(\"SATELLITE\")\n", "m.add_gdf(buildings_gdf, layer_name=\"Buildings\")" ] }, @@ -136,7 +138,8 @@ "metadata": {}, "outputs": [], "source": [ - "m.add_gdf(roads_gdf, layer_name=\"Roads\", style={\"color\": \"red\", \"weight\": 2})" + "m.add_gdf(roads_gdf, layer_name=\"Roads\", style={\"color\": \"red\", \"weight\": 2})\n", + "m" ] }, { @@ -174,7 +177,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.9" + "version": "3.12.2" } }, "nbformat": 4, diff --git a/leafmap/foliumap.py b/leafmap/foliumap.py index a495a36978..dbb0a2523f 100644 --- a/leafmap/foliumap.py +++ b/leafmap/foliumap.py @@ -90,6 +90,7 @@ def __init__(self, **kwargs): super().__init__(**kwargs) self.baseclass = "folium" + self.user_roi = None if (height is not None) or (width is not None): f = folium.Figure(width=width, height=height)