Fix cities.json generation - Remove canton from cities' names

stefanzweifel · Jun 21, 2024 · e43a658 · e43a658
1 parent a8b2518
commit e43a658
Show file tree

Hide file tree

Showing 3 changed files with 622 additions and 484 deletions.
diff --git a/src/Console/UpdateZipcodeDatasetCommand.php b/src/Console/UpdateZipcodeDatasetCommand.php
@@ -15,6 +15,8 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Wnx\SwissCantons\Canton;
+use Wnx\SwissCantons\Cantons;
 use ZipArchive;
 
 class UpdateZipcodeDatasetCommand extends Command
@@ -129,6 +131,8 @@ protected function generateZipcodesFiles(TabularDataReader $records): void
     {
         $data = [];
 
+        $cantonsAbbreviations = array_map(fn (Canton $canton) => $canton->getAbbreviation(), (new Cantons())->getAll());
+
         foreach ($records as $zipcodeRecord) {
             $city = $zipcodeRecord['Ortschaftsname'];
             $zipcode = (int)$zipcodeRecord['PLZ'];
@@ -138,6 +142,12 @@ protected function generateZipcodesFiles(TabularDataReader $records): void
                 continue;
             }
 
+            if (preg_match('/ ([A-Z]{2})$/', $city, $matches)) {
+                if (in_array($matches[1], $cantonsAbbreviations)) {
+                    $city = substr($city, 0, -3);
+                }
+            }
+
             $data[] = [
                 'city' => $city,
                 'zipcode' => $zipcode,