.gitignore

@@ -12,8 +12,3 @@ public/locales/undefined/
 .screenshots
 .vscode
 output.json
-
-# fase-0 higiene: variantes de settings con secretos (no versionar)
-settings-production-*.json
-settings-tests.json
-*.json~

README.md

@@ -33,11 +33,11 @@ TEST_PORT=3000 TEST_WATCH=1 TEST_CLIENT=0 MONGO_URL=mongodb://localhost:27017/fu
 
 # and
 
-node_modules/.bin/chimp --watch --ddp=http://localhost:3000 --path=cucumber
+chimp --watch --ddp=http://localhost:3000 --path=cucumber
 
 # and
 
-node_modules/.bin/chimp --ddp=http://localhost:3000 --path=cucumber
+chimp --ddp=http://localhost:3000 --path=cucumber
 
 ```
 

cucumber/chimp-config.js

@@ -1,29 +0,0 @@
-module.exports = {
-  // - - - - CHIMP - - - -
-  /* watch: false,
-   * watchTags: '@watch',
-   * offline: false,
-   */
-  // - - - - CUCUMBER - - - -
-  /* path: './features',
-   * jsonOutput: 'output.json', */
-
-  // '- - - - DEBUGGING  - - - -
-  log: 'info',
-  debug: false,
-  seleniumDebug: false,
-  webdriverLogLevel: false,
-  // debugBrkCucumber: 5858,
-  // - - - - WEBDRIVER-IO  - - - -
-  webdriverio: {
-    waitforTimeout: 10000,
-    waitforInterval: 250, // KEEP SMALL (!!!) this is the INTERVAL in which waitFor* is looped fo
-    desiredCapabilities: {
-      chromeOptions: {
-        // args: ["headless", "disable-gpu"]
-        args: ['--disable-gpu', '--no-sandbox', '--headless']
-      },
-      isHeadless: true
-    }
-  }
-};

imports/api/ActiveFiresUnion/server/publications.js

@@ -67,14 +67,12 @@ Meteor.publish('activefiresunionmyloc', function activeInMyLoc(northEastLng, nor
   check(northEastLat, NumberBetween(-90, 90));
   check(withMarks, Boolean);
 
-  // I use this for fire stats
+  if (!Meteor.isDevelopment) return this.ready(); // empty
-  // if (!Meteor.isDevelopment) return this.ready(); // empty
   return activeFiresUnion(northEastLng, northEastLat, southWestLng, southWestLat, withMarks);
 });
 
 // Warning: this increase always by one the fire stats
 Meteor.publish('lastFireUnionDetected', function lastFireDetected() {
-  // I use this for fire stats
+  if (!Meteor.isDevelopment) return this.ready(); // empty
-  // if (!Meteor.isDevelopment) return this.ready(); // empty
   return ActiveFiresUnion.find({}, { limit: 1, sort: { when: -1 } });
 });

imports/api/FalsePositives/server/publications.js

@@ -5,8 +5,7 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { NumberBetween } from '/imports/modules/server/other-checks';
-import '/imports/startup/server/leaflet-workaround.js';
+import L from 'leaflet-headless';
-import L from 'leaflet';
 import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify';
 import Industries from '/imports/api/Industries/Industries';
 import FalsePositives from '../FalsePositives';

imports/modules/server/notificationsProcess.js

@@ -43,18 +43,7 @@ function imgUrl(lat, lng) {
    return `<img src="${imgUrl(lat, lng)}" width="640" height="480"/>`;
    } */
 
-// Cutover flag (fase 1a): channels listed in
-// Meteor.settings.private.notifDisabledChannels (e.g. ['mobile','web']) are
-// handled by the tcef-notifications microservice, so the old observer/cron must
-// NOT send them. Mutual exclusion per channel — reversible by editing settings,
-// no code deploy needed. ES5-compatible on purpose (Meteor 1.6 / Node 8).
-const notifDisabledChannels = (Meteor.settings.private && Meteor.settings.private.notifDisabledChannels) || [];
-
 const processNotif = (notif) => {
-  if (notifDisabledChannels.indexOf(notif.type) !== -1) {
-    // This channel was migrated to tcef-notifications; do nothing here.
-    return;
-  }
   if (isMailServerMaster && validFcmSender && notif.type === 'mobile' && notif.notified !== true) {
     const fcmSender = new gcm.Sender(Meteor.settings.private.fcmApiToken);
     const user = Meteor.users.findOne({ _id: notif.userId });

imports/startup/server/index.js

@@ -17,4 +17,5 @@ import './prerender';
 import './feedback';
 import './cron';
 import './isMaster';
+import './segfaults';
 import './rest';

imports/startup/server/leaflet-workaround.js

@@ -1,19 +0,0 @@
-// imports/startup/server/leaflet-workaround.js
-global.window = {
-  screen: {
-    deviceXDPI: 1,
-    logicalXDPI: 1
-  }
-};
-global.document = {
-  documentElement: {
-    style: {}
-  },
-  createElement: () => {
-    return {};
-  }
-};
-global.navigator = {
-  userAgent: 'foo',
-  platform: 'bar'
-};

imports/startup/server/segfaults.js

@@ -0,0 +1,25 @@
+import SegfaultHandler from 'segfault-handler';
+import moment from 'moment';
+// import ravenLogger from './ravenLogger';
+
+// https://github.com/ddopson/node-segfault-handler
+
+const dateFileFormat = moment().format('YYYYMMDD_HH:mm:ss');
+
+SegfaultHandler.registerHandler(`/var/tmp/tcef-stacktrace-${dateFileFormat}.log`);
+
+
+// This callaback does not work:
+// https://github.com/ddopson/node-segfault-handler/issues/49
+
+/* SegfaultHandler.registerHandler('/var/tmp/tcef-crash.log', (signal, address, stack) => {
+ *   // Do what you want with the signal, address, or stack (array)
+ *   // This callback will execute before the signal is forwarded on.
+ *   ravenLogger.log(stack, signal);
+ * }); */
+
+// Only uncomment for segv tests
+// SegfaultHandler.causeSegfault();
+
+// Or this for normal error (should go to raven in configured)
+// throw new Error('This is just a test of error in server');

imports/startup/server/subsUnion.js

@@ -4,8 +4,7 @@ import { Meteor } from 'meteor/meteor';
 import Subscriptions from '/imports/api/Subscriptions/Subscriptions';
 import SiteSettings from '/imports/api/SiteSettings/SiteSettings';
 import Perlin from 'loms.perlin';
-import './leaflet-workaround';
+import L from 'leaflet-headless';
-import L from 'leaflet';
 import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify';
 import { isMailServerMaster } from '/imports/startup/server/email';
 

imports/ui/components/Maps/DefMapLayers.js

@@ -35,8 +35,7 @@ class DefMapLayers extends Component {
         <TileLayer
             opacity={defOpacity}
             attribution="&copy; <a href=&quot;http://osm.org/copyright&quot;>OpenStreetMap</a> contributors"
-            // url="https://tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png"
+            url="https://tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png"
-            url="https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png"
         />
       </BaseLayer>);
     const osmlayer = (

imports/ui/components/Maps/FireCircleMark.js

@@ -31,7 +31,7 @@ class FireCircleMark extends Component {
     } = this.props;
     const rect = rectangleAround({ lat, lon }, track, track);
     return (
-      <GeoJSON data={rect} color="red" stroke width="1" opacity=".4" fillOpacity="1">
+      <GeoJSON data={rect} color="red" stroke width="1" opacity=".4" fillOpacity=".3">
         <FirePopup t={t} history={history} id={id} nasa={nasa} lat={lat} lon={lon} when={when} />
       </GeoJSON>
     );

imports/ui/pages/FiresMap/FiresMap.js

@@ -84,6 +84,19 @@ class FiresMap extends React.Component {
     });
   }
 
+  /* shouldComponentUpdate(nextProps, nextState) {
+   *   const notMoving = !nextState.moving;
+   *   const markersChanged = this.state.useMarkers !== nextState.useMarkers;
+   *   const unionChanged = this.state.showSubsUnion !== nextState.showSubsUnion;
+   *   const otherViewport = this.state.viewport !== nextState.viewport;
+   *   // const init = nextState.viewport.center === [0, 0];
+   *   // console.log(notMoving ? 'Not moving map' : 'Moving map');
+   *   // console.log(otherViewport ? 'Other viewport' : 'Not other viewport');
+   *   console.log(`${otherViewport ? 'OTHER' : 'Not other'} viewport ${nextState.viewport.center} zoom: ${nextState.viewport.zoom}`);
+   *   return this.state.init || (notMoving && otherViewport && this.state.moved) || unionChanged || markersChanged;
+   * }
+   */
+
   shouldComponentUpdate(nextProps, nextState) {
     const notMoving = !nextState.moving;
     return notMoving;
@@ -236,7 +249,7 @@ class FiresMap extends React.Component {
               <p className="firesmap-legend">
                 { (this.props.activefires.length + this.props.firealerts.length) === 0 ?
                   <Fragment><Trans parent="span" i18nKey="noActiveFireInMapCount">No hay fuegos activos en esta zona del mapa. <strong>{{ countTotal: this.props.activefirestotal }}</strong> fuegos activos en el mundo.</Trans> <FireStats loadingAll={loading} {... this.props} /></Fragment> :
-                  <Fragment><Trans parent="span" i18nKey="activeFireInMapCount">En rojo, <strong>{{ count: this.props.activefiresunion.length + this.props.firealerts.length }}</strong> fuegos activos. <strong>{{ countTotal: this.props.activefirestotal }}</strong> fuegos activos en el mundo.</Trans> <FireStats loadingAll={loading} {... this.props} /></Fragment>
+                  <Fragment><Trans parent="span" i18nKey="activeFireInMapCount">En rojo, <strong>{{ count: this.props.activefires.length + this.props.firealerts.length }}</strong> fuegos activos. <strong>{{ countTotal: this.props.activefirestotal }}</strong> fuegos activos en el mundo.</Trans> <FireStats loadingAll={loading} {... this.props} /></Fragment>
                 }
               </p>
               {isNotHomeAndMobile() && this.props.firealerts.length > 0 &&

package.json

@@ -2,7 +2,7 @@
   "name": "tcef",
   "private": true,
   "scripts": {
-    "start": "QT_QPA_PLATFORM='' MONGO_URL=mongodb://fuegos:fuegos@localhost:27017/fuegos  meteor --settings settings-development.json",
+    "start": "QT_QPA_PLATFORM='' MONGO_URL=mongodb://localhost:27017/fuegos  meteor --settings settings-development.json",
     "test": "jest"
   },
   "dependencies": {
@@ -39,6 +39,7 @@
     "juice": "^4.2.2",
     "leaflet": "^1.3.1",
     "leaflet-graphicscale": "0.0.2",
+    "leaflet-headless": "^0.2.6",
     "leaflet-sleep": "^0.5.1",
     "lodash": "^4.17.4",
     "loms.perlin": "^1.0.1",
@@ -82,6 +83,7 @@
     "react-router-hash-link": "^1.1.1",
     "react-share": "^2.0.0",
     "reactstrap": "^5.0.0-alpha.3",
+    "segfault-handler": "^1.0.0",
     "simpl-schema": "^1.5.0",
     "simple-line-icons": "^2.4.1",
     "store": "^2.0.12",

packages/meteor-comments-ui

@@ -1 +1 @@
-Subproject commit 4761da921f467838a2c01b34e84a7703ee49b12c
+Subproject commit 3346b6db70c153b1dd66e6a16a0ad28f10ebf740