Upgrade format for the new version 3.2.0

maxhelias · Aug 27, 2018 · 7bd5fd7 · 7bd5fd7
1 parent b64cce8
commit 7bd5fd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Nominatim.php b/src/Nominatim.php
@@ -158,7 +158,7 @@ public function newLookup(): Lookup
      */
     private function decodeResponse(string $format, Request $request, ResponseInterface $response)
     {
-        if ('json' === $format) {
+        if ('json' === $format || 'jsonv2' === $format || 'geojson' === $format || 'geocodejson' === $format) {
             return \json_decode($response->getBody()->getContents(), true);
         }
 
@@ -175,8 +175,8 @@ private function decodeResponse(string $format, Request $request, ResponseInterf
      * @param QueryInterface $nRequest The object request to send
      * @param array          $headers  Override the request header
      *
-     * @throws \RuntimeException
-     * @throws NominatimException if no format for decode
+     * @throws NominatimException                    if no format for decode
+     * @throws \GuzzleHttp\Exception\GuzzleException
      *
      * @return array|\SimpleXMLElement The decoded data returned from Nominatim
      */

diff --git a/src/Query.php b/src/Query.php
@@ -44,7 +44,7 @@ abstract class Query implements QueryInterface
      *
      * @var array
      */
-    protected $acceptedFormat = ['xml', 'json'];
+    protected $acceptedFormat = ['xml', 'json', 'jsonv2', 'geojson', 'geocodejson'];
 
     /**
      * Output polygon format accepted.