Merge pull request #25 from saniho/DefectNoneCoeffMaree

Add Coeff prochaine marée pour la marée BM

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.3"
+__VERSION__ = "1.1.4"
 
 __name__ = "apiMareeInfo"

custom_components/apiMareeInfo/manifest.json

@@ -2,7 +2,7 @@
     "domain": "apiMareeInfo",
     "name": "apiMareeInfo sensor",
     "documentation": "",
-    "version": "1.0.3",
+    "version": "1.1.4",
     "requirements": [
     ],
     "dependencies": [],

custom_components/apiMareeInfo/sensorApiMaree.py

@@ -71,6 +71,8 @@ def getstatus(self):
                 nieme = info["nieme"]
                 jour = info["jour"]
                 status_counts["horaire_%s_%s" % (jour, nieme)] = "%s" % (info['horaire'])
+                if info['coeff'] is None:
+                    info['coeff'] = ""
                 status_counts["coeff_%s_%s" % (jour, nieme)] = "%s" % (info['coeff'])
                 status_counts["etat_%s_%s" % (jour, nieme)] = "%s" % (info['etat'])
                 status_counts["hauteur_%s_%s" % (jour, nieme)] = "%s" % (info['hauteur'])
@@ -81,11 +83,15 @@ def getstatus(self):
             # pour avoir les 2 prochaines marées
             for x in range(2):
                 i = x + 1
-                status_counts["next_maree_%s" % i] = "%s" % self.getnextmaree(i)["horaire"]
-                status_counts["next_coeff_%s" % i] = "%s" % self.getnextmaree(i)["coeff"]
-                status_counts["next_etat_%s" % i] = "%s" % self.getnextmaree(i)["etat"]
+                pMaree = self.getnextmaree(i)
+                if pMaree['coeff'] is None:
+                    pMaree['coeff'] = ""
+                status_counts["next_maree_%s" % i] = "%s" % pMaree["horaire"]
+                status_counts["next_coeff_%s" % i] = "%s" % pMaree["coeff"]
+                status_counts["next_etat_%s" % i] = "%s" % pMaree["etat"]
                 if status_counts["next_coeff_%s" % i] == "":
-                    status_counts["next_coeff_%s" % i] = "%s" % self.getnextmaree(i + 1)["coeff"]
+                    pMaree = self.getnextmaree(i + 1)
+                    status_counts["next_coeff_%s" % i] = "%s" % pMaree["coeff"]
             status_counts["timeLastCall"] = datetime.datetime.now()
 
             dicoPrevis = []

testMareeInfo.py

@@ -9,6 +9,8 @@ def testPortMeteoMarine():
     _myMaree = apiMareeInfo.ApiMareeInfo()
     # lat, lng = "46.7711", "-2.05306"
     lat, lng = "46.4967", "-1.79667"
+    lat, lng = "46.009313818464726", "-1.1740585688883056"
+    lat, lng = "45.0015181", "-1.1999562"
     _myMaree.setport(lat, lng)
     _myMaree.getinformationport(outfile="file_20220726.json")
     dataJson = None
@@ -70,6 +72,6 @@ def testListePorts():
     print(a)
 
 
-# testPortMeteoMarine()
-testPortStormGlass()
+testPortMeteoMarine()
+# testPortStormGlass()
 # testListePorts()