Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-09 01:09:51 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch '250-fix-import-postal-codes' into 'master'

Browse Source 
Resolve "Import postal codes"

Closes #250

See merge request Chill-Projet/chill-bundles!672
This commit is contained in:
LenaertsJ 2024-04-12 10:54:15 +00:00
commit b577bd7123
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/unreleased/Fixed-20240411-164104.yaml Normal file
View File

@ -0,0 +1,5 @@
kind: Fixed
body: 'Postal codes import : fix the source URL and the keys to handle each record'
time: 2024-04-11T16:41:04.786062252+02:00
custom:
Issue: "250"

16
src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
View File

@ -23,7 +23,7 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
*/ */
class PostalCodeFRFromOpenData class PostalCodeFRFromOpenData
{ {
private const CSV = 'https://datanova.laposte.fr/data-fair/api/v1/datasets/laposte-hexasmal/data-files/019HexaSmal.csv'; private const CSV = 'https://datanova.laposte.fr/data-fair/api/v1/datasets/laposte-hexasmal/metadata-attachments/base-officielle-codes-postaux.csv';
public function __construct(private readonly PostalCodeBaseImporter $baseImporter, private readonly HttpClientInterface $client, private readonly LoggerInterface $logger) public function __construct(private readonly PostalCodeBaseImporter $baseImporter, private readonly HttpClientInterface $client, private readonly LoggerInterface $logger)
{ {
@ -50,7 +50,7 @@ class PostalCodeFRFromOpenData
fseek($tmpfile, 0); fseek($tmpfile, 0);
$csv = Reader::createFromStream($tmpfile); $csv = Reader::createFromStream($tmpfile);
$csv->setDelimiter(';'); $csv->setDelimiter(',');
$csv->setHeaderOffset(0); $csv->setHeaderOffset(0);
foreach ($csv as $offset => $record) { foreach ($csv as $offset => $record) {
@ -65,23 +65,23 @@ class PostalCodeFRFromOpenData
private function handleRecord(array $record): void private function handleRecord(array $record): void
{ {
if ('' !== trim($record['coordonnees_geographiques'] ?? $record['coordonnees_gps'])) { if ('' !== trim((string) $record['_geopoint'])) {
[$lat, $lon] = array_map(static fn ($el) => (float) trim($el), explode(',', $record['coordonnees_geographiques'] ?? $record['coordonnees_gps'])); [$lat, $lon] = array_map(static fn ($el) => (float) trim($el), explode(',', (string) $record['_geopoint']));
} else { } else {
$lat = $lon = 0.0; $lat = $lon = 0.0;
} }
$ref = trim((string) $record['Code_commune_INSEE']); $ref = trim((string) $record['code_commune_insee']);
if (str_starts_with($ref, '987')) { if (str_starts_with($ref, '987')) {
// some differences in French Polynesia // some differences in French Polynesia
$ref .= '.'.trim((string) $record['Libellé_d_acheminement']); $ref .= '.'.trim((string) $record['libelle_d_acheminement']);
} }
$this->baseImporter->importCode( $this->baseImporter->importCode(
'FR', 'FR',
trim((string) $record['Libellé_d_acheminement']), trim((string) $record['libelle_d_acheminement']),
trim((string) $record['Code_postal']), trim((string) $record['code_postal']),
$ref, $ref,
'INSEE', 'INSEE',
$lat, $lat,