Update Geo6.php

Jonathan Beliën · Jonathan Beliën · commit 1f599f52427b · 2019-01-16T16:50:50.000+01:00
diff --git a/Geo6.php b/Geo6.php
@@ -416,10 +416,10 @@ private static function extractComponents(array $components, string $language) :
                         $postalCode = (string) $component->id;
                         break;
                     case 'province':
-                        $province = $component->name_fr ?? $component->name_nl;
+                        $province = $component->name_de ?? $component->name_fr ?? $component->name_nl;
                         break;
                     case 'region':
-                        $region = $component->name_fr ?? $component->name_nl;
+                        $region = $component->name_de ?? $component->name_fr ?? $component->name_nl;
                         break;
                     case 'street':
                         $street = $component->name_de;
diff --git a/Tests/.cached_responses/api-v2.geo6.be_3b28a5bb14a1357fbee542e8d14f2ce3af03ccc6 b/Tests/.cached_responses/api-v2.geo6.be_3b28a5bb14a1357fbee542e8d14f2ce3af03ccc6
@@ -1 +1 @@
-s:1009:"{"query":{"source":null,"nis5":null,"locality":"raeren","postalcode":"4731","street":"aachener strasse","number":"33"},"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[6.083168,50.694741]},"properties":{"type":"street_number","source":"ICAR 2019-01 (09/11/2017)","formatted_fr":null,"formatted_nl":null,"formatted_de":"33 Aachener Stra\u00dfe, 4731 RAEREN","components":[{"type":"location_type","name_fr":"Rooftop","name_nl":"Rooftop"},{"type":"street_number","name_fr":"33","name_nl":"33"},{"type":"street","name_fr":null,"name_nl":null,"name_de":"Aachener Stra\u00dfe"},{"type":"postal_code","id":"4731","name_fr":"RAEREN (Eynatten)","name_nl":null},{"type":"municipality","id":63061,"name_fr":"RAEREN","name_nl":"RAEREN"},{"type":"province","name_fr":"Li\u00e8ge","name_nl":"Luik"},{"type":"region","name_fr":"R\u00e9gion wallonne","name_nl":"Waals gewest"},{"type":"country","id":"be","name_fr":"Belgique","name_nl":"Belgi\u00eb","name_de":"Belgien"}]}}]}";
+s:1065:"{"query":{"source":null,"nis5":null,"locality":"raeren","postalcode":"4731","street":"aachener strasse","number":"33"},"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[6.083168,50.694741]},"properties":{"type":"street_number","source":"ICAR 2019-01 (09/11/2017)","formatted_fr":null,"formatted_nl":null,"formatted_de":"33 Aachener Stra\u00dfe, 4731 RAEREN","components":[{"type":"location_type","name_fr":"Rooftop","name_nl":"Rooftop"},{"type":"street_number","name_fr":"33","name_nl":"33"},{"type":"street","name_fr":null,"name_nl":null,"name_de":"Aachener Stra\u00dfe"},{"type":"postal_code","id":"4731","name_fr":"RAEREN (Eynatten)","name_nl":null},{"type":"municipality","id":63061,"name_fr":"RAEREN","name_nl":"RAEREN"},{"type":"province","name_fr":"Li\u00e8ge","name_nl":"Luik","name_de":"L\u00fcttich"},{"type":"region","name_fr":"R\u00e9gion wallonne","name_nl":"Waals gewest","name_de":"Wallonische Region"},{"type":"country","id":"be","name_fr":"Belgique","name_nl":"Belgi\u00eb","name_de":"Belgien"}]}}]}";
diff --git a/Tests/.cached_responses/api-v2.geo6.be_513f54975077c0b4c6f1424f56de0995bc13397e b/Tests/.cached_responses/api-v2.geo6.be_513f54975077c0b4c6f1424f56de0995bc13397e
@@ -1 +1 @@
-s:1064:"{"query":{"source":null,"nis5":null,"locality":"bruxelles","postalcode":"1000","street":"place des palais","number":"1"},"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[4.362288,50.841974]},"properties":{"type":"street_number","source":"UrbIS 2018-12 (11/10/2018)","formatted_fr":"1 Place des Palais, 1000 BRUXELLES","formatted_nl":"1 Paleizenplein, 1000 BRUSSEL","formatted_de":null,"components":[{"type":"location_type","name_fr":"Rooftop","name_nl":"Rooftop"},{"type":"street_number","name_fr":"1","name_nl":"1"},{"type":"street","name_fr":"Place des Palais","name_nl":"Paleizenplein","name_de":null},{"type":"postal_code","id":"1000","name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"municipality","id":21004,"name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"province","name_fr":null,"name_nl":null},{"type":"region","name_fr":"R\u00e9gion de Bruxelles-Capitale","name_nl":"Brussels Hoofdstedelijk Gewest"},{"type":"country","id":"be","name_fr":"Belgique","name_nl":"Belgi\u00eb","name_de":"Belgien"}]}}]}";
+s:1079:"{"query":{"source":null,"nis5":null,"locality":"bruxelles","postalcode":"1000","street":"place des palais","number":"1"},"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[4.362288,50.841974]},"properties":{"type":"street_number","source":"UrbIS 2018-12 (11/10/2018)","formatted_fr":"1 Place des Palais, 1000 BRUXELLES","formatted_nl":"1 Paleizenplein, 1000 BRUSSEL","formatted_de":null,"components":[{"type":"location_type","name_fr":"Rooftop","name_nl":"Rooftop"},{"type":"street_number","name_fr":"1","name_nl":"1"},{"type":"street","name_fr":"Place des Palais","name_nl":"Paleizenplein","name_de":null},{"type":"postal_code","id":"1000","name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"municipality","id":21004,"name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"province","name_fr":null,"name_nl":null,"name_de":null},{"type":"region","name_fr":"R\u00e9gion de Bruxelles-Capitale","name_nl":"Brussels Hoofdstedelijk Gewest"},{"type":"country","id":"be","name_fr":"Belgique","name_nl":"Belgi\u00eb","name_de":"Belgien"}]}}]}";
diff --git a/Tests/.cached_responses/api-v2.geo6.be_89a0b3838c127e270038347e93954dd777ce66f6 b/Tests/.cached_responses/api-v2.geo6.be_89a0b3838c127e270038347e93954dd777ce66f6
@@ -1 +1 @@
-s:1064:"{"query":{"source":null,"nis5":null,"locality":"Bruxelles","postalcode":"1000","street":"Place des Palais","number":"1"},"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[4.362288,50.841974]},"properties":{"type":"street_number","source":"UrbIS 2018-12 (11/10/2018)","formatted_fr":"1 Place des Palais, 1000 BRUXELLES","formatted_nl":"1 Paleizenplein, 1000 BRUSSEL","formatted_de":null,"components":[{"type":"location_type","name_fr":"Rooftop","name_nl":"Rooftop"},{"type":"street_number","name_fr":"1","name_nl":"1"},{"type":"street","name_fr":"Place des Palais","name_nl":"Paleizenplein","name_de":null},{"type":"postal_code","id":"1000","name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"municipality","id":21004,"name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"province","name_fr":null,"name_nl":null},{"type":"region","name_fr":"R\u00e9gion de Bruxelles-Capitale","name_nl":"Brussels Hoofdstedelijk Gewest"},{"type":"country","id":"be","name_fr":"Belgique","name_nl":"Belgi\u00eb","name_de":"Belgien"}]}}]}";
+s:1079:"{"query":{"source":null,"nis5":null,"locality":"Bruxelles","postalcode":"1000","street":"Place des Palais","number":"1"},"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[4.362288,50.841974]},"properties":{"type":"street_number","source":"UrbIS 2018-12 (11/10/2018)","formatted_fr":"1 Place des Palais, 1000 BRUXELLES","formatted_nl":"1 Paleizenplein, 1000 BRUSSEL","formatted_de":null,"components":[{"type":"location_type","name_fr":"Rooftop","name_nl":"Rooftop"},{"type":"street_number","name_fr":"1","name_nl":"1"},{"type":"street","name_fr":"Place des Palais","name_nl":"Paleizenplein","name_de":null},{"type":"postal_code","id":"1000","name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"municipality","id":21004,"name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"province","name_fr":null,"name_nl":null,"name_de":null},{"type":"region","name_fr":"R\u00e9gion de Bruxelles-Capitale","name_nl":"Brussels Hoofdstedelijk Gewest"},{"type":"country","id":"be","name_fr":"Belgique","name_nl":"Belgi\u00eb","name_de":"Belgien"}]}}]}";

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-s:1009:"{"query":{"source":null,"nis5":null,"locality":"raeren","postalcode":"4731","street":"aachener strasse","number":"33"},"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[6.083168,50.694741]},"properties":{"type":"street_number","source":"ICAR 2019-01 (09/11/2017)","formatted_fr":null,"formatted_nl":null,"formatted_de":"33 Aachener Stra\u00dfe, 4731 RAEREN","components":[{"type":"location_type","name_fr":"Rooftop","name_nl":"Rooftop"},{"type":"street_number","name_fr":"33","name_nl":"33"},{"type":"street","name_fr":null,"name_nl":null,"name_de":"Aachener Stra\u00dfe"},{"type":"postal_code","id":"4731","name_fr":"RAEREN (Eynatten)","name_nl":null},{"type":"municipality","id":63061,"name_fr":"RAEREN","name_nl":"RAEREN"},{"type":"province","name_fr":"Li\u00e8ge","name_nl":"Luik"},{"type":"region","name_fr":"R\u00e9gion wallonne","name_nl":"Waals gewest"},{"type":"country","id":"be","name_fr":"Belgique","name_nl":"Belgi\u00eb","name_de":"Belgien"}]}}]}";
	`1`	+s:1065:"{"query":{"source":null,"nis5":null,"locality":"raeren","postalcode":"4731","street":"aachener strasse","number":"33"},"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[6.083168,50.694741]},"properties":{"type":"street_number","source":"ICAR 2019-01 (09/11/2017)","formatted_fr":null,"formatted_nl":null,"formatted_de":"33 Aachener Stra\u00dfe, 4731 RAEREN","components":[{"type":"location_type","name_fr":"Rooftop","name_nl":"Rooftop"},{"type":"street_number","name_fr":"33","name_nl":"33"},{"type":"street","name_fr":null,"name_nl":null,"name_de":"Aachener Stra\u00dfe"},{"type":"postal_code","id":"4731","name_fr":"RAEREN (Eynatten)","name_nl":null},{"type":"municipality","id":63061,"name_fr":"RAEREN","name_nl":"RAEREN"},{"type":"province","name_fr":"Li\u00e8ge","name_nl":"Luik","name_de":"L\u00fcttich"},{"type":"region","name_fr":"R\u00e9gion wallonne","name_nl":"Waals gewest","name_de":"Wallonische Region"},{"type":"country","id":"be","name_fr":"Belgique","name_nl":"Belgi\u00eb","name_de":"Belgien"}]}}]}";
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-s:1064:"{"query":{"source":null,"nis5":null,"locality":"bruxelles","postalcode":"1000","street":"place des palais","number":"1"},"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[4.362288,50.841974]},"properties":{"type":"street_number","source":"UrbIS 2018-12 (11/10/2018)","formatted_fr":"1 Place des Palais, 1000 BRUXELLES","formatted_nl":"1 Paleizenplein, 1000 BRUSSEL","formatted_de":null,"components":[{"type":"location_type","name_fr":"Rooftop","name_nl":"Rooftop"},{"type":"street_number","name_fr":"1","name_nl":"1"},{"type":"street","name_fr":"Place des Palais","name_nl":"Paleizenplein","name_de":null},{"type":"postal_code","id":"1000","name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"municipality","id":21004,"name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"province","name_fr":null,"name_nl":null},{"type":"region","name_fr":"R\u00e9gion de Bruxelles-Capitale","name_nl":"Brussels Hoofdstedelijk Gewest"},{"type":"country","id":"be","name_fr":"Belgique","name_nl":"Belgi\u00eb","name_de":"Belgien"}]}}]}";
	`1`	+s:1079:"{"query":{"source":null,"nis5":null,"locality":"bruxelles","postalcode":"1000","street":"place des palais","number":"1"},"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[4.362288,50.841974]},"properties":{"type":"street_number","source":"UrbIS 2018-12 (11/10/2018)","formatted_fr":"1 Place des Palais, 1000 BRUXELLES","formatted_nl":"1 Paleizenplein, 1000 BRUSSEL","formatted_de":null,"components":[{"type":"location_type","name_fr":"Rooftop","name_nl":"Rooftop"},{"type":"street_number","name_fr":"1","name_nl":"1"},{"type":"street","name_fr":"Place des Palais","name_nl":"Paleizenplein","name_de":null},{"type":"postal_code","id":"1000","name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"municipality","id":21004,"name_fr":"BRUXELLES","name_nl":"BRUSSEL"},{"type":"province","name_fr":null,"name_nl":null,"name_de":null},{"type":"region","name_fr":"R\u00e9gion de Bruxelles-Capitale","name_nl":"Brussels Hoofdstedelijk Gewest"},{"type":"country","id":"be","name_fr":"Belgique","name_nl":"Belgi\u00eb","name_de":"Belgien"}]}}]}";