DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10927 from mfo/US/renormalize_department_code_and_name

Browse source 
amelioration ETQ tech, je souhaite que les composants d'adresses soient normalisés en anglais
This commit is contained in:
mfo 2024-10-15 07:49:16 +00:00 • committed by GitHub
commit e7080c1ad1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 35 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
app/services/api_geo_service.rb
View file

@ -140,7 +140,7 @@ class APIGeoService
postal_code = address[:code_postal]
city_name_fallback = address[:commune]
city_code = address[:code_insee]
departement_code, region_code = if postal_code.present? && city_code.present?
department_code, region_code = if postal_code.present? && city_code.present?
commune = communes_by_postal_code(postal_code).find { _1[:code] == city_code }
if commune.present?
[commune[:departement_code], commune[:region_code]]
@ -149,15 +149,18 @@ class APIGeoService
end
end
department_name = departement_name(department_code)
{
street_number: address[:numero_voie],
street_name: address[:libelle_voie],
street_address: address[:libelle_voie].present? ? [address[:numero_voie], address[:type_voie], address[:libelle_voie]].compact.join(' ') : nil,
postal_code: postal_code.presence || '',
city_name: safely_normalize_city_name(departement_code, city_code, city_name_fallback),
city_name: safely_normalize_city_name(department_code, city_code, city_name_fallback),
city_code: city_code.presence || '',
departement_code:,
departement_name: departement_name(departement_code),
departement_code: department_code,
department_code:,
departement_name: department_name,
department_name:,
region_code:,
region_name: region_name(region_code)
}
@ -167,7 +170,7 @@ class APIGeoService
postal_code = address[:postalCode]
city_name_fallback = address[:cityName]
city_code = address[:cityCode]
departement_code, region_code = if postal_code.present? && city_code.present?
department_code, region_code = if postal_code.present? && city_code.present?
commune = communes_by_postal_code(postal_code).find { _1[:code] == city_code }
if commune.present?
[commune[:departement_code], commune[:region_code]]
@ -175,16 +178,19 @@ class APIGeoService
[]
end
end
department_name = departement_name(department_code)
{
street_number: address[:streetNumber],
street_name: address[:streetName],
street_address: address[:streetAddress],
postal_code: postal_code.presence || '',
city_name: safely_normalize_city_name(departement_code, city_code, city_name_fallback),
city_name: safely_normalize_city_name(department_code, city_code, city_name_fallback),
city_code: city_code.presence || '',
departement_code:,
departement_name: departement_name(departement_code),
departement_code: department_code,
department_code:,
departement_name: department_name,
department_name:,
region_code:,
region_name: region_name(region_code)
}
@ -194,7 +200,7 @@ class APIGeoService
postal_code = etablissement.code_postal
city_name_fallback = etablissement.localite.presence || ''
city_code = etablissement.code_insee_localite
departement_code, region_code = if postal_code.present? && city_code.present?
department_code, region_code = if postal_code.present? && city_code.present?
commune = communes_by_postal_code(postal_code).find { _1[:code] == city_code }
if commune.present?
[commune[:departement_code], commune[:region_code]]
@ -203,15 +209,19 @@ class APIGeoService
end
end
department_name = departement_name(department_code)
{
street_number: etablissement.numero_voie,
street_name: etablissement.nom_voie,
street_address: etablissement.nom_voie.present? ? [etablissement.numero_voie, etablissement.type_voie, etablissement.nom_voie].compact.join(' ') : nil,
postal_code: postal_code.presence || '',
city_name: safely_normalize_city_name(departement_code, city_code, city_name_fallback),
city_name: safely_normalize_city_name(department_code, city_code, city_name_fallback),
city_code: city_code.presence || '',
departement_code:,
departement_name: departement_name(departement_code),
departement_code: department_code,
department_code:,
departement_name: department_name,
department_name:,
region_code:,
region_name: region_name(region_code)
}