Skip to content

Load boundaries only once #421

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Load boundaries only once #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca35821
remove unneeded LayerGroup
aaron-kaplan May 2, 2024
bcc6dd1
Don't recreate admin layers on every change
aaron-kaplan May 2, 2024
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
5 changes: 1 addition & 4 deletions enacts/flex_fcst/layout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,7 @@ def map_layout():
dlf.Map(
[
dlf.LayersControl(id="layers_control", position="topleft"),
dlf.LayerGroup(
[dlf.Marker(id="loc_marker", position=(0, 0))],
id="layers_group"
),
dlf.Marker(id="loc_marker", position=(0, 0)),
dlf.ScaleControl(imperial=False, position="bottomleft"),
dlf.Colorbar(
id="fcst_colorbar",
Expand Down
79 changes: 41 additions & 38 deletions enacts/flex_fcst/maproom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ def read_cptdataset(lead_time, start_date, y_transform=config["y_transform"]):
Output("lng_input", "max"),
Output("lng_input_tooltip", "children"),
Output("map", "center"),
Output("layers_control", "children"),
State("lead_time_label", "style"),
State("lead_time_control", "style"),
Input("location", "pathname"),
Expand Down Expand Up @@ -218,13 +219,49 @@ def initialize(lead_time_label_style, lead_time_control_style, path):
lead_time_label_style = dict(lead_time_label_style, display=target_display)
lead_time_control_style = dict(lead_time_control_style, display=target_display)

layers = [
dlf.BaseLayer(
dlf.TileLayer(
url="https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png",
),
name="Street",
checked=False,
),
dlf.BaseLayer(
dlf.TileLayer(
url="https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png"
),
name="Topo",
checked=True,
),
] + [
make_adm_overlay(
adm["name"],
adm["sql"],
adm["color"],
i+1,
len(GLOBAL_CONFIG["datasets"]["shapes_adm"])-i,
is_checked=adm["is_checked"]
)
for i, adm in enumerate(GLOBAL_CONFIG["datasets"]["shapes_adm"])
] + [
dlf.Overlay(
dlf.TileLayer(
opacity=1,
id="tile_layer",
),
name="Forecast",
checked=True,
),
]
return (
phys_units,
start_dates, start_dates[-1],
lead_time_label_style, lead_time_control_style,
lat_min, lat_max, lat_label,
lon_min, lon_max, lon_label,
center_of_the_map
center_of_the_map,
layers,
)

@APP.callback(
Expand Down Expand Up @@ -661,7 +698,7 @@ def draw_colorbar(proba, variable, percentile):


@APP.callback(
Output("layers_control", "children"),
Output("tile_layer", "url"),
Output("forecast_warning", "is_open"),
Input("proba", "value"),
Input("variable", "value"),
Expand All @@ -670,7 +707,7 @@ def draw_colorbar(proba, variable, percentile):
Input("start_date","value"),
Input("lead_time","value")
)
def make_map(proba, variable, percentile, threshold, start_date, lead_time):
def set_tile_url(proba, variable, percentile, threshold, start_date, lead_time):

try:
if variable != "Percentile":
Expand All @@ -686,41 +723,7 @@ def make_map(proba, variable, percentile, threshold, start_date, lead_time):
except:
url_str= ""
send_alarm = True
return [
dlf.BaseLayer(
dlf.TileLayer(
url="https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png",
),
name="Street",
checked=False,
),
dlf.BaseLayer(
dlf.TileLayer(
url="https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png"
),
name="Topo",
checked=True,
),
] + [
make_adm_overlay(
adm["name"],
adm["sql"],
adm["color"],
i+1,
len(GLOBAL_CONFIG["datasets"]["shapes_adm"])-i,
is_checked=adm["is_checked"]
)
for i, adm in enumerate(GLOBAL_CONFIG["datasets"]["shapes_adm"])
] + [
dlf.Overlay(
dlf.TileLayer(
url=url_str,
opacity=1,
),
name="Forecast",
checked=True,
),
], send_alarm
return url_str, send_alarm


# Endpoints
Expand Down