Update Geo6.php

Enable `withLocale()`
geo6 · May 11, 2018 · a6bb55c · a6bb55c
1 parent 1f225e5
commit a6bb55c
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/Geo6.php b/Geo6.php
@@ -83,6 +83,11 @@ public function geocodeQuery(GeocodeQuery $query): Collection
             throw new InvalidArgument('Address, Street Name, and Locality (or Postal Code) cannot be empty.');
         }
 
+        $language = '';
+        if (!is_null($query->getLocale()) && preg_match('/^(fr|nl).*$/', $query->getLocale(), $matches) === 1) {
+            $language = $matches[1];
+        }
+
         $url = sprintf($this->getGeocodeEndpointUrl(), urlencode($postalCode ?? $locality), urlencode($streetName), urlencode($streetNumber));
         $json = $this->executeQuery($url);
 
@@ -98,16 +103,24 @@ public function geocodeQuery(GeocodeQuery $query): Collection
             foreach ($feature->properties->components as $component) {
                 switch ($component->type) {
                     case 'municipality':
-                        $municipality = $component->name_fr ?? $component->name_nl;
+                        if ($language === 'nl') {
+                            $municipality = $component->name_nl ?? $component->name_fr;
+                        } else {
+                            $municipality = $component->name_fr ?? $component->name_nl;
+                        }
                         break;
                     case 'postal_code':
                         $postalCode = (string) $component->id;
                         break;
                     case 'street':
-                        $streetName = $component->name_fr ?? $component->name_nl;
+                        if ($language === 'nl') {
+                            $streetName = $component->name_nl ?? $component->name_fr;
+                        } else {
+                            $streetName = $component->name_fr ?? $component->name_nl;
+                        }
                         break;
                     case 'street_number':
-                        $streetNumber = (string) $component->name_fr ?? $component->name_nl;
+                        $streetNumber = (string) $component->name_fr;
                         break;
                 }
             }