Merge pull request #21 from saniho/integrationOfMeteoMarinev2

integration de des infos de marées
saniho · Dec 16, 2022 · acadd20 · acadd20
2 parents 2510d23 + ed50a52
commit acadd20
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/custom_components/apiMareeInfo/apiMareeInfo.py b/custom_components/apiMareeInfo/apiMareeInfo.py
@@ -32,6 +32,8 @@ def getjson(self, url):
     def getlisteport(self, nomport):
         url = "http://webservices.meteoconsult.fr/meteoconsultmarine/android/100/fr/v20/recherche.php?rech=%s&type=48" % (
             nomport)
+        url = "https://ws.meteoconsult.fr/meteoconsultmarine/android/100/fr/v30/recherche.php?rech=%s&type=48" % (
+            nomport)
         print(url)
         retour = self.getjson(url)
         print(retour)
@@ -45,6 +47,9 @@ def __init__(self, lat, lng):
         self._url = \
             "http://webservices.meteoconsult.fr/meteoconsultmarine/androidtab/115/fr/v20/previsionsSpot.php?lat=%s&lon=%s" % (
                 lat, lng)
+        self._url = \
+            "http://ws.meteoconsult.fr/meteoconsultmarine/androidtab/115/fr/v30/previsionsSpot.php?lat=%s&lon=%s" % (
+                lat, lng)
         """ autre url possible
         self._url = \
         #    "http://webservices.meteoconsult.fr/meteoconsultmarine/android/100/fr/v20/previsionsSpot.php?lat=%s&lon=%s" % (

diff --git a/custom_components/apiMareeInfo/const.py b/custom_components/apiMareeInfo/const.py
@@ -8,6 +8,6 @@
 # delai pour l'update http, toutes les 3 heures
 CONF_SCAN_INTERVAL_HTTP = datetime.timedelta(seconds=60 * 60 * 3)
 
-__VERSION__ = "1.1.0"
+__VERSION__ = "1.1.1"
 
 __name__ = "apiMareeInfo"
diff --git a/custom_components/apiMareeInfo/sensor.py b/custom_components/apiMareeInfo/sensor.py
@@ -50,6 +50,7 @@ def __init__(self, idDuPort, lat, lng, stormkey, _update_interval):
         self._idDuPort = idDuPort
         self._lat = lat
         self._lng = lng
+        self._origine = "MeteoMarine"
         self._stormkey = stormkey
         self._myMaree = apiMareeInfo.ApiMareeInfo()
         pass
@@ -61,7 +62,10 @@ def update(self, ):
                 ((self._lastSynchro + self._update_interval) < courant):
             _LOGGER.warning("-update possible- on lance")
             self._myMaree.setport(self._lat, self._lng)
-            self._myMaree.getinformationport( origine="stormio", info={"stormkey":self._stormkey})
+            if ( self._origine == "MeteoMarine"):
+                self._myMaree.getinformationport(origine=self._origine)
+            else:
+                self._myMaree.getinformationport( origine="stormio", info={"stormkey":self._stormkey})
             self._lastSynchro = datetime.datetime.now()
 
     def getIdPort(self):

diff --git a/file_20220726.json b/file_20220726.json
diff --git a/testMareeInfo.py b/testMareeInfo.py
@@ -42,10 +42,12 @@ def testPortStormGlass():
     # lat, lng = "46.7711", "-2.05306"
     lat, lng = "46.4967", "-1.79667"
     _myMaree.setport(lat, lng)
+    #_myMaree.getinformationport( jsondata= dataJson, outfile = "file_20220726.json",
+    #                             origine="stormio", info={'stormkey':thekey} )
     _myMaree.getinformationport( jsondata= dataJson, outfile = "file_20220726.json",
-                                 origine="stormio", info={'stormkey':thekey} )
+                                 origine="MeteoMarine")
 
-    _myMaree.getinformationport( outfile = "file_20220726.json", origine="stormio", info={'stormkey':thekey} )
+    #_myMaree.getinformationport( outfile = "file_20220726.json", origine="stormio", info={'stormkey':thekey} )
     # print(_myMaree.getinfo())
     # print(_myMaree.getnomduport())
     # print(_myMaree.getdatecourante())