Fix Nominatim provider when "missing" osm_id and osm_type (#997)

* Fix Nominatim provider when "missing" osm_id and osm_type

* Apply fixes from StyleCI

Author: jbelien

src/Provider/Nominatim/Nominatim.php

@@ -230,10 +230,15 @@ private function jsonResultToLocation(\stdClass $place, bool $reverse): Location
 
         $location = $builder->build(NominatimAddress::class);
         $location = $location->withAttribution($place->licence);
-        $location = $location->withOSMId(intval($place->osm_id));
-        $location = $location->withOSMType($place->osm_type);
         $location = $location->withDisplayName($place->display_name);
 
+        if (isset($place->osm_id)) {
+            $location = $location->withOSMId(intval($place->osm_id));
+        }
+        if (isset($place->osm_type)) {
+            $location = $location->withOSMType($place->osm_type);
+        }
+
         if (false === $reverse) {
             $location = $location->withCategory($place->category);
             $location = $location->withType($place->type);

src/Provider/Nominatim/Tests/.cached_responses/nominatim.openstreetmap.org_388d03935611eb4bd1d69d1d91b5af2fd70ec24f

@@ -0,0 +1 @@
+s:505:"[{"place_id":200404707,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","boundingbox":["34.085763939939","34.085863939939","-118.2905153602","-118.2904153602"],"lat":"34.0858139399386","lon":"-118.290465360203","display_name":"LA, California, 90210, United States of America","place_rank":21,"category":"place","type":"postcode","importance":0.535,"address":{"city":"LA","state":"California","postcode":"90210","country":"United States of America","country_code":"us"}}]";

src/Provider/Nominatim/Tests/NominatimTest.php

@@ -159,4 +159,25 @@ public function testGeocodeWithViewbox()
         $this->assertEquals('way', $result->getOSMType());
         $this->assertEquals('yes', $result->getType());
     }
+
+    public function testGeocodeNoOSMId()
+    {
+        $provider = Nominatim::withOpenStreetMapServer($this->getHttpClient(), 'Geocoder PHP/Nominatim Provider/Nominatim Test');
+        $results = $provider->geocodeQuery(GeocodeQuery::create('90210,United States'));
+
+        $this->assertInstanceOf('Geocoder\Model\AddressCollection', $results);
+        $this->assertCount(1, $results);
+
+        /** @var \Geocoder\Model\Address $result */
+        $result = $results->first();
+        $this->assertInstanceOf('\Geocoder\Model\Address', $result);
+        $this->assertEquals('90210', $result->getPostalCode());
+        $this->assertEquals('US', $result->getCountry()->getCode());
+
+        $this->assertEquals('Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright', $result->getAttribution());
+        $this->assertEquals('place', $result->getCategory());
+        $this->assertEquals('postcode', $result->getType());
+        $this->assertEquals(null, $result->getOSMId());
+        $this->assertEquals(null, $result->getOSMType());
+    }
 }