Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml

1 files changed, 28 insertions, 2 deletions

diff --git a/src/AppBundle/Controller/HomeController.php b/src/AppBundle/Controller/HomeController.php
index f6ee8b9..d8234cf 100644
--- a/src/AppBundle/Controller/HomeController.php
+++ b/src/AppBundle/Controller/HomeController.php
@@ -11,6 +11,9 @@ namespace AppBundle\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use AppBundle\Utils\Aqi;
+
+
 
 
 class HomeController extends Controller
@@ -19,8 +22,21 @@ class HomeController extends Controller
      * @Route("/", name="homepage")
      */
 
-    public function numberAction()
+
+    public function numberAction(Aqi $aqi)
     {
+        $table = array(
+            'Co' => array('breakpoints' => [0, 4.4, 4.5, 9.4, 9.5, 12.4, 12.5, 15.4, 15.5, 30.4, 30.5, 40.4, 40.5, 50.4],
+                'aq' => [0, 50, 51, 100, 101, 150, 151, 200, 201, 300, 301, 400, 401, 500]),
+            'So' => array('breakpoints' => [0.000, 0.034, 0.035, 0.144, 0.145, 0.224, 0.225, 0.304, 0.305, 0.604, 0.605, 0.804, 0.805, 1.004],
+                'aq' => [0, 50, 51, 100, 101, 150, 151, 200, 201, 300, 301, 400, 401, 500]),
+            'No' => array('breakpoints' => [0,0.05,0.08,0.10,0.15,0.20,0.25 ,0.31,0.65, 1.24, 1.25, 1.64, 1.65, 2.04],
+                'aq' => [0 ,50 ,51 ,100 ,101 ,150 ,151,200,201, 300, 301, 400, 401, 500])
+        );
+
+
+        $tableObj = json_decode(json_encode($table));
+
         // Get cURL resource
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, "https://pollutometerapi.azurewebsites.net/api/Readings/latest");
@@ -34,8 +50,18 @@ class HomeController extends Controller
         $data = json_decode($resp, true);
         $data['TimeStamp'] = gmdate("l jS \of F Y h:i:s A", $data['TimeStamp']);
 
+        $arr = [];
+        print_r($data);
+        $CO = is_nan($aqi->calculateAQI("Co", $data['Co'], $tableObj)) ? 0 : $aqi->calculateAQI("Co", $data['Co'], $tableObj);
+        $SO = is_nan($aqi->calculateAQI("So", $data['So'], $tableObj)) ? 0 : $aqi->calculateAQI("So", $data['So'], $tableObj);
+        $NO = is_nan($aqi->calculateAQI("No", $data['No'], $tableObj)) ? 0 : $aqi->calculateAQI("No", $data['No'], $tableObj);
+
+        array_push($arr, $CO, $SO, $NO);
+        $max = max($arr);
+        $data['Aqi'] = $max;
+
 
-        return $this->render('default/index.html.twig',$data);
+        return $this->render('default/index.html.twig', $data);
     }
 
 }