Olav63/outils_OSM
2
1
Fork 2
Code Issues 2 Pull Requests Projects Releases Wiki Activity

déplacement de la méthode de nettoyage json avec les méthodes de sauvegarde

Browse Source
This commit is contained in:
SebF 2021-10-09 20:47:09 +02:00
parent bcb9b7e9b2
commit 85eb60333a
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
osm_vc63/save.py
View File

@ -46,3 +46,45 @@ class Save:
jsonFile.close()
print("Sauvegarde résultat format JSON/OSM " + nom_req)
def nettoyage_json_pour_umap(self, data, overpass_query_fields):
"""Sélection uniquement des champs export_json == oui"""
export_json = {
"version": data["version"],
"generator": data["generator"] + " and ETALAB API",
"osm3s": data["osm3s"],
"elements": [],
}
index_line = 0
for element in data["elements"]:
export_json["elements"].append(
{"type": element["type"], "id": element["id"]}
)
# positionnement des éléments
if element["type"] == "node": # noeuds
export_json["elements"][index_line]["lat"] = element["lat"]
export_json["elements"][index_line]["lon"] = element["lon"]
else: # ways et relations
export_json["elements"][index_line]["center"] = element["center"]
export_json["elements"][index_line]["nodes"] = element["nodes"]
# filtrage des tags
description = ""
for tag in overpass_query_fields.keys():
if overpass_query_fields[tag]["export_json"] == "Oui":
if tag in element["tags"]:
if overpass_query_fields[tag]["FR"] != "":
description = (
description + overpass_query_fields[tag]["FR"] + " : "
)
description = description + str(element["tags"][tag]) + "\n"
export_json["elements"][index_line]["tags"] = {"description": description}
index_line = index_line + 1
return export_json

37
recup_donnees_OSM_Overpass.py
View File

@ -70,41 +70,6 @@ trad_bicycle_parking = {
"handlebar_holder": "Accroche-guidons"}
def nettoyage_json_pour_umap(data, overpass_query_fields):
export_json = {"version": data["version"],
"generator" : data["generator"] + " and ETALAB API",
"osm3s" : data["osm3s"],
"elements": []
}
index_line = 0
for element in data["elements"]:
export_json["elements"].append({"type" : element["type"],
"id" : element["id"]})
# positionnement des éléments
if (element["type"] == "node") : # noeuds
export_json["elements"][index_line]["lat"] = element["lat"]
export_json["elements"][index_line]["lon"] = element["lon"]
else : # ways et relations
export_json["elements"][index_line]["center"] = element["center"]
export_json["elements"][index_line]["nodes"] = element["nodes"]
# filtrage des tags
description = ""
for tag in overpass_query_fields.keys() :
if overpass_query_fields[tag]["export_json"] == "Oui" :
if tag in element["tags"] :
if overpass_query_fields[tag]["FR"] != "" :
description = description + overpass_query_fields[tag]["FR"] + " : "
description = description + str(element["tags"][tag]) + "\n"
export_json["elements"][index_line]["tags"] = {"description": description}
index_line = index_line + 1
return export_json
def run_overpass_query(critere, aire_de_recherche) :
@ -196,7 +161,7 @@ def executer_requete_et_exporter_resultats(nom_req, critere, aire_de_recherche,
print()
"""
export_json = nettoyage_json_pour_umap(data, overpass_query_fields)
export_json = Save().nettoyage_json_pour_umap(data, overpass_query_fields)
# Sauvegarde
os.makedirs(dossier_sauvegarde, exist_ok = True)