})
`;
} */
+// 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 });
diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js
index dd4f913..7f84dde 100644
--- a/imports/startup/server/index.js
+++ b/imports/startup/server/index.js
@@ -17,5 +17,4 @@ import './prerender';
import './feedback';
import './cron';
import './isMaster';
-import './segfaults';
import './rest';
diff --git a/imports/startup/server/leaflet-workaround.js b/imports/startup/server/leaflet-workaround.js
new file mode 100644
index 0000000..740aa3b
--- /dev/null
+++ b/imports/startup/server/leaflet-workaround.js
@@ -0,0 +1,19 @@
+// 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'
+};
diff --git a/imports/startup/server/segfaults.js b/imports/startup/server/segfaults.js
deleted file mode 100644
index b976f0b..0000000
--- a/imports/startup/server/segfaults.js
+++ /dev/null
@@ -1,25 +0,0 @@
-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');
diff --git a/imports/startup/server/subsUnion.js b/imports/startup/server/subsUnion.js
index 390a6ee..2643359 100644
--- a/imports/startup/server/subsUnion.js
+++ b/imports/startup/server/subsUnion.js
@@ -4,7 +4,8 @@ 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 L from 'leaflet-headless';
+import './leaflet-workaround';
+import L from 'leaflet';
import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify';
import { isMailServerMaster } from '/imports/startup/server/email';
diff --git a/imports/ui/components/Maps/DefMapLayers.js b/imports/ui/components/Maps/DefMapLayers.js
index 713b499..6e3ed56 100644
--- a/imports/ui/components/Maps/DefMapLayers.js
+++ b/imports/ui/components/Maps/DefMapLayers.js
@@ -35,7 +35,8 @@ class DefMapLayers extends Component {
+