Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update overture notebook #896

Merged
merged 2 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 6 additions & 3 deletions docs/notebooks/97_overture_data.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"metadata": {},
"outputs": [],
"source": [
"from leafmap import leafmap"
"import leafmap"
]
},
{
Expand Down Expand Up @@ -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\")"
]
},
Expand Down Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -174,7 +177,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.9"
"version": "3.12.2"
}
},
"nbformat": 4,
Expand Down
1 change: 1 addition & 0 deletions leafmap/foliumap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading