Skip to content

Commit

Permalink
Update topics
Browse files Browse the repository at this point in the history
  • Loading branch information
@WoCha-FR
WoCha-FR committed Nov 22, 2022
1 parent f04fc0d commit b771f5e
Show file tree
Hide file tree
Showing 11 changed files with 246 additions and 228 deletions.
100 changes: 50 additions & 50 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,24 +74,24 @@ frenchtools/global/saints
```
frenchtools/global/annee
{
"nbjouran":365,
"numjouran":320,
"dstdate":"26/03/2023",
"dstdiff":130,
"numsem":46
"anNbjour":365,
"anNumjour":326,
"dstDate":"26/03/2023",
"dstDiff":124,
"anNumsem":47
}
```

```
frenchtools/global/edftempo
{
"coulj":"TEMPO_BLEU",
"coulj1":"TEMPO_BLEU",
"nb_bleu":222,
"nb_blanc":43,
"nb_rouge":22,
"tempodebut":"01/092022",
"tempofin":"31/08/2023"
"tempoCoulj": "TEMPO_BLEU",
"tempoCoulj1": "TEMPO_BLEU",
"tempoBleu": 216,
"tempoBlanc": 43,
"tempoRouge": 22,
"tempoDeb": "01/09/2022",
"tempoFin": "31/08/2023"
}
```

Expand All @@ -111,68 +111,68 @@ frenchtools/Lyon69/infos
```
frenchtools/Lyon69/ferie
{
"jourestferie":0,
"journomferie":"",
"prochainfdate":"25/12",
"prochainfnom":"Jour de Noël",
"prochainfdif":39
"ferCejour": 0,
"ferNom": "",
"ferProchaindate": "25/12",
"ferProchainnom": "Jour de Noël",
"ferProchainjour": 33
}
```

```
frenchtools/Lyon69/vacances
{
"jourestvacance":0,
"journomvacance":"",
"jourfinvacance":"",
"prochainvacdate":"17/12",
"prochainvacnom":"Vacances de Noël",
"prochainvacdif":30
"vacCejour": 0,
"vacNom": "",
"vacFin": "",
"vacProchaindate": "17/12",
"vacProchainom": "Vacances de Noël",
"vacProchainjour": 24
}
```

```
frenchtools/Lyon69/soleil
{
"soleillever":"7:42",
"soleilzenith":"12:26",
"soleilcoucher":"17:10",
"soleilelevation":"6.64",
"soleilelevzenith":"25.54",
"soleilposv":"-0.70",
"soleilposh":"209.80",
"jourduree":"9:28",
"jourdifference":"-3m26s"
"soleilLever": "7:51",
"soleilZenith": "12:28",
"soleilCoucher": "17:05",
"soleilElevation": "-24.94",
"soleilElevzenith": "24.14",
"soleilPosv": "-15.00",
"soleilPosh": "230.00",
"soleilDuree": "9:14",
"soleilDiff": "-3m10s"
}
```

```
frenchtools/Lyon69/lune
{
"lunelever":"23:59",
"lunecoucher":"14:13",
"lunelevation":"-16.71",
"lunetoujours":0,
"luneabsente":0,
"lunephase":"Dernier quartier"
"luneLever": "05:49",
"luneCoucher": "16:07",
"luneElevation": "-33.55",
"luneToujours": 0,
"luneAbsente": 0,
"lunePhase": "Dernier croissant"
}
```

```
frenchtools/Lyon69/vigilance
{
"vent":"Vert",
"orage":"Vert",
"pluie_inondation":"Vert",
"inondation":"Vert",
"neige":"Vert",
"canicule":"Vert",
"grandfroid":"Vert",
"avalanches":"Vert",
"vague_submersion":"Vert",
"crue":"",
"conseil":"",
"commentaire":""
"vigiVent": "Vert",
"vigiOrage": "Vert",
"vigiPluie": "Vert",
"vigiInondation": "Vert",
"vigiNeige": "Vert",
"vigiCanicule": "Vert",
"vigiFroid": "Vert",
"vigiAvalanche": "Vert",
"vigiVague": "Vert",
"vigiCrue": "",
"vigiConseil": "",
"vigiComment": "Vents forts sur la Corse du Sud associés à la tempête Denise."
}
```

Expand Down
2 changes: 1 addition & 1 deletion index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function updateData () {
infoFr.getJourSemAn()
for (const key in mesVilles) {
infoVi.getJourFerie(mesVilles[key].dpt, key)
infoVi.getMeteoVigilance(mesVilles[key].vac, key)
infoVi.getVacances(mesVilles[key].vac, key)
}
lastJours = curJours
}
Expand Down
44 changes: 22 additions & 22 deletions lib/infofrance.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,40 +55,40 @@ class InfosFrance {
// Année Bissextile ?
const annee = curDate.getFullYear()
if (((annee % 4 === 0) && (annee % 100 !== 0)) || (annee % 400 === 0)) {
result.nbjouran = 366
result.anNbjour = 366
} else {
result.nbjouran = 365
result.anNbjour = 365
}
// Numéro du jour dans l'année
const debDate = new Date(curDate.getFullYear(), 0, 1)
const numJour = 1 + Math.ceil((curDate - debDate) / 86400000)
result.numjouran = numJour
result.anNumjour = numJour
// Date prochain changement heure
let dstDate
if (curDate.getTimezoneOffset() === -120) {
dstDate = this.getLastDimanche(curDate.getFullYear(), 10)
const monthjs = dstDate.getMonth() + 1
const month = (monthjs < 10 ? '0' + monthjs : monthjs)
result.dstdate = dstDate.getDate() + '/' + month
result.dstDate = dstDate.getDate() + '/' + month
} else {
// Entre Janvier (0) et Mars (2)
if (curDate.getMonth() <= 2) {
dstDate = this.getLastDimanche(curDate.getFullYear(), 3)
const monthjs = dstDate.getMonth() + 1
const month = (monthjs < 10 ? '0' + monthjs : monthjs)
result.dstdate = dstDate.getDate() + '/' + month
result.dstDate = dstDate.getDate() + '/' + month
} else {
dstDate = this.getLastDimanche(curDate.getFullYear() + 1, 3)
const monthjs = dstDate.getMonth() + 1
const month = (monthjs < 10 ? '0' + monthjs : monthjs)
result.dstdate = dstDate.getDate() + '/' + month + '/' + dstDate.getFullYear()
result.dstDate = dstDate.getDate() + '/' + month + '/' + dstDate.getFullYear()
}
}
// Difference
const diffseconds = dstDate.valueOf() - curDate.valueOf()
const diffjours = Math.trunc(diffseconds / 86400000)
// On ajout les données
result.dstdiff = diffjours
result.dstDiff = diffjours
// Numéro de semaine - Modifie curDate
const dayNumr = (curDate.getDay() + 6) % 7
curDate.setDate(curDate.getDate() - dayNumr + 3)
Expand All @@ -98,7 +98,7 @@ class InfosFrance {
curDate.setMonth(0, 1 + ((4 - curDate.getDay()) + 7) % 7)
}
const tempVal = 1 + Math.ceil((premJeudi - curDate) / 604800000)
result.numsem = tempVal
result.anNumsem = tempVal
// Emit publish Event
eventEmitter.emit('frame', 'global/annee', result)
}
Expand Down Expand Up @@ -133,35 +133,35 @@ class InfosFrance {
response = await this.request('searchTempoStore', params)
if (_.isUndefined(response.couleurJourJ)) {
logger.warn('Erreur lors de la récupération des couleurs TEMPO')
result.coulj = 'NO_DATA'
result.coulj1 = 'NO_DATA'
result.tempoCoulj = 'NO_DATA'
result.tempoCoulj1 = 'NO_DATA'
} else {
result.coulj = response.couleurJourJ
result.coulj1 = response.couleurJourJ1
result.tempoCoulj = response.couleurJourJ
result.tempoCoulj1 = response.couleurJourJ1
}
// Jours restant Tempo
params = { TypeAlerte: 'TEMPO' }
response = await this.request('getNbTempoDays', params)
if (_.isUndefined(response.PARAM_NB_J_BLEU)) {
logger.warn('Erreur lors de la récupération des jours TEMPO')
result.nb_bleu = 'NO_DATA'
result.nb_blanc = 'NO_DATA'
result.nb_rouge = 'NO_DATA'
result.tempoBleu = 'NO_DATA'
result.tempoBlanc = 'NO_DATA'
result.tempoRouge = 'NO_DATA'
} else {
result.nb_bleu = response.PARAM_NB_J_BLEU
result.nb_blanc = response.PARAM_NB_J_BLANC
result.nb_rouge = response.PARAM_NB_J_ROUGE
result.tempoBleu = response.PARAM_NB_J_BLEU
result.tempoBlanc = response.PARAM_NB_J_BLANC
result.tempoRouge = response.PARAM_NB_J_ROUGE
}
// Période Tempo
const mois = date.getMonth()
if (mois < 8) {
const past = date.getFullYear() - 1
result.tempodebut = '01/09/' + past
result.tempofin = '31/08/' + date.getFullYear()
result.tempoDeb = '01/09/' + past
result.tempoFin = '31/08/' + date.getFullYear()
} else {
const next = date.getFullYear() + 1
result.tempodebut = '01/09/' + date.getFullYear()
result.tempofin = '31/08/' + next
result.tempoDeb = '01/09/' + date.getFullYear()
result.tempoFin = '31/08/' + next
}
// Emit publish Event
eventEmitter.emit('frame', 'global/edftempo', result)
Expand Down

0 comments on commit b771f5e

Please sign in to comment.