Update bpost.php

Enable "full adress" geocoding
geo6 · Jan 4, 2018 · faabe42 · faabe42
1 parent bb96dec
commit faabe42
Showing 1 changed file with 36 additions and 19 deletions.
diff --git a/bpost.php b/bpost.php
@@ -58,29 +58,46 @@ public function geocodeQuery(GeocodeQuery $query): Collection
             throw new InvalidArgument('Address cannot be empty.');
         }
 
-        $request = [];
-        $request['ValidateAddressesRequest'] = [
-          'AddressToValidateList' => [
-            'AddressToValidate' => [
-              [
-                '@id'           => 1,
-                'PostalAddress' => [
-                  'DeliveryPointLocation' => [
-                    'StructuredDeliveryPointLocation' => [
-                      'StreetName'   => $query->getData('streetName'),
-                      'StreetNumber' => $query->getData('streetNumber'),
-                    ],
+        $address = $query->getText();
+        $streetName = $query->getData('streetName');
+        $streetNumber = $query->getData('streetNumber');
+
+        if (!is_null($streetName) && !is_null($streetNumber)) {
+            $addressToValidate = [
+              '@id'           => 1,
+              'PostalAddress' => [
+                'DeliveryPointLocation' => [
+                  'StructuredDeliveryPointLocation' => [
+                    'StreetName'   => $query->getData('streetName'),
+                    'StreetNumber' => $query->getData('streetNumber'),
                   ],
-                  'PostalCodeMunicipality' => [
-                    'StructuredPostalCodeMunicipality' => [
-                      'PostalCode'       => $query->getData('postalCode', ''),
-                      'MunicipalityName' => $query->getData('locality', ''),
-                    ],
+                ],
+                'PostalCodeMunicipality' => [
+                  'StructuredPostalCodeMunicipality' => [
+                    'PostalCode'       => $query->getData('postalCode', ''),
+                    'MunicipalityName' => $query->getData('locality', ''),
                   ],
                 ],
-                'DeliveringCountryISOCode'  => 'BE',
-                'DispatchingCountryISOCode' => 'BE',
               ],
+              'DeliveringCountryISOCode'  => 'BE',
+              'DispatchingCountryISOCode' => 'BE',
+            ];
+        } else {
+          $addressToValidate = [
+            '@id'           => 1,
+            'AddressBlockLines' => [
+              'UnstructuredAddressLine' => $address
+            ],
+            'DeliveringCountryISOCode'  => 'BE',
+            'DispatchingCountryISOCode' => 'BE',
+          ];
+        }
+
+        $request = [];
+        $request['ValidateAddressesRequest'] = [
+          'AddressToValidateList' => [
+            'AddressToValidate' => [
+              $addressToValidate,
             ],
           ],
           'ValidateAddressOptions' => [