Merge pull request #46 from warna720/patch-2

Fix for geo + country lever results

Author: x-fran

src/GTrends/GTrends.php

@@ -130,12 +130,12 @@ public function getRelatedSearchQueries(array $keyWords): array
         return $this->explore($keyWords, ['RELATED_QUERIES']);
     }
 
-    public function getComparedGeo(array $keyWords): array
+    public function getComparedGeo(array $keyWords, string $resolution = 'CITY'): array
     {
-        return $this->explore($keyWords, ['GEO_MAP']);
+        return $this->explore($keyWords, ['GEO_MAP'], $resolution);
     }
 
-    private function explore(array $keyWords, array $widgetIds): array
+    private function explore(array $keyWords, array $widgetIds, string $resolution = 'CITY'): array
     {
         if (count($keyWords) > 5) {
             return [];
@@ -159,6 +159,7 @@ private function explore(array $keyWords, array $widgetIds): array
             ),
         ];
 
+
         $results = [];
         if ($data = $this->getData(self::GENERAL_ENDPOINT, $payload)) {
             $widgets = Json\Json::decode(trim(substr($data, 5)), Json\Json::TYPE_ARRAY)['widgets'];
@@ -186,9 +187,9 @@ private function explore(array $keyWords, array $widgetIds): array
                 );
 
                 if ($widget['id'] === 'GEO_MAP' && in_array('GEO_MAP', $widgetIds, true)) {
-                    $widget['request']['resolution'] = 'CITY';
+                    $widget['request']['resolution'] = $resolution;
                     $widget['request']['includeLowSearchVolumeGeos'] = false;
-                    $payload['req'] = Json\Json::encode($widget['request']);
+                    $payload['req'] = str_replace('"geo":[]', '"geo":{}', Json\Json::encode($widget['request']));
                     if ($data = $this->getData(self::COMPARED_GEO_ENDPOINT, $payload)) {
                         $results['GEO_MAP']['widget']   = $widget;
                         $results['GEO_MAP']['data']     =