Edugolr / anax-chai17-weather

src/Models/Location.php

Spacing +4 added lines, -4 removed lines

@@ -23,16 +23,16 @@
         $validateIP = new Models\ValidateIP;
         $test = $validateIP->validate($ipNumber);
         if ($test[0]) {
-            $location = $getJson->cUrl($ipstack["url"]. $ipNumber. '?access_key='. $ipstack["key"]);
+            $location = $getJson->cUrl($ipstack["url"].$ipNumber.'?access_key='.$ipstack["key"]);
             $location = json_decode($location, true);
             $latitude = $location["latitude"];
             $longitude = $location["longitude"];
             $location = [$location["city"], $latitude, $longitude];
         } else {
-            $search = array('å','ä','ö');
-            $replace = array('a','a','o');
+            $search = array('å', 'ä', 'ö');
+            $replace = array('a', 'a', 'o');
             $ipNumber = str_replace($search, $replace, $ipNumber);
-            $location = $getJson->cUrl($mapquest["url"]. $mapquest["key"]. $mapquest["extra"]. $ipNumber);
+            $location = $getJson->cUrl($mapquest["url"].$mapquest["key"].$mapquest["extra"].$ipNumber);
             $location = json_decode($location, true);
             $latitude = $location["results"][0]["locations"][0]["latLng"]["lat"];
             $longitude = $location["results"][0]["locations"][0]["latLng"]["lng"];

src/Controller/WeatherController.php

Spacing +11 added lines, -11 removed lines

@@ -18,8 +18,8 @@ 
         $api = $this->di->get("ipstack");
         $ipstack = $api["config"];
         $getipInfo = new Models\Curl;
-        $extra =  "&fields=ip";
-        $userIp =  $getipInfo->cUrl($ipstack["url"]. "check". '?access_key='. $ipstack["key"]. $extra);
+        $extra = "&fields=ip";
+        $userIp = $getipInfo->cUrl($ipstack["url"]."check".'?access_key='.$ipstack["key"].$extra);
         $apiResult = json_decode($userIp, true);
 
         $session->set("userIp", $apiResult["ip"]);
@@ -74,7 +74,7 @@ 
 
         $extra = "?lang=sv&units=auto";
         $mapDiv = $map->getMap($latitude, $longitude);
-        $weatherJson = $getJson->cUrl($darksky["url"]. $darksky["key"]. "/". $latitude. ",". $longitude. $extra);
+        $weatherJson = $getJson->cUrl($darksky["url"].$darksky["key"]."/".$latitude.",".$longitude.$extra);
 
         $weather = json_decode($weatherJson, true);
         $page->add("weather/weather", [
@@ -106,21 +106,21 @@ 
         $ipNumber = $request->getGet("ip");
         $test = $validateIP->validate($ipNumber);
         if ($test[0]) {
-            $location = $getJson->cUrl($ipstack["url"]. $ipNumber. '?access_key='. $ipstack["key"]);
+            $location = $getJson->cUrl($ipstack["url"].$ipNumber.'?access_key='.$ipstack["key"]);
             $location = json_decode($location, true);
             $latitude = $location["latitude"];
             $longitude = $location["longitude"];
             $location = [$location["city"], $latitude, $longitude];
         } else {
-            $search = array('å','ä','ö');
-            $replace = array('a','a','o');
+            $search = array('å', 'ä', 'ö');
+            $replace = array('a', 'a', 'o');
             $ipNumber = str_replace($search, $replace, $ipNumber);
             $location = $getJson->cUrl("http://www.mapquestapi.com/geocoding/v1/address?key=HVd7TbTeHvGGiGF14rSntAMMq3VDSAtT&location=".$ipNumber);
             $location = json_decode($location, true);
 
             $latitude = $location["results"][0]["locations"][0]["latLng"]["lat"];
             $longitude = $location["results"][0]["locations"][0]["latLng"]["lng"];
-            $location = $getJson->cUrl("http://www.mapquestapi.com/geocoding/v1/reverse?key=HVd7TbTeHvGGiGF14rSntAMMq3VDSAtT&location=".$latitude. ",". $longitude);
+            $location = $getJson->cUrl("http://www.mapquestapi.com/geocoding/v1/reverse?key=HVd7TbTeHvGGiGF14rSntAMMq3VDSAtT&location=".$latitude.",".$longitude);
             $location = json_decode($location, true);
             $city = $location["results"][0]["locations"][0]["adminArea5"] ?? "Ingen ort";
             $location = [$city, $latitude, $longitude];
@@ -128,16 +128,16 @@ 
         $url = [];
         $extra = "?lang=sv&units=auto";
         $time  = time() - (30 * 24 * 60 * 60);
-        for ($i=0; $i < 31; $i++) {
-            $time  = time() - ($i * 24 * 60 * 60);
-            array_push($url, $darksky["url"]. $darksky["key"]. "/". $latitude. ",". $longitude. ",". $time. $extra);
+        for ($i = 0; $i < 31; $i++) {
+            $time = time() - ($i * 24 * 60 * 60);
+            array_push($url, $darksky["url"].$darksky["key"]."/".$latitude.",".$longitude.",".$time.$extra);
         }
 
 
         $mapDiv = $map->getMap($latitude, $longitude);
         $weatherJson = $getJson->cUrlMulti($url);
         $weather = [];
-        for ($i=0; $i < count($weatherJson); $i++) {
+        for ($i = 0; $i < count($weatherJson); $i++) {
             array_push($weather, json_decode($weatherJson[$i], true));
         }