Fix #3186. Fix Firefox 62/Chrome 69 flat function conflicts (#3187)

kappu72 · offtherailz · commit b2f3cc2ff3a7 · 2018-09-10T16:57:41.000+02:00
diff --git a/web/client/selectors/__tests__/layers-test.js b/web/client/selectors/__tests__/layers-test.js
@@ -32,6 +32,12 @@ describe('Test layers selectors', () => {
         expect(props[0].type).toBe("osm");
     });
 
+    it('test layersSelector without layers', () => {
+        const props = layersSelector({});
+        expect(props).toExist();
+        expect(props.length).toBe(0);
+    });
+
     it('test layerSelectorWithMarkers with no markers', () => {
         const props = layerSelectorWithMarkers({config: {layers: [{type: "osm"}]}});
 
diff --git a/web/client/selectors/layers.js b/web/client/selectors/layers.js
@@ -11,9 +11,9 @@ const {createSelector} = require('reselect');
 const MapInfoUtils = require('../utils/MapInfoUtils');
 const LayersUtils = require('../utils/LayersUtils');
 const {getNormalizedLatLon} = require('../utils/CoordinatesUtils');
-const {get, head, isEmpty, find, isObject, castArray} = require('lodash');
+const {get, head, isEmpty, find, isObject, isArray, castArray} = require('lodash');
 
-const layersSelector = state => state.layers && state.layers.flat || state.layers || state.config && state.config.layers || [];
+const layersSelector = ({layers, config} = {}) => layers && isArray(layers) ? layers : layers && layers.flat || config && config.layers || [];
 const currentBackgroundLayerSelector = state => head(layersSelector(state).filter(l => l && l.visibility && l.group === "background"));
 const getLayerFromId = (state, id) => head(layersSelector(state).filter(l => l.id === id));
 const allBackgroundLayerSelector = state => layersSelector(state).filter(l => l.group === "background");
