From dcb4342e4766a8cedc595120ac51962c7eb1485d Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Thu, 11 Dec 2025 18:40:46 +0100 Subject: [PATCH 1/4] Translations update from Hosted Weblate (#2652) From 57ce49f1e8ca8cd107a0f0d35dad4c7e2a5365c1 Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Thu, 11 Dec 2025 18:40:46 +0100 Subject: [PATCH 2/4] Translations update from Hosted Weblate (#2652) From 498401be85ed43d63e81e1951417b8b358b3faab Mon Sep 17 00:00:00 2001 From: trouyer Date: Sun, 21 Dec 2025 11:19:36 +0100 Subject: [PATCH 3/4] fix normalizedHours for defibrillators FR analyser --- analysers/analyser_merge_defibrillators_FR.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/analysers/analyser_merge_defibrillators_FR.py b/analysers/analyser_merge_defibrillators_FR.py index 29432f3ff..7c260c015 100644 --- a/analysers/analyser_merge_defibrillators_FR.py +++ b/analysers/analyser_merge_defibrillators_FR.py @@ -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 From 4487c6353997e54de1ebc0b3dd6765c5a19366e3 Mon Sep 17 00:00:00 2001 From: trouyer Date: Sun, 21 Dec 2025 13:00:57 +0100 Subject: [PATCH 4/4] fix coordinates parsing --- analysers/analyser_merge_defibrillators_FR.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/analysers/analyser_merge_defibrillators_FR.py b/analysers/analyser_merge_defibrillators_FR.py index 7c260c015..c15564ae9 100644 --- a/analysers/analyser_merge_defibrillators_FR.py +++ b/analysers/analyser_merge_defibrillators_FR.py @@ -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( @@ -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"]) }, @@ -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, [