From 9ee01a6ef8e3e8cd1df1da960892155279cb4bf2 Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 22 Mar 2018 09:38:40 +0100 Subject: [PATCH] Improved autonomies names, cron job return --- imports/api/ActiveFires/server/countFires.js | 1 + .../api/ActiveFires/server/tweetFiresInZone.js | 7 +++++-- imports/startup/server/cron.js | 15 +++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/imports/api/ActiveFires/server/countFires.js b/imports/api/ActiveFires/server/countFires.js index dbb91e6..2be6e68 100644 --- a/imports/api/ActiveFires/server/countFires.js +++ b/imports/api/ActiveFires/server/countFires.js @@ -34,6 +34,7 @@ const countFires = (regions, stringsToRemove) => { regions.features.forEach((region) => { const regionName = cleanProv(region.properties.name, stringsToRemove); + if (debug) console.log(`${regionName} -----`); try { const fires = findFiresInRegion(region); // TODO Also check neighbour fires (when better implementation of that part) diff --git a/imports/api/ActiveFires/server/tweetFiresInZone.js b/imports/api/ActiveFires/server/tweetFiresInZone.js index 797dab6..1ad9dec 100644 --- a/imports/api/ActiveFires/server/tweetFiresInZone.js +++ b/imports/api/ActiveFires/server/tweetFiresInZone.js @@ -16,11 +16,12 @@ const stringsToRemove = [ ['Región de', ''], ['Valencia', 'CValenciana'], ['Comunidad de Madrid', 'CMadrid'], - ['La Mancha', 'CLMancha'], - ['León', 'CyL'], + ['León', 'CyLeón'], + ['Leon', 'CyLeón'], ['Castilla-', ''], ['Cataluña/', ''], ['Cataluña', 'Catalunya'], + ['La Mancha', 'CLMancha'], ['Baleares', 'IllesBalears'], ['Galicia', 'Galiza'], ['Principado de', ''], @@ -65,7 +66,9 @@ const tweetFires = () => { } else { tweet(tweetText, 'es'); } + return tweetText; } + return ''; }; if (Meteor.isDevelopment) { diff --git a/imports/startup/server/cron.js b/imports/startup/server/cron.js index 95d529f..38377dc 100644 --- a/imports/startup/server/cron.js +++ b/imports/startup/server/cron.js @@ -55,14 +55,13 @@ Meteor.startup(() => { } return sched; }, - job: () => { - tweetFires(); - // console.log('cron is working'); - /* console.log(this.userID) // Context Object becomes this argument - * console.log(this.magic) / - * var numbersCrunched = CrushSomeNumbers(); - * return numbersCrunched; */ - } + job: () => tweetFires() + /* console.log('cron is working'); + * console.log(this.userID) // Context Object becomes this argument + * console.log(this.magic) / + * var numbersCrunched = CrushSomeNumbers(); + * return numbersCrunched; + return tweetFires(); */ }); SyncedCron.start();