Merge branch 'main' into scheduled-update

stefanzweifel · May 26, 2024 · 9da7a20 · 9da7a20
2 parents 28b14bd + f9d7d50
commit 9da7a20
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/Console/UpdateZipcodeDatasetCommand.php b/src/Console/UpdateZipcodeDatasetCommand.php
@@ -75,7 +75,7 @@ protected function fetchDataset(): void
 
         // Open the destination file for writing in binary mode
         $fileHandler = fopen('/tmp/dataset.zip', 'wb');
-        if (!$fileHandler) {
+        if (! $fileHandler) {
             throw new RuntimeException("Failed to open file for writing: '/tmp/dataset.zip'");
         }
 
@@ -100,7 +100,7 @@ protected function fetchDataset(): void
         foreach ($iterator as $file) {
             if ($file->isFile() && pathinfo($file->getPathname(), PATHINFO_EXTENSION) === 'csv') {
                 $destinationFile = self::PATH_TO_CSV;
-                if (!rename($file->getPathname(), $destinationFile)) {
+                if (! rename($file->getPathname(), $destinationFile)) {
                     // Handle potential errors during move operation
                     throw new \Exception("Error moving file: " . $file->getPathname());
                 }
@@ -130,10 +130,18 @@ protected function generateZipcodesFiles(TabularDataReader $records): void
         $data = [];
 
         foreach ($records as $zipcodeRecord) {
+            $city = $zipcodeRecord['Ortschaftsname'];
+            $zipcode = (int)$zipcodeRecord['PLZ'];
+            $canton = $zipcodeRecord['Kantonskürzel'];
+
+            if ($this->shouldRecordBeIgnored($city, $zipcode, $canton)) {
+                continue;
+            }
+
             $data[] = [
-                'city' => $zipcodeRecord['Ortschaftsname'],
-                'zipcode' => (int) $zipcodeRecord['PLZ'],
-                'canton' => $zipcodeRecord['Kantonskürzel'],
+                'city' => $city,
+                'zipcode' => $zipcode,
+                'canton' => $canton,
             ];
         }
 
@@ -145,4 +153,13 @@ protected function cleanup(): void
         unlink('/tmp/dataset.zip');
         unlink(self::PATH_TO_CSV);
     }
+
+    protected function shouldRecordBeIgnored(string $city, int $zipcode, string $canton): bool
+    {
+        if ($zipcode === 1290 && $city === 'Versoix' && $canton === 'VD') {
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/src/data/cities.json b/src/data/cities.json
@@ -23604,11 +23604,6 @@
         "zipcode": 1274,
         "canton": "VD"
     },
-    {
-        "city": "Versoix",
-        "zipcode": 1290,
-        "canton": "VD"
-    },
     {
         "city": "Mies",
         "zipcode": 1295,