Skip to content

fix defibrillators FR analyser #2657

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
frodrigo merged 4 commits into from
Jan 18, 2026
Merged

fix defibrillators FR analyser #2657

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcb4342
Translations update from Hosted Weblate (#2652)
weblate Dec 11, 2025
57ce49f
Translations update from Hosted Weblate (#2652)
weblate Dec 11, 2025
498401b
fix normalizedHours for defibrillators FR analyser
trouyer Dec 21, 2025
4487c63
fix coordinates parsing
trouyer Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions analysers/analyser_merge_defibrillators_FR.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ def normalizeEtage(self, etg):
else:
return None

def normalizeHours(self, jours, heures):
if jours == "{7j/7}" and heures == "{24h/24}":
def normalizeHours(self, days, hours):
if "7j/7" in days and "24h/24" in hours:
return "24/7"
else:
return None
Expand All @@ -74,7 +74,7 @@ def __init__(self, config, logger = None):
attribution="Ministère de la Santé",
dataset="61556e1e9d6adb2df86eb0fc",
resource="86ea48a0-dd94-4a23-b71c-80d3041d7db2")),
Load_XY("geom_x", "geom_y",
Load_XY("c_long_coor1", "c_lat_coor1",
select = {"c_etat_fonct": "En fonctionnement", "c_doublon": "false"}),
Conflate(
select = Select(
Expand All @@ -87,7 +87,7 @@ def __init__(self, config, logger = None):
mapping1 = {
"ref:FR:GeoDAE": "c_gid",
"indoor": lambda res: "yes" if res["c_acc"] == "Intérieur" else "no" if res["c_acc"] == "Extérieur" else None,
"access": lambda res: "yes" if res["c_acc_lib"] == "t" else "permissive" if res["c_acc_lib"] == "f" else None,
"access": lambda res: "yes" if res["c_acc_lib"] else "permissive",
"level": lambda res: self.normalizeEtage(res["c_acc_etg"]),
"opening_hours": lambda res: self.normalizeHours(res["c_disp_j"], res["c_disp_h"])
},
Expand All @@ -97,8 +97,8 @@ def __init__(self, config, logger = None):
"source": lambda res: ("Direction Générale de la Santé - " + res["c__edit_datemaj"].split(" ")[0]),
"defibrillator:location": lambda res: res["c_acc_complt"] if "c_acc_complt" in res else reaccentue.reaccentue(res["c_nom"]) if res["c_nom"] else None,
"start_date": "c_date_instal",
"security_desk": lambda res: "yes" if res["c_acc_pcsec"] == "t" else "no" if res["c_acc_pcsec"] == "f" else None,
"reception_desk": lambda res: "yes" if res["c_acc_acc"] == "t" else "no" if res["c_acc_acc"] == "f" else None,
"security_desk": lambda res: "yes" if res["c_acc_pcsec"] else "no",
"reception_desk": lambda res: "yes" if res["c_acc_acc"] else "no",
"operator:ref:FR:SIREN": lambda res: res["c_expt_siren"] if "c_expt_siren" in res else None
},
text = lambda tags, fields: {"en": " - ".join(filter(lambda x: x, [
Expand Down
Loading