From 0f17480a06f9aadbda14f1835f7186eb269762d0 Mon Sep 17 00:00:00 2001 From: Florent VIOLLEAU Date: Fri, 10 Jan 2020 00:11:29 +0100 Subject: [PATCH 1/3] Add new bridge for Air Quality in cities supported by Atmo Occitanie --- bridges/AtmoOccitanieBridge.php | 59 +++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 bridges/AtmoOccitanieBridge.php diff --git a/bridges/AtmoOccitanieBridge.php b/bridges/AtmoOccitanieBridge.php new file mode 100644 index 00000000000..5813e9e9abe --- /dev/null +++ b/bridges/AtmoOccitanieBridge.php @@ -0,0 +1,59 @@ + array( + 'name' => 'Ville', + 'required' => true + ) + )); + const CACHE_TIMEOUT = 7200; + + public function collectData() { + $uri = self::URI . $this->getInput('city'); + + $html = getSimpleHTMLDOM($uri) + or returnServerError('Could not request ' . $uri); + + $generalMessage = $html->find('.landing-ville .city-banner .iqa-avertissement', 0)->innertext; + $recommendationsDom = $html->find('.landing-ville .recommandations', 0); + $recommendationsItemDom = $recommendationsDom->find('.recommandation-item .label'); + + $recommendationsMessage = ''; + + $i = 0; + $len = count($recommendationsItemDom); + foreach ($recommendationsItemDom as $key => $value) { + if ($i == 0) { + $recommendationsMessage .= trim($value->innertext) . '.'; + } else { + $recommendationsMessage .= ' ' . trim($value->innertext) . '.'; + } + $i++; + } + + $lastRecommendationsDom = $recommendationsDom->find('.col-md-6', -1); + $informationHeaderMessage = $lastRecommendationsDom->find('.heading', 0)->innertext; + $indice = $lastRecommendationsDom->find('.current-indice .indice div', 0)->innertext; + $informationDescriptionMessage = $lastRecommendationsDom->find('.current-indice .description p', 0)->innertext; + + $message = "$generalMessage L'indice est de $indice/10. $informationDescriptionMessage. $recommendationsMessage"; + $city = $this->getInput('city'); + + $item['uri'] = $uri; + $today = date('d/m/Y'); + $item['title'] = "Bulletin de l'air du $today pour la ville : $city."; + //$item['title'] .= ' Retrouvez plus d\'informations en allant sur atmo-occitanie.org #QualiteAir. ' . $message; + $item['title'] .= ' #QualiteAir. ' . $message; + $item['author'] = 'floviolleau'; + $item['content'] = $message; + $item['uid'] = hash('sha256', $item['title']); + + $this->items[] = $item; + } +} + From 27341b1760c82295796768192c8c0979d97ae653 Mon Sep 17 00:00:00 2001 From: Florent VIOLLEAU Date: Fri, 10 Jan 2020 00:16:24 +0100 Subject: [PATCH 2/3] Php CS --- bridges/AtmoOccitanieBridge.php | 1 - 1 file changed, 1 deletion(-) diff --git a/bridges/AtmoOccitanieBridge.php b/bridges/AtmoOccitanieBridge.php index 5813e9e9abe..4aa35cc049f 100644 --- a/bridges/AtmoOccitanieBridge.php +++ b/bridges/AtmoOccitanieBridge.php @@ -56,4 +56,3 @@ public function collectData() { $this->items[] = $item; } } - From 14ef3827fcd605693900147484079207565af817 Mon Sep 17 00:00:00 2001 From: floviolleau Date: Fri, 10 Jan 2020 01:55:56 +0100 Subject: [PATCH 3/3] [AtmoOccitanie] Change description --- bridges/AtmoOccitanieBridge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/AtmoOccitanieBridge.php b/bridges/AtmoOccitanieBridge.php index 4aa35cc049f..24f6383292a 100644 --- a/bridges/AtmoOccitanieBridge.php +++ b/bridges/AtmoOccitanieBridge.php @@ -3,7 +3,7 @@ class AtmoOccitanieBridge extends BridgeAbstract { const NAME = 'Atmo Occitanie'; const URI = 'https://www.atmo-occitanie.org/'; - const DESCRIPTION = 'Fetches the latest air polution of Toulouse from Atmo Occitanie'; + const DESCRIPTION = 'Fetches the latest air polution of cities in Occitanie from Atmo'; const MAINTAINER = 'floviolleau'; const PARAMETERS = array(array( 'city' => array(