From 3ba33251d4cd7221c488edbe7f1057bec5f77ca8 Mon Sep 17 00:00:00 2001
From: CervezaStallone <48717031+CervezaStallone@users.noreply.github.com>
Date: Mon, 2 Nov 2026 22:40:52 +0100
Subject: [PATCH 1/4] feat: Show limits as dashed lines in the time chart
The limits of the selected quantity (all sensors, or the selected sensor) are drawn as dashed lines with their level and value: yellow for warning, red for alarm.
---
callbacks.py | 28 ++++++++++++++++++++++------
test_app.py | 16 ++++++++++++++++
2 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/callbacks.py b/callbacks.py
index 21fa106..19a0570 100644
--- a/callbacks.py
+++ b/callbacks.py
@@ -120,8 +120,11 @@ def humidex_score(temp, hum):
return 0
-def metric_figure(df, names, colors, metric, t, mode):
- """Eén grootheid, één lijn per sensor (of één sensor), in de kleuren van het thema."""
+def metric_figure(df, names, colors, metric, t, mode, limits=()):
+ """Eén grootheid, één lijn per sensor (of één sensor), in de kleuren van het thema.
+
+ limits: [(min, max, niveau)] uit de alarmregels, als gestippelde lijnen (geel = waarschuwing, rood = alarm).
+ """
fig = go.Figure()
unit = METRIC_UNITS[metric]
for device_id, name in names.items():
@@ -140,6 +143,14 @@ def metric_figure(df, names, colors, metric, t, mode):
else f'{name}: %{{y}}'))
style_figure(fig, mode)
fig.update_layout(showlegend=len(fig.data) > 1)
+ k = THEMES[mode]
+ for low, high, level in limits:
+ color = k['warn'] if level == 'warning' else k['alarm']
+ for value in (low, high):
+ if value is not None:
+ fig.add_hline(y=value, line=dict(color=color, width=1.5, dash='dash'),
+ annotation_text=f"{t['opt_level_' + level]} {value:g}", annotation_position='top left',
+ annotation_font=dict(color=color, size=11))
title = t[METRIC_KEYS[metric]] + (f' ({unit})' if unit else '')
fig.update_yaxes(title_text=title)
if metric == 'humidity':
@@ -149,13 +160,18 @@ def metric_figure(df, names, colors, metric, t, mode):
return fig
-def wood_zones(device_id):
- """Houtvochtgrenzen uit de alarmregels: [(min, max, niveau)] voor één sensor of de globale regels."""
+def limit_rules(metric, device_id):
+ """Grenzen van één grootheid uit de alarmregels: [(min, max, niveau)] voor één sensor of de globale regels."""
if device_id:
rules = alerts.effective_rules(device_id).values()
else:
rules = [r for r in alerts.load_rules() if r['enabled'] and r['device_id'] is None]
- return [(r['min_value'], r['max_value'], r['level']) for r in rules if r['metric'] == 'wood_emc']
+ return [(r['min_value'], r['max_value'], r['level']) for r in rules if r['metric'] == metric]
+
+
+def wood_zones(device_id):
+ """Houtvochtgrenzen uit de alarmregels (voor het houtdiagram)."""
+ return limit_rules('wood_emc', device_id)
def theme_mollier(fig, mode, point_color=None):
@@ -332,7 +348,7 @@ def update_graph(n, time_range_minutes, relayout_data, lang, device_sel, metric,
fig.update_yaxes(visible=False)
return fig, count_text, stored_relayout
df['timestamp'] = pd.to_datetime(df['timestamp'], unit='s').dt.tz_localize('UTC').dt.tz_convert(settings.get('timezone')).dt.tz_localize(None)
- fig = metric_figure(df, names, device_colors(mode), metric, t, mode)
+ fig = metric_figure(df, names, device_colors(mode), metric, t, mode, limit_rules(metric, device_filter))
return fig, count_text, stored_relayout
@app.callback(
diff --git a/test_app.py b/test_app.py
index 98daa47..dd72115 100644
--- a/test_app.py
+++ b/test_app.py
@@ -1389,6 +1389,22 @@ def test_wood_value_restarts_when_wood_settings_change():
assert abs(wood.update(1, 20, 65, now=now + 60) - 10.0) < 0.2
+def test_limits_shown_in_time_chart():
+ """Grenswaarden van de getoonde grootheid als lijnen in de tijdgrafiek (alleen die grootheid)."""
+ import callbacks
+ import pandas as pd
+ setup_alerts([{'scope': 0, 'metric': 'temperature', 'max_value': 8, 'level': 'alarm', 'enabled': 'true'},
+ {'scope': 0, 'metric': 'temperature', 'min_value': 2, 'max_value': 6, 'level': 'warning',
+ 'enabled': 'true'},
+ {'scope': 0, 'metric': 'humidity', 'max_value': 80, 'enabled': 'true'}])
+ df = pd.DataFrame({'timestamp': [1, 2], 'temperature': [5.0, 7.0], 'humidity': [60.0, 70.0], 'device_id': [1, 1]})
+ limits = callbacks.limit_rules('temperature', None)
+ fig = callbacks.metric_figure(df, {1: 'Kas'}, {}, 'temperature', TRANSLATIONS['nl'], 'dark', limits=limits)
+ lines = sorted((shape.y0, shape.line.color) for shape in fig.layout.shapes)
+ k = callbacks.THEMES['dark']
+ assert lines == [(2, k['warn']), (6, k['warn']), (8, k['alarm'])]
+
+
def test_warning_and_alarm_levels():
names = setup_alerts([{'scope': 0, 'metric': 'wood_emc', 'max_value': 18, 'level': 'warning', 'enabled': 'true'},
{'scope': 0, 'metric': 'wood_emc', 'max_value': 20, 'level': 'alarm', 'enabled': 'true'}])
From 2427fe158e8769703fe6b5d40183551b33ff38b1 Mon Sep 17 00:00:00 2001
From: CervezaStallone <48717031+CervezaStallone@users.noreply.github.com>
Date: Mon, 2 Nov 2026 22:46:58 +0100
Subject: [PATCH 2/4] refactor: Zones only in the wood diagram
The Mollier diagram shows its fixed comfort zone again, without user zones or the draw button; zones belong to the wood diagram (temperature x humidity), where a shape editor replaces free drawing.
---
callbacks.py | 88 +++++-------------------------------------------
layout.py | 18 ----------
psychrometric.py | 32 ------------------
test_app.py | 68 +++++--------------------------------
4 files changed, 17 insertions(+), 189 deletions(-)
diff --git a/callbacks.py b/callbacks.py
index 19a0570..5adae64 100644
--- a/callbacks.py
+++ b/callbacks.py
@@ -1,9 +1,8 @@
-import json
import sqlite3
import math
import pandas as pd
from datetime import datetime, timedelta
-from dash import ALL, Patch, callback_context, html, no_update, Input, Output, State
+from dash import ALL, callback_context, html, no_update, Input, Output, State
import plotly.graph_objects as go
import alerts
@@ -11,13 +10,12 @@
import devices
import layout
import settings
-import settings_ui
import wood
import zones
from translations import TRANSLATIONS
from database import get_all_measurement_tables, build_union_query, DB_FILE
from modbus_reader import derived_values
-from psychrometric import add_device_points, add_zones, path_to_points, create_psychrometric_chart, create_psychrometric_chart_historical
+from psychrometric import add_device_points, create_psychrometric_chart, create_psychrometric_chart_historical
# Categorisch palet per sensor (vaste volgorde, gevalideerd op kleurenblindheid en contrast).
# Sensor 9 en verder krijgen een neutrale kleur; status-kleuren worden nooit voor sensoren gebruikt.
@@ -351,80 +349,16 @@ def update_graph(n, time_range_minutes, relayout_data, lang, device_sel, metric,
fig = metric_figure(df, names, device_colors(mode), metric, t, mode, limit_rules(metric, device_filter))
return fig, count_text, stored_relayout
- @app.callback(
- [Output('draw-zone-msg', 'children'),
- Output('zone-drawing', 'data', allow_duplicate=True),
- Output('draw-bar', 'style', allow_duplicate=True)],
- Input('save-zone-btn', 'n_clicks'),
- [State('zone-draw-path', 'data'),
- State('draw-zone-name', 'value'),
- State('draw-zone-mode', 'value'),
- State('draw-zone-color', 'value'),
- State('device-selector', 'value'),
- State('selected-language', 'data')],
- prevent_initial_call=True
- )
- def save_drawn_zone(n_clicks, path, name, mode, color, device_sel, lang):
- """Getekende vorm opslaan als zone (alleen ingelogd: het dashboard kan publiek zijn)."""
- t = TRANSLATIONS.get(lang) or TRANSLATIONS['en']
- if not auth.is_logged_in():
- return t['draw_login'], no_update, no_update
- points = path_to_points(path)
- if len(points) < 3:
- return t['draw_empty'], no_update, no_update
- rows = settings_ui.table_rows('zones') + [{
- 'scope': device_sel or 0, 'name': (name or '').strip() or f"{t['zone']} {len(zones.load()) + 1}",
- 'color': color or 'blue', 'mode': mode or 'none', 'level': 'warning', 'shape': 'polygon',
- 'points': json.dumps(points),
- 'enabled': 'true'}]
- errors = zones.save(rows)
- if errors:
- return t['msg_save_failed'], no_update, no_update
- return t['draw_saved'], False, {'display': 'none'}
-
- @app.callback(
- [Output('zone-drawing', 'data'),
- Output('draw-bar', 'style'),
- Output('psychrometric-chart', 'figure', allow_duplicate=True)],
- [Input('draw-zone-btn', 'n_clicks'),
- Input('cancel-zone-btn', 'n_clicks')],
- prevent_initial_call=True
- )
- def toggle_zone_drawing(draw_clicks, cancel_clicks):
- """Tekenmodus: Plotly tekent een gesloten pad; annuleren wist de tekening."""
- drawing = callback_context.triggered_id == 'draw-zone-btn'
- figure = Patch()
- figure['layout']['dragmode'] = 'drawclosedpath' if drawing else 'zoom'
- figure['layout']['newshape'] = {'line': {'color': zones.COLORS['blue'], 'width': 2},
- 'fillcolor': zones.fill_color('blue', 0.2)}
- if not drawing:
- figure['layout']['shapes'] = []
- return drawing, {} if drawing else {'display': 'none'}, figure
-
- @app.callback(
- Output('zone-draw-path', 'data'),
- Input('psychrometric-chart', 'relayoutData'),
- State('zone-drawing', 'data'),
- prevent_initial_call=True
- )
- def keep_drawn_path(relayout, drawing):
- """Laatst getekende vorm onthouden (Plotly geeft alle vormen in 'shapes')."""
- shapes = (relayout or {}).get('shapes')
- if not drawing or not shapes:
- return no_update
- return shapes[-1].get('path')
-
# Callback voor psychrometric chart
@app.callback(
Output('psychrometric-chart', 'figure'),
[Input('graph-update', 'n_intervals'),
Input('selected-language', 'data'),
- Input('device-selector', 'value')],
- State('zone-drawing', 'data')
+ Input('device-selector', 'value')]
)
- def update_psychrometric_chart(n, lang, device_sel, drawing):
+ def update_psychrometric_chart(n, lang, device_sel):
"""Update psychrometrisch diagram met actuele meetwaarden (alle devices of één device)"""
- if not settings.get('show_mollier') or drawing: # tijdens tekenen niet verversen: wist de tekening
+ if not settings.get('show_mollier'):
return no_update
if lang is None:
lang = 'nl'
@@ -438,7 +372,7 @@ def update_psychrometric_chart(n, lang, device_sel, drawing):
coldest = min((p[1] for p in points if p[1] is not None), default=0)
if coldest < 0:
fig.update_xaxes(range=[coldest - 3, 40]) # punten onder 0 °C zichtbaar houden
- return add_zones(fig, zones.visible(device_sel)) # na theme_mollier: dat kleurt vlakken als comfortzone
+ return fig
@app.callback(
Output('wood-chart', 'figure'),
@@ -979,12 +913,7 @@ def update_device_overview(n, lang, view, tab):
Output('custom-start-date', 'placeholder'),
Output('custom-end-date', 'placeholder'),
Output('custom-start-hour', 'placeholder'),
- Output('custom-end-hour', 'placeholder'),
- Output('draw-zone-btn', 'children'),
- Output('draw-zone-hint', 'children'),
- Output('draw-zone-name', 'placeholder'),
- Output('save-zone-btn', 'children'),
- Output('cancel-zone-btn', 'children')] +
+ Output('custom-end-hour', 'placeholder')] +
[Output(f'preset-{key}', 'children') for key in PRESET_BUTTONS],
Input('selected-language', 'data')
)
@@ -993,5 +922,4 @@ def update_history_language(lang):
t = TRANSLATIONS.get(lang) or TRANSLATIONS['en']
return [t['btn_select_range'], t['modal_title'], t['quick_select'], t['specific_period'], t['start_datetime'],
t['end_datetime'], t['btn_apply'], t['select_date'], t['select_date'], t['hour_placeholder'],
- t['hour_placeholder'], t['btn_draw_zone'], t['hint_draw_zone'], t['lbl_zone_name'], t['btn_save_zone'],
- t['btn_cancel']] + [t[f'btn_{key}'] for key in PRESET_BUTTONS]
+ t['hour_placeholder']] + [t[f'btn_{key}'] for key in PRESET_BUTTONS]
diff --git a/layout.py b/layout.py
index 34fef7f..afa213b 100644
--- a/layout.py
+++ b/layout.py
@@ -409,24 +409,6 @@ def create_layout():
html.Section(id='mollier-panel', className='panel', style=mollier_style(), children=[
html.Div(className='panel-head', children=[
html.Span(id='label-psychrometric-chart', className='panel-title', children=t['psychrometric_chart']),
- html.Button(t['btn_draw_zone'], id='draw-zone-btn', n_clicks=0, className='btn btn-small'),
- ]),
- # Zone tekenen: zolang dit open is pauzeert de live-verversing (die zou de tekening wissen)
- dcc.Store(id='zone-drawing', data=False),
- dcc.Store(id='zone-draw-path'),
- html.Div(id='draw-bar', className='draw-bar', style={'display': 'none'}, children=[
- html.Div(t['hint_draw_zone'], id='draw-zone-hint', className='hint'),
- html.Div(className='draw-actions', children=[
- dcc.Input(id='draw-zone-name', type='text', placeholder=t['lbl_zone_name'], className='input',
- maxLength=50),
- dcc.Dropdown(id='draw-zone-mode', options=zone_mode_options(t), value='keep_outside',
- clearable=False, searchable=False, className='draw-select'),
- dcc.Dropdown(id='draw-zone-color', options=zone_color_options(t), value='red',
- clearable=False, searchable=False, className='draw-select'),
- html.Button(t['btn_save_zone'], id='save-zone-btn', n_clicks=0, className='btn btn-primary btn-small'),
- html.Button(t['btn_cancel'], id='cancel-zone-btn', n_clicks=0, className='btn btn-small'),
- html.Span(id='draw-zone-msg', className='hint'),
- ]),
]),
html.Div(className='panel-body', children=dcc.Graph(
id='psychrometric-chart', config={'displaylogo': False, 'displayModeBar': False})),
diff --git a/psychrometric.py b/psychrometric.py
index 82b9965..4b1462f 100644
--- a/psychrometric.py
+++ b/psychrometric.py
@@ -315,35 +315,3 @@ def add_device_points(fig, points):
))
return fig
-
-def add_zones(fig, zone_list):
- """Zones (veelhoek in temperatuur × RV) in het Mollier diagram; randen volgen de RV-lijnen."""
- import zones
- for zone in zone_list:
- temps, ratios = [], []
- points = zone['points']
- for (t1, h1), (t2, h2) in zip(points, points[1:] + points[:1]):
- for f in np.linspace(0, 1, 16, endpoint=False):
- temp, rh = t1 + (t2 - t1) * f, h1 + (h2 - h1) * f
- pw = 611.2 * np.exp(17.62 * temp / (243.12 + temp)) * rh / 100
- temps.append(temp)
- ratios.append(0.622 * pw / (101325 - pw) * 1000)
- color = zones.COLORS[zone['color']]
- fig.add_trace(go.Scatter(x=temps + temps[:1], y=ratios + ratios[:1], mode='lines', fill='toself',
- name=zone['name'], fillcolor=zones.fill_color(zone['color']),
- line=dict(color=color, width=1.5), hoverinfo='skip'))
- if zone_list: # zones onder de sensorpunten en lijnen leggen
- fig.data = fig.data[-len(zone_list):] + fig.data[:-len(zone_list)]
- return fig
-
-
-def path_to_points(path):
- """Plotly tekenpad ('M20,7.3L30,13.3Z', x = °C, y = g/kg) naar zonepunten [[°C, RV %], ...]."""
- import re
- points = []
- for temp, ratio in re.findall(r'(-?[\d.]+),(-?[\d.]+)', path or ''):
- temp, w = float(temp), max(float(ratio), 0) / 1000
- pw = w * 101325 / (0.622 + w)
- pws = 611.2 * np.exp(17.62 * temp / (243.12 + temp))
- points.append([round(temp, 2), round(float(min(max(pw / pws * 100, 0), 100)), 1)])
- return points
diff --git a/test_app.py b/test_app.py
index dd72115..60a9eb6 100644
--- a/test_app.py
+++ b/test_app.py
@@ -682,8 +682,10 @@ def test_zone_alarms_on_leaving_and_entering():
assert len(outbox_texts()) == 2 and alerts.device_status(cel['id'])[0] == 'ok'
-def test_zones_drawn_in_mollier_and_wood_diagram():
+def test_zones_only_in_wood_diagram():
+ """Zones horen bij het houtdiagram (temperatuur × RV); het Mollier-diagram toont alleen de vaste comfortzone."""
import callbacks
+ import layout
import zones
from dash import Dash
setup_alerts([])
@@ -692,11 +694,12 @@ def test_zones_drawn_in_mollier_and_wood_diagram():
'temp_min': 10, 'temp_max': 20, 'rh_min': 50, 'rh_max': 70, 'enabled': 'true'}]) == {}
app = Dash(__name__)
callbacks.register_callbacks(app)
- for output in ('psychrometric-chart.figure', 'wood-chart.figure'):
- fig = run_callback(app, output, 0, 'nl', 0, *(['dashboard'] if output == 'wood-chart.figure' else [False]),
- trigger='selected-language.data')
- zone = next(trace for trace in fig.data if trace.name == 'Opslag')
- assert zone.fill == 'toself' and zone.line.color == zones.COLORS['blue'], output
+ mollier = run_callback(app, 'psychrometric-chart.figure', 0, 'nl', 0, trigger='selected-language.data')
+ assert 'Opslag' not in [trace.name for trace in mollier.data]
+ assert 'draw-zone-btn' not in str(layout.create_layout())
+ wood = run_callback(app, 'wood-chart.figure', 0, 'nl', 0, 'dashboard', trigger='selected-language.data')
+ zone = next(trace for trace in wood.data if trace.name == 'Opslag')
+ assert zone.fill == 'toself' and zone.line.color == zones.COLORS['blue']
def test_zone_alarm_has_margin_at_the_edge():
@@ -725,59 +728,6 @@ def test_zone_alarm_has_margin_at_the_edge():
assert any('Schimmel' in x for x in outbox_texts())
-def test_drawn_mollier_path_becomes_zone_points():
- """Plotly tekenpad (x = °C, y = g/kg) naar zonepunten in °C × RV."""
- import psychrometric
- points = psychrometric.path_to_points('M20,7.29L30,13.31L25,40Z')
- assert [round(t) for t, _ in points] == [20, 30, 25]
- assert abs(points[0][1] - 50) < 1 and abs(points[1][1] - 50) < 1 and points[2][1] == 100 # boven verzadiging: 100 %
-
-
-def test_save_drawn_zone_only_when_logged_in():
- import callbacks
- import zones
- from dash import Dash
- setup_alerts([])
- app = Dash(__name__)
- callbacks.register_callbacks(app)
- path = 'M20,7.29L30,13.31L25,4Z'
- with app.server.test_request_context():
- msg, drawing, _ = run_callback(app, 'draw-zone-msg.children', 1, path, 'Droog', 'keep_outside', 'red', 0, 'nl',
- trigger='save-zone-btn.n_clicks')
- assert msg == TRANSLATIONS_NL['draw_login'] and zones.load() == [] # dashboard kan publiek zijn
- original, auth.is_logged_in = auth.is_logged_in, lambda: True
- try:
- assert run_callback(app, 'draw-zone-msg.children', 1, None, 'Droog', 'keep_outside', 'red', 0, 'nl',
- trigger='save-zone-btn.n_clicks')[0] == TRANSLATIONS_NL['draw_empty']
- msg, drawing, _ = run_callback(app, 'draw-zone-msg.children', 1, path, 'Droog', 'keep_outside', 'red', 0, 'nl',
- trigger='save-zone-btn.n_clicks')
- finally:
- auth.is_logged_in = original
- assert msg == TRANSLATIONS_NL['draw_saved'] and drawing is False
- zone = zones.load()[0]
- assert zone['name'] == 'Droog' and zone['shape'] == 'polygon' and len(zone['points']) == 3 and zone['mode'] == 'keep_outside' and zone['color'] == 'red'
-
-
-def test_draw_mode_pauses_live_mollier_and_keeps_path():
- import callbacks
- import layout
- from dash import Dash
- setup_alerts([])
- rendered = str(layout.create_layout())
- assert 'draw-zone-btn' in rendered and 'draw-bar' in rendered
- assert 'draw-zone-mode' in rendered and 'draw-zone-color' in rendered
- app = Dash(__name__)
- callbacks.register_callbacks(app)
- drawing, bar, _ = run_callback(app, '..zone-drawing.data...draw-bar.style', 1, 0, trigger='draw-zone-btn.n_clicks')
- assert drawing is True and bar == {}
- assert run_callback(app, 'psychrometric-chart.figure', 1, 'nl', 0, True, trigger='graph-update.n_intervals') \
- is callbacks.no_update # live-verversing zou de tekening wissen
- assert run_callback(app, 'zone-draw-path.data', {'shapes': [{'path': 'M1,2L3,4L5,6Z'}]}, True,
- trigger='psychrometric-chart.relayoutData') == 'M1,2L3,4L5,6Z'
- drawing, bar, _ = run_callback(app, '..zone-drawing.data...draw-bar.style', 1, 1, trigger='cancel-zone-btn.n_clicks')
- assert drawing is False and bar == {'display': 'none'}
-
-
def test_zone_alarm_does_not_stick_after_zones_are_saved_again():
"""Opslaan geeft zones nieuwe id's (bv. na tekenen): een alarm op een oude zone mag niet blijven hangen."""
import zones
From 6b66bb5f5135346909c8b5cf0398e1849b2739cb Mon Sep 17 00:00:00 2001
From: CervezaStallone <48717031+CervezaStallone@users.noreply.github.com>
Date: Mon, 2 Nov 2026 23:02:50 +0100
Subject: [PATCH 3/4] feat: Shape editor for zones in the wood diagram
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- '+ Zone' starts a square; drag the corners, drag the dot in the middle of a side to add a corner, double-click a corner to remove it (at least 3), with mouse or touch
- Click a zone in the diagram (or pick it from 'Edit zone…') to change its shape, name, sensor, notification, level and colour, or delete it
- Saving and deleting require being logged in
- The zone being edited is hidden from the diagram by its own callback, so the one-second refresh cannot overwrite it
- Settings no longer has min/max fields or an add button for zones; it edits the other properties
---
assets/zone_editor.js | 168 ++++++++++++++++++++++++++++++++++++++++++
callbacks.py | 165 +++++++++++++++++++++++++++++++++++++----
layout.py | 52 +++++++++++++
settings_ui.py | 28 +++----
test_app.py | 119 ++++++++++++++++++++++++++++--
translations.py | 50 ++++++++++---
wood.py | 4 +-
7 files changed, 535 insertions(+), 51 deletions(-)
create mode 100644 assets/zone_editor.js
diff --git a/assets/zone_editor.js b/assets/zone_editor.js
new file mode 100644
index 0000000..0fa9e01
--- /dev/null
+++ b/assets/zone_editor.js
@@ -0,0 +1,168 @@
+/* Zone-editor voor het houtdiagram (temperatuur × RV).
+ *
+ * Tekent over het Plotly-diagram een vorm met sleepbare hoeken (grote bollen) en op elke zijde een
+ * middenbol. Een middenbol slepen voegt daar een hoek toe; dubbelklik op een hoek verwijdert hem
+ * (minimaal 3). Werkt met muis en touch (pointer events). Na elke wijziging gaan de punten naar de
+ * Dash-store 'zone-edit-points'; de server slaat ze op.
+ *
+ * Aangestuurd door de clientside callback zones.edit met de inhoud van de store 'zone-edit'
+ * ({id, points} of null = editor uit).
+ */
+(function () {
+ 'use strict';
+ var SVG_NS = 'http://www.w3.org/2000/svg';
+ var GRAPH_ID = 'wood-chart';
+ var editor = { points: null, svg: null, plot: null, drag: null };
+
+ function plotElement() {
+ var graph = document.getElementById(GRAPH_ID);
+ return graph ? graph.querySelector('.js-plotly-plot') : null;
+ }
+
+ function axes(plot) {
+ var layout = plot && plot._fullLayout;
+ return layout && layout.xaxis && layout.yaxis ? layout : null;
+ }
+
+ function toPixels(layout, point) {
+ return [layout._size.l + layout.xaxis.l2p(point[0]), layout._size.t + layout.yaxis.l2p(point[1])];
+ }
+
+ function toData(layout, x, y) {
+ var temp = layout.xaxis.p2l(x - layout._size.l);
+ var rh = layout.yaxis.p2l(y - layout._size.t);
+ return [Math.round(temp * 10) / 10, Math.round(Math.min(100, Math.max(0, rh)) * 10) / 10];
+ }
+
+ function commit() {
+ if (window.dash_clientside && window.dash_clientside.set_props) {
+ window.dash_clientside.set_props('zone-edit-points', { data: editor.points.map(function (p) { return p.slice(); }) });
+ }
+ }
+
+ function circle(cx, cy, radius, className) {
+ var c = document.createElementNS(SVG_NS, 'circle');
+ c.setAttribute('cx', cx);
+ c.setAttribute('cy', cy);
+ c.setAttribute('r', radius);
+ c.setAttribute('class', className);
+ return c;
+ }
+
+ function startDrag(event, index) {
+ event.preventDefault();
+ event.stopPropagation();
+ editor.drag = index;
+ }
+
+ function draw() {
+ var plot = plotElement();
+ var layout = axes(plot);
+ if (!editor.points || !layout) {
+ return;
+ }
+ var host = plot.querySelector('.svg-container');
+ if (!editor.svg || editor.svg.parentNode !== host) {
+ editor.svg = document.createElementNS(SVG_NS, 'svg');
+ editor.svg.setAttribute('class', 'zone-editor');
+ host.appendChild(editor.svg);
+ }
+ var svg = editor.svg;
+ svg.setAttribute('width', layout.width);
+ svg.setAttribute('height', layout.height);
+ while (svg.firstChild) {
+ svg.removeChild(svg.firstChild);
+ }
+ var pixels = editor.points.map(function (p) { return toPixels(layout, p); });
+ var shape = document.createElementNS(SVG_NS, 'polygon');
+ shape.setAttribute('points', pixels.map(function (p) { return p.join(','); }).join(' '));
+ shape.setAttribute('class', 'zone-editor-shape');
+ svg.appendChild(shape);
+
+ // Middenbollen: slepen voegt een hoek toe tussen hoek i en i + 1
+ pixels.forEach(function (p, i) {
+ var next = pixels[(i + 1) % pixels.length];
+ var mid = circle((p[0] + next[0]) / 2, (p[1] + next[1]) / 2, 6, 'zone-editor-mid');
+ mid.addEventListener('pointerdown', function (event) {
+ editor.points.splice(i + 1, 0, toData(layout, (p[0] + next[0]) / 2, (p[1] + next[1]) / 2));
+ startDrag(event, i + 1);
+ draw();
+ });
+ svg.appendChild(mid);
+ });
+ // Hoeken: slepen; dubbelklik verwijdert (minimaal 3 hoeken)
+ pixels.forEach(function (p, i) {
+ var corner = circle(p[0], p[1], 8, 'zone-editor-corner');
+ corner.addEventListener('pointerdown', function (event) { startDrag(event, i); });
+ corner.addEventListener('dblclick', function (event) {
+ event.preventDefault();
+ event.stopPropagation();
+ if (editor.points.length > 3) {
+ editor.points.splice(i, 1);
+ draw();
+ commit();
+ }
+ });
+ svg.appendChild(corner);
+ });
+ }
+
+ function onMove(event) {
+ if (editor.drag === null || !editor.points) {
+ return;
+ }
+ var plot = plotElement();
+ var layout = axes(plot);
+ if (!layout) {
+ return;
+ }
+ var box = plot.querySelector('.svg-container').getBoundingClientRect();
+ editor.points[editor.drag] = toData(layout, event.clientX - box.left, event.clientY - box.top);
+ draw();
+ }
+
+ function onUp() {
+ if (editor.drag !== null) {
+ editor.drag = null;
+ commit();
+ }
+ }
+
+ function stop() {
+ editor.points = null;
+ editor.drag = null;
+ if (editor.svg && editor.svg.parentNode) {
+ editor.svg.parentNode.removeChild(editor.svg);
+ }
+ editor.svg = null;
+ }
+
+ function watchPlot() {
+ // Na elke (her)tekening of zoom van Plotly de bollen opnieuw plaatsen
+ var plot = plotElement();
+ if (plot && plot !== editor.plot && plot.on) {
+ editor.plot = plot;
+ plot.on('plotly_afterplot', draw);
+ }
+ }
+
+ window.addEventListener('pointermove', onMove);
+ window.addEventListener('pointerup', onUp);
+ window.addEventListener('pointercancel', onUp);
+
+ window.dash_clientside = Object.assign({}, window.dash_clientside, {
+ zones: {
+ edit: function (editing) {
+ stop();
+ if (editing && editing.points) {
+ editor.points = editing.points.map(function (p) { return [Number(p[0]), Number(p[1])]; });
+ watchPlot();
+ // Het diagram wordt mogelijk net opnieuw opgebouwd: tekenen na de volgende frame
+ window.requestAnimationFrame(function () { watchPlot(); draw(); });
+ commit();
+ }
+ return window.dash_clientside.no_update;
+ }
+ }
+ });
+}());
diff --git a/callbacks.py b/callbacks.py
index 5adae64..78a9517 100644
--- a/callbacks.py
+++ b/callbacks.py
@@ -1,8 +1,9 @@
+import json
import sqlite3
import math
import pandas as pd
from datetime import datetime, timedelta
-from dash import ALL, callback_context, html, no_update, Input, Output, State
+from dash import ALL, ClientsideFunction, callback_context, html, no_update, Input, Output, State
import plotly.graph_objects as go
import alerts
@@ -10,6 +11,7 @@
import devices
import layout
import settings
+import settings_ui
import wood
import zones
from translations import TRANSLATIONS
@@ -31,6 +33,7 @@
hover='#eceee8', ok='#0b8a0b', warn='#c98500', alarm='#d03b3b', offline='#7d838a'),
}
FONT = 'system-ui, -apple-system, Segoe UI, Roboto, Ubuntu, sans-serif'
+NEW_ZONE_SQUARE = ((15, 40), (25, 40), (25, 60), (15, 60)) # nieuwe zone begint als vierkant (°C, % RV)
METRIC_UNITS = {'temperature': '°C', 'humidity': '%', 'dewpoint': '°C', 'absolute_humidity': 'g/m³', 'comfort': '',
'wood_emc': '%'}
METRIC_KEYS = {'temperature': 'temperature', 'humidity': 'humidity', 'dewpoint': 'dewpoint',
@@ -374,28 +377,148 @@ def update_psychrometric_chart(n, lang, device_sel):
fig.update_xaxes(range=[coldest - 3, 40]) # punten onder 0 °C zichtbaar houden
return fig
- @app.callback(
- Output('wood-chart', 'figure'),
- [Input('graph-update', 'n_intervals'),
- Input('selected-language', 'data'),
- Input('device-selector', 'value')],
- State('main-tabs', 'value')
- )
- def update_wood_chart(n, lang, device_sel, tab):
- """Houtvochtdiagram: actuele punten per sensor en de zones uit de houtvochtregels"""
- if not settings.get('show_wood') or (callback_context.triggered_id == 'graph-update' and (n % 5 or tab == 'settings')):
- return no_update
+ def wood_chart(lang, device_sel, editing):
+ """Houtvochtdiagram: actuele punten per sensor, houtvochtgrenzen en zones (zone in bewerking: door de editor)."""
t = TRANSLATIONS.get(lang) or TRANSLATIONS['en']
mode = theme_mode()
colors = device_colors(mode)
latest = latest_per_device()
points = [(d['name'], latest[d['id']][1], latest[d['id']][2], colors.get(d['id'])) for d in devices.list_devices()
if d['id'] in latest and (not device_sel or d['id'] == device_sel)]
- fig = wood.figure(points, wood_zones(device_sel), t, THEMES[mode], zones.visible(device_sel))
+ areas = [z for z in zones.visible(device_sel) if not editing or z['id'] != editing.get('id')]
+ fig = wood.figure(points, wood_zones(device_sel), t, THEMES[mode], areas)
fig = style_figure(fig, mode, height=520)
fig.update_layout(hovermode='closest', margin=dict(l=60, r=50, t=30, b=50))
return fig
+ @app.callback(
+ Output('wood-chart', 'figure'),
+ [Input('graph-update', 'n_intervals'),
+ Input('selected-language', 'data'),
+ Input('device-selector', 'value')],
+ [State('zone-edit', 'data'),
+ State('main-tabs', 'value')]
+ )
+ def update_wood_chart(n, lang, device_sel, editing, tab):
+ """Live houtvochtdiagram (elke 5 s); tijdens het bewerken van een zone stil."""
+ if not settings.get('show_wood') or editing:
+ return no_update
+ if callback_context.triggered_id == 'graph-update' and (n % 5 or tab == 'settings'):
+ return no_update
+ return wood_chart(lang, device_sel, editing)
+
+ @app.callback(
+ Output('wood-chart', 'figure', allow_duplicate=True),
+ Input('zone-edit', 'data'),
+ [State('selected-language', 'data'),
+ State('device-selector', 'value')],
+ prevent_initial_call=True
+ )
+ def wood_chart_for_editing(editing, lang, device_sel):
+ """Editor open of dicht: diagram zonder (of weer met) de zone in bewerking.
+
+ Een eigen callback: Dash vervangt een lopend verzoek door een nieuwer verzoek van dezelfde callback, dus
+ via update_wood_chart zou de ververs-tik van elke seconde dit diagram telkens overschrijven.
+ """
+ if not settings.get('show_wood'):
+ return no_update
+ return wood_chart(lang, device_sel, editing)
+
+ @app.callback(
+ [Output('zone-edit', 'data'),
+ Output('zone-edit-bar', 'style'),
+ Output('zone-edit-name', 'value'),
+ Output('zone-edit-scope', 'value'),
+ Output('zone-edit-mode', 'value'),
+ Output('zone-edit-level', 'value'),
+ Output('zone-edit-color', 'value'),
+ Output('zone-edit-scope', 'options'),
+ Output('zone-edit-points', 'data')],
+ [Input('zone-add-btn', 'n_clicks'),
+ Input('zone-edit-select', 'value')],
+ [State('device-selector', 'value'),
+ State('selected-language', 'data')],
+ prevent_initial_call=True
+ )
+ def start_zone_edit(add_clicks, zone_id, device_sel, lang):
+ """Nieuwe zone (vierkant) of een bestaande zone openen in de editor."""
+ t = TRANSLATIONS.get(lang) or TRANSLATIONS['en']
+ if callback_context.triggered_id == 'zone-add-btn':
+ zone = {'id': None, 'points': [list(p) for p in NEW_ZONE_SQUARE],
+ 'name': f"{t['zone']} {len(zones.load()) + 1}", 'device_id': device_sel or None,
+ 'mode': 'keep_outside', 'level': 'warning', 'color': 'red'}
+ else:
+ zone = next((z for z in zones.load() if z['id'] == zone_id), None)
+ if zone is None:
+ return (no_update,) * 9
+ return ({'id': zone['id'], 'points': zone['points']}, {}, zone['name'], zone['device_id'] or 0, zone['mode'],
+ zone['level'], zone['color'], layout.scope_options(t), None)
+
+ @app.callback(
+ [Output('zone-edit-msg', 'children'),
+ Output('zone-edit', 'data', allow_duplicate=True),
+ Output('zone-edit-bar', 'style', allow_duplicate=True),
+ Output('zone-edit-select', 'value'),
+ Output('zone-edit-select', 'options')],
+ [Input('zone-save-btn', 'n_clicks'),
+ Input('zone-delete-btn', 'n_clicks'),
+ Input('zone-cancel-btn', 'n_clicks')],
+ [State('zone-edit', 'data'),
+ State('zone-edit-points', 'data'),
+ State('zone-edit-name', 'value'),
+ State('zone-edit-scope', 'value'),
+ State('zone-edit-mode', 'value'),
+ State('zone-edit-level', 'value'),
+ State('zone-edit-color', 'value'),
+ State('selected-language', 'data')],
+ prevent_initial_call=True
+ )
+ def finish_zone_edit(save_clicks, delete_clicks, cancel_clicks, editing, points, name, scope, mode, level, color,
+ lang):
+ """Opslaan, verwijderen of annuleren (opslaan en verwijderen alleen ingelogd: het dashboard kan publiek zijn)."""
+ t = TRANSLATIONS.get(lang) or TRANSLATIONS['en']
+ closed = ({'display': 'none'}, None)
+ trigger = callback_context.triggered_id
+ if trigger == 'zone-cancel-btn' or not editing:
+ return '', None, *closed, no_update
+ if not auth.is_logged_in():
+ return t['draw_login'], no_update, no_update, no_update, no_update
+ rows = settings_ui.table_rows('zones')
+ if trigger == 'zone-delete-btn':
+ rows = [r for r in rows if r['id'] != editing['id']]
+ message = t['zone_deleted']
+ else:
+ existing = next((r for r in rows if editing['id'] and r['id'] == editing['id']), None)
+ row = {'id': editing['id'], 'scope': scope or 0, 'name': (name or '').strip() or t['zone'], 'color': color,
+ 'mode': mode, 'level': level, 'shape': 'polygon', 'points': json.dumps(points or editing['points']),
+ 'enabled': existing['enabled'] if existing else 'true'}
+ rows = [row if r is existing else r for r in rows] if existing else rows + [row]
+ message = t['draw_saved']
+ if zones.save(rows):
+ return t['msg_save_failed'], no_update, no_update, no_update, no_update
+ return message, None, *closed, layout.zone_options()
+
+ @app.callback(
+ Output('zone-edit-select', 'value', allow_duplicate=True),
+ Input('wood-chart', 'clickData'),
+ State('wood-chart', 'figure'),
+ prevent_initial_call=True
+ )
+ def open_clicked_zone(click, figure):
+ """Klik op een zone in het houtdiagram opent die zone in de editor (zone-id staat in trace.meta)."""
+ try:
+ trace = figure['data'][click['points'][0]['curveNumber']]
+ except (TypeError, KeyError, IndexError):
+ return no_update
+ return trace.get('meta') if trace.get('hoveron') == 'fills' and trace.get('meta') else no_update
+
+ # De editor zelf draait in de browser (assets/zone_editor.js): sleepbare hoeken en middenbollen
+ app.clientside_callback(
+ ClientsideFunction(namespace='zones', function_name='edit'),
+ Output('zone-editor-ready', 'data'),
+ Input('zone-edit', 'data')
+ )
+
# Callback voor modal open/close
@app.callback(
Output('range-modal', 'style'),
@@ -913,7 +1036,17 @@ def update_device_overview(n, lang, view, tab):
Output('custom-start-date', 'placeholder'),
Output('custom-end-date', 'placeholder'),
Output('custom-start-hour', 'placeholder'),
- Output('custom-end-hour', 'placeholder')] +
+ Output('custom-end-hour', 'placeholder'),
+ Output('zone-add-btn', 'children'),
+ Output('zone-edit-select', 'placeholder'),
+ Output('zone-edit-hint', 'children'),
+ Output('zone-edit-name', 'placeholder'),
+ Output('zone-edit-mode', 'options'),
+ Output('zone-edit-level', 'options'),
+ Output('zone-edit-color', 'options'),
+ Output('zone-save-btn', 'children'),
+ Output('zone-delete-btn', 'children'),
+ Output('zone-cancel-btn', 'children')] +
[Output(f'preset-{key}', 'children') for key in PRESET_BUTTONS],
Input('selected-language', 'data')
)
@@ -922,4 +1055,6 @@ def update_history_language(lang):
t = TRANSLATIONS.get(lang) or TRANSLATIONS['en']
return [t['btn_select_range'], t['modal_title'], t['quick_select'], t['specific_period'], t['start_datetime'],
t['end_datetime'], t['btn_apply'], t['select_date'], t['select_date'], t['hour_placeholder'],
- t['hour_placeholder']] + [t[f'btn_{key}'] for key in PRESET_BUTTONS]
+ t['hour_placeholder'], t['btn_new_zone'], t['lbl_edit_zone'], t['hint_edit_zone'], t['lbl_zone_name'],
+ layout.zone_mode_options(t), layout.level_options(t), layout.zone_color_options(t), t['btn_save_zone'],
+ t['btn_delete_zone'], t['btn_cancel']] + [t[f'btn_{key}'] for key in PRESET_BUTTONS]
diff --git a/layout.py b/layout.py
index afa213b..e0a2724 100644
--- a/layout.py
+++ b/layout.py
@@ -152,6 +152,13 @@
.draw-actions { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; }
.draw-actions .input { width: 220px; max-width: 100%; }
.draw-select { width: 230px; max-width: 100%; }
+ .zone-editor { position: absolute; left: 0; top: 0; pointer-events: none; overflow: visible; z-index: 5; }
+ .zone-editor-shape { fill: var(--accent); fill-opacity: .14; stroke: var(--accent); stroke-width: 2; stroke-dasharray: 6 4; }
+ .zone-editor-corner { fill: var(--panel); stroke: var(--accent); stroke-width: 2.5; pointer-events: all; cursor: grab; touch-action: none; }
+ .zone-editor-corner:hover { fill: var(--accent); }
+ .zone-editor-mid { fill: var(--accent); fill-opacity: .55; pointer-events: all; cursor: copy; touch-action: none; }
+ .zone-editor-mid:hover { fill-opacity: 1; }
+ @media (pointer: coarse) { .zone-editor-corner { r: 13px; } .zone-editor-mid { r: 10px; } }
.slider-box { padding: 4px 16px 18px; }
.slider-time { font-family: var(--mono); font-size: 15px; margin-bottom: 8px; }
@@ -341,6 +348,20 @@ def current_theme():
return mode if mode in THEMES else 'dark'
+def zone_options():
+ """Keuzelijst 'Zone bewerken…' in het houtpaneel."""
+ return [{'label': z['name'], 'value': z['id']} for z in zones.load()]
+
+
+def level_options(t):
+ return [{'label': t[f'opt_level_{level}'], 'value': level} for level in ('warning', 'alarm')]
+
+
+def scope_options(t):
+ return [{'label': t['opt_all_devices'], 'value': 0}] + [
+ {'label': f"#{d['id']} {d['name']}", 'value': d['id']} for d in devices.list_devices()]
+
+
def zone_mode_options(t):
return [{'label': t[f'opt_mode_{mode}'], 'value': mode} for mode in zones.MODES]
@@ -428,6 +449,37 @@ def create_layout():
html.Section(id='wood-panel', className='panel', style=wood_style(), children=[
html.Div(className='panel-head', children=[
html.Span(id='label-wood-chart', className='panel-title', children=t['wood_chart']),
+ html.Div(className='draw-actions', children=[
+ dcc.Dropdown(id='zone-edit-select', options=zone_options(), value=None, placeholder=t['lbl_edit_zone'],
+ clearable=False, searchable=False, className='draw-select'),
+ html.Button(t['btn_new_zone'], id='zone-add-btn', n_clicks=0, className='btn btn-small'),
+ ]),
+ ]),
+ # Zone-editor: assets/zone_editor.js tekent sleepbare hoeken en middenbollen over het diagram en
+ # schrijft de punten in zone-edit-points; zone-edit = {'id', 'points'} van de zone in bewerking
+ dcc.Store(id='zone-edit'),
+ dcc.Store(id='zone-edit-points'),
+ dcc.Store(id='zone-editor-ready'),
+ html.Div(id='zone-edit-bar', className='draw-bar', style={'display': 'none'}, children=[
+ html.Div(t['hint_edit_zone'], id='zone-edit-hint', className='hint'),
+ html.Div(className='draw-actions', children=[
+ dcc.Input(id='zone-edit-name', type='text', placeholder=t['lbl_zone_name'], className='input',
+ maxLength=50),
+ dcc.Dropdown(id='zone-edit-scope', options=[], value=0, clearable=False, searchable=False,
+ className='draw-select'),
+ dcc.Dropdown(id='zone-edit-mode', options=zone_mode_options(t), value='keep_outside',
+ clearable=False, searchable=False, className='draw-select'),
+ dcc.Dropdown(id='zone-edit-level', options=level_options(t), value='warning',
+ clearable=False, searchable=False, className='draw-select'),
+ dcc.Dropdown(id='zone-edit-color', options=zone_color_options(t), value='red',
+ clearable=False, searchable=False, className='draw-select'),
+ ]),
+ html.Div(className='draw-actions', children=[
+ html.Button(t['btn_save_zone'], id='zone-save-btn', n_clicks=0, className='btn btn-primary btn-small'),
+ html.Button(t['btn_delete_zone'], id='zone-delete-btn', n_clicks=0, className='btn btn-small'),
+ html.Button(t['btn_cancel'], id='zone-cancel-btn', n_clicks=0, className='btn btn-small btn-link'),
+ html.Span(id='zone-edit-msg', className='hint'),
+ ]),
]),
html.Div(className='panel-body', children=dcc.Graph(
id='wood-chart', config={'displaylogo': False, 'displayModeBar': False})),
diff --git a/settings_ui.py b/settings_ui.py
index 1e11235..38b5be7 100644
--- a/settings_ui.py
+++ b/settings_ui.py
@@ -26,8 +26,7 @@
BYTE_ORDER_LABELS = {'ABCD': 'ABCD · big endian', 'DCBA': 'DCBA · little endian', 'BADC': 'BADC · byte swap',
'CDAB': 'CDAB · word swap'}
RULE_COLUMNS = ['scope', 'metric', 'level', 'min_value', 'max_value', 'enabled']
-ZONE_COLUMNS = ['name', 'scope', 'mode', 'level', 'color', 'temp_min', 'temp_max', 'rh_min', 'rh_max', 'enabled']
-RECT_FIELDS = ['temp_min', 'temp_max', 'rh_min', 'rh_max']
+ZONE_COLUMNS = ['name', 'scope', 'mode', 'level', 'color', 'enabled'] # vorm: in het houtdiagram (zone-editor)
TABLE_COLUMNS = {'buses': BUS_COLUMNS, 'devices': DEVICE_COLUMNS, 'rules': RULE_COLUMNS, 'zones': ZONE_COLUMNS}
HIDDEN_FIELDS = {'zones': ['shape', 'points']} # meegestuurd zonder zichtbaar veld (getekende vorm)
WIDE_FIELDS = {'name', 'port', 'bus', 'scope', 'metric', 'byte_order', 'mode'} # twee kolommen breed
@@ -83,8 +82,8 @@ def table_rows(table):
"""Opgeslagen bussen, sensoren, grenswaarden of zones als formulierregels (aan/uit als 'true'/'false')."""
if table == 'zones':
return [{'id': z['id'], 'scope': z['device_id'] or 0, 'name': z['name'], 'mode': z['mode'], 'level': z['level'],
- 'color': z['color'], 'shape': z['shape'], 'points': json.dumps(z['points']),
- **{f: z[f] for f in RECT_FIELDS}, 'enabled': 'true' if z['enabled'] else 'false'} for z in zones.load()]
+ 'color': z['color'], 'shape': 'polygon', 'points': json.dumps(z['points']),
+ 'enabled': 'true' if z['enabled'] else 'false'} for z in zones.load()]
if table == 'rules':
return [{'id': None, 'scope': r['device_id'] or 0, 'metric': r['metric'], 'level': r['level'],
'min_value': r['min_value'], 'max_value': r['max_value'], 'enabled': 'true' if r['enabled'] else 'false'}
@@ -162,12 +161,10 @@ def row_form(table, rows, t, bus_names=None):
value=row.get(field)) for field in ['id'] + HIDDEN_FIELDS.get(table, [])]
for field in TABLE_COLUMNS[table]:
cell_id = {'type': 'cfg-cell', 'table': table, 'row': index, 'field': field}
- if row.get('shape') == 'polygon' and field in RECT_FIELDS:
- if field == RECT_FIELDS[0]: # getekende vorm: één vak in plaats van vier min/max-velden
- cells.append(html.Div(id=cell_id, className='cfg-cell wide', children=[
- html.Span(t['col_shape'], className='cfg-label'),
- html.Span(t['zone_free_shape'], className='cfg-static')]))
- continue
+ if table == 'zones' and field == 'enabled': # vorm: alleen in het houtdiagram aan te passen
+ cells.append(html.Div(className='cfg-cell wide', children=[
+ html.Span(t['col_shape'], className='cfg-label'),
+ html.Span(t['zone_shape_in_diagram'], className='cfg-static')]))
control = _control(table, index, field, row.get(field), t, bus_names)
# Label om het veld heen (koppeling zonder id); het vinkje heeft al een eigen label
wrapper = html.Div if field == 'enabled' else html.Label
@@ -202,10 +199,6 @@ def _new_row(table, rows, bus_names):
'slave_id': next(i for i in range(1, 248) if i not in used), 'function_code': 4, 'register_temp': 1,
'register_humidity': 2, 'data_type': 'int16', 'byte_order': 'ABCD', 'scale_temp': 0.1,
'scale_humidity': 0.1, 'offset_temp': 0, 'offset_humidity': 0, 'enabled': 'true'}
- if table == 'zones':
- return {'id': None, 'scope': 0, 'name': f'Zone {len(rows) + 1}', 'mode': 'keep_inside', 'level': 'warning',
- 'color': 'green', 'shape': 'rect', 'points': None, 'temp_min': 18, 'temp_max': 24, 'rh_min': 40,
- 'rh_max': 60, 'enabled': 'true'}
return {'id': None, 'scope': 0, 'metric': 'temperature', 'level': 'alarm', 'min_value': None, 'max_value': None,
'enabled': 'true'}
@@ -279,7 +272,6 @@ def _alerts_section(t):
html.H4(t['table_zones']),
html.Div(t['hint_zones'], className='field-hint'),
html.Div(id='zones-form', className='cfg-list', children=row_form('zones', table_rows('zones'), t)),
- html.Button(t['btn_add_zone'], id='add-zone', n_clicks=0, className='btn btn-small'),
html.Div(id='zone-errors', className='field-error'),
html.H4(t['lbl_alert_log']),
html.Div(id='alert-log', children=alert_log_list(t)),
@@ -549,13 +541,13 @@ def edit_rules(n_clicks, remove_clicks, values, lang):
@app.callback(
Output('zones-form', 'children'),
- [Input('add-zone', 'n_clicks'),
- Input({'type': 'cfg-remove', 'table': 'zones', 'row': ALL}, 'n_clicks')],
+ Input({'type': 'cfg-remove', 'table': 'zones', 'row': ALL}, 'n_clicks'),
[State(_fields('zones'), 'value'),
State('selected-language', 'data')],
prevent_initial_call=True
)
- def edit_zones(n_clicks, remove_clicks, values, lang):
+ def edit_zones(remove_clicks, values, lang):
+ """Zone verwijderen uit de lijst (nieuwe zones en de vorm: in het houtdiagram)."""
if not auth.is_logged_in():
return no_update
return edit_rows('zones', _t(lang), bus_names=[])
diff --git a/test_app.py b/test_app.py
index 60a9eb6..b8bb1ee 100644
--- a/test_app.py
+++ b/test_app.py
@@ -572,7 +572,7 @@ def test_settings_callbacks_require_login():
assert callbacks['change_password'](1, 'x', 'y', 'y', 'nl')[0] == TRANSLATIONS_NL['settings_locked']
assert 'admin' not in str(callbacks['show_settings']('settings', 'nl')) # alleen het inlogscherm
assert callbacks['edit_rules'](1, [], [], 'nl') is dash.no_update
- assert callbacks['edit_zones'](1, [], [], 'nl') is dash.no_update
+ assert callbacks['edit_zones']([], [], 'nl') is dash.no_update
assert callbacks['send_test'](1, 0, [], 'nl') == TRANSLATIONS_NL['settings_locked']
assert callbacks['refresh_alert_log'](5, 'settings', 'nl') is dash.no_update
assert callbacks['test_mqtt'](1, [], 'nl') == TRANSLATIONS_NL['settings_locked']
@@ -610,7 +610,7 @@ def test_config_forms_round_trip():
def test_zone_form_round_trip():
- """Zones in Settings: rechthoek via min/max-velden, getekende vorm blijft behouden (geen min/max-velden)."""
+ """Zones in Settings: eigenschappen bewerken, de vorm (in het houtdiagram gemaakt) blijft behouden."""
import settings_ui
import zones
from dash import html
@@ -622,8 +622,13 @@ def test_zone_form_round_trip():
'points': '[[10, 80], [30, 85], [20, 95]]', 'enabled': 'true'}]) == {}
form = html.Div(settings_ui.row_form('zones', settings_ui.table_rows('zones'), TRANSLATIONS['nl']))
fields = [c for c in components(form) if isinstance(getattr(c, 'id', None), dict) and c.id.get('type') == 'cfg']
- assert not any(c.id['row'] == 1 and c.id['field'] == 'temp_min' for c in fields)
- assert TRANSLATIONS_NL['zone_free_shape'] in str(form)
+ assert not any(c.id['field'] in ('temp_min', 'temp_max', 'rh_min', 'rh_max') for c in fields)
+ assert str(form).count(TRANSLATIONS_NL['zone_shape_in_diagram']) == 2
+ original, auth.is_logged_in = auth.is_logged_in, lambda: True
+ try:
+ assert 'add-zone' not in str(settings_ui.render_settings('nl')) # nieuwe zone: in het houtdiagram
+ finally:
+ auth.is_logged_in = original
rows = settings_ui.collect([{'id': c.id, 'value': c.value} for c in fields])
assert zones.save(rows) == {}
assert [z['points'] for z in zones.load()] == [[[18.0, 40.0], [24.0, 40.0], [24.0, 60.0], [18.0, 60.0]],
@@ -697,11 +702,111 @@ def test_zones_only_in_wood_diagram():
mollier = run_callback(app, 'psychrometric-chart.figure', 0, 'nl', 0, trigger='selected-language.data')
assert 'Opslag' not in [trace.name for trace in mollier.data]
assert 'draw-zone-btn' not in str(layout.create_layout())
- wood = run_callback(app, 'wood-chart.figure', 0, 'nl', 0, 'dashboard', trigger='selected-language.data')
+ wood = run_callback(app, 'wood-chart.figure', 0, 'nl', 0, None, 'dashboard', trigger='selected-language.data')
zone = next(trace for trace in wood.data if trace.name == 'Opslag')
assert zone.fill == 'toself' and zone.line.color == zones.COLORS['blue']
+def test_zone_editor_add_save_edit_delete():
+ """Zone-editor in het houtdiagram: nieuw = vierkant, hoeken/middenbollen slepen (JS), opslaan alleen ingelogd."""
+ import callbacks
+ import layout
+ import zones
+ from dash import Dash
+ setup_alerts([])
+ assert settings.save({'show_wood': ['on']}) == {}
+ rendered = str(layout.create_layout())
+ for component_id in ('zone-add-btn', 'zone-edit-select', 'zone-edit-bar', 'zone-edit-points'):
+ assert component_id in rendered, component_id
+ app = Dash(__name__)
+ callbacks.register_callbacks(app)
+ start = '..zone-edit.data...zone-edit-bar.style'
+ edit, bar, *_ = run_callback(app, start, 1, None, 0, 'nl', trigger='zone-add-btn.n_clicks')
+ assert edit['id'] is None and len(edit['points']) == 4 and bar == {} # begint als vierkant
+ shape = edit['points'][:2] + [[22.0, 70.0]] + edit['points'][2:] # middenbol versleept: vijfhoek
+ finish = 'zone-edit-msg.children'
+ fields = ('Nat', 0, 'keep_outside', 'alarm', 'red', 'nl')
+ with app.server.test_request_context():
+ msg = run_callback(app, finish, 1, 0, 0, edit, shape, *fields, trigger='zone-save-btn.n_clicks')[0]
+ assert msg == TRANSLATIONS_NL['draw_login'] and zones.load() == [] # dashboard kan publiek zijn
+ original, auth.is_logged_in = auth.is_logged_in, lambda: True
+ try:
+ msg, edit_after, bar_after, *_ = run_callback(app, finish, 1, 0, 0, edit, shape, *fields,
+ trigger='zone-save-btn.n_clicks')
+ zone = zones.load()[0]
+ assert msg == TRANSLATIONS_NL['draw_saved'] and edit_after is None and bar_after == {'display': 'none'}
+ assert zone['points'] == shape and zone['name'] == 'Nat' and zone['mode'] == 'keep_outside'
+ edit, bar, name, *_ = run_callback(app, start, 0, zone['id'], 0, 'nl', trigger='zone-edit-select.value')
+ assert edit == {'id': zone['id'], 'points': shape} and name == 'Nat' # bestaande zone bewerken
+ run_callback(app, finish, 0, 1, 0, edit, None, *fields, trigger='zone-delete-btn.n_clicks', value=1)
+ assert zones.load() == []
+ finally:
+ auth.is_logged_in = original
+
+
+def test_zone_editing_redraw_is_not_overwritten_by_the_interval():
+ """Editor open: eigen callback tekent het diagram zonder de zone in bewerking; de seconde-tik doet niets.
+
+ Dash vervangt een lopend verzoek door een nieuwer verzoek van dezelfde callback: zat het hertekenen in de
+ ververs-callback, dan overschreef de tik het steeds (de oude zone bleef onder de editor staan).
+ """
+ import callbacks
+ import zones
+ from dash import Dash
+ setup_alerts([])
+ assert settings.save({'show_wood': ['on']}) == {}
+ assert zones.save([{'scope': 0, 'name': 'Opslag', 'color': 'blue', 'mode': 'none', 'level': 'alarm',
+ 'temp_min': 10, 'temp_max': 20, 'rh_min': 50, 'rh_max': 70, 'enabled': 'true'}]) == {}
+ editing = {'id': zones.load()[0]['id'], 'points': [[10, 50], [20, 50], [20, 70], [10, 70]]}
+ app = Dash(__name__)
+ callbacks.register_callbacks(app)
+ key = next(k for k, v in app.callback_map.items()
+ if 'wood-chart.figure' in k and [i['id'] for i in v['inputs']] == ['zone-edit'])
+ fig = app.callback_map[key]['callback'].__wrapped__(editing, 'nl', 0)
+ assert 'Opslag' not in [trace.name for trace in fig.data]
+ assert run_callback(app, 'wood-chart.figure', 5, 'nl', 0, editing, 'dashboard',
+ trigger='graph-update.n_intervals') is callbacks.no_update
+
+
+def test_click_zone_in_wood_diagram_opens_editor():
+ """Klik op een zone in het houtdiagram: die zone gaat open in de editor (zonder keuzelijst)."""
+ import callbacks
+ import zones
+ from dash import Dash
+ setup_alerts([])
+ assert settings.save({'show_wood': ['on']}) == {}
+ assert zones.save([{'scope': 0, 'name': 'Opslag', 'color': 'blue', 'mode': 'none', 'level': 'alarm',
+ 'temp_min': 10, 'temp_max': 20, 'rh_min': 50, 'rh_max': 70, 'enabled': 'true'}]) == {}
+ zone_id = zones.load()[0]['id']
+ app = Dash(__name__)
+ callbacks.register_callbacks(app)
+ fig = run_callback(app, 'wood-chart.figure', 0, 'nl', 0, None, 'dashboard', trigger='selected-language.data')
+ curve = next(i for i, trace in enumerate(fig.data) if trace.name == 'Opslag')
+ assert fig.data[curve].hoveron == 'fills' # klikbaar op het vlak zelf
+ figure = fig.to_plotly_json()
+ assert run_callback(app, 'zone-edit-select.value@', {'points': [{'curveNumber': curve}]}, figure,
+ trigger='wood-chart.clickData') == zone_id
+ assert run_callback(app, 'zone-edit-select.value@', {'points': [{'curveNumber': len(fig.data) - 1}]}, figure,
+ trigger='wood-chart.clickData') is callbacks.no_update # sensorpunt: geen zone
+
+
+def test_zone_editor_script_is_wired():
+ """De sleep-editor (assets/zone_editor.js) is de clientside callback zones.edit en levert de punten aan Dash.
+
+ Het slepen zelf (hoeken, middenbollen, dubbelklik) wordt in de browser getest.
+ """
+ import callbacks
+ from dash import Dash
+ script = open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'assets', 'zone_editor.js'),
+ encoding='utf-8').read()
+ for needle in ('zones:', 'edit: function', "set_props('zone-edit-points'", 'zone-editor-mid', 'zone-editor-corner',
+ 'dblclick', 'pointerdown', 'plotly_afterplot'):
+ assert needle in script, needle
+ app = Dash(__name__)
+ callbacks.register_callbacks(app)
+ assert 'zone-editor-ready.data' in app.callback_map
+
+
def test_zone_alarm_has_margin_at_the_edge():
"""Herstel pas als de sensor de hysterese (0.5 °C / 2 % RV) van de rand af is: geen klapperen op de grens."""
import zones
@@ -1268,10 +1373,10 @@ def test_wood_chart_and_board_follow_setting():
conn.close()
app = Dash(__name__)
callbacks.register_callbacks(app)
- assert run_callback(app, 'wood-chart.figure', 0, 'nl', 0, 'dashboard', trigger='selected-language.data') is \
+ assert run_callback(app, 'wood-chart.figure', 0, 'nl', 0, None, 'dashboard', trigger='selected-language.data') is \
callbacks.no_update # houtvocht staat uit
assert settings.save({'show_wood': ['on']}) == {}
- fig = run_callback(app, 'wood-chart.figure', 0, 'nl', 0, 'dashboard', trigger='selected-language.data')
+ fig = run_callback(app, 'wood-chart.figure', 0, 'nl', 0, None, 'dashboard', trigger='selected-language.data')
assert {'Koelcel', 'Waarschuwing ≥ 18 %'} <= {trace.name for trace in fig.data}
board, _ = run_callback(app, 'device-overview.children', 0, 'nl', 'board', 'dashboard', trigger='view-toggle.value')
assert 'Houtvocht' in json.dumps(board, cls=plotly.utils.PlotlyJSONEncoder, ensure_ascii=False)
diff --git a/translations.py b/translations.py
index 6cfeed3..ecfe568 100644
--- a/translations.py
+++ b/translations.py
@@ -217,6 +217,12 @@
'alert_low': '⚠️ {device}: {metric} {value} {unit} is onder het minimum van {limit} {unit} ({time})',
'alert_warn_high': '🟡 {device}: {metric} {value} {unit} is boven de waarschuwingsgrens van {limit} {unit} ({time})',
'alert_warn_low': '🟡 {device}: {metric} {value} {unit} is onder de waarschuwingsgrens van {limit} {unit} ({time})',
+ 'btn_new_zone': '+ Zone',
+ 'lbl_edit_zone': 'Zone bewerken…',
+ 'hint_edit_zone': 'Sleep de hoeken naar de gewenste plek. Sleep een bolletje midden op een zijde om een hoek toe te voegen; dubbelklik een hoek om hem te verwijderen.',
+ 'btn_delete_zone': 'Verwijderen',
+ 'zone_deleted': 'Zone verwijderd.',
+ 'zone_shape_in_diagram': 'Vorm aanpassen in het houtdiagram',
'lbl_scan': 'Bus scannen',
'hint_scan': 'Zoekt welke sensoren (slave-adres 1-30) antwoorden op een opgeslagen bus. Het uitlezen van die bus pauzeert zolang de scan loopt (maximaal ongeveer 10 seconden).',
'btn_scan': 'Scannen',
@@ -241,8 +247,8 @@
'alert_zone_recovered': '✅ {device}: {temperature} °C / {humidity} % is weer goed voor zone {zone} ({time})',
'zone': 'Zone',
'err_zone_points': 'Een getekende zone heeft minstens 3 punten nodig',
- 'table_zones': 'Zones (Mollier- en houtdiagram)',
- 'hint_zones': 'Een zone is een gebied van temperatuur × luchtvochtigheid met een eigen kleur. Gewenste zone: melding als een sensor de zone verlaat. Gevarenzone: melding als een sensor de zone binnengaat. Vrije vormen teken je in het Mollier-diagram.',
+ 'table_zones': 'Zones (houtdiagram)',
+ 'hint_zones': 'Een zone is een gebied van temperatuur × luchtvochtigheid met een eigen kleur. Gewenste zone: melding als een sensor de zone verlaat. Gevarenzone: melding als een sensor de zone binnengaat. De vorm maak en wijzig je in het houtdiagram.',
'btn_add_zone': '+ Zone toevoegen',
'col_color': 'Kleur',
'col_mode': 'Melding',
@@ -576,6 +582,12 @@
'alert_low': '⚠️ {device}: {metric} {value} {unit} is below the minimum of {limit} {unit} ({time})',
'alert_warn_high': '🟡 {device}: {metric} {value} {unit} is above the warning limit of {limit} {unit} ({time})',
'alert_warn_low': '🟡 {device}: {metric} {value} {unit} is below the warning limit of {limit} {unit} ({time})',
+ 'btn_new_zone': '+ Zone',
+ 'lbl_edit_zone': 'Edit zone…',
+ 'hint_edit_zone': 'Drag the corners into place. Drag a dot in the middle of a side to add a corner; double-click a corner to remove it.',
+ 'btn_delete_zone': 'Delete',
+ 'zone_deleted': 'Zone deleted.',
+ 'zone_shape_in_diagram': 'Edit the shape in the wood diagram',
'lbl_scan': 'Scan bus',
'hint_scan': 'Finds which sensors (slave address 1-30) respond on a saved bus. Reading that bus pauses while the scan runs (about 10 seconds at most).',
'btn_scan': 'Scan',
@@ -600,8 +612,8 @@
'alert_zone_recovered': '✅ {device}: {temperature} °C / {humidity} % is fine again for zone {zone} ({time})',
'zone': 'Zone',
'err_zone_points': 'A drawn zone needs at least 3 points',
- 'table_zones': 'Zones (Mollier and wood diagram)',
- 'hint_zones': 'A zone is an area of temperature × humidity with its own colour. Desired zone: notification when a sensor leaves it. Danger zone: notification when a sensor enters it. Draw free shapes in the Mollier diagram.',
+ 'table_zones': 'Zones (wood diagram)',
+ 'hint_zones': 'A zone is an area of temperature × humidity with its own colour. Desired zone: notification when a sensor leaves it. Danger zone: notification when a sensor enters it. Create and shape zones in the wood diagram.',
'btn_add_zone': '+ Add zone',
'col_color': 'Colour',
'col_mode': 'Notification',
@@ -935,6 +947,12 @@
'alert_low': '⚠️ {device}: {metric} {value} {unit} liegt unter dem Minimum von {limit} {unit} ({time})',
'alert_warn_high': '🟡 {device}: {metric} {value} {unit} liegt über der Warngrenze von {limit} {unit} ({time})',
'alert_warn_low': '🟡 {device}: {metric} {value} {unit} liegt unter der Warngrenze von {limit} {unit} ({time})',
+ 'btn_new_zone': '+ Zone',
+ 'lbl_edit_zone': 'Zone bearbeiten…',
+ 'hint_edit_zone': 'Ziehen Sie die Ecken an die gewünschte Stelle. Ziehen Sie einen Punkt in der Mitte einer Seite, um eine Ecke hinzuzufügen; Doppelklick auf eine Ecke entfernt sie.',
+ 'btn_delete_zone': 'Löschen',
+ 'zone_deleted': 'Zone gelöscht.',
+ 'zone_shape_in_diagram': 'Form im Holzdiagramm bearbeiten',
'lbl_scan': 'Bus scannen',
'hint_scan': 'Sucht, welche Sensoren (Slave-Adresse 1-30) an einem gespeicherten Bus antworten. Das Auslesen dieses Busses pausiert während des Scans (höchstens etwa 10 Sekunden).',
'btn_scan': 'Scannen',
@@ -959,8 +977,8 @@
'alert_zone_recovered': '✅ {device}: {temperature} °C / {humidity} % ist wieder in Ordnung für Zone {zone} ({time})',
'zone': 'Zone',
'err_zone_points': 'Eine gezeichnete Zone braucht mindestens 3 Punkte',
- 'table_zones': 'Zonen (Mollier- und Holzdiagramm)',
- 'hint_zones': 'Eine Zone ist ein Bereich aus Temperatur × Luftfeuchte mit eigener Farbe. Wunschzone: Meldung, wenn ein Sensor sie verlässt. Gefahrenzone: Meldung, wenn ein Sensor sie betritt. Freie Formen zeichnen Sie im Mollier-Diagramm.',
+ 'table_zones': 'Zonen (Holzdiagramm)',
+ 'hint_zones': 'Eine Zone ist ein Bereich aus Temperatur × Luftfeuchte mit eigener Farbe. Wunschzone: Meldung, wenn ein Sensor sie verlässt. Gefahrenzone: Meldung, wenn ein Sensor sie betritt. Die Form erstellen und ändern Sie im Holzdiagramm.',
'btn_add_zone': '+ Zone hinzufügen',
'col_color': 'Farbe',
'col_mode': 'Meldung',
@@ -1294,6 +1312,12 @@
'alert_low': '⚠️ {device} : {metric} {value} {unit} est sous le minimum de {limit} {unit} ({time})',
'alert_warn_high': "🟡 {device} : {metric} {value} {unit} dépasse le seuil d'avertissement de {limit} {unit} ({time})",
'alert_warn_low': "🟡 {device} : {metric} {value} {unit} est sous le seuil d'avertissement de {limit} {unit} ({time})",
+ 'btn_new_zone': '+ Zone',
+ 'lbl_edit_zone': 'Modifier une zone…',
+ 'hint_edit_zone': 'Faites glisser les coins à la position voulue. Faites glisser un point au milieu d’un côté pour ajouter un coin ; double-cliquez sur un coin pour le supprimer.',
+ 'btn_delete_zone': 'Supprimer',
+ 'zone_deleted': 'Zone supprimée.',
+ 'zone_shape_in_diagram': 'Modifier la forme dans le diagramme du bois',
'lbl_scan': 'Scanner le bus',
'hint_scan': 'Cherche quels capteurs (adresse esclave 1-30) répondent sur un bus enregistré. La lecture de ce bus est suspendue pendant le scan (environ 10 secondes au maximum).',
'btn_scan': 'Scanner',
@@ -1318,8 +1342,8 @@
'alert_zone_recovered': '✅ {device} : {temperature} °C / {humidity} % est de nouveau correct pour la zone {zone} ({time})',
'zone': 'Zone',
'err_zone_points': 'Une zone dessinée doit avoir au moins 3 points',
- 'table_zones': 'Zones (diagramme de Mollier et du bois)',
- 'hint_zones': 'Une zone est une plage de température × humidité avec sa propre couleur. Zone souhaitée : notification quand un capteur la quitte. Zone de danger : notification quand un capteur y entre. Dessinez des formes libres dans le diagramme de Mollier.',
+ 'table_zones': 'Zones (diagramme du bois)',
+ 'hint_zones': 'Une zone est une plage de température × humidité avec sa propre couleur. Zone souhaitée : notification quand un capteur la quitte. Zone de danger : notification quand un capteur y entre. La forme se crée et se modifie dans le diagramme du bois.',
'btn_add_zone': '+ Ajouter une zone',
'col_color': 'Couleur',
'col_mode': 'Notification',
@@ -1653,6 +1677,12 @@
'alert_low': '⚠️ {device}: {metric} {value} {unit} está por debajo del mínimo de {limit} {unit} ({time})',
'alert_warn_high': '🟡 {device}: {metric} {value} {unit} supera el límite de aviso de {limit} {unit} ({time})',
'alert_warn_low': '🟡 {device}: {metric} {value} {unit} está por debajo del límite de aviso de {limit} {unit} ({time})',
+ 'btn_new_zone': '+ Zona',
+ 'lbl_edit_zone': 'Editar zona…',
+ 'hint_edit_zone': 'Arrastre las esquinas a su sitio. Arrastre un punto en el centro de un lado para añadir una esquina; haga doble clic en una esquina para quitarla.',
+ 'btn_delete_zone': 'Eliminar',
+ 'zone_deleted': 'Zona eliminada.',
+ 'zone_shape_in_diagram': 'Editar la forma en el diagrama de la madera',
'lbl_scan': 'Escanear bus',
'hint_scan': 'Busca qué sensores (dirección esclavo 1-30) responden en un bus guardado. La lectura de ese bus se detiene mientras dura el escaneo (unos 10 segundos como máximo).',
'btn_scan': 'Escanear',
@@ -1677,8 +1707,8 @@
'alert_zone_recovered': '✅ {device}: {temperature} °C / {humidity} % vuelve a estar bien para la zona {zone} ({time})',
'zone': 'Zona',
'err_zone_points': 'Una zona dibujada necesita al menos 3 puntos',
- 'table_zones': 'Zonas (diagrama de Mollier y de la madera)',
- 'hint_zones': 'Una zona es un área de temperatura × humedad con su propio color. Zona deseada: aviso cuando un sensor sale de ella. Zona de peligro: aviso cuando un sensor entra en ella. Las formas libres se dibujan en el diagrama de Mollier.',
+ 'table_zones': 'Zonas (diagrama de la madera)',
+ 'hint_zones': 'Una zona es un área de temperatura × humedad con su propio color. Zona deseada: aviso cuando un sensor sale de ella. Zona de peligro: aviso cuando un sensor entra en ella. La forma se crea y se modifica en el diagrama de la madera.',
'btn_add_zone': '+ Añadir zona',
'col_color': 'Color',
'col_mode': 'Aviso',
diff --git a/wood.py b/wood.py
index 9587c0b..89755ba 100644
--- a/wood.py
+++ b/wood.py
@@ -111,7 +111,9 @@ def figure(points, limits, t, k, areas=()):
corners = zone['points'] + zone['points'][:1]
fig.add_trace(go.Scatter(x=[p[0] for p in corners], y=[p[1] for p in corners], mode='lines', fill='toself',
name=zone['name'], fillcolor=zones.fill_color(zone['color']),
- line=dict(color=zones.COLORS[zone['color']], width=1.5), hoverinfo='skip'))
+ line=dict(color=zones.COLORS[zone['color']], width=1.5),
+ # klikbaar op het vlak: opent de zone in de editor (meta = zone-id)
+ hoveron='fills', hoverinfo='name', meta=zone.get('id')))
for level in ('warning', 'alarm'): # alarm als laatste: ligt over de waarschuwing
color = k['warn'] if level == 'warning' else k['alarm']
for low, high, zone_level in limits:
From 6bafad89b1f17baf9d4d6e85ee8550ff28229820 Mon Sep 17 00:00:00 2001
From: CervezaStallone <48717031+CervezaStallone@users.noreply.github.com>
Date: Mon, 2 Nov 2026 23:04:53 +0100
Subject: [PATCH 4/4] docs: Zones in the wood diagram with the shape editor,
limits in the time chart; new screenshots
---
CHANGELOG.md | 3 ++-
README.md | 35 ++++++++++++++++++++---------------
img/mollier.png | Bin 91692 -> 81649 bytes
img/settings-limits.png | Bin 76734 -> 76388 bytes
img/wood-diagram.png | Bin 63004 -> 65105 bytes
img/zone-editor.png | Bin 0 -> 89192 bytes
6 files changed, 22 insertions(+), 16 deletions(-)
create mode 100644 img/zone-editor.png
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c46129a..376f2a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,8 @@ All notable changes to Climate Monitor. Older versions: see the [GitHub releases
### Added
- **Wood moisture** (equilibrium moisture content, USDA Wood Handbook) per sensor, with its own diagram, a correction for the wood species and a response time (averaged value, so short peaks do not trigger alarms). On/off in Settings → Display.
- **Warning and alarm level** per limit, e.g. a warning at 18 % and an alarm at 20 % wood moisture.
-- **Zones** in the Mollier and wood diagram: coloured areas of temperature × humidity from min/max or drawn freely in the Mollier diagram, with a notification when a sensor leaves a desired zone or enters a danger zone.
+- **Zones** in the wood diagram: coloured areas of temperature × humidity with a notification when a sensor leaves a desired zone or enters a danger zone. A zone starts as a square; drag the corners, drag the dot in the middle of a side to add a corner, double-click a corner to remove it. Click a zone to change or delete it.
+- **Limits in the time chart** as dashed lines (yellow = warning, red = alarm).
- **Alarm window** from the top bar with muting per alarm (15 minutes to 24 hours).
- **Dark/light toggle** in the top bar, remembered per browser.
- **Logo** in the top bar and as favicon.
diff --git a/README.md b/README.md
index 0684756..4ca91c3 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,8 @@ A real-time climate monitoring dashboard for Modbus RTU temperature and humidity
- Comfort Score (0-6, based on Humidex)
- **Psychrometric chart**: Mollier diagram with live indicator and comfort zone visualization
- **Wood moisture** (optional): equilibrium moisture content per sensor, a diagram with zones from your limits, warning and alarm levels
-- **Zones**: your own coloured areas of temperature × humidity in the Mollier and wood diagram (from min/max or drawn freely), with a notification when a sensor leaves a desired zone or enters a danger zone
+- **Zones**: your own coloured areas of temperature × humidity in the wood diagram, shaped by dragging corners, with a notification when a sensor leaves a desired zone or enters a danger zone
+- **Limits in the chart**: the limits of the shown quantity appear as dashed lines in the time chart
- **Historical data replay**: Time-travel through data with preset buttons or custom date/time selection
- **Interactive slider**: Live updates while dragging for smooth historical navigation
- **Scientific analysis**: Humidex formula according to Environment Canada standard
@@ -102,11 +103,14 @@ A real-time climate monitoring dashboard for Modbus RTU temperature and humidity
#### Mollier diagram
-*Current state of every sensor in its own colour, with saturation line, RH curves, comfort zone and your own zones (here a desired comfort zone and a mould-risk danger zone).*
+*Current state of every sensor in its own colour, with saturation line, RH curves and comfort zone.*
#### Wood moisture
-*Equilibrium wood moisture: lines of equal wood moisture, the 18 % warning and 20 % alarm limits and the zones.*
+*Equilibrium wood moisture: lines of equal wood moisture, the 18 % warning and 20 % alarm limits and your zones (here a desired comfort zone and a mould-risk danger zone).*
+
+
+*Zone editor: drag the corners, drag a dot in the middle of a side to add a corner.*
#### Historical replay
@@ -291,7 +295,7 @@ ClimateMonitor/
├── translations.py # Texts in NL, EN, DE, FR, ES
├── test_app.py # Automated tests
├── deploy/ # Service install scripts (Linux, Windows)
-├── assets/ # Logo (header and favicon), served by Dash
+├── assets/ # Logo (header and favicon) and the zone editor script, served by Dash
├── img/ # README screenshots
├── .env # Configuration (not in git)
├── .env.example # Example configuration
@@ -331,13 +335,14 @@ Every sensor keeps the same colour everywhere (its marker, trend line, chart lin
**Chart**: choose the quantity with the tabs (temperature, humidity, dew point, absolute humidity,
comfort), and choose *All sensors (combined)* or a single sensor and the time range on the right.
-**Mollier diagram and replay**: shows the current state of all sensors and your zones. Select one
-sensor in the chart to enable *Choose range for historical analysis*.
+**Mollier diagram and replay**: shows the current state of all sensors. Select one sensor in the
+chart to enable *Choose range for historical analysis*.
-**Drawing a zone**: click *Draw zone* above the Mollier diagram, draw a closed shape with the mouse
-or a finger, give it a name, choose desired zone / danger zone / display only and a colour, and save
-(requires being logged in). The zone applies to the sensor selected above the chart, or to all
-sensors. Change it later in Settings → Notifications: limits → Zones.
+**Zones** (wood diagram): click **+ Zone** to start with a square. Drag the corners into place; drag
+the dot in the middle of a side to add a corner there (square → pentagon → …); double-click a corner
+to remove it. Works with mouse and touch. Give the zone a name, choose the sensor, *desired zone* /
+*danger zone* / *display only*, the level and a colour, and save (requires being logged in). To
+change or delete a zone, click it in the diagram or pick it from *Edit zone…*.
### Configuration
@@ -410,9 +415,9 @@ its detailed view and historical replay.
- Add a limit per quantity (temperature, humidity, dew point, absolute humidity, wood moisture)
with a minimum and/or maximum and a level (*Warning* or *Alarm*), for *All sensors* or for one
sensor. A rule for one sensor replaces the rule for all sensors for that quantity and level.
- - *Zones*: an area of temperature × humidity (min/max, or drawn in the Mollier diagram) with a
- colour. *Desired zone* notifies when a sensor leaves it, *danger zone* when a sensor enters it,
- *display only* just draws it.
+ - *Zones*: an area of temperature × humidity with a colour, shaped in the wood diagram.
+ *Desired zone* notifies when a sensor leaves it, *danger zone* when a sensor enters it,
+ *display only* just draws it. Settings lists the zones to change their other properties.
- *Alarm delay*: how long a limit must be exceeded before an alert is sent (no alerts for spikes).
- *Hysteresis*: how far back inside the limit (or away from a zone edge) a value must be before it
counts as normal again, so a value hovering around the limit does not cause a stream of messages.
@@ -658,7 +663,7 @@ python test_app.py
- Buses and sensors: validation, upgrade of existing data, data types and byte order, calibration, scanning, failure isolation
- Notifications: limits and levels, zones, alarm delay, hysteresis, recovery, muting, offline alerts, retries
- Wood moisture: formula against the Wood Handbook, response time, restart after settings change
-- Dashboard: form fields, zones in the diagrams, drawing zones, theme toggle, alarm window, phone layout
+- Dashboard: form fields, zone editor, limits in the chart, theme toggle, alarm window, phone layout
- MQTT: topics, payloads, reconnect behaviour
- Translations: same placeholders in every language, no untranslated text in the layout
@@ -673,7 +678,7 @@ pip freeze > requirements.txt
- **app.py**: entry point, starts the Modbus reader, notifications, MQTT and the web server
- **layout.py**: page structure, theme tokens (dark/light) and styling
-- **callbacks.py**: dashboard (board/meters, chart, status, Mollier and wood diagram, drawing zones, alarm window, theme)
+- **callbacks.py**: dashboard (board/meters, chart, status, Mollier and wood diagram, zone editor, alarm window, theme)
- **settings_ui.py**: Settings tab
- **settings.py** / **devices.py**: settings, buses and sensors stored in the database
- **modbus_reader.py**: one thread per RS-485 bus, batched database writes
diff --git a/img/mollier.png b/img/mollier.png
index 0bdf5b393dd43e7730bfce094569e6ba04023e1d..64cc1b731c720184dc7f563a6f16abd83ae1c812 100644
GIT binary patch
literal 81649
zcmcHhby(BiA3uyEqSz=XC`gD1NK1Ej8k7*Yba>kJ$5U
zSQv7uncl7@Zg;qdeD*Xk*qO?Yx=iad5o)3Qn*YyRYb5cHy0M6^MA=qG0Im`AhE+=6
z@ik73AeFJ^-9!O7p5i709(Xp)IF8T|hML%auSiHVBi`gJQJuf~@KiqYe{a0{EPLU6
zo_{0oY`0LqezLQ3oee&#D|i3RNX)u#v!73!zdw3@KK<}iA@h7n^8dxc
zCKj2yqfmUBBFE0o#!1i8fVELP)V6UOLx+r0A)<952-)f(OMZu$%KRS_>~U%;j+lN-
zx&b>FqE
z-XokK1R&-Y@j^&m-$~F0M#3psqGqR42B*iL)GM82%#&cc=hf&ByXd^-CqNlGoFbn!
z-;p9L)SK3}bilPLhr^eQEtE`;K@q=v5Gf(Z;5nO-)hhJ+_4%^d2Fyr`Bm;P}`ljCK
ziVv)R8-vE&u*`_xT5_;MdSQ?W<&g^@!giQ+Bx+6OguZU~<8Y^J#>AFICW8B6#5b9F
z?}LqmxnDnOCsd&n6p`tYuK77IU-g0JXd
zbM*SKilLD~984bW-50!>prjB^7tfpJDl4q@CmV4LFqWwC&ahP&KuED^ubz@=+slH2
zqVm2+qeA!Ov!a94Qii%i(nk
z(f3DWH}A&J{yIuOabk2X@IO3Z^wZJOdg6b-GC>9waZvMGY-2y&a~A
z_8!~xNWkCW)aMEBTq@8J(Q(L)gsg2kGfWW2XyB(wVuz!X%2UDGEU}Xb)(`P_RBq8D
z%02KmIpbZfsIbQEOoK%waio4C?$07XvsAHiFK=l(
zMYtsEK}-KQb{Lc~_s~?rX9S~Fxwj`HBQa`|nUiC)Xc?Hk6X26Y-W$_#NzkMo&17f4
z{Z4$g(dY1{plWtq$NWUk&`4}ok>A{hk%j&_$LZ>ue$uEusSu3LpSbb}M(1qu8+by2
zcKVZlYW>pclnuLRTB#YIXhG>`K(GGDOOkgUX#OoR*u;njH%6-XuIg__DKa;?pC0=R
zW*wG@IAtcp6~}8iBs{gOs?ysWvsz`n5&5lY6Psn?KSgA*aJyOR&iF~rnQsI6qp1#|
z?#yG_Xm+Ym3DNf5mjEH$Rx)Hcin>>M9exz?6g>JeyF=@oA>pjecURn%`9QG`H0Uw}
zv10f&_{>FIUfOd&T-O`eA;A`#^y^HXDmGw_xMUGHPs76xJuBD9NJHAN!h=
zo)_zFJDSi44c}fHo38H5K*&;&RZJ#3`fbNay-)gC+Vt5}e5xVCAG6{xCQFohfAl+C
z#3~?Is(}K~^;`J7;ogx&_qtMa&Q0aCg>EVDI(bZB2&%wf%X3YGcl#m43|)BO>lga_
zIPnv~oz{^3?t7fyu+!=H^uQ^x(JG6qw%yFWXB#Z2&rL5UnXjK<7wBarVmoMGijJG{f=JTYj=IPLy4+b$y$nd%E_rONKKQH+Fzp(
ze+jr6#kY6p-{|C1y0ZrmKH^3SI>xxZm0Zu#;n?086Z(7i9-ZDhD|`FS&*Ao^=qthU
z=3Jh8yqwfw&W25v?tfh|4n1Cv)TW#vXdRs)l=lFvMx-~b0ubn>V)=-0?xuN{I%j$@
zF@je4ru6dr$+!TtlF|cS+`DE*zrFVHod(n`>5R3e-OUleii<}pqWe`izeXl)2<&!8
zn7k^A^jh9^O`hdyFn49T-#F}VTOO-j0Hq9U&vq?z7r)5=A5}m2xtb_Fn4T86csT7e
zqbf1rSdvELU*+ro4e_AUx4AB&uNQBiAI}!swO~%ymFE!nIa9`K+SHidMWy>!b|tAKx?AVm1h{vV244<~TH4?kY_C;QN+=9XL(;Y9+$y!Tp(vOPP-UgsvwYj@
zwKOIpB2e6aQCf{<`X{4Y>m^L+*0VqZQf{l)j9{T)Qtde)i9XE5tPvDw@
zee2*CI3*_!k(la7(XdB1&>5scD<@;v>NdD?j?mYAb*JZ^SS#4>@8|~
z{&Gev`1=YNaZuk&l0HU;AW`YFbo=2VbAHQh6tkWu;b^sAk>Y=;aBGtVoCgr3Cb16T
zP*_q@R9uYQ*eEG1{N81`8qkwLII_eRutCY&pNelG@RbcLYGZ59$FKcKz77P_hPOyz{rquZEn`}a)%^6H
znEUSfS3QmKQjl6jx)~Fd;}!zEyim07DB}3j`NxWjn3Yu$j@DU6FtJ-eHc~K8T@E_9
zCSY`H>1(9T)=FmGD=umoPxRfsr_~Nd@Pn#e>O>CRmb
zA5j;r`q%95w)YZ=|D6iNS7{0WrvLM@GIx!~Z(NF*^yPhZ4}KVfys9fmi9g8E8DS6f
zbVZUlb1}%c&#y<6?d^u@|8&Uxbbx*-GnUYkZP7ZZ?DH&{U#wM2#IYMAEaG4+RTg1Z
z{aGIK9y#xwe-R-f+t3oOK@-E7Nntj3ij!qhWt^UakynI=Q4he)k12ifN}E_ETAIuq
zU<#Xc5nJ@i$_`F7HMJAp>8A@W9?1|VQMPL%wu8K{>j#l89`5cSOy~A&+VP#5nd&%9
z>>6*crm}6r^TQ7j%iv1z2-jnypXSEQNxkubjg``^PvEGi!asaT;WtkD#&EbPA^Z3d
z#nre3uuz6$0}hY0@B&nirzd9paH_*9jOFd#9~N~J(;(0JNCq)AP&u750F#lMbY82-
zgwsG-Z>6XH{&v=T!(q@2sSzKf4rJUW)6*fI95$HvS#xUPQz!G#`qz8mXb;`O@8CKA
z>s`I$&k?>T`bmjF_oc&ejAH8xpQyjRh1Y^xO%ca2QLM3YT$DGB*){$l$>+~Sd&Zsi
zY7wxH^vjoWUJ#K30g0E%0O4gSaDp%8U%E~gaP$deDu}%NPk9~wrJX(Oe@>$OfZiij
z($#t?Unn*ymtGmXI%3^gXuZRpNn==1!_4O
zv7D0;&y=$YSmOGB8|RV?f6^u~75UTvrb~2cWc$RU6=B)XY1jKav2x3;{pklgdZgyN7;nTQ=d(+%
zy$b|y^65}rnHsUzsTzJ89`dOzxltKHH1oTHK`suncmCVoRp7yVCb(Ah5c&JJ)4eBK
zJRh-*7--UTJS1!iR?D-bt-7jS(A@mfv=lT`rbj`Bk_OiP0G7=pX||orGK-L9HaeC5
zXm>0YMQ;JAwRCtRQKYLWU!5;oUM9&+MX4WRjC_XfhH0dofAfqU@jr@-@y9yw8t`~n
z#z}AIl`zW!wl5rG8ur4`c4_83)L|Jui`abTCCi=DunhdbcFnA&A)8UWe2(EuFb<~>
zkE(bZ_lIK#qz=|Y7y{PAKu26jPbbOD&0Tl%eMFK9*MkBgOmL448fT{lF}E#urO}Ifu|3*hV~@Wi%~xovqi)z#WBLY?&7!
z;3aMqgmo_A_rUO@0?6^|{NSJ8DA1di=-*5590LGmOgf02j_o0c3j^p?IDXS$mSJE3
zvX`J`yj@`T@kOI;$)qH37_hP
zZwf8zk*l#T7II3$jBiEuG-zIF@EP5Q92fA;dJmjbh`>+MoZ0Vv9q=aEY;sRC1sl2P}&?hXyKd%ET<%NO-tex2O
z3nF|r!!3Wd`E8&l!-j)g>1t*I5T7DXcd(Fvc|t=xw~73I3w;gZ^mxGkEh4auLS`Qc
zA+Cb^)9qoaf`P+!m5$qK(W<|9T(nmS#roVJc)&gL%Tvh3+uFGI{J~U5l&;8|Xs5-Z
zo0BJ?RVTaFl|7ym*5`<$Rq*;9dERJMbabR&ylIvlsUz`VNvC7!D*x*dNq5KrhTDy9
zLv1JA1MQU*jk7(SwE(dS38X?>GixhBIgw+?teDla!8*pUj<<#R?
zLFYebPkd$Mk6ynTW3V3hd(BlKWYj8BZR#pi#A?T&P($NVDyO8ya*-YBVK@{Lmw#0T
zKM6(o&o9WFB6&p|XHO?}Ac7}PU~)D)HKHBEJhTmsevoC5o0THz!VZ4w-I!62vVgwX;nf**5GZF7C-Uu%0
zejh`JPe^^Np0~*Bx0eyH3nM;so~*W7TBwPj7x(*a3S3tD@jN-B-$oJ*&$KOnQhmKo
zQ8A|h4~X^dRaE^!HT>iRYO+#r;zxL_5@~e#XWYHK$`FN8wU_Zs4`Z$y%Q!FAio*!e
z6mTMhhyo7~9m!#8zPGqbwkLV53asznsDD+^Pr!j8-Ra)&`XyvR#_{wlsxHoycmPV*
z=eQ?mb7%Lc0kd_29Dv~QD1ZC*eXC;q*s@wS(Im;L8^8rN(}{l{zv)*
z8Chb~FeNUE?v%l=Ozgd~9QN{)W{b=IlsB0&j5GS}<|I!1do}lA(-+fd-T+nIGV$re
zYvPS6km!gbejV0?o;8ymUvE??4I{3(Q`r$yECZXA;CyLtgpyLdZM`PH4-4R1U
zWjaRhBUsIx&nx~Uzn$X*q<~rnwTdL+Xaqdxv045ktOntUI2y?2-BiFLUKxNiK!X7D
z?6qH~nSr3vDk(69Isu8R^v*jH?vrcBbG~zKySqk=0n7dpo?EBeD8>eKr`F5-iq1QO
z#HeqFA)C2{k>4o^!MEn$TCM&uE@eg7i^>#8MKi6~o0Hbrs^8K29-#Vl{!H+P6OXVE)4I2XBP)}~9XnfP;5-Y{0zCuW??aK%5&b(T
z0-VwGX>{Y=khXhQYSAAg;RX3o8MUrXZyrk#t+tQ7W%sZpOwkAA+%+Q|GEV)b1p^a$
z;uC*A9=jn0FfAc6LT@XEQqUsQ*PX(hFvg=G}qABzmwhfk(N%Ivvg
zuH8&;!oXckbmkK
z!u+7d`CE2DfzkWRaz{v)|f%lBe4yq13#vWkzXoUl|9
ziHjOg{}p@0Q41EXB~d>B-{r@%f{usR4t-_|q)(pYwCqNL@T5}X1L-aBHK`gr0UJr!
zH-LN@jK;FaN+ryeWC61s=Z>#g=tPvFUp&+LC%FH{9K!iTBky#TQ8(0ecI9(
zkKAV5?EO1BN|+~?$;m;3PD2L#_m?71Pif#;u!QaD8p1dj@@H+2u#(ZV>>`TY9{9PL
zC6x-oV{~YwYAW4MS`nUp+Zk}X!Ohl%-Ju+|;$n_BZzRfj`{L5q>g#DY=jT;q2;Mc*
zZh4F%lLaEN4TB8tV^)Pt9_{dQBc1=|bL65#dFbMjAifIA5>lyws;e4FbvI+L*e4rJ
zQS&68^j1KO%HF>=G9uTyt*)bsQA-LmPE?r->vLV;i|GqtkUmYN#M5rQRob(5qB0rB?C?Iq0n1|bX0ZW_2
zqr!oJXw7ynofImKU4*U1oS?|)QNQe%Am)2JWuwTHmkod2)ot?w0s1Yl7^@xi;LuQ<
z7FBtFRprpG)nxe-_zB*k(6Xq!d@BWkbDq-nZ3WM`x_MshDv;h&#q?81yP&?((Lzo_
zWZ>w1d#k)Bl`A-ezi}yF^p_E~<4Qe-P&at3Hy_;-%dVip;PxaQpMxlLO-PvJ9qF3|
zwSLl(J-*}4P437=A|Znj^jFmanCyr|GDz%|piT#h?uqy$WCuA4
zE-|gm3n7d^uf+ZseFvA34e{iC2X~#$AJOXLMR}!pUS2nRAoUtl_SO!g0rB5B&RU4>
zB<|~SQTr|g)8p~hQ^z%LLcWG+Qo%27t2<8BVr<|?ea#;Ze|L=xND&vkj!7D33ElP$
zw#hDsoys9MQE*~^27y`NC3tB}3oVf<>GAoqDB8EwsN(CbOCz4p0i6?Hv>X9h2CoOQ
zU&G8eH<6zpdd6Y;nNeWe_(~Ta^E4X~q|+H(m$d)k&cTI~3dZosH>`7y?p<$~
zJB{!ifD8%-&KWgld=`APX_7H#(tu5q9?{JB3WwENY;VL>T5ZN3@;0I0xw-Wq^D9Ck
z9-35GD`C=Y`qL%6%b()=J&-&F_OF++_sc19r=mPhXI%2uUbDs$Fjz=`X>i?eWD2FJ
zGAmQ2cZ-ct9q$BBQ=7o!#GAf2JzglH6hr?&h!QJ*8IY^
zAl5&_M3X>K3IcLx?(M%=fM}un21@!Q)RqeaLf|iSJuJHg)AnsER~Bc2?93czMltw8
z{LrCc5oi2w)1T^VF`k0%2haj>h_J?D@1m_p!6yxpWu#+EUxp92`r=qZ8AFxj>H0h8>OVTip$l
zxqmyXeRA`CFc)q3@S~9)Vd=f)3L@qZI!Glao=Di(bnY!I@jt8*5f^Vj!PX));M*PC
zHFV!_DgX~FP~{8C9QIzPxo5@lZDG%=yiU!U8b?N3VvTN164~Y$tZ+%%Iu(Nrpn6QR
zo&}BjF8D}xP&F>4nih-#f%UMJ({GUrcT#jc1JbKK99EATa0QUl5Vi~-X^FW$|g*
zX++{6eH{>M!a7P+-wyr
zxb8gHv^^MIQ;rI==+qgqTmTRqae+emXu?9rdYs$@Gtn^oOvj?(y1_^341_J;gtBti
zT`RXzOKVS+m~kte*E7ianon1Eo^p;;vBny%^1a}@|B{1er?mKP_nrl6<1ek2y;0{;
zpPe6eh{m*eVYuz_{WU4XPb1R@_lYr5&5%4jjr^uRUzFM2RIO$!)7}$H?cbZ}v!=^~
zw;mZ((S|=~x?j5+y|Op_L&Ux2fri7?`Qi
zt2C)gjSfp?7Hp_Gl=&x9Y(+)@Dny2WfD#W3hFP>!#*a^XGIp)TwBb!Bu^E2L*@dgU
zf9HniBio(pyr&}!=E^o&w)gbE$44Lp@1s3Wjw_bY%b0@$oS%DdctjA`0~@2s`*;3*
zJ+EH~c;=vdwjI!zMl6(s!>+Y{hzNAt_OA`pz(DW!qN})>p^=^ka`hv6ZJ1^KVx-?Y
zbgLcyaDJGlZ$js`K|1g6#2XFXl;MMwA07|owe@#lJ=l;Y8K&W@evzsLBi5bqFopq$
z%<)W~gq1NyVkmt88i4PVAs!bx1Aid7Vu7)RKnF7-_li
z!_6=!eme)COy}bir{oXc1gRPrKC
z)Z2%jD5k~I2@&F-MKx){zLmYDE$*jz%d&GD^jPcuawx4y?fBCL?Xuw;+Y8Qfjf6i#
zOH_1ePBn5+M!1^HX2;`4-7B6WpK^15us4t_lpp_*n4?dSXf7o#omC{wZ~R&|&xh^f
z=rpK#a|?#hIPU41G%4R5_3+n>$A8E(0#=>NY5E-5}yXFt#cKbc|Msl{7|D{Jvvd`rrLKURt0Hma^ID*tF&;Ljo6>syc9(rtPc
z+DWCQ)rXx0vpv{UoUQd3*@2z#!070iN`A64X55d_v*bU6)c664IfgaKfYZN#AWP7-vnB2GKt^ZW4d+Ufk2q6^*0_KEaGotLa$_
z`);(-TlaoGv}d7wwr!1g-xEGbv+`#s7K;EEEXa$no?J8S>W)ha=a6669UN5kau`)(
zzgwE}Dha5vn!+se{|R(66A?h=|Z*?W)dw^(w$;psKR;jcZ%sh}L8Z
zn~pHxG~#CJ4m_yY4z3RqvIf=|AJS%BSVREWAfMU7AD_B~k`R@Ac;$0;*@P7Ytru~8
zd_c$1**zGr+=fCSkr{q3I(j4B5pc2UB)z)J-$ZlKjcO)EkI%PmuKxr!Dbpis~-(7L4Sqr8C9RofiW>3dI(3r}J
z$smMmE#?_4gK#=t>3a->gZAw~T@F9ZgpC*oy9ER3j>pGD0)`VrXuye8ZKur=k9djC
z;{0z8oDAs@uoqE~-C!GHs%pMz!0{*z0n?p_74upz@!e^%SSubFZd|p2i-IOjTgZ31
z@6w;P+Ej=T*G^>o7Yo-EnHPxo)00XNcztk)c-*1`-FJhWE`gd*Fsu||9UAsk6OX?L
z!ga%~ua|&6IY5+ko5aQ4yWQqbkcRnmOLGT|3t}SbMZ%w_OnYa{t=Cvlb1+mF8zEEw
zDfd_lG=Tfyo75rNP5uJ00YOlnO{Im7W4BR+X765)JmM+AcjuGU;ufdfB0^e9Hh`PNWVvK68Bds`qnheG*@YQ`@=E~ZZY`T&rUrC5es-_2){>U
zj)%Z@ywOe91BjiSNOC1Ds}(BXX&mCfD{f-H3>)i~
z5UO_JdI*r%Y;pCt(1!{&a~r6j<9Kuk2{<_+?ni=77qIZYmG>596B-hx#C9UyDTc`H
zFTK`ZjMy8FMZ@#bmd|2S1qZVUnnN_%Z|GbvA0xb~T7{}p+E9_n+J?(m5o`V1x%r}v
zaJMxE+DC&l>oAI04gQ1YZzKKC6`ww}5ebY$RN%?Z>7tBZhjj%Wi-m}r5?D7y;Qr_a
z#4+|{2R33|0Y6?1fSH2h7+ohXI=qqo2ckY!_-#{1o=mZ|@Mq|^glYc`%nw*6u
zzj#b}HL5qDtxRx1KC!(=|6Q&f>4W05XQOuXz2DW@?7p~2Yt=?^4z)dw{&vE=MzoFK
zR+q=i19pMk{r()8S?X1_3pNgGtp|AOskM7of@ZG!?&rM}Fi{SqXYDr_a0vagX5%~S
zjGFXbxU~ecRn6!}bGT;o2=}v>7i=DX?Pe-Js_8o1
zi?Z{-tl~Q$mGb=EPn?N$jxPgo_>T2dXBIYdsWnwIL_{c^x0xl67ae|_gulS+?bC_b
z(qxUX@Rt9YFpx7y#1?nOv((l*gbr@C-ky7Ma9Won=V#6zovB09N1qQC8A$?57vvyc
zTF-U2JD2tv#iZnhkh8@;&Gj;LJBybF-(*uD>5W0Q#|VlD2y@g9`*}Vb+BP9tO
ztB2^nZ2eLCLWqkYAN|EM^D1usnUthru#_%i05a}Po@8zw$mebTi=H(U17>@z9f^q&
z^YW<>4Pxa&`S9}aQnlxfut1902iJpESy68`ze`l(*n>qWfTgZ60J$ma1?$g!Y}1dH
z?rEkSBV#5LqXj0}N?f{+K(osf6`FQEex+Tad0@ty&(EqmWzGK|i;7>%kzIS4lnQ+K
zY&4_IA(^+YUH(@Z3KTPQa(VxIhvffOpd4=#_^~Au5zw=m&HVTgGJk}-0lYm>O`L{9
zlHAO(2SBaCkY9E9`B!E8mtSWx#j0N>4*~gGfhDQoYlP_psI8=Hqgvs2@{cWy{=|fT
zg#jca){5zuuHmh(!z`gGCtP`X?SjvvIG3}`63-WF*6doMy=GwWwS6!C;(~F+o>+p-KEh1Qk`jhnO
z4%BNIXY-!PS7Z|!d1F3OJfvK~;|a67xN-*5x1MdA65INv^$Swqxl~xXdY&h|3_>Kd
zS;lJ;4!NO4p~}oTj}=%lh7bk?A{dN&lzZ~8yBWMc(nn-LPjTIgcuvYtPW#n~&n2dj
zA-|$!nOFpviKIYWf8TcphDWl2DkryqYPhx)<(y~#WvZjtj{N4Nu(M@edmp#7YNk&X
z5vItUjmN#Llp00$8zo~+9|lzRQw_P0+fHm-dAjzRN>A`oX?vnLb;V)<+e%z|KgN<@
zZXO3*)AJWEJW+VC6-h!q!?@QrvVCimaN?nCqQ_hBfw
z0dw@=Cej_(Cq<6k5|h0T%`Rt6ZVGw!zgPfm7{(KP+e|X<4c)C^Nhh|zXBXhSl(+6A
zvU*dqOCJBeo*-PEYF|L}k7_c)4#sXvS}E&;&tMFpiW#SyZoQyYSw_dUMx~1v{pBEY
zyl(8b12RP7)G2F8>{`*?OOB8KW0QU0QoMGv8US$@Qi-VW`kDF=|G0(v_gV1^pyP;&8f)?@y*|W^!V9`;_Qj%Zd&S3xkM_5Ssl?K
zZaciXZZ4ctXqff#(7ig^PuVxl=jbS{#l-6(`YAqu)Pl0>_xhjPfs-Hpb)1;_
zd{N3iVQj20cQV0Pi&7qMg3>p)k!-#Cx-Y3CJNx`+$@YUr(y{h0^IvczvG8e}cbsT`
z+TR~0NBGvf@edFQ$;w)QpB}%4j;q`sSoziY_M2&htA{ZUZ=8Grr5QC)a&R_kO;d!S
z)8!sgk)1trlCG!d9^P%u)vjhc(}Jr$pPoLvRo3v9l*HnkmufxV2cNct?39+4-gou}
zIv|phe}#kkT}4y7H^j1@-?ozvynQ8@GW74-;cc@U=X4nV(PZ9_$HG;Z<1C$TQB0=$
z?0bi_DKT~4Ro8p1R8eKTSgT31XWp_Byw`KDn_#Njor@BZ
z^VZX1zrDWE+!6Kd(>ZnD-B89WpkULM{MOEwFJ={F5R7!djOKg{kp_B3i0L@Q#YXw)
zALaG^&&0Pp#ja}XUHbU7=uO7>$n>n-wRC-(K{~B?!kmk!;s@{l5x%86uE(j)F-4Z?
z&)gPr8?p+8TqpY!)bgD}h<+4s0DG~>t5)|$@ly1AUa7ynD;J2||9Tnc%N))3)IpGx
z6Z$i2K*45Oj8rrDe2*`IJRP2*vEV-rV2++R>}XOTkEFEb?{$)3ZqXVC$TZ=4bVE<6&4BmgD>WmR7;Y;W%7Ugr8si{B5yH1QLl
zRPD*))mAf$o`>BhzV+EdS1xo^+~TXh+LWu_nj|FeFP~rT3b(N+s^8Zs?o0b*3IO~e_#QWg$OJx9@wD#E
zJI=u`SFkHB2RE8;`vo#Rqia{c!+y3q660^Y^N4^>%t{a4fA$6FS;6c`%R;04qIe?@
z$~lVHyri5+gD)%$9dhz;15QB2e(AXi-o2%y)PZdxnx<)|z>wHW1l;)AAJtW|u+1$5wdLo-Xw`|rhlzZ#r9wmK4&C;ISKxCZmW?F;hi>YPXNa=twe{(>5<
z^H%gE8K4y<-qbcM|I^k{>QAsTE(Rw4S{Q3d2FUj4Y-dC|b8pAT2TP<`zsh|gddwLg
zyxkVOou{tV0J(^lngF7Vu?Yra6UvvRJ|z~qhOaN^>c5b(MP?kf%bjaURS%E$ixjgZ
z&;L}2YH|SmEG$+Ko+UPDC0S}q026{j%&%PEu0)r
zsluMj(sOrN#xx6MxoV21S^qI+_$S)W2WyRYw5CO%M)0p~3zkL^O&}Rm
zD=TuI1P>iOTbJUx(Nqhf6c=l3)3R
zyuli-EMm43s`R=+_Ja`6xh5f>f&3^K=zqSCmOIyi!3f{!Y^8$=5o9J}Zk8OgEuooM
z(pa9ndSy1PglzwUusg}vISLQXtIb`9p&AT|^=zE$jni$?aVhQms`m$+=t31+$w;n!
zQ00o?4`_RHPCZ!wpj2#kgadWHz7=(Khrw%SopdaW%g)KN8N2&MZ`_;>#M4-t0j0}7
zkG)f?&s>(8%#T$55Rd}xTbd7A>@cCrdJQKEfXB!*;F~QvkJ{0+gos^a1KeTs7cmunedH*UEbtR2anUYI;N4H0@>H7&81;L->n^
z87*i``88?K;G}11bHaPe_)6U|Aa2u-aU&~LbG55e1>h}G_4k1t@3~=VegnWR05y)E
z>2VxB&?dvXu%IE5FR`%pdv2&B3s5{_dWqgPk67+CqL^eX*D&~4K|gX@?OKX*u>f`4
zn_gHJQ%;Ss6&Fu}k&JVeqnEAMp#1*Le`0M`u+oz-=W`;Q^*j+aIXZdLI|8{LoM<%u
z8~_lyqqS+b3M{@a3sfnu9n|}qj+L@MDp3N;<0}xY+EnI-T2SZ&*zqQ7oU+BvX2e=oJe5JqqMYv(
zmXjNbK9Owubdl`J)uTppUCml)Z@{0dmKdEpZRmet@G5|
zPfkfstNG0Cq^LVw(qOv#h8)ND%>3bS5NXIi4Q=>wU}@HGbNY~`kcutYv$0X&j?V4;
zn4Wu2tn@Cf?x-f#**`OTh~XtkymJ09IoD7mVETdft;v)Yv-RUO(;ZtBYp=3Oqr`NI
z+T5ax=%uEX3(YKhUXoeQf0v8V|C2r@l;ce0Dxe=boINYSQpA~C$xm;0xHaro&ya+?
zdhx=sDscqa$i+(jD*JhnVIzL+#^5?y`IQ=2<+?e|KZ-?lYO=QBDdzNa-2*KC7z$##
zIUBTrUc@L3j;iY1pMK3V2?cpb#J$MQH5buP#nii!g_@@Nrb3oVce?F=FCB1l*fTHi
zabjD~5vX@4;2};{o8xhMX!Yv$cl16RT{JU1V>|kP$SPAzOkbp_vQGD>J>tq6r9*$t
zF2%Uz&c}V%yF%7Fw}VmqSQo6CsOc=ImRlaZ(Bi_bI&n^+2UVz4
z1D0`yNF8Vl1bEu>tf<`}%>(_DDAKH`h>j42to~|A9*1Y#y6+rcE5&(aA~s#`B#I|L
z{vL0DlXTL6@S5|UpI+xka;|ziWvtYsYvp|fH(((LBo9SGKGn@KlqtS^sXsX#H{Kxs
zzPtEcOek3x8|!+w(z|d^mrQtbjr{U;vOKFepaXVg>nZ8DA`5lOR}H|t?HPXiMf;D@
z|Ii(aK5Mb%i09P3=&y-zUfj@q7d~xHLFN|}{`;++ol@Mu(#DSMlS@z^?Y2Q#2;Y4s
zmy(!JONb8JQ_isZQ+A2G3h+ggezr{ME>`%&NdFY+c})P_`pNIvDgd`itCO;SPn
zj|2H=B0Hx&mpVK)4OWJJlidn=1z;b_TOL&vjsxEMUzMYeNQ@t!%h>bwCrT8OUI{Ik
zJ#zrq@%3ahJNiwgULX=N^;yBYfy`gB;euyQ*O_{CDLL|!Q+wSm3!!*w_U}L+T)iac
z#vJL!oDI`dsHi%`wuECc)+Z
z?$6fkN^rK%lXK-0p~1##c=>XMH%=+x`qB@v-z$6FoJC7zh5&GARYuox6#vj>S>&24
zej5WgjqmGXJU<_R8Tz;u4~~HzJOiJGDauf?3+J@BotVhSDflL>@W)^NL7E#!SLy6L
zE`KVV=$-?)#MnkWfAa!)zv|Gvs_^d{(pR~Q7PUu~rNce+F^0DS>+GIFN3SKEJ+rOo{iN&Fcf5HoOBy{gU0VzXAtKTuE{
z=8-A$@LEhOfKvQSc{g}X*|5u3^8ObK$QW0cr##=Er%T;TiIK=pL@iLjW@VHp^GuF~
zIw8*B5-B0#l(E>-mEu*-=*WfRQVca|(4guQ&1+J6fe+8EUd22=71i7XWc_vy8*AcM
z_2p}Eqr;5hL09?i(`$Cj1bldKj;5{eCiKiUTFrK7*&o=x{rH@{sHntEeCsUUai7AD
z)R+#Jm8)w%qfH*zb-uK~+HmOA2G1P{zoYx+!b$Q&)1yG0t6D(zBW=KSY4-G!W}JRt
zDv;KaE0WmjZ$id;&P2UIy}yI{Hiez~3qr3h?Sp^6f7?VK4gwJJMH*pR{S809Q(AD)r)0Hv4)GeQpgM90Gm3fbRZ0AOl%V0>ofH
zL6?;m`m-!D;+uOFmGH3bq0$qp_(18G6Z{g1v|67ouF5v6n0;NZu;IH$@w#tF)T=u=+-foBWh{vj04z;8)GOn^PFdM>Z;`CBOZ3m9C<606oK4)|V`
zKRGC`Rsqi3C9aB3c1j-2s7>3x6M9XXOOc&9C@>dg-8r^1!worYf7Y@Wb~a4_ws@n1
zImvhkk<$5OlI5kHl?Q#8im{f`lWTcCgHw#Rf>kf%kQcqlsYpHn9G5_Q`6c1$U8caz
zbH6bE^_-Swlxl9?Jw4M%3FrtJe|2hl$>Y+up?_^Tu3i2F;Jw`WCsd(w8Zs9W9nV=$
z+;OUWr-M!;93hy(4b;)|$Fi~BP52&`HyqfMZpfv+Z`?dE6^wpg_jd5D^$K%@{q4}8
zt0WiydEXz9uE^g(BA!j&Kx<*EE}#g0W_Jtoi%MEPYIXoX5s4;!NZZ1}r9Dwkmp@nk
zi8J3#VdvLCsYm#d2zl=qfO$f@sHo5#%!RsBlViQz-1jbg7~Z&%zxWa-%oauWZHSBbz*8_>9=^yL^j?I?WwI&T5li(5KR15rB{R&Gro18%|D4S#LP15UT=jh#ZO{7^1}3?uk&@E8X1Y32Dq}FMb17v
zDBI50N)dt5!6&Cjh^KB60Jb%kq-BqiWQpZe@8Q_?rVDQ5tds9rRKFejd%@+a2Iud$
zSBHb_U%k|SM5*yJzR8xX!E9L{2p{qnTDrI#0gdLJ7JI%saR1}49l(zo+_*ejO*bw>
z+~U+uI4SjYGHGhu`+YU{zhFk4-m6#M<5D&DRU2DPHn&zdAPc&CqRi+4W{{dHLd5
zYr0a&%gOD2hn$|3XZO)$XU}NZ9
zS34!3X~)c-?UggvF!H9m8!@{AJNMqB_kc31lAhp|9<0MQA-o;m-;`%Gjfu{Z<4G`>
z&$wUtm?}Idk6$e5&XJ#W&4c1Qu?d0lT3RdBDZifhdz`%dUsLctOZlSMx-H^t(v%$?k!fw@@EB8&5fDhwNGz&s
z{5r4(uBu^)y&5xMz2Yx;5d~t1gbv&K)K6XW4sUa4Srgd2`hPL?77S5+U$`(LAPv$j
z9YadDbc29&ceivXNJ)2tG>C+BH_{*sNK3bL3kbe@{N4Y1?-!VJ=A3=jUhAoiAi+uF
zM#T6rq<2w36DioJP?IV7T#Rzdt<{jt>$TT=Mm+ktFJEf^eDZUCe>Y6%*m&{2TiEIA
zO5UguU*_c{{lDdITifi~Q`xk_2wpS|&+z^j!}fkzaLYjPc3#Ai-(n<6V6-FLlr;0>3c`ug?j%r71T%-yZw
zy0+E%+#F*LI(&S~o0a#2Nv}Ii8qj0-cyk19&R&bMB*_Q&OakWP{vNG^g9R**?)pia
z8F$Lk)>gOnZ4k#2tL+)~!PM$|8j!(rE6CB}uv))$9^|^>8MIj~@{kchC
zHUjF4`>kj9cSsZueMx4y9Smo`Z=R*UKiyiqWu+3KC_hkWu
z&(_l=h*0W(k0@I9+3;M2
zVU5RPfR=?ap9Qvtcs|{OdDlpDhCJ&K-7ofkDp~m
zDyBfLPV?vhB9Klknrp0KAjoNh5-y2A#1tOXdsbLF=V)O0aNt56OA9k=2DT`SMuOUp
zSqP2q$WSN-q)R7A%7_+;D$JSDfOM5kPK#@oDT%^(fVs{GVsn6s1Vgzk$WMJlid3Q9
zpF!KdH>9fVhZba?s8n+2D~Q6OgZUJ(GoC$3q3bebVqTUUcj@nG8^b?Rkt0xtW%1p`
z>^3ur0GUc-zZtRrV+%Q9PS;CR@)~s6UL&v0RMIuK7K{tRrLbpUHH3K7+LQSkdHId%
zs?Q@xn1T-1!OB%+Y9H^3)u?Hnn8(fKa|bq9CPcSfOiUEO)5{I$M_158C4`LMUu>c5
zsB~%D*4NkBkrI!ratCdkdpjIifBB);AhWbOhaZ=(4tI91>Vq)P4j#@Y!)O29WSr60
zj@=a@2xN5NAFR1p-quGIrqV?iMb~eMUn3WSXm}HH@_e-HcY4}mUWO-02$}vav-}fLGWaR@BGP3k@$9%;
z)s{Gd$_mv!NR*Kf*P8jrJ!U?Nt=Gurp5H!2==sNPnZuU#YFz;E@o%yk8g{S?H}&ma
z;393FH&>3A%D>|ziV}9x7LK)puSi+IQ7>ymzr;zW&H*zbq*x8Uv3tmC`UPWjbo4*l
ztO*ikc%A3+2xz~NrF$I!|FnEI_5J#qt=HQ}F!U2>
zkQln!`dBFrVP1xp%2cU>+1h)#>d!c;X~ECqb5%86Jwwf5+*5kq0v%W+K=&9UD|08{
zc%o$_uR-<{2<-X&$?zU`m^O$EJ5ow7N1PJ-+Oq*_omCwr##q#0lSm&-z{RA2Q`FR-M1rH
zy%x;j#ZMVYK~?;V{y>$U{~vN!f|fRF*ygldGJf#QOs$bFL5@t+-Qnc;DaycC%Avtp
zPn@!f<{}^($J8AU@vwOne~n~2(l>_4$rUV$0_K9;!RdwBY=vTErA&jWiqBQWY7*Lh
z;?D5B2)@C?IvQrA#J`SyYU<8?2L4HRfvU{g?ZepWsQarh{V@-)%1tw(y}
z8Zm8}dpk!B7On)_&9iE5Oz@UXe2Jp(Kw;`=EU{~+BSP;0!00fpj(#Std&TQYDBx`U
zjj&A9YVwLea0zsmz+~xvSU}LW1Y7^>LWBqnUQS`6fp-XVBPZrdZ8Tkz6O5ti02dTm
z%$%-!*+LKY0K(48;U}XeARFTCxMTG49T9AO-O}O=&t~yf7}P}j<^LccR~7NR`~lE@
zYBl;#mQa;URoe5`3y-M~G0N;|j#VepV+VWs3UdfV)3%;l!Q{XxEot}0*P#!6SsQ=N
z@C*^YOo`Wm9HgdLq;7Gj&fnf;UF^&(`;QX%?w>T(XCK%&+Q#*(uECmmlUjbV?_Xy4
z9F|+fsZ*l)8k;;iu75d|CPgfJkoe%GX(5O920cYpg(=CxOJN!Vo9Cb0sz7Jw`J!V)a63~
zbZ}W04;~)PrY`F?=;s&CH48Gv?`*B#ud?Kd8%2CK;UvFvdPgtU7v3S2N}t$tLEg}8GWxDXG;Nqymrqfg96~YIRLL0ltcM7LdBUIKP@&E
z-Ly}mxgz@+Du9XTV$cX!(wS2~`uX1F`uyte>Hn}d`6$U$?2K>6BxaRB@y
zvP;kTwqldxDr4I4fWF>DL)Y~kMN?FZ$B$ypmem6c1b^DqA$$eFJG1
zhgIw1N?EY2VuaEd1(QAjptbQ{!0#bQnpI)pz)@Naf6d|*NyU25&m(bD~AI%9VGQ8MQyiE3a+
z=@4fii2PSB4KR(nSL=P2TRoV8Dx@(K6NN(1-QjOm_)Fe&G{N8m%scS)X9&Oly(m{S
z1zK+@YNNHMqXPwrs*@8V5e!`Pp*)y%vW$4P9<5YS0&%>V!=`yIfA;o0NVRqU3TA)&
zuQyeioNuX^-q)jsR={@ooPML-kBV-+$(~cAq@o9*3$t%_0vwU5-9qOy9Z5~T^ea~L&
zu*|yfs~f(lu{w%;dcQ&q`}YnEN%GE%oj&`u{RV7&OF#_=(odUi9hgnQ(4FFC`$3G7
z1;V6E|Ar=*;97Z$4Z>6y0Lpu>;hCrwfrc|F#n{bAUL7?F#*JqKZaN(fkfTC&Tw1OZ
z@+sR2LMq5+Rp%QW`(o3)FwnDC+d#K6dV;p%x~ptxn4S-N5*5<82!bDLeMWt2bdnt-
zq|NVdUI@6aRU(vZyygRhiG~5aHbgdTubXGdQ*e@43Fx0T-8>s|X%OXE5@yG2iI~xV
zQi~@7v>{dzax82RHu44xYwgTxb?~`1$ZX$qZAPFW1>2=$!v1abkNfT=Vt*ikcN!a_pah}l$UE$)`8SI7=wa}^**6m3-66i7x4{gd)>@E%N)
z<=Y&p)k`^~yp;3D2xlc#Qd2+>P4y-c#O;)SA?QKHi7sSML
zV}-MOd(FCjqH%Yrni|mjxyHB3A%?%<#XTGY0QKqMEMJTopnx{2m9>kRHkhPf`8lzh
zJ5-gD7kmxOLY@Jql33ilZ0>C$Wg3w(S5Te98epG-{Vg33Dd+&`!K*LZo2(RZHx1fe
zP1)uf^R))~ED$!dQ1~2jR@z()y|H~D?2HwoJUrR&O?}59Plh?Cp`k=00ho~|>8_wc
zgdxd3p6tHY>1M`}?lE5o__HLK
z{OnGaq6W)#%JkEdw^(SYnsuDYdA<3ROv3Q_92AmaoIGThgEo-aUl@%E>+PQ$lTSjZ
zYt+l!<{gVD!IR9h@vrte`G>=F3yx}YgW4^guNvKyEex%<-|ZBOcO{qT6a!7O%)LY7
zy7(B?Gns^8{CbcuC?N8(BKi~jUC};ziQ1COQVSPY17eh5Oa9oOD6#UMw&_2H;huXe
z>+Qw(5xRq6^c4PI(`uI%c9M(+BUM6$Y&&A-aEfvV59dR%k{d
zlhFJAiJC)k?|#k%f`cq|4PEzFvMnY5M?nR8X{)QdFCFn|YNfEN-7^W~)OmspnIUegkg
zD$@ZrIG}4W8Ek9$;))1r@LQ!e+*5PQ;wB$JD*_@;wAq$EDbX9MOq_wRRIBX=8$~b<2=9ed6ApKi)r3OX*Bozg!vViI;U)hLurpxayl&FvjY=QgPEFQ~l-f{R
zieJ^uuD+t(V!gNJ8CEAg
zddMiV0-vKUGd6N8nWzfv8zGX(Pj+5zbX}hT&!TIVZdv{g9|qR19)hHwT+jT7v0{e$octc
zzyI3}nt;ETgA7ZHf|axRton2Rkw{>f7G*V67KCqy@4GI=xjOJqZH5YBrvgRi66RBGH6bss9lL08Ut}}~5
zv3e}@Ieb!lpIH9qA%5Y@*fi50R;4iu2Lz*e>SdI$|2alU5Cv1|_>Q{)A&6uCZgT1C
zoaGL`uGPVBomD*=6?{at$sEEqRB&T?s$Zf@%$9~Y;6s_9dzah_r}yn2ajc@mD1VSD
z1HGsW3Se})x4=Mf>g^wu#xj4ivwoH;9kp}+beAto4T4ugv;qN_o~|?aK517!N^SgMy>!8MH%X#bEed2xwj-ef
zLt%M8S^vgg`J|C8pxhCSYilcKji9@$6K6>U+5nugA202|PSb@ovyjp!X1co4cO&8=
zn=owSCAhC#sVCwr{(v^ok@#TO_fzlwbMU{%Kp~pjQ9)KR#C#f>n(EoMTw^orU#K>*?IJ5n-gSFr
z4%XztS5MDN?i?p7*d5gcffOhGMhlRf45pHH*KV@_$3ds4(EVkJrcwFxNEyY!zY4-m
z)}lL<+TwB4By=G5O|WX;jgv2Egd7MG^o)ojr2a9Z!WmB(=LMqvQO{^de-NrP!Cptw
z2*ozNA-!kdMGgIMsPL@ZBmLiV2f8w+?Tg%Y2u>T`AnYV_~P@E3nT8sck~WK}&q|JA2n
ze=Y~R{`*^|Ak@&2&xt!DdXrV9G%EHzu&%iF^|l+OzHZC3+}2!oi4Tz8iI%1l>~Q_T
z`(s6YZ?tlmjm7j6UV@Iql&#VR+%@QZu~9&z#(Fq~-{rmyt-^q3!p~~ctBjI=t{9Vn
zneSztXC=y(mUNq}Mqgo>#sGZj>sArUW#_<8^A)N3v+S-4Nx?|>GlMdk62@qyDF8hT
z&+|ZekPPQrDBn$Zd1DIy<8bYQD_{iy)o4csytOXTvp)e?KhK~bOY?TuxaA=>3lH@c
zH}2Kk|LF{^RDFE*$D14~D&KnU~>q*-k@GgQXu
zROX0;7ru$wo#~Ha`5>2LN+xY7V8Iit&cJ;jm}zoans0WeN*f(-1RULT>G$K6j@1)1
zY#GkX$fxh#uV55Hp|8MFo!h*=Zx1ot`&}D20S1VK4^o981shXh-EoZTB$EuR8QxnJ17E3(W}aF?t1`RS{BFr
zX?*AwzG&`O=r0>giMF3Cin#TH!8M=fH{A%VGARKGtiUXhpSSGvRzL
zHF{d#zat{xxFo3)9Oj#S0nrH`WYS(!S7*Iz@8`hlnTnLnYQP2>tS_o%wy~3|OVT=0
zK-0n4bKvUL*noFPjaehL2m}24HSAcQ4Drd~TKy+u9x|86cUivE1Y5OxmKY?RDbUU+otE{f>UH?{4e)SgxVO7{4>j7)b$-VjIJ#j2ric==(mn#9ICuwv
zFagLPC=Ywt^m2k2)^0pKXmRHI;Z{O5=u6e$bJ+m}kDZQT7NJoItvv~5eE)B|3l#3#
zc1vS-{#ow>B$7nV?t+GZ3|##=);vBSZB_%-V8M$xYFz)LjQe@LN0|ANL*6Nk=6z|5
z0pP*niXY#AaT{F*S44xXuu%-o@7Wl9hCx0b!CCXq50$ASN&+Z&q7MtQnG^LqJUM7c
z7r(#KgZIjzYQ9+j^xii0zs?8%A+_^K60B%>pw^U^GLxrQz>bu0?0c6R4o8EpmubR5
z05#Huu|mUYWjvR}QG*5ZLMDxjnwNAObhs$tj{HOxdsZTd%nU)j86~r!XuD1;tyQI^
ze;wW^`uXuqKXwEAoY;zPv(3sZD=9ktgSR3--U`?fL7Eay*z-uKk^=R7Rel1xtp$2y
zaEe2UwUduw_r~4Xtv`^TPYJaZS>9paNFd49Q_wC4MBtu2l
z9Rt`E+{G5HD&PzFJ8V2M!Bz_sYs@Y=J2>tO2izSFaa?}_Wg(EsK3&NApfQGyPI{9S
z#K{fin}cHyV*1TOe9#BX;+8VJ)IMlH3TbLGiiu6NlsSt7dTT`G<2xCPPCxeJkkAcn
zp_VSsF8XJ7YkV`W0rHTb1<(w9qn3aFT2?srj(#i!tZuf_EKHI~MYS5&vkgQn5qB>Z
z3TMH9SSyTwC?JmAu7-1)t2ro<-ipEr{GOLvogLwQraQ4(+lE+DRjN~rK}N38vDHk<
zMCAj9cXC)}#mhj5f2FN1M}pHo*_YzocY5*
z`ctPJ_VhN_>CCCAjffa$a*>+9<9+X5%ucG17ArV{xA~+Sy555wH5+dItBF{to?V#+
z=RoWQlg2eP0ed$4HT)M1c!MnB4Z!0eynr=6BVW$dvP8%}eJ9uQ
zHmF)U^0_U}fq5SXNVida7(XgYfqOWQ(_zu;ul;Jr
z6k=rnJjBVM1i=YXag2hVd&LA0Qvl+CPog1E1QOBS{K=ubP|LQAEyPgu;u&HD`21;s
zND)4IFTh{8kaF&_4Dj!n{U_=GHpVB#(o}HBG0M7
zt#q5XWjGw&rGTRx3Nw1W%{j0I-L`&1X&9){vmPO-ascqUL=TC5x;s}3jKpMp|k{wZ9-@@R$89pKKyu6IUntVs}5Pf
zVl-jKfVEJkO@u}P6Mjyq!^N{fUKPNXxX&;hQ-X52`s89Q%MWWA%u2XjMe6n_)g=Es
zq5p&_Ck1Ibg_>WD8r+Zn2(E+-hdDLf%tNPHcLmk=>y@f#qqi=6f!wr{tOhF(#D#h6e(rqOVtt*X9Mh~
zqfT6neTrbkOgt~81xh_b(C3--@dla0P1WkfP*UY#
zDKm>n9G0~JZ0mC_uJ^AB_QRvKoTEb|)1zJRTl@lA42*iJq|NX$S(1no`oyS8dwQh$
z`{~n`aATzU&7eE1_WF8@Fq(}+(o*xbMET&?FME1kOmv-_4xi?_!mMuY{G88UGVk04
z0pgT;RrqU%4Luwl#-o0q{^`O)ouE_7_k~+8&751KyJy-VL9SRYC*g5vIVin3aBHD4
zA+31Emg06uQo@uzc>nNFz-Cp>SzhIOU
ztW^1vr{)!Ypy^9>`REw+%T`rAux$ibb#&0_21>=MRQE5DI>px9qcJf+WzyyT2HlU|
zcVFBlBd@>2Wu$Gvz|*QQXtghciA6NdKwPQIit%K<3H3K7DCT@PwzNOEdE
z)2`iMTwdk&B_pFnGJM#RgL&62Mg;z(&7ssUjxuW%KR5n9UJcVQ2b
z0CQu|Cw1Y+JuVuWLi^c@p+2o%95-x4_|Fu
z-68i)k_CCL95yDbRPkClY53^YFO{j=3p+Jxa^Wi$K~ffZIi*msj4AWN3uMZ@79ID}
z4WGg!nhV%bgF20LtOi*C6_E&{B=R4W5UtcApUCZ60M|UN3Zd@#rO7;7VN3-G8B&^r
zy)*OD%q*es@O1Agc5LMT#IA|2yoEpY=oCST!zwEDUa%!G@168-yP?(T%M~J2eqXCz
zT7*qG?TL)lBlIqGFa$5$fzNUEviIVvm9t$#=24Tw@riT_ELVp&euUP3w#uO44k#W%5n%jEJkmSkn;e;kpmqPYFwHK<0smCQGx
zAdjpIogie?fHX~uoA6HVzDf}Dgwsw26Zzn1+sfb50OPw~)*%u-eR0CTi!JLIt8Kgh
zJGz51mq|17>Oh;_7|Mu^JOC(!zxlzkapXcNvdqXtDzpUCP`?NbtEQN0AT`v%@1Qob|sX%CmbP>}x0;dt9*kdOYGSi93S(ZWqy%{3#y{Tpy5
z=}48SM@c8b|3twlk*b8+UCG=fY}Ci;jRhcB#mmu_yzZ1Ke=8`Xc8aqC=Iqc)KBxJ*
zgYLc0!A7;L>KX3CiMO(txs>2<#%lx9M+xfzp#Mf;J25czg3tJ;e`5*<3h=5DjJ>Gc
zIpd9o+7y+R$5h8o9OM(Kb0A1ik?%Atg(U%Ph*#gb3(x~EW)(j}p|2hj4ppz5CiV93
z9DTXC7#;eHg9*If*{{aZPeY?fz|{0lIx08A=84m`b`pDp#yX
zs5xV$A}V@%`hdGc1Kk4vjs&<`;KI&?^L(?9qpj_kH`>u2
zU7}D4^ag@C1vK*&OpF|(VC2=H`
zO9qAk+gG^NtoS!AU-HFXi^jvIl`XW+z%IA`+J*z|FB&6f1K!lGcUub&_c$J@6#v5l
zF#S5BDQ+jyVj%lv!bfgkT0FVI#K@#EO~uR3ijSMuZDiHT(O?=qYQ+aaO#dg&X7?}N-M}^)I4f8cn5!^ovCEKx
z5IX}09)k)u`TToeg}@mA$Ia}wv(8vSAOH@mA6;I6CYq^5bY==*0B5}NE%KIxCl$Jg
zoa%-1j%B1TQB-1Ca+LI&f`$DMEM
z)IL092iqqHrn36=T+0eHP7&<(Z`L6bG}#P$jA*
z&f*sq@^CaLmuuB+BO{7}LcTJNu?_axAhztA1*c1k0qoUqDVC{M7}i_3$22U37a~h8H8-SQwpV7U#V);Wm3xqo5aaV@H^v@oe_Om6@NfwIjpp@
z`Q?Bc=vHE4XE*Hdy#0XqcAxUX+ngUqz+(gbq44mG!J|OldyjPLt8prrkImh;b9y#^G2F_U1KHnOX$HMA+lA+q%El0
z$5j_J*?z1Bj3`iPL>ys;Ukt6|!a#&?8A9i|
z>|7rE8QE-a+E(OVoCdZq3>0yu&P88idH4ovIbZr3fWEIN5UoXkybz&EDPIH1sLYap
zjb%LJ*C(flMrzp~LF78^q8Rr7RT|J|H_jyonil%Mh
zT~LC=K0~1^6`wF8TmKu`U&wm$|vIq+^41J|c~cIkTr4tOL@W5YvTW$VX_8=UxLE8xDD9+0d%EP52bAJE!PP#D1aaXPyA?14APjj@Jo-$gi{0gNZy22P6)K6I*}#Su>5fz=NBjLCXnd`LO=mo(muX98
z0_tIoPfg}oVV}+-$Z=e~l+MxLIw@yaE5#XsUF!1jo7o+)H2b=0yo}uJ6PfTiu$k5Z
z1qmhgsc!&hOY+K=i@?7tKh2$Rb}*>-JVFhYe^nCz937|Y=DXh;U)qHgDOFAG$GCe>
z+rA*DsK-th5vF(**Eo?b1D~&2%4Oq@^mWj(A-xdMfNFyTB-VC2
zhP&9r#MymYALC;{JC)*BHLH8iYg>%@q}_dV?TjYqSa;$g%@AZ>>CFflfj&&;GVU|j_}vHcCiE1_<+Fa=4NDK
z(rbG+^8pdV|8eR4x4wj-VO(X|xNM6x-groZ3@y$slpdK3Gu*Sq!`GZ2&thB&HApOd
zxvl5O4R1&5<0Ym0!ch<$1lb6KoJ8{rH?Tt@SP>k_+tmxEO$TKlhejhE-!>C*fPo$G
z*Z|C5srNYo>b2{u%%!E)?>tR|o35}@^hV0B1?(ObhE25v1rBCypeh3-Z2Z_bknT)+$%90~HOb^}>N(OB!|`0C|XT
z(t$Pu4y{3tr>3K+^e!zKTs0|bg<)h_@g9*XwoP1Natf2seR~6NQs!iz-$6CJkFE!DlIKdxfJG*jV;#FJa
z*d<>QyL*t0`y}X@EWRW*69IJ|b@
z19(P*HqT;kW>rl9V;#oU*-l;M*a8yp6WUxMrRXWj@;|%tMYSf%4r(?qf@pqho3@_K
zJ-8&P6vex&bNe8#B29y+ot{L6O^1hk_e9fB|Mgph*}oBE03Z2TCj`@ODSa?t)9>)T
zJ;ztHbSrUwDlZ8}sqS?*1I+t)9%rQMTmMd_{L5Cu5a}({VgP{!eelSO!%MG?w2RPC
zxTx@7_!6My!cQjH8@_A31Bk!`IRl%lx?U-e^Huji#snwuH6L6BPFu~uOb@7Dfx772
zl2oom;w7g8O8B`Iv_Yb*Ab8#^!rk2>zPk6@$SGTC2M5FLw6QRE;L0LCsNKHv)9q#D
z9ii9=s9X&9K{N?+mACDv=vBso==Fm|FMGOx55Oa$f
zuUDu@yMg%VMgy~@rK^Dz2+V81F9!&*Z`Yqz9%;hkJnBtJhYsj)B7obLv*UQo|97KB
zB3;KZh(G{w1gib;Arj9=-YO+3RppWEwMeXc*1jL-Eo9WR%UK!PJhS~U4Z6u*_#}9-
zRVQu*)iNHiHNa+PeNYc!wuD9o++npgns4c-GvF4u0w;FaLC8wjwjx_*BKB+A@4OAb
zeQZ^S3uZD)KnQP}jBI8=5_HB!jBZXTg_uK(6)3SkH~2Ql91u118|)Ev36T_le1gS%
z)^0nJy4ZInfDfy6pb=}X7!$_Jq_J^_%B9Poq(4ap$iO-{`qI`TlR2QFxOlU;tAik_
z9|i%H6Gz_x@YKej6&R6J9B%HPf)7CW-Ju5KP;$Is<&3RIm^&n8PLd7i#GBF}A>86+
zQ=c#GJ{hcGMqj5dy)i|jL`pXE!g%Nl0R)3IH^AFk1<5$>x>`bzQ?w+lxg&0K$M(*cTG>+y4<%D?S!y7IyZI
zJw+fc0_O_r=?fCoVic(|PW{3FEPiwLKRik|q%L@LvkcTq^JF}te7TC5{cZYU_Cpd3
z^iYG09wU|PQ9958ax4Ko?_?ew&i5?4Z(J}(4)Bp1{aGr1x^t0l=%sDk{i5~aIP3lL
znT@sVYg)37o6aTJ(>X|23IkmWtE~YeK@@%C;O1GKwH|RpE8y(YBNY)P@<&abfqeR0
z%8EWz%lY`gR5<{lMWPJ)%aXHYbej^9o=(oT-2E}#ddPt-o`-x+rg*kU-L@+(2iJv2
zkzV_=1_?#3^-FUB`SpSq%5u0>v@q#464
zOA%BK5~>zB&+8>gk$;D0F1XBd8S`$wv8|8r?mckz03PHT`=?8m^!cB8xP=QA?vNp7
z|5OQS#_t}2U-++G{5=KugQD}7WCe=cdmx&z>ROy{?zSU`?KVD9>}%}cklyVP%VNuZ
z!T?+EA(^)!b;`TcYCk@Av4KXu@!hAT{c622H3EFEyygB6i*V{?>S*{IYBwed=^NOX
zLCl3cx*mqXfefeK20NX{Fi&;~SOGxj^!_z4<&@@Z7jfR|#O9%dOBltqximsEVD1Sp
ziM)6?P2*|MlqrlI-Cl4g>=4;G`}GFa8G=D|=ye7YO1X2MZLjnj9B{OD%g!wD(jq;}
zz{!mIW>)##gp|TU?#WP@0zIye#!u68R9Xe>C_0548C!L~KDMU81cH(TdL{Tl-VjG*
z>u`^}T(~8W`E}=m282RZ#L!b!NT@vH934XtyhvMtwT1CygiVOsgmXP_ZAK1KXP
zr$|txQ*#MkS!z&E5<}MaY+EoBaC(UdT~lL!G*I#TRDz<>`4w@^rFq}IQ}lK&`f=8-
zQp;4G4pBaLm1in0zl&+j1$hb~FdKwXm@6x<>ZT=$t)F!L9^RCF4U}_#Y7>HhD!9$F
zAA^~+>t;C@426N~5)Zro!vg$GIEl3?jXG`4{zR3~hDffLl)N2`%WaI~EavZ$W0|$N
zy4<+%JuIYISEax!0ftHcpukwd=Z$$?34#}pJ)}EdvzlHKakZ@aR?b3ZlNW9og=*LB
zCDT!zuW$Xu*DHKXky{MPrfl|h$3c=rkc9MwauLcjBcMO+zaDm8%{rFP{RBbBIhbin
zM_1m$Kzvj_LxjE8?
zqsTjTVpFJ6l5J6mzy}!yyoh$Ew3(^Fl3V`h6d&zhm)x>)-!>`YMrU6p_oiZ0$gCQ3
z%jSLMkC_JXBHbr+@qR6k5u&L6tcm)6jO5S@u*wy8zUtJ}Z{@s!4c}f~tHYbhM@NRy
zm9p`KhIpW(n*7y|!*t{Utl*Ql0f~Qs<4{vMXKDNJ*iMmP04d(AhPGd^q-Z!9xsA6y
zYU*4eMGv52fcVZg3G7ySNq{d~V=4J0Z}>UJ^JF`Ww7z12-oO_2uzoEr#_%>_@D8^U
zfS(9IEh`aNHecrm`fdCMRhUWSiKubB+?M^TY|N?uW=oxrFl56c)*?87w}t9ea@v~x
z`8;=^P+D!@*LL9}0uz@IhnIF>pL+lKvMBgb?O^jD8%!?RS=aK@z`t)s{N(S
z<%fkzXlav%udl1#Fno9S@?sk<`ZG}AVpCW2iAr7r7bJM@h*I1($SG?1r9qnogV9o-10nx~)`WgA=VeFncSR7wkuG*4pqo-OD@
zPh=tW5(K>EQH(y{s7YTsBC9tWbM%xe=EO|Xx3Rpvg%7Hlr{w$WZ`w5NjCN%@@MsAz
zks7JUZFDZBD%CGMdLY|rA~mtf1)mJ_S=$8Xzc>&^7K!|7fZJezS0|0Tv>72~uQ)io
zS$cn$uI_7CJPU@NAk{5bp$i*gj(~Y?1lM`T5PX0g9X0Nu4*)Huh8#G;I!Pr$T|HQM
z=mP6T*9G!kS0N>HCqO-;Jufz9LAp>RMMm+Jwatf3*EZFG+~sD2SoM^J{JtZ%jRva{
zFuZ^XsnNkz-ZnvkO3}K+?^a)5$glMtY|7mZz<6j>W3~_Szt}SqP3mGk@vr=FZx!e*
zBL9dWk#CScR0webUsNG9f-cd9+pH-j{*UZyQ(I#-+Ejk>#@+?EM5Jf7(D?z34@vObl%q8-TUY6Rde=r(7O_rXtSEbR1CWYUV=EEWws@kw^S@V5FIj1<%4>K
z1{wO4`*yarWdca`f~gPKwR;&}J#dgC)-I4a#qp&mmHqhAcG7aR7E~y^Dku+DhE=30
ztqqvC{coo>aHhXq>u`HEwp{&);DR|(KY6pH65{v&Uce_NapX*JY0HreR?1j)6;T+0
z>^pB=HIsYlQ&qTvr3*rF#}$DNX{<$9Bwx0ne-uipq}P#9VrAr8Z?4sg4osppp9eE5
zP1h7OzKp%Y;0&GGb%n;6D8kv2PXmn`zhB7}zZDU^
zF$@+G7)bye@a=5+@}YS{x$a%pIN*n$J!>`$
znE{p{g-ZPL;!p8!X)RFNBnhVwya|EP3r@`GTLBa%@@P-ID2V3aNy%!gpfhJ`mML86
z@OuT@Y-7ObP?ih?EkRnS``DtR;d^Ai#%-BZh
z!ZZdrq)#*4b)d;!Yh_A_guMVK0~_v6b6ZJB%CEyc0grPfSy{ffBY_k8^Kug@7sW#_$VCg5
zA>do}TRWVu70=fw=OJm4(Bv;BsGDkc*W=K#OOW+{i6y=euQ>T5+S9(lSCX3I#^gSb
zm?}YzNAT&9&XgB*fFh>uvubuGeK1KDt4qHMY9Vu?CN8Z>07EBS6hM$+vA#wD9!;w^
z*AA_jiwYkmtbvk6)C^=RC*Fc-`EvzJ*PbE(E-#070MCU0FW$=mf)J56b6#}M?b#5H
z9=KxYjIQEB|Pt8Vy45f7NXBe3&C%-|}%oJga6!I7gDQQ$oZ$H0<#iY7T
zu^p-^7#q`!{2xHF@4+v7X)~(fKLS`D9#^f|P5{B-z@M2(;g(JBa;cJH`7}=vGoYux
zIFW6;zi;)ex=xB3A6Z(|x%08Okm`fTixM@Zl)1hgR?_dz51+LzQY2na3gB_dW}6nF
zByG8E9Uw7}$>OrrNa^w0N3E%!>9E8~YavoL@!-kGlK;zfDEV$O2~L}?_a26a!9^k&
zN}gU`V@;MO3EXp243?P$ag$DIvf(W|8Mv%tGGO&GC+y7i9tP-5qMC3*b
z5G3&VmPoO|#;|6K;a*TcrHyOR(Rq1t>_wMIFuBZ3yMQjj#>1@U+omVxfBIP7#k17m
zZ6hp2D>S#3pGweT`+G<)jzg(e#v;O=gko%Qn#)
zn|7Y-kaD1?nAjz5z#!D?*5(KN<#;q6q(O)F`gU&>m*IbTeMI75yVv3O8csx<;Yq14
z>RdWhZbN0EtpRaPOXs#u<`w)@|_UHRve{tz4_|IxL6@McTz^K?>JD
zmb<#$M5v}(cowkeqQC{Ix?lkh9z_yxh>|uS*y-OfVWWQ%TJkK}&z>1+
zellP~`x8V|-FiF@c>b9k!B_a2MMr)zRjbgTCHod3ZCX?nF8G4FhMy#+2w}K>&p%d-
zGvzx!0-KutEA|wH+xFwfPB!$6??vn4iY#GkVcT17(vY0S%=rT!P2)y>!J{lf2@T}2-!@ro!2>VCE{fCx0oWI6vSb4wcvk@x$F3Fb{FNrK7Ur3>YPdIjj|ov^7(l=j+3a#7jWG7FeV{T+n}!
z#?AI0iXkc4XRXqdE%25NbZjRg`lB(ALY&;`T|nPPpj{e#0rIsbBm1U}7gW_)G%On5
zk)2^kIizd&zYJBEUQOp_dRtw9iF_eXtDZ^Am~3}vb?LKAlxM|Uqa(3ufSQsyvFUf=
zxn!O$4aUwrxF1{-?H0#P7S6nUO}Br7+KxLBf$~IbeeL4*VrPzzm#re_jk2sU!@J>w
zD?T2cTv4CdefQ@`dDa>bp7H10?&#T{MD&63zs|MAAj4q)rpDsiCkhI4eO{Ye_{ZuQ
z2~^2Uivt#%*hv1~KB{Mt*@i4x$56DR9|ihCPc=v!OTxO;@iD`*uc6{m83DLCfzd~w
z^)%FFo)&_@`&AgDMBDrED2eg}MjoQwzFQTFd`kQ8cmNHk@G&SFt>z>E46
zoyfH-r?UN!+{_eB&}-5LXuJB%-a_R6MMA?F#{iY+wZ?GqyNl~15#f!0U?Bi}1MElF
z%HE{MbNXhsf0m5w4<2>^xoA&TH{vOm_LuT*6fDxgv7
zmw;mpDT5hZiYs`;7kIm->kSWEaukeQBuA6V&X^IZdO9Z06=I@*OYW0*hN8^&Y!t8o
zkR(RO9$j8G_iWC3b+lg@2S!$s_8}38jjDM@7N^b1^D9riMC*HXs11uDu{}l3BfwKn
zU|R_yn$e#|o7krNoT#fTvfiJ+px}b`$VJ
zKBu&$OtxKj3$4?HLXI`=iDW~93U72rF-r0$3@sW733-R;$aI!0?3xo8Cr|yQ;Jg|5
zB53foR?em(y1^l5#%|!`>hi{W5Y+IByM6<}+Qes%1HMY~7J=4{?^}(&fG!8FUDxaO
zFA#IVnyK)8t*xS$_-%(XUv22~vR)qhjmgbgN09$^EUwDG|55}5YRvq;LnE9Zj0Y}q
zmNWW*!+N=?rc30>suf_R9)_SdbHJ`TA2MqFCbl@+{gC*SnQ3j+arWJ~ZS~?@NvP*J
zkt30hU7x3|tESWUo6}SnU$WE64+3E0>b+!UV>4~GdM=K-IKUbi05B;t>+`;Q{Cf15kMoQ53$f^s4GCL0nf_DADK}Ny+>d
zS%Zlea=vY5Tlcu-tCn&gJEe@iEueV{m0jsZl7Kklx8%60mH
zeIxZ_uZ4(bN7=bh7BXvHMf~RZz`2LtRRoHF={FHgRrw92KPaW_p#c-XVu??bHid!ahga?Hw`p2
zEvl-kYpd&Yt91y2As>BPS^z|wcVHKY8)&9Wa_ku5@BOXj%h_KJ<;No-CQ+>5mRja&
zPumd#_63Oc3a)C9fx!h1^rKIMG_&^STbvNiW6VK#jZkT@MrvQVy6QDCR(!>y#Lw;X
zb_I$s7Az$?i-wHnzs;*2&3Ugv!)^1$sftd>@3**Hy{vQMXMSB-x2d~DD_X!f)%ANq
z=F4_*T3uE-kAOlP2OAl2`7h8VEl$=xtRHo`EWzS
z;<^h3^>3wOg}uK7L5`u+nGm}e1~SyyFA2(pM^zJVA8E$`
z|20!U5!&U#b8w&nl=12Purok^3!A7b6sl9DY4<~(**+_9ba50|bZNmzHF$>?XO~n|
ztN~9gnw(o;f^Ab`8|jqe8WfTktqGWISyB#K>^-_iEHu-JEs?i+7hb8;Y8K|@524i6Dtv}Y5@9~gPW4}t?c
zC|T?#+B!xObwR(j9vE8Xif0H50;81M%DG{p&yW~vE_+TQ!wx6+&>le7(W?U>)T7%y
z_ofPs^z>-)O!7V^Ckd_?3K|-&#>Ck8|CQ?&7njqpO9HO__DSY|S`E~NLWwRqgo;~5
z3!Xkz4|x$OHX)4C%&)l;j~TH`cDM3NxvFlQa$VpAk68F%Q8exgY1C@ZzLsJo7%tXm
z8?z^+_;Cmy^2M}L8&ycOks_Ej5ol?CwDL?*1Nx-G7voAi<`0jXp^w92_xO-5bE@XQ
zSHYAo14st~YG#H0Qw0&gw#Y8WoH?Gm$>|yr?Ci{27<%^GiiC0+3*1uHFFKlW_7YdM
z0&Hsk*lXj=Pkz`9`f1CI8fB9Sl(R{`1%=q>evd#4Qt23g-DT8?Q+AI;L`{Zc}jwg$R^Ym
zEdI$9S(!x;gMqR-fhu!UaCHjX92mT^QnJL0H?7oOXKAB86u>F%)H9ZdQ|WiQ$jHbL
zo1G>})Ehhf!!l)a5qSaSaf%3C63ii~*q
zb@g`dam`c5alj2&VWxJ+WTy}6FYrqYKzFU{X4BL_M^&zC|H~3&+cqv3x|6*H9d5`4~x+)cYP0emsviD8}NQB3$jp%vvM6ar&$zrhv;yOS-wp8><=@DT|y
z#oL%Kt1a6A85mp+jl`fxdt@k)nzB>_RALnZ7)OFQtwLs28Y$(37+YUzOc2I8Km`J1}#u5`F;W;8OzETS>|-8oFgSU^&OxPW6A{OqH*|x2e*S2`@`QaJEROFciIo-->;Qnbf$%RPfR%fs|IxezU6r7
zy*j6wTFJqFu-=BtlB`f-lseW&8eo#Z-6N`M(fxIp)D8WrMEKc1=#?4079bN^87w=I
zOU^~#75nn-MM4oPX##P2DaTZ^bo#l1I?_^yEcyJJ2f?1T!hYb
z2@YTgOYa7aMQpcJa1%|V6>|Wu<4{}AN$)W(5W1`E4
z9|c=K4W8W?vHl75hW1KW7Z;%laKAi&uJo<2Xk~``U&~i;M5^rR*72;mi`u7mgrSN;
z`RpV#&CSi2hB1(DBt{@WVB<~o>msnrXBD|0$=Pm7$molkTT!8?O;@Yd+PWC7Zx{0~iYxy=ZK
zbIL?plt0$+|CwgC^Jc+FC$uI~&nkYI%6+JhA>PUJw$9mq
zVjsC)Sc}w*dVa)$ZVxk1jwY)<-azj8u-G>7k`v(lAb2ndp?s!D1crh6s&`M_|2TgM
zQmG<%io6rCR;bp3nWzXs|2+WVb}*OqGs#G3fH_!B6d(Ya*^=N=`lmz*y+8)^3QE&W
z^D6@L0RL?wUk@;Nv)?lxaRL-Q9%(zEqli3iSdo8y%w;_k9wyAjCr&9w?l=mq1s-pb
zEN%AF>}`22E3MX8eD$dP=U<5((ax_S(iBrPAXA`3log}5LIomtOK?d=_HfAS*jehz
zr~G?Q&~Cdx`MMYWlDNiM>U6q}JUk4I$r!`ijCIKVL)ykwP|||~0~=Lz?hj>vtb3Y!
z^=b(CD5H}6fU79rjMp;KdWVO?(G_8B&MIf;a`j+aLpn}~3{-~NRRFh{e06HmdFr>N
z{4)_L9)L^+f!Y8W0@mok%pohAJnqN6%_6Glk1q6XVcPU#38Ijl%K%0!w@$JM0w>GV
zKzlA8J0N@=VTpwxku#`)qF2YySatPKMfUqQ;7|ivGQ+@-ThTu0*SGt9&4?1kfU^)j
zKnT|3TGUljUDiU&nMKQ(6|Dbm#t-x9^Eg$5bQ%corJnf*{b#$SYHC|753V_^S_G(r
zKPZ|j`X?;|7g-P`vB|No{JW%dm6!)7B{Wj?tt^LtX%rTmg0zG-S)%l;aSm0f-DhzQ
zvOY*iEboJhG8$ODbmq^&J~Sneioz0>mto+QNh}`Kdc({z)0V8wUQyRL_R;ol2D>>Q
z$vbG%Fv~nr*X-~jt7H*yxaIrB;XosjRh+<2rCiYE*=8jMzXw+-ew>3p`(Ob{IXPd}
z8}ewL7?zq1vg38n+l%;*4Y6A6A>`s
z1@f+DpBd1xm$XHy>pCN9R(U?Zn;jR;H*D#i#ry2ng$*0|Dv&ClRDpuXu0c@krg
zmxE;`yG-adftKFwI81bQVZr}exq9pX5a6)B!$XD5&Ce|^F7VAU;>9VQU?mR+22R9S
z@ZC*5P52*M4>n?Y#t}Hc7SCH+Q1p^v)5+S7FA_z$>Fpu643}p2g>LTz*U80j?HnzV
zFs5=}GEoKWY1Is>er#C+Y`&#a`>E6ym6-g#V%g=s2im8Hj4?3^rw5~7<7SOwsSMmq
zx*?L
zhU|+yeRX;kDV`;jrRdt8rIfQ#;{pNoD`a?iB&hq-@V1G4IE@iB5)e&p=^F^y_U$!-
zKmYQ-ln2y%USyfWyC^cn>YOQxjTdm{p8?`3M$EKn`MPL$Can{GtaL!9AQp|dC=N0L
zUH&8#>tivn)Kp^}ul|sJa53fvoZ{(GfEFf%@`E5eToxyh*VUEhpS=ZLT_AKX`;HYo
zhE~<}vSG2{&(VPz9ZtupZj2-h)~w|Cq4WA#Z
zp;&4`+)i)L&e!6s(9t*Ie(%pgrs|^qr9i7sflk0S0P6An#7%TUj}RFM(utNuxr_*p
zMh2U6;-Q*b^t~klT%aSNlBr*=J8PQ@@@nD-Kk@nri<0BDA7<}!Dul2(e@_FRu$ssn
zpJ=k4k(r3A%lhd27~p8<>)wQ(%HZw*Rg{0^aB#${ibT+|H|WY=2Z6!a7P;1_O+;(LOl^DXxBsA4gKT*wN&&GrO~)FIArqgd~U
z>r>sq&*ASD=z2E4P|L!~mA#{TD~IDmA4QYo73w@?JYFirQg?)+kJBYOzXfzT{gky{
zQ_GfOW7;UZc-YxqL{8hG)@V@%vgA_$~8h_uI2G
zd55>+F%C_c*nUAFu6jZcqo8i8i+HP6d-WNFfs-2pw%{3Lp%Mh3OMw&H2OfLjEqol0
zpG*7WrGx$c>+Cb9@4%qI+7R(y`-*B6X*SrCKPCf-8njNA@T_2E3Pn~k;GJHIZ8a~@
zKO(2N=~!pHSvH1Xe;BY>{B;t_
z1{`yNyVrFdG@wJfzrdX(MhfX{kHcvxWGsuc&2@DAS;Q@)zy}u&Zb*w6-xD@J59|_i
zy4HIYCVeNEUf$O}UOrb|S286qhK14i+FNujLL1!D^qDz74iW5Kx2aJ23JVz0PWm(0
zid7tn(A^lx0L>0^y1C`sQse=>FmeWH9MhXO_BrBpp5%9J$(5V1cbqCf
z(_6WAJWHlX3VJEkpWSA(+E>OS_@w{2NS^LDprn9JI28q!&6vQ+f-7EK4nzanGEVZa
zq{RK*4gjh|rB
zv;&e{p!oSBG;GIX9DpSFMhI9H%c+(1{5(8^#EvHmt2>Iku(~q@vI0hYpK^rX-vfJ}
z*W~Co67@>kFOB>~YG+cZC38j^7xNnW@1{O($?b-lW;
zk_0Ubx$--YSk<(SZk7O3UYxX3+j(5c5Q`Rl`kH`fNPDzNkEO{`sW)hiA3dw{i#6)q(7RhrCrgVR_R(~0
zSw-{gd$nBJi13KE@W7(>tY0|YwuTWmm`P@S$nGWNUMo^Y>5<{t?ToJ>KlgT$n^>f^wZQnu3;%QC5Fme~AvRV6@@U|P}J+x+b
z4g3>Vx&8S$bnj)M3a_}!KkaMjCOkq^79Z(VzOt!K)%`jYhHSZ~@vZlw$nt09jYq=J
z5H#)SrHh7NlM9vg?}*mL0KmTy;sCPZLI}y_{EtH<`lASR%n4}>WVZ=`Y4#g+bs!;e
z7w;>u`TuJJPCPA$bYcQyQ4_(9YRV
zb{@95%`+{G?A*73Yk}P|M#Xz=J7~u&cc+fe+@WWMxA}h)Lo+!7#GAINQC{kSqnPd~
zf-o5Aemk$u_PE6G&b?Ni_|NjT|3%M;HV^>Cax~$Sf3agrbR@#eo-hTi-3Cav?HIO?
zc}D0kB=#&ONOegbFUfglLq#Z9xMeX@;QDR&rCt@(bNAqy3KmPP3e{gb74y^zrPx`s
zR$ecn@y!niBO8a%MTwns@Ty!Lcz
zIMn_;9%_MCo*W1{sabQ{MpM#KTOBzHp!tKq(>WZy(s6It{>as`56r~WT*W4^1qC~79n(qJvuV?zwcjM!^~x0lf88J*NTJ+*
z5m?Ob-%84)8~5rtYW>(Y=6?0SefOlKM!qwu{JD4g{Lymz!YkwXzR-t4p{Jhps==m~
zTeZL_D1KK;sLG8d2^y?L|PD-tBJl?XdE0C{we)=
z9-1(b7gl*5``Vr(rhk4ka=z~gm_#C8
zR4`=f)IP4H0guL)et$d9py@`cj*qXvwPbTXJr^p)6rKKGvO5%{8f-
z?HA|YU=^~X$Y7(uXg{Hf7lco5lwRJ!RpdW2
zL|(*+v?zlVq+0Eu48eK96ci$Zo2hA=tVG@ZrgsXIM@<5SM5D?d>jy{vCSBS%2N=Rf
zRsZ@Pl&3FjV*mTg)S|1}1^=ZebJGLv_h*pqjPkCz<_#?&y_MF3fnXf!u+SAis
z18Teok2=+OifY-aQQcDeXhIg$#ab|UnU{o{_F`aR0x(*Eus-^wT%#hhEIBW(GIhmq
zi#F;@1jQ;37i%{PAO|bStqtML^Y2T{y>i3XJFwTri~5}>l2y2h*smD4^)<@(WbTUZ{WC44qMlRT
zX1Ui~-90}S+@`^L=H)ZKsizumPX}#F>jjLZ&22R0fiF6R-GZoVy*-)~9%N^IYZS)b
z<%#pN{c``UFe{d3D#+mM?J?wIs1Sdfw{NAzHnXH(<@D``1sxd)Ib`bz=%&|?
zDN#Wjlx?g0d^_XqAk-Z4GR(xIll>&mguXU2
zoruqGjrZM5y!I}3-1dU@%^b7}U3ckG7;^T6MF;!?_@Ay;E{8{FU!d7{E|r%;Nz{UW
ze#Z_cqPPYw-W83iXHiUCc60keQD&EkBsu5`i2eCaa~`y4KK>b!O>#RtTITBuep;e?
zF{*`Ti>~JfoY2$!N|#Q%$<=Fz-9wFC&Xe#5is-k9Zmw|iuy5wOUuRcqS8})Dmo)+a
zjbX?-JCcvXmsd#|q+!B*x;PS(+vl=%DJ15Y80J(tRkj3N^1GL2Vd`@mT$L#9r?vl^
z?+H_!T!g-y{ntfp{st(ea&krik_Rwzxe8b>^DPQCkGHOG>Z)jJ3beAy7>^#0{X)}}
z*`dyeitq?7$~2Bw-sB){fO)0CXOESLF?+YqQ&zsGQmCqKy
zWm$8O4{fuJCaCpP^O_yAUYYt~@|dDTIJ-
zJk&Q*;7?<_pDoz>FCjYUQC3{BJg?wvlmWtB9w5A3sRC$cV;j_DsJ`CUtu4NQ##4r-
zsa`YtpU2LyU0AD$Q(A4{u^Uh#(gh_xkXvO7?cj-6m!`%jgG*nzhpO2!yZSmp_b*Y)
z;$%@$-S~+vfed@k%@^Af5jZ-QvF0N!fJIR|*>3ygV|3of5gIB~3+aJ8Xpf^Y-}lRUPFOswy|iF;&nT88!EgKO*xw
z4Bb;tr5Y|zBc6?^-&ymFkR_J!_apgJ098-
zLuvGF2HJ*p#a2v%=m$&|Yxsx9C1q^RbLxK3uOxW#Fg+ZXKE_83)K~
zNaGMb`x#PeFg`CZ86Cl+CW_M#lu%-PLjXKOCG#`8l68xK4P1Vp1e?b?1tU13{}4yf
z_nSV?ubWBbL|V94JZLpZKHVzH)4XE2V_@XTs`_&i3ROXWQh_I7m(8+l6Lrttl4M~>
z4gUT)mA`ti?#kR|kF#?Ucu1Li!D~$$$1YAts8#(Q?&?aLj
zpsc;u+KJ0txn&^&i(@b*s@gUz$zOeL@WJ_3Iq*k^&M^0)t)+%m=2}IVxr?}ddPMPa
zyE*>c9nGKSUbaFc)hV-^D&aJvkK|z0>=>Q0St0T2d1`#0E2_#QXWM)U`s|sc$9=d0jxqM7eAb}KW*IO{y%T0vjdNOQWGfs?{amm4Pz|=k(d3fR)X*kCD-THJ
z66`X?G9U;*Dq>w@mRbcFFSNgX3{iPYY#9*oK3~zgsU;#;9u)>>#~F#r@3lXxvw4(<
zhPY*B%%^LretYa2!pi#iSkdMIq_B+dUkd6He8i2H{%SxFHev-N(L%RN(k-`fT^0rD
zjvaUm&;K}j-?xJlTx6Ii$_YkpQxHHar3ZpKtDzwtmuiw21Ay1akupGp-BoLOqj};=
zwnUvE?88G`WC#zoCDIMPe})G&qU@*wY9r4{`DCMD`nQpRkIhTuY&A*RX@kW@zP+e@
z79y7c9lddb*&31M#cg1WV=1ar#I2;a_qMHNxRquKo=Km>zEhWk{(J`)_*IQdEI!j8LYRVfjCTuEf_vnYphlc54dwGtO
zN9F2_w<~cr5fEiQZZ5lsSCnnPNAMeegUu2*Njkvs)*ewVzbtU@99#-zDzQjvvYcGY
z6nEVxJXPWiOPC0CdG#QJ{sV_)fk(ArHFnxijgaa-B>cC4(72k};5n;c2!QN^vE2f;dQuNII&T1y>*~
zxf3>NXZ$E`qIDHExzunZ=z;+?9|CExJq2KCn)X_3=>J~cJzuwRXfI!nJ1t;ri~%US
zfq|VdAJE@oVtV=dGH3F#t6T9+P6!SUGbl)Z0TqnZq!TL~t2@Sy`gbgTw`ug
zwbG^0)5OIa!iZ|(vKrKJFq$Z9e|F=?kwJ41m0Y
zootFp7W8W~uZvALS&x+qJ)g<}(M(nQhYpk^Bt#?>MEfT?jt+ClVE<(30X^bJiy#LN
z5Bgk_7b}xl-aXrL&FW3huU3qW;V6wk%vPcoxWHSjLK?xZTBz=3V};RpK8pqCZyzbg
z53bCtOBJRE-Ga?iFp-@CC_`9DvaAmLG|N{6JLKgUcP_>w5z?w)m%O+
z$21z#KU`~N`1a6`5kN4~z^a?fRC>$`eKd~T*)peYO*GjomjMyRU@Vqp+~krb6g&R8
zoyT7+zowHVYl#HvV_vHaj-sJjTBi5)A#r>^etw`>ZnEt;{R{9yhK4KHJ8plNt)B~F
zz|}W2tQti}KPbo%k^SK#y5t@HZnDwtzxdpRL{C5BrRM3Fq)g92;P~LS(8$SE$8_pU
z?os*6a#LBT?nB{|LAz#)oxa84%(T|#o(GfYW&V&SuoU^SG0iHqQ*8^#O4(sf6R$MA
z`&jT$XBF2bmrLS3@67eK_*DH{dnxHA%oHRlHCqJ*?FAPjSoNE4{MGtW;LeJRB%$N#5Sx(6`Stn1S8yNb=*Zr>lF(s)
z^n-qycc>H?f?cR3s5K=-pFyOB+pk3u<)x|Q8nRsTi7=2zOC{i3=}_MvH4Z!na&Nr8
zW_d1@Y^z7_S9{S5dRaGy?AVm#4yMzJs!3PVf~sT0Vy$fm+vq*Fbw%?P0BL}TfI_>isTu;_p|=a6JXJjZ)e@r=m*rE
z4#B;8(qGBx^L#(J?s5KYs72nb7bAGQ}t;3v-BaNl0@)%PtPf
z$S$z5@Q7=M>$1?*PE9J8Y9(e0D^J>%Nv5*kdHz%You{m&7>^Gw-nr5vc~_ToMG4QC
ztkcmv{KkopQ(e%xi|?TXdp-#JAdf*LB}Hz1Q|
zfn6bmx#_Rg
z7u-P%-0%7k5fQWbc6QvO64LR%b*!~8c$zFoz1g2z?&*@$XB~o$cADxaBkG5uIfK74
zjg;!i{-(+Xm+ms`l
zB@Oc3(!=*^7RQYwERTHG^MBreCNGz!8`3|3A#Y^x1
zJ<+Jtj!9OaPus@T+P2if#nm#MVs6$GW^P^M{E{4#h7r^s`R43=VrRk)L4%C<7|o12496ELoxFUH91NQ>jHtQht~~8iYR_^
z6MHm^E_Dy%KK!AyqXxd%x?Xd}$%d3*>zIn-vTrg+DQcNXXtL3@_Ge6eeOJr0y=?lX
zsJ(2j;xf%0<;1i|?J2d|z4N#{;qr`_v?`;5sY0>5&G&Rd#u;Q6Rmc7+1>*$PgFoJL
zXt|TBt4!N9w;M;3eTeCiE~n42`#?KCkAdY|$dHB6Q$Ws63zrk)|W_
z5`qoD<9?zukdX-EuMf=#;fMPq?cUsifqsRFiHY&{>Y#b0AE^`ys)X3%U;|re-lX?e
zIdOK2uAkzviK_xeo`&?gJ`L{3G2xf}C~R~JtSQx29+|KtOaiU(pSj8HT{l6KK|^xQ
z>lGC+pL1vWMcn(y@X!r&o+{pzb`aCSJFYp~0FMMC`^Zy-atyrquy2Pw^zC&R_*2XR
zCrUy=)v0WeO=~@go
z{nyE^nd~^3nclV=Pj2Vb3A_m=?gb83%7@zrv(Vs|*EeDw{STW4p8uN}L+0@`exudR7;I#)Px^F8MuU?fHcbZbBn+h8}ao0qEp%70ewGC;FjAB)Rbn_l(Z
z@2#uq7HT`x@OO7|b&oYicOmP2)uC=RsX0YZQo9P$FF!2CcN^&_YN8z#b$?mOu=hZy
zwVK-F4nI|M9;PtiM{Td*<33xMwqnmAB&j*e+iGs9yA5*L^{(_)LC@x~_CusC)F<9A
zwHHZDPdg{;VR;F5oE@ac@~@xlZ|If$L5H*cS1itRxF(-^uTYc0P0xAVcwOIIr6q~e
zzzaM$CV}$vVYJxv3=Fm;;1GU;Jsy*4gPtmheNv)wP}#43Gu@;v^&K-^mZUBVtJ>^f
zAStW7OrLbzs#S1B5GPijj%<%xl2kG;Et9u|LZ!iM_}Y)tsJU{f55ve^PkX2)DF+bi
z7#fnZp31q(H&S>veA*Nf;?~jcg0l59xHug#+IWmUnCcyR;u|Km`xa=f%?^n)>t*et
zMincwBdUa5XDgP~YB@)~o`}x+#%1bGo30F2Z`6v$rvWxc9?nww%ggKZaB&j&iE>Sa
zNQzJI8qUMR$66LNir_xsOVnswU0u}|hHY#Vu(ucn-x4)it+|}sF74b7?9AONJ2)Ge
zLYs3Bi38|t{U%8ROoW7>ODUis>26Y>v+KTFn|wxcE@2Td~;#({Z82
zPK?}-aTLE53F=N15hdSw4mJ*{0zKsZ{C(H@`=(+EyOHEinqdj`QSWvhZRcmB;5bCp
zf^_`d#$uIoSsX!y1&^A0Rlc
zlrlI46sg>{a!twik@bs5(k=pajQioVKFZ}w
zv6qX&jnP+dB(Iy6r5Wr)#SW0Wj>wa8*eC?{XyTKSR1y+Z6Oxh`emhp_r>n5wNf*h@
zPC__Faa2h0yZH*Ja~0x=O@_IecG#p1)?cxhOI6J|WF`H4SjbSc4!@BJT$|j<`I71g
zr0&6*h~!z`PtQ4A_L|nV|00zruw;2&q*DqiVkkgyFI?$=g3`Nm#;)R~qx3;Fie?<3
zl`9(DUPN>YoES1$+oXJWadDeJ7^etP&n;%YWS3c=^Dy*0v=oOy@*5MrEoq0t=Yt81
z(1`Pz#gpkiHOB3OvHI4_5KMM%jyDEhO>=(Lb`Xt{sGBFzhWb=y!X`51EE3DaORhW=GqGQQwPc+6LI;B