diff --git a/bundles/admin/admin-announcements/publisher/AnnouncementsTool.js b/bundles/admin/admin-announcements/publisher/AnnouncementsTool.js
index 16a792cf0e..d4836c3598 100644
--- a/bundles/admin/admin-announcements/publisher/AnnouncementsTool.js
+++ b/bundles/admin/admin-announcements/publisher/AnnouncementsTool.js
@@ -63,6 +63,10 @@ Oskari.clazz.define('Oskari.admin.bundle.admin-announcements.publisher.Announcem
}
service.fetchAdminAnnouncements((err, data) => {
+ if (err) {
+ alert('Error loading announcements');
+ return;
+ }
me.announcements = data;
const toolPluginAnnouncementsConf = me._getToolPluginAnnouncementsConf();
if (toolPluginAnnouncementsConf !== null) {
diff --git a/bundles/framework/announcements/plugin/AnnouncementsPlugin.js b/bundles/framework/announcements/plugin/AnnouncementsPlugin.js
index fc5791dd85..bf38dd00ab 100644
--- a/bundles/framework/announcements/plugin/AnnouncementsPlugin.js
+++ b/bundles/framework/announcements/plugin/AnnouncementsPlugin.js
@@ -60,6 +60,10 @@ Oskari.clazz.define('Oskari.framework.announcements.plugin.AnnouncementsPlugin',
);
service.fetchAnnouncements((err, data) => {
+ if (err) {
+ alert('Error loading announcements');
+ return;
+ }
me.allAnnouncements = data;
if (me._config.announcements !== undefined) {
me.addAnnouncements();
diff --git a/bundles/framework/coordinatetool/plugin/CoordinateToolPlugin.js b/bundles/framework/coordinatetool/plugin/CoordinateToolPlugin.js
index c5965fe8ab..03845eee5f 100755
--- a/bundles/framework/coordinatetool/plugin/CoordinateToolPlugin.js
+++ b/bundles/framework/coordinatetool/plugin/CoordinateToolPlugin.js
@@ -867,7 +867,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.coordinatetool.plugin.Coordinate
function (responseDataTo4326) {
me._updateEmergencyCallMessage(responseDataTo4326);
},
- function (error) {
+ function () {
me._coordinateTransformationExtension._showMessage(me._locale('display.cannotTransformCoordinates.title'), me._locale('cannotTransformCoordinates.message'));
});
}
diff --git a/bundles/framework/divmanazer/component/GridModel.js b/bundles/framework/divmanazer/component/GridModel.js
index eee7d1b3c9..77c033b01d 100755
--- a/bundles/framework/divmanazer/component/GridModel.js
+++ b/bundles/framework/divmanazer/component/GridModel.js
@@ -66,7 +66,7 @@ Oskari.clazz.define('Oskari.userinterface.component.GridModel',
*/
setFirstField: function (firstField) {
if (_.indexOf(this.fields, firstField) === 0 || _.indexOf(this.fields, firstField) === -1) {
-
+ // nothing to do
} else {
_.pull(this.fields, firstField);
this.fields.unshift(firstField);
diff --git a/bundles/framework/divmanazer/component/Popover.js b/bundles/framework/divmanazer/component/Popover.js
index e9f58a4724..7072f36e6a 100755
--- a/bundles/framework/divmanazer/component/Popover.js
+++ b/bundles/framework/divmanazer/component/Popover.js
@@ -186,10 +186,14 @@
return this.getTitle();
},
getPosition: function (inside) {
- return $.extend({}, (inside ? {
+ let offset = {
top: 0,
left: 0
- } : this.$element.offset()), {
+ };
+ if (!inside) {
+ offset = this.$element.offset();
+ }
+ return $.extend({}, offset, {
width: this.$element[0].offsetWidth,
height: this.$element[0].offsetHeight
});
diff --git a/bundles/framework/divmanazer/component/UIHelper.js b/bundles/framework/divmanazer/component/UIHelper.js
index 25e8a6a4b4..f83338f9a1 100755
--- a/bundles/framework/divmanazer/component/UIHelper.js
+++ b/bundles/framework/divmanazer/component/UIHelper.js
@@ -75,6 +75,7 @@ Oskari.clazz.define('Oskari.userinterface.component.UIHelper',
}
},
success: function (resp) {
+ /* eslint-disable node/no-callback-literal */
if (resp && resp.articles[0] && resp.articles[0].content) {
callback(true, resp.articles[0].content);
} else {
diff --git a/bundles/framework/divmanazer/instance.js b/bundles/framework/divmanazer/instance.js
index 3136f2425f..db7613919b 100755
--- a/bundles/framework/divmanazer/instance.js
+++ b/bundles/framework/divmanazer/instance.js
@@ -337,18 +337,16 @@ Oskari.clazz.define('Oskari.userinterface.bundle.ui.UserInterfaceBundleInstance'
* applies draggable handle to flyouts title bar
*/
_applyDraggableToFlyout: function (flyout, extensionInfo, cls) {
- var me = this,
- handle = flyout.children(cls).get()[0],
- flyoutTarget = flyout.get()[0],
- useHelper = false,
- el;
-
- extensionInfo.draggableHandle = handle;
- extensionInfo.draggableTarget = flyoutTarget;
-
- extensionInfo.draggable = jQuery(flyout).draggable({
- handle: jQuery(handle),
- helper: useHelper ? function () {
+ const me = this;
+ const handle = flyout.children(cls).get()[0];
+ const flyoutTarget = flyout.get()[0];
+ const useHelper = false;
+ let el;
+ let helperFn;
+ if (useHelper) {
+ // note! useHelper is always false
+ // not sure why this is here...
+ helperFn = function () {
el = jQuery('');
el.css('width', flyout.css('width'));
@@ -357,7 +355,14 @@ Oskari.clazz.define('Oskari.userinterface.bundle.ui.UserInterfaceBundleInstance'
el.css('z-index', flyout.css('z-index'));
return el;
- } : null,
+ };
+ }
+ extensionInfo.draggableHandle = handle;
+ extensionInfo.draggableTarget = flyoutTarget;
+
+ extensionInfo.draggable = jQuery(flyout).draggable({
+ handle: jQuery(handle),
+ helper: useHelper ? helperFn : null,
scroll: false,
stack: '.oskari-flyout',
create: function (event, ui) {},
diff --git a/bundles/framework/featuredata2/plugin/MapSelectionPlugin.js b/bundles/framework/featuredata2/plugin/MapSelectionPlugin.js
index b0066df3e5..244c4fada6 100644
--- a/bundles/framework/featuredata2/plugin/MapSelectionPlugin.js
+++ b/bundles/framework/featuredata2/plugin/MapSelectionPlugin.js
@@ -80,7 +80,6 @@ Oskari.clazz.define(
control = this.drawControls[key];
if (this.currentDrawMode === key) {
control();
- } else {
}
}
}
diff --git a/bundles/framework/guidedtour/instance.js b/bundles/framework/guidedtour/instance.js
index 99a0c5e578..8b9f5af220 100755
--- a/bundles/framework/guidedtour/instance.js
+++ b/bundles/framework/guidedtour/instance.js
@@ -358,6 +358,7 @@ Oskari.clazz.define(
}
},
success: function (resp) {
+ /* eslint-disable node/no-callback-literal */
if (resp && resp.articles[0] && resp.articles[0].content) {
callback(true, resp.articles[0].content);
} else {
diff --git a/bundles/framework/layerlist/view/LayerViewTabs/LayerList/LayerCollapse/LayerCollapseHandler.js b/bundles/framework/layerlist/view/LayerViewTabs/LayerList/LayerCollapse/LayerCollapseHandler.js
index 685ecc5676..5188e04f1d 100644
--- a/bundles/framework/layerlist/view/LayerViewTabs/LayerList/LayerCollapse/LayerCollapseHandler.js
+++ b/bundles/framework/layerlist/view/LayerViewTabs/LayerList/LayerCollapse/LayerCollapseHandler.js
@@ -80,10 +80,10 @@ const filterGroups = (groups = [], searchText) => {
group.groups = filterGroups(group.groups, searchText);
if (!group.getLayerCount()) {
// no layers and no subgroups with layers
- return;
+ return null;
}
return group;
- }).filter(group => typeof group !== 'undefined');
+ }).filter(group => !!group);
};
/* ------------- /Helpers ------ */
diff --git a/bundles/framework/layerlist/view/LayerViewTabs/LayerList/LayerCollapse/util.js b/bundles/framework/layerlist/view/LayerViewTabs/LayerList/LayerCollapse/util.js
index e083cb4f1a..bb0e1fb49a 100644
--- a/bundles/framework/layerlist/view/LayerViewTabs/LayerList/LayerCollapse/util.js
+++ b/bundles/framework/layerlist/view/LayerViewTabs/LayerList/LayerCollapse/util.js
@@ -85,10 +85,10 @@ const filterOutEmptyGroups = (groups = []) => {
group.groups = filterOutEmptyGroups(group.groups);
if (!group.layers.length && !group.groups.length) {
// no layers and no subgroups with layers
- return;
+ return null;
}
return group;
- }).filter(group => typeof group !== 'undefined');
+ }).filter(group => !!group);
};
/**
* Function to construct layer groups based on information included in layers and given grouping method.
diff --git a/bundles/framework/mapfull/instance.js b/bundles/framework/mapfull/instance.js
index 3045ac809d..78c3d8b737 100755
--- a/bundles/framework/mapfull/instance.js
+++ b/bundles/framework/mapfull/instance.js
@@ -524,23 +524,23 @@ Oskari.clazz.define('Oskari.mapframework.bundle.mapfull.MapFullBundleInstance',
params.mapLayers = state.selectedLayers
.map(layer => {
if (layer.hidden) {
- return;
+ return null;
}
if (optimized) {
if (layer.opacity === 0) {
// leave out layers that are not visible
- return;
+ return null;
}
// also leave out layers that are not inside zoom-limits, are outside of extent
// or are otherwise not shown to user
if (!this.getMapModule().isLayerVisible(layer.id)) {
- return;
+ return null;
}
}
return layer.id + '+' + layer.opacity + '+' + (layer.style || '');
})
// filter out hidden == undefined from map-function
- .filter(layer => typeof layer !== 'undefined')
+ .filter(layer => !!layer)
// separate with comma
.join(',');
diff --git a/bundles/framework/myplaces3/service/MyPlacesService.js b/bundles/framework/myplaces3/service/MyPlacesService.js
index 679509ecf3..444b097129 100644
--- a/bundles/framework/myplaces3/service/MyPlacesService.js
+++ b/bundles/framework/myplaces3/service/MyPlacesService.js
@@ -108,6 +108,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
var places = me.getPlacesInCategory(oldCategoryId);
if (places.length === 0) {
// no places to move -> callback right away
+ /* eslint-disable node/no-callback-literal */
callback(true);
return;
}
@@ -133,6 +134,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
if (idList.length === 0) {
// no places to delete -> callback right away
this._removePlaces(categoryId);
+ /* eslint-disable node/no-callback-literal */
callback(true);
return;
}
@@ -159,6 +161,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
},
error: function (jqXHR, textStatus) {
if (jqXHR.status !== 0) {
+ /* eslint-disable node/no-callback-literal */
callback(false);
}
}
@@ -267,6 +270,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
},
error: function (jqXHR, textStatus) {
if (jqXHR.status !== 0) {
+ /* eslint-disable node/no-callback-literal */
callback(false);
}
}
@@ -311,6 +315,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
const place = this.findMyPlace(placeId);
if (!place) {
this.log.error('Could not find requested place with id:', placeId);
+ /* eslint-disable node/no-callback-literal */
callback(false);
return;
}
@@ -379,6 +384,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
},
error: function (jqXHR, textStatus) {
if (jqXHR.status !== 0) {
+ /* eslint-disable node/no-callback-literal */
callback(false);
}
}
@@ -449,6 +455,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
},
error: jqXHR => {
if (jqXHR.status !== 0) {
+ /* eslint-disable node/no-callback-literal */
callback(false);
}
}
diff --git a/bundles/framework/personaldata/service/ViewService.js b/bundles/framework/personaldata/service/ViewService.js
index f89cfd40fc..2fb6a2f1f7 100755
--- a/bundles/framework/personaldata/service/ViewService.js
+++ b/bundles/framework/personaldata/service/ViewService.js
@@ -64,9 +64,11 @@ Oskari.clazz.define('Oskari.mapframework.bundle.personaldata.service.ViewService
}
},
success: function (response) {
+ /* eslint-disable node/no-callback-literal */
callback(true, response);
},
error: function () {
+ /* eslint-disable node/no-callback-literal */
callback(false);
}
});
@@ -96,9 +98,11 @@ Oskari.clazz.define('Oskari.mapframework.bundle.personaldata.service.ViewService
}
},
success: function (response) {
+ /* eslint-disable node/no-callback-literal */
callback(true);
},
error: function () {
+ /* eslint-disable node/no-callback-literal */
callback(false);
}
});
@@ -133,9 +137,11 @@ Oskari.clazz.define('Oskari.mapframework.bundle.personaldata.service.ViewService
}
},
success: function (response) {
+ /* eslint-disable node/no-callback-literal */
callback(true);
},
error: function () {
+ /* eslint-disable node/no-callback-literal */
callback(false);
}
});
@@ -172,9 +178,11 @@ Oskari.clazz.define('Oskari.mapframework.bundle.personaldata.service.ViewService
}
},
success: function (response) {
+ /* eslint-disable node/no-callback-literal */
callback(true);
},
error: function () {
+ /* eslint-disable node/no-callback-literal */
callback(false);
}
});
diff --git a/bundles/framework/publisher2/view/FlyoutStartView.js b/bundles/framework/publisher2/view/FlyoutStartView.js
index a56809591c..8954e47ee5 100755
--- a/bundles/framework/publisher2/view/FlyoutStartView.js
+++ b/bundles/framework/publisher2/view/FlyoutStartView.js
@@ -172,13 +172,13 @@ Oskari.clazz.define('Oskari.mapframework.bundle.publisher2.view.FlyoutStartView'
* list of layers to render
* @return {jQuery} DOM element with layer listing
*/
- _getRenderedLayerList: function (list) {
+ _getRenderedLayerList: function (list = []) {
var layerList = this.templateLayerList.clone();
var listElement = layerList.find('ul');
var listItemTemplate = this.templateListItem;
var map = this.instance.sandbox.getMap();
- (list || []).forEach((layer) => {
+ list.forEach((layer) => {
var item = listItemTemplate.clone();
var txt = layer.getName();
var reasons = [];
@@ -190,10 +190,14 @@ Oskari.clazz.define('Oskari.mapframework.bundle.publisher2.view.FlyoutStartView'
reasons.push(this.loc.noRights);
}
if (!map.isLayerSupported(layer)) {
- reasons = reasons.concat(map.getUnsupportedLayerReasons(layer).map(
- cur => cur instanceof UnsupportedLayerSrs
- ? this.loc.unsupportedProjection : cur.getDescription().replace(/\./g, '')
- ));
+ reasons = reasons.concat(map.getUnsupportedLayerReasons(layer)
+ .map(cur => {
+ if (cur instanceof UnsupportedLayerSrs) {
+ return this.loc.unsupportedProjection;
+ }
+ return cur.getDescription().replace(/\./g, '');
+ })
+ );
}
if (reasons.length) {
txt += ' (' + reasons.join(', ') + ')';
diff --git a/bundles/framework/publisher2/view/PanelMapPreview.js b/bundles/framework/publisher2/view/PanelMapPreview.js
index bf467ee9a9..c9a93562b3 100755
--- a/bundles/framework/publisher2/view/PanelMapPreview.js
+++ b/bundles/framework/publisher2/view/PanelMapPreview.js
@@ -456,22 +456,19 @@ Oskari.clazz.define('Oskari.mapframework.bundle.publisher2.view.PanelMapPreview'
* @return {Object}
*/
getValues: function () {
- var me = this,
- values = {},
- selected = me._getSelectedMapSize(),
- size = isNaN(parseInt(selected.width)) || isNaN(parseInt(selected.height)) ? undefined : {
- width: selected.width,
- height: selected.height
- };
-
- values = {
+ const selected = this._getSelectedMapSize();
+ const values = {
metadata: {
- preview: selected.option.id,
- size: size
-
+ preview: selected.option.id
}
};
+ if (!isNaN(parseInt(selected.width)) && !isNaN(parseInt(selected.height))) {
+ values.metadata.size = {
+ width: selected.width,
+ height: selected.height
+ };
+ }
return values;
},
validate: function () {
diff --git a/bundles/framework/publisher2/view/PanelToolLayout.js b/bundles/framework/publisher2/view/PanelToolLayout.js
index 8be9bcdf83..ffc00b606f 100755
--- a/bundles/framework/publisher2/view/PanelToolLayout.js
+++ b/bundles/framework/publisher2/view/PanelToolLayout.js
@@ -33,8 +33,12 @@ Oskari.clazz.define('Oskari.mapframework.bundle.publisher2.view.PanelToolLayout'
me.toolLayouts = ['lefthanded', 'righthanded', 'userlayout'];
me.data = me.instance.publisher.data;
- me.activeToolLayout = me.instance.publisher.data && me.instance.publisher.data.metadata && me.instance.publisher.data.metadata.toolLayout
- ? me.instance.publisher.data.metadata.toolLayout : 'userlayout';
+ me.activeToolLayout = 'userlayout';
+ if (me.instance.publisher.data &&
+ me.instance.publisher.data.metadata &&
+ me.instance.publisher.data.metadata.toolLayout) {
+ me.activeToolLayout = me.instance.publisher.data.metadata.toolLayout;
+ }
me.toolLayoutEditMode = false;
me._addedDraggables = [];
}, {
diff --git a/bundles/framework/timeseries/WMSAnimator.js b/bundles/framework/timeseries/WMSAnimator.js
index 49bbcf8bec..45179b0201 100644
--- a/bundles/framework/timeseries/WMSAnimator.js
+++ b/bundles/framework/timeseries/WMSAnimator.js
@@ -151,6 +151,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.timeseries.WMSAnimator',
* @param {Function} callback is called when loading is ready or 5000 ms timeout reached
*/
_bufferImages: function (urls, nextTime, callback) {
+ /* eslint-disable node/no-callback-literal */
var imgCount = urls.length;
if (imgCount === 0) {
callback(true);
diff --git a/bundles/framework/timeseries/view/TimeseriesControlPlugin.js b/bundles/framework/timeseries/view/TimeseriesControlPlugin.js
index 944bf4c753..4f01f3c9f4 100644
--- a/bundles/framework/timeseries/view/TimeseriesControlPlugin.js
+++ b/bundles/framework/timeseries/view/TimeseriesControlPlugin.js
@@ -518,31 +518,43 @@ Oskari.clazz.define('Oskari.mapframework.bundle.timeseries.TimeseriesControlPlug
* @return {Function} time formatting function
*/
_getTickFormatter: function () {
- var locale;
- var formatterFunction;
+ let locale;
+ let formatterFunction;
if (this._d3TimeDef) {
locale = d3.timeFormatLocale(this._d3TimeDef);
formatterFunction = locale.format.bind(locale);
} else {
formatterFunction = d3.timeFormat.bind(d3);
}
- var formatMillisecond = formatterFunction('.%L'),
- formatSecond = formatterFunction(':%S'),
- formatMinute = formatterFunction(locale ? '%H:%M' : '%I:%M'),
- formatHour = formatterFunction(locale ? '%H:%M' : '%I %p'),
- formatDay = formatterFunction(locale ? '%d.%m.' : '%d %b'),
- formatMonth = formatterFunction('%b'),
- formatYear = formatterFunction('%Y');
-
+ const getFormatter = (date) => {
+ // try to format date sensibly based on accuracy
+ if (d3.timeSecond(date) < date) {
+ // milliseconds
+ return formatterFunction('.%L');
+ } else if (d3.timeMinute(date) < date) {
+ // seconds
+ return formatterFunction(':%S');
+ } else if (d3.timeHour(date) < date) {
+ // minutes
+ return formatterFunction(locale ? '%H:%M' : '%I:%M');
+ } else if (d3.timeDay(date) < date) {
+ // hours
+ return formatterFunction(locale ? '%H:%M' : '%I %p');
+ } else if (d3.timeMonth(date) < date) {
+ // days
+ return formatterFunction(locale ? '%d.%m.' : '%d %b');
+ } else if (d3.timeYear(date) < date) {
+ // months
+ return formatterFunction('%b');
+ }
+ // default to years
+ return formatterFunction('%Y');
+ };
return function multiFormat (date) {
- var textEl = d3.select(this);
- return (d3.timeSecond(date) < date ? formatMillisecond
- : d3.timeMinute(date) < date ? formatSecond
- : d3.timeHour(date) < date ? formatMinute
- : d3.timeDay(date) < date ? formatHour
- : d3.timeMonth(date) < date ? formatDay
- : d3.timeYear(date) < date ? formatMonth
- : (textEl.classed('bold', true), formatYear))(date);
+ const textEl = d3.select(this);
+ textEl.classed('bold', true);
+ const formatFn = getFormatter(date);
+ return formatFn(date);
};
},
/**
diff --git a/bundles/mapping/mapmodule/MapModuleClass.ol.js b/bundles/mapping/mapmodule/MapModuleClass.ol.js
index b50ff4c1c0..181239b33e 100644
--- a/bundles/mapping/mapmodule/MapModuleClass.ol.js
+++ b/bundles/mapping/mapmodule/MapModuleClass.ol.js
@@ -399,6 +399,7 @@ export class MapModule extends AbstractMapModule {
if (this.isLoading()) {
if (numOfTries < 0) {
+ /* eslint-disable node/no-callback-literal */
callback('');
return;
}
@@ -433,6 +434,7 @@ export class MapModule extends AbstractMapModule {
me.getMap().renderSync();
} catch (err) {
me.log.warn('Error in screenshot map render sync: ' + err);
+ /* eslint-disable node/no-callback-literal */
callback('');
}
}
@@ -759,6 +761,7 @@ export class MapModule extends AbstractMapModule {
if (!isNaN(zoom)) {
view.setZoom(zoom);
}
+ /* eslint-disable node/no-callback-literal */
callback(true);
break;
}
@@ -1173,7 +1176,7 @@ export class MapModule extends AbstractMapModule {
/* insert at */
if (index === layerIndex) {
-
+ // nothing to do here
} else if (index === layerColl.getLength()) {
/* to top */
layerColl.removeAt(layerIndex);
diff --git a/bundles/mapping/mapmodule/mapmodule.olcs.js b/bundles/mapping/mapmodule/mapmodule.olcs.js
index 4fcfdec50b..bcc560939f 100644
--- a/bundles/mapping/mapmodule/mapmodule.olcs.js
+++ b/bundles/mapping/mapmodule/mapmodule.olcs.js
@@ -775,10 +775,15 @@ class MapModuleOlCesium extends MapModuleOl {
const cameraHeight = this._zoomToAltitude(zoom);
const duration = options.duration ? options.duration : 3000;
const animationDuration = duration / 1000;
- const camera = options.heading && options.roll && options.pitch
- ? { heading: options.heading,
+
+ let camera;
+ if (options.heading && options.roll && options.pitch) {
+ camera = {
+ heading: options.heading,
roll: options.roll,
- pitch: options.pitch } : undefined;
+ pitch: options.pitch
+ };
+ }
const complete = () => this.notifyMoveEnd();
// 3d map now only supports one animation so ignore the parameter, and just fly
this._flyTo(location[0], location[1], cameraHeight, animationDuration, camera, complete);
@@ -875,11 +880,17 @@ class MapModuleOlCesium extends MapModuleOl {
const cameraHeight = this._zoomToAltitude(zoom);
const coords = coordinates.map(coord => olProj.transform([coord.lon, coord.lat], this.getProjection(), 'EPSG:4326'));
// check for 3d map options
- const cameraOptions = options.camera;
- const camera = cameraOptions
- ? { heading: Cesium.Math.toRadians(cameraOptions.heading),
- roll: Cesium.Math.toRadians(cameraOptions.roll),
- pitch: Cesium.Math.toRadians(cameraOptions.pitch) } : undefined;
+ const getCameraOpts = (opts, defaultOpts) => {
+ if (!opts) {
+ return defaultOpts;
+ }
+ return {
+ heading: Cesium.Math.toRadians(opts.heading),
+ roll: Cesium.Math.toRadians(opts.roll),
+ pitch: Cesium.Math.toRadians(opts.pitch)
+ };
+ };
+ const camera = getCameraOpts(options.camera);
let index = 0;
let delay = 0;
let status = { steps: coordinates.length, step: 0 };
@@ -889,10 +900,7 @@ class MapModuleOlCesium extends MapModuleOl {
if (index < coordinates.length) {
const location = coords[index];
const locOptions = coordinates[index];
- const cameraValues = locOptions.camera
- ? { heading: Cesium.Math.toRadians(locOptions.camera.heading),
- roll: Cesium.Math.toRadians(locOptions.camera.roll),
- pitch: Cesium.Math.toRadians(locOptions.camera.pitch) } : camera;
+ const cameraValues = getCameraOpts(locOptions.camera, camera);
const heightValue = locOptions.zoom ? this._zoomToAltitude(locOptions.zoom) : cameraHeight;
const locationDuration = locOptions.duration ? locOptions.duration / 1000 : animationDuration;
status = { ...status, step: index + 1 };
diff --git a/bundles/mapping/mapmodule/plugin/getinfo/GetFeatureInfoFormatter.js b/bundles/mapping/mapmodule/plugin/getinfo/GetFeatureInfoFormatter.js
index 82558a3b91..44e0a3e392 100755
--- a/bundles/mapping/mapmodule/plugin/getinfo/GetFeatureInfoFormatter.js
+++ b/bundles/mapping/mapmodule/plugin/getinfo/GetFeatureInfoFormatter.js
@@ -202,7 +202,7 @@ Oskari.clazz.category('Oskari.mapframework.mapmodule.GetInfoPlugin', 'formatter'
pretty = me._formatGfiDatum(datum);
}
if (typeof pretty === 'undefined') {
- return;
+ return null;
}
const layer = sandbox.findMapLayerFromSelectedMapLayers(datum.layerId);
@@ -217,7 +217,7 @@ Oskari.clazz.category('Oskari.mapframework.mapmodule.GetInfoPlugin', 'formatter'
isMyPlace: !!layerIdString.match('myplaces_')
};
})
- .filter(feature => typeof feature !== 'undefined');
+ .filter(feature => !!feature);
return coll || [];
},
diff --git a/bundles/mapping/mapmodule/plugin/layers/LayerSelectionPlugin.js b/bundles/mapping/mapmodule/plugin/layers/LayerSelectionPlugin.js
index 0691b2b679..c641220cdf 100755
--- a/bundles/mapping/mapmodule/plugin/layers/LayerSelectionPlugin.js
+++ b/bundles/mapping/mapmodule/plugin/layers/LayerSelectionPlugin.js
@@ -709,16 +709,6 @@ Oskari.clazz.define('Oskari.mapframework.bundle.mapmodule.plugin.LayerSelectionP
// fix layers content height
me._handleMapSizeChanged(size, false);
-
- var layersTitle = div.find('.content-header');
-
- if (layersTitle.length == 0) {
- layersTitle = div.find('.header');
- }
-
- // Get layers title height
- if (layersTitle.length > 0) {
- }
}
me._rebindHandlers();
diff --git a/bundles/mapping/mapmodule/plugin/search/SearchPlugin.js b/bundles/mapping/mapmodule/plugin/search/SearchPlugin.js
index 9484d023f1..612134b16d 100755
--- a/bundles/mapping/mapmodule/plugin/search/SearchPlugin.js
+++ b/bundles/mapping/mapmodule/plugin/search/SearchPlugin.js
@@ -298,10 +298,6 @@ Oskari.clazz.define(
* Detects if key was pressed and calls #_doSearch if it was
*/
_checkForEnter: function (event) {
- if (window.event) {
- } else if (event) {
- }
-
if (event.keyCode === 13) {
this._doSearch();
}
diff --git a/bundles/mapping/mapmodule/plugin/vectorlayer/VectorLayerPlugin.ol.js b/bundles/mapping/mapmodule/plugin/vectorlayer/VectorLayerPlugin.ol.js
index 0f2f809b6c..b227e9e0be 100644
--- a/bundles/mapping/mapmodule/plugin/vectorlayer/VectorLayerPlugin.ol.js
+++ b/bundles/mapping/mapmodule/plugin/vectorlayer/VectorLayerPlugin.ol.js
@@ -1074,8 +1074,8 @@ Oskari.clazz.define(
if (a.config.positionInsideLayer > b.config.positionInsideLayer) {
return 1;
}
- return 0;
}
+ return 0;
});
layer.removeAllFeatures();
layer.addFeatures(features);
diff --git a/bundles/mapping/mapmodule/service/map.layer.js b/bundles/mapping/mapmodule/service/map.layer.js
index 9e5dbbe924..b78e37cc3e 100755
--- a/bundles/mapping/mapmodule/service/map.layer.js
+++ b/bundles/mapping/mapmodule/service/map.layer.js
@@ -675,10 +675,12 @@ Oskari.clazz.define('Oskari.mapframework.service.MapLayerService',
this._loadedLayersList = layers;
} else {
// Clear data provider from needed layers.
- this.getAllLayers().filter(l => l.admin && l.admin.organizationId === dataProvider.id).map(l => {
- l._organizationName = '';
- delete l.admin.organizationId;
- });
+ this.getAllLayers()
+ .filter(l => l.admin && l.admin.organizationId === dataProvider.id)
+ .forEach(l => {
+ l._organizationName = '';
+ delete l.admin.organizationId;
+ });
}
this.trigger('dataProvider.update');
},
diff --git a/bundles/mapping/mapmodule/service/map.state.js b/bundles/mapping/mapmodule/service/map.state.js
index df1aec8903..c54d233aaf 100755
--- a/bundles/mapping/mapmodule/service/map.state.js
+++ b/bundles/mapping/mapmodule/service/map.state.js
@@ -612,8 +612,9 @@ import { UnsupportedLayerReason } from '../domain/UnsupportedLayerReason';
if (supported instanceof UnsupportedLayerReason) {
return layer;
}
+ return null;
})
- .filter(layer => typeof layer !== 'undefined');
+ .filter(layer => !!layer);
if (affectedLayers.length !== 0) {
const event = Oskari.eventBuilder('MapLayerEvent')(null, 'update');
diff --git a/bundles/statistics/statsgrid2016/components/IndicatorParameters.js b/bundles/statistics/statsgrid2016/components/IndicatorParameters.js
index 71d3f5ca00..b7c69f09ea 100755
--- a/bundles/statistics/statsgrid2016/components/IndicatorParameters.js
+++ b/bundles/statistics/statsgrid2016/components/IndicatorParameters.js
@@ -147,12 +147,8 @@ Oskari.clazz.define('Oskari.statistics.statsgrid.IndicatorParameters', function
me._selections.push(select);
}
});
-
- var optionsToDisable = regionsets.filter(function (iter) {
- if (me.regionsetRestrictions.length && me.regionsetRestrictions.indexOf(iter) === -1) {
- return iter;
- }
- });
+ const restrictedSets = me.regionsetRestrictions || [];
+ var optionsToDisable = regionsets.filter((item) => !restrictedSets.includes(item));
var regionSelect = me.regionSelector.create(regionsets, false);
me.regionSelector.setWidth(205);
if (regionsets.length === 1) {
diff --git a/bundles/statistics/statsgrid2016/service/CacheHelper.js b/bundles/statistics/statsgrid2016/service/CacheHelper.js
index f1b3bc0049..23129890b7 100644
--- a/bundles/statistics/statsgrid2016/service/CacheHelper.js
+++ b/bundles/statistics/statsgrid2016/service/CacheHelper.js
@@ -57,6 +57,7 @@ Oskari.clazz.define('Oskari.statistics.statsgrid.CacheHelper', function (cache,
return '' + ind.id === '' + data.id;
});
if (!existingIndicator) {
+ /* eslint-disable node/no-callback-literal */
callback('Tried saving an indicator with id, but id didn\'t match existing indicator');
return;
}
@@ -94,6 +95,7 @@ Oskari.clazz.define('Oskari.statistics.statsgrid.CacheHelper', function (cache,
return '' + ind.id === '' + indicatorId;
});
if (!existingIndicator) {
+ /* eslint-disable node/no-callback-literal */
callback('Tried saving dataset for an indicator, but id didn\'t match existing indicator');
return;
}
diff --git a/bundles/statistics/statsgrid2016/service/StatisticsService.js b/bundles/statistics/statsgrid2016/service/StatisticsService.js
index 3b64dd9154..78b0d99a5c 100755
--- a/bundles/statistics/statsgrid2016/service/StatisticsService.js
+++ b/bundles/statistics/statsgrid2016/service/StatisticsService.js
@@ -2,6 +2,7 @@
* @class Oskari.statistics.statsgrid.StatisticsService
*/
(function (Oskari) {
+ /* eslint-disable node/no-callback-literal */
var _log = Oskari.log('StatsGrid.StatisticsService');
var _cacheHelper = null;
diff --git a/package.json b/package.json
index 94b86005e3..afbe78968a 100644
--- a/package.json
+++ b/package.json
@@ -49,14 +49,13 @@
"dompurify": "2.3.1",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6",
- "eslint": "7.1.0",
- "eslint-config-standard": "14.1.1",
- "eslint-import-resolver-webpack": "0.12.1",
- "eslint-plugin-import": "2.20.2",
+ "eslint": "8.9.0",
+ "eslint-config-standard": "16.0.3",
+ "eslint-import-resolver-webpack": "0.13.2",
+ "eslint-plugin-import": "2.25.4",
"eslint-plugin-node": "11.1.0",
- "eslint-plugin-promise": "4.2.1",
- "eslint-plugin-react": "7.20.0",
- "eslint-plugin-standard": "4.0.1",
+ "eslint-plugin-promise": "6.0.0",
+ "eslint-plugin-react": "7.29.1",
"expose-loader": "0.7.5",
"file-loader": "4.2.0",
"fs-extra": "8.1.0",