Merge pull request #1 from ZakarFin/mvt

Merged develop and resolved conflicts
oskariorg · Mar 28, 2019 · 84dbd10 · 84dbd10
2 parents a3894b4 + ade3032
commit 84dbd10
Show file tree

Hide file tree

Showing 176 changed files with 1,692 additions and 683 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -5,6 +5,7 @@ src/**
 resources/**
 packages/**
 node_modules/**
+node_modules.bak/**
 locale/**
 libraries/**
 dist/**

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -30,7 +30,7 @@ module.exports = {
     "__webpack_public_path__": false
   },
   "parserOptions": {
-    "ecmaVersion": 6,
+    "ecmaVersion": 9,
     "sourceType": "module"
   },
   // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style

diff --git a/bundles/admin/admin-hierarchical-layerlist/collections/userRoleCollection.js b/bundles/admin/admin-hierarchical-layerlist/collections/userRoleCollection.js
@@ -4,7 +4,7 @@
         function (roleModel) {
             return Backbone.Collection.extend({
 
-            // Reference to this collection's model.
+                // Reference to this collection's model.
                 model: roleModel,
 
                 getRoles: function () {

diff --git a/bundles/admin/admin-hierarchical-layerlist/instance.js b/bundles/admin/admin-hierarchical-layerlist/instance.js
@@ -347,7 +347,7 @@ Oskari.clazz.define('Oskari.admin.bundle.admin.HierarchicalLayerListBundleInstan
                         xhr = null;
                         var successCount = resp.success.length;
                         var failCount = Object.keys(resp.error).length;
-                        content.append('<br><br><span>' + loc('recheckAllSucceeded', {success: successCount, fail: failCount}) + '<span>');
+                        content.append('<br><br><span>' + loc('recheckAllSucceeded', { success: successCount, fail: failCount }) + '<span>');
                         tool.removeClass('active');
                     },
                     error: function (xhr, status, error) {

diff --git a/bundles/admin/admin-layereditor/components/Button.stories.js b/bundles/admin/admin-layereditor/components/Button.stories.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { Button } from './Button';
-import {StyledButton} from './StyledButton';
+import { StyledButton } from './StyledButton';
 
 const defaultText = 'My text';
 const defaultProps = {};

diff --git a/bundles/admin/admin-layereditor/instance.js b/bundles/admin/admin-layereditor/instance.js
@@ -1,4 +1,4 @@
-import {LayerEditorFlyout} from './view/Flyout';
+import { LayerEditorFlyout } from './view/Flyout';
 const BasicBundle = Oskari.clazz.get('Oskari.BasicBundle');
 
 Oskari.clazz.defineES('Oskari.admin.admin-layereditor.instance',

diff --git a/bundles/admin/admin-layereditor/view/LayerWizard/LayerCapabilitiesListing.jsx b/bundles/admin/admin-layereditor/view/LayerWizard/LayerCapabilitiesListing.jsx
@@ -1,17 +1,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {List} from '../../components/List';
+import {List, ListItem} from '../../components/List';
 
 export class LayerCapabilitiesListing extends React.Component {
     getItem (item) {
         return (
-            <span onClick={() => this.props.onSelect(item)}>{item.name}</span>
+            <ListItem onClick={() => this.props.onSelect(item)}>
+                {item.name}
+            </ListItem>
         );
     }
     render () {
         return (
             <div>
-                <List dataSource={this.props.capabilities.map(item => this.getItem(item))}></List>
+                <List dataSource={this.props.capabilities} renderItem={item => this.getItem(item)}></List>
             </div>
         );
     }

diff --git a/bundles/admin/admin-layereditor/view/LayerWizard/StateHandler.js b/bundles/admin/admin-layereditor/view/LayerWizard/StateHandler.js
@@ -19,7 +19,7 @@ export class StateHandler {
         return this.loading;
     }
     getLayer () {
-        return {...this.layer};
+        return { ...this.layer };
     }
     getCapabilities () {
         return this.capabilities || [];

diff --git a/bundles/admin/admin/DefaultViews.js b/bundles/admin/admin/DefaultViews.js
@@ -174,13 +174,13 @@ Oskari.clazz.define('Oskari.admin.bundle.admin.DefaultViews', function (locale,
     __showGenericErrorSave: function (id) {
         this.instance.showMessage(
             this.locale.notifications.errorTitle,
-            _.template(this.locale.notifications.errorUpdating)({id: id}));
+            _.template(this.locale.notifications.errorUpdating)({ id: id }));
     },
 
     __viewSaved: function (id, data) {
         this.instance.showMessage(
             this.locale.notifications.successTitle,
-            _.template(this.locale.notifications.viewUpdated)({id: id}));
+            _.template(this.locale.notifications.viewUpdated)({ id: id }));
     },
 
     /**

diff --git a/bundles/admin/admin/Flyout.js b/bundles/admin/admin/Flyout.js
@@ -61,7 +61,7 @@ Oskari.clazz.define('Oskari.admin.bundle.admin.GenericAdminFlyout',
          *      request to handle
          */
         handleRequest: function (core, request) {
-            this.addTab({'title': request.getTitle(), 'content': request.getContent(), 'priority': request.getPriority(), 'id': request.getId()});
+            this.addTab({ 'title': request.getTitle(), 'content': request.getContent(), 'priority': request.getPriority(), 'id': request.getId() });
         }
     }, {
         'extend': ['Oskari.userinterface.extension.DefaultFlyout']

diff --git a/bundles/admin/admin/request/AddTabRequestHandler.js b/bundles/admin/admin/request/AddTabRequestHandler.js
@@ -22,7 +22,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.admin.request.AddTabRequestHandl
      *      request to handle
      */
         handleRequest: function (core, request) {
-            this.flyout.addTab({'title': request.getTitle(), 'content': request.getContent(), 'priority': request.getPriority(), 'id': request.getId()});
+            this.flyout.addTab({ 'title': request.getTitle(), 'content': request.getContent(), 'priority': request.getPriority(), 'id': request.getId() });
         }
     }, {
     /**

diff --git a/bundles/admin/metrics/instance.js b/bundles/admin/metrics/instance.js
@@ -29,7 +29,7 @@ Oskari.clazz.define('Oskari.admin.bundle.metrics.MetricsAdminBundleInstance',
                     content.append('Error loading metrics');
                 },
                 success: function (response) {
-                    content.tree({'data': me.formatData(response)});
+                    content.tree({ 'data': me.formatData(response) });
                 }
             });
             if (sandbox.hasHandler('Admin.AddTabRequest')) {

diff --git a/bundles/catalogue/metadatacatalogue/instance.js b/bundles/catalogue/metadatacatalogue/instance.js
@@ -625,7 +625,7 @@ Oskari.clazz.define(
                 dropdownDef,
                 emptyOption,
                 newOption,
-                renderCoverageButton = (_.filter(dataFields, {'field': 'coverage'}).length > 0),
+                renderCoverageButton = (_.filter(dataFields, { 'field': 'coverage' }).length > 0),
                 checkboxChange = function () {
                     me._updateOptions(advancedContainer);
                 };
@@ -1079,7 +1079,7 @@ Oskari.clazz.define(
                                     if (action.callback && typeof action.callback === 'function') {
                                         // Bind action click to bindCallbackTo if bindCallbackTo param exist
                                         callbackElement = actionElement.first();
-                                        callbackElement.css({'cursor': 'pointer'}).on('click', {metadata: row}, function (event) {
+                                        callbackElement.css({ 'cursor': 'pointer' }).on('click', { metadata: row }, function (event) {
                                             action.callback(event.data.metadata);
                                         });
                                     }

diff --git a/bundles/catalogue/metadatacatalogue/instance.ol2.js b/bundles/catalogue/metadatacatalogue/instance.ol2.js
@@ -582,7 +582,7 @@ Oskari.clazz.define(
                 dropdownDef,
                 emptyOption,
                 newOption,
-                renderCoverageButton = (_.filter(dataFields, {'field': 'coverage'}).length > 0),
+                renderCoverageButton = (_.filter(dataFields, { 'field': 'coverage' }).length > 0),
                 checkboxChange = function () {
                     me._updateOptions(advancedContainer);
                 };
@@ -718,7 +718,7 @@ Oskari.clazz.define(
             this.selectionPlugin = Oskari.clazz.create('Oskari.mapframework.bundle.featuredata2.plugin.MapSelectionPlugin', config, me.sandbox);
             mapModule.registerPlugin(this.selectionPlugin);
             mapModule.startPlugin(this.selectionPlugin);
-            this.selectionPlugin.startDrawing({drawMode: 'square'});
+            this.selectionPlugin.startDrawing({ drawMode: 'square' });
         },
 
         /**
@@ -1037,7 +1037,7 @@ Oskari.clazz.define(
                                     // Set action callback
                                     if (action.callback && typeof action.callback === 'function') {
                                         callbackElement = actionElement.first();
-                                        callbackElement.css({'cursor': 'pointer'}).on('click', {metadata: row}, function (event) {
+                                        callbackElement.css({ 'cursor': 'pointer' }).on('click', { metadata: row }, function (event) {
                                             action.callback(event.data.metadata);
                                         });
                                     }

diff --git a/bundles/catalogue/metadatacatalogue/request/AddSearchResultActionRequest.js b/bundles/catalogue/metadatacatalogue/request/AddSearchResultActionRequest.js
@@ -7,7 +7,7 @@
  */
 Oskari.clazz.define('Oskari.catalogue.bundle.metadatacatalogue.request.AddSearchResultActionRequest',
 
-/**
+    /**
  * @method create called automatically on construction
  * @static
  *

diff --git a/bundles/catalogue/metadatacatalogue/service/MetadataOptionService.js b/bundles/catalogue/metadatacatalogue/service/MetadataOptionService.js
@@ -6,7 +6,7 @@
  */
 Oskari.clazz.define('Oskari.catalogue.bundle.metadatacatalogue.service.MetadataOptionService',
 
-/**
+    /**
  * @method create called automatically on construction
  * @static
  *

diff --git a/bundles/catalogue/metadatacatalogue/service/MetadataSearchService.js b/bundles/catalogue/metadatacatalogue/service/MetadataSearchService.js
@@ -6,7 +6,7 @@
  */
 Oskari.clazz.define('Oskari.catalogue.bundle.metadatacatalogue.service.MetadataSearchService',
 
-/**
+    /**
  * @method create called automatically on construction
  * @static
  *

diff --git a/bundles/catalogue/metadataflyout/Flyout.js b/bundles/catalogue/metadataflyout/Flyout.js
@@ -122,7 +122,7 @@ Oskari.clazz.define('Oskari.catalogue.bundle.metadataflyout.Flyout',
                     }
                 }
             }
-            me.instance.state = {current: allMetadata};
+            me.instance.state = { current: allMetadata };
         },
 
         /**

diff --git a/bundles/framework/coordinatetool/plugin/CoordinateToolPlugin.js b/bundles/framework/coordinatetool/plugin/CoordinateToolPlugin.js
@@ -185,7 +185,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.coordinatetool.plugin.Coordinate
                 popupTitle = loc('display.popup.title'),
                 popupContent = me._templates.popupContent.clone(),
                 crs = me.getMapModule().getProjection(),
-                crsDefaultText = loc('display.crs.default', {crs: crs}),
+                crsDefaultText = loc('display.crs.default', { crs: crs }),
                 popupName = 'xytoolpopup',
                 popupLocation,
                 isMobile = Oskari.util.isMobile(),
@@ -315,7 +315,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.coordinatetool.plugin.Coordinate
                 var topOffsetElement = jQuery('div.mobileToolbarDiv');
                 me._popup.addClass('coordinatetool__popup');
                 me._popup.addClass('mobile-popup');
-                me._popup.setColourScheme({'bgColour': '#e6e6e6'});
+                me._popup.setColourScheme({ 'bgColour': '#e6e6e6' });
 
                 // hide mouse coordinates
                 popupContent.find('.mousecoordinates-div').hide();

diff --git a/bundles/framework/divmanazer/component/Chart.js b/bundles/framework/divmanazer/component/Chart.js
@@ -24,8 +24,6 @@ Oskari.clazz.define('Oskari.userinterface.component.Chart', function () {
         options.colors = options.colors || this._options.colors;
         if (typeof options.colors === 'string') {
             options.colors = [options.colors];
-        } else if (options.colors) {
-            options.colors = options.colors;
         }
     },
     chartIsInitialized: function () {
@@ -184,7 +182,7 @@ Oskari.clazz.define('Oskari.userinterface.component.Chart', function () {
             .ticks(Math.min(10, tickTarget))
             .tickSizeInner(-this.dimensions.height() + this.dimensions.xAxisOffset)
             .tickSizeOuter(0)
-            .tickFormat(function (d) { return me.loc('graph.tick', {value: d}); });
+            .tickFormat(function (d) { return me.loc('graph.tick', { value: d }); });
     },
     /**
      * initializes the chart skeleton without any specific line or bar options

diff --git a/bundles/framework/divmanazer/component/FileInput.js b/bundles/framework/divmanazer/component/FileInput.js
@@ -173,14 +173,14 @@ Oskari.clazz.define('Oskari.userinterface.component.FileInput', function (option
             message = this.loc('fileInput.invalidType');
             if (Array.isArray(allowedExtensions) && allowedExtensions.length > 0) {
                 allowedExtensions = '.' + allowedExtensions.join(', .');
-                message += '<br>' + this.loc('fileInput.allowedExtensions', {allowedExtensions: allowedExtensions});
+                message += '<br>' + this.loc('fileInput.allowedExtensions', { allowedExtensions: allowedExtensions });
             }
             this._showPopup(this.loc('fileInput.error'), message);
         }
         // if max file size is defined check that file isn't too large
         if (opts.maxFileSize && file.size > opts.maxFileSize * 1048576) {
             valid = false;
-            this._showPopup(this.loc('fileInput.error'), this.loc('fileInput.fileSize', {size: opts.maxFileSize}));
+            this._showPopup(this.loc('fileInput.error'), this.loc('fileInput.fileSize', { size: opts.maxFileSize }));
         }
         return valid;
     },
@@ -238,10 +238,10 @@ Oskari.clazz.define('Oskari.userinterface.component.FileInput', function (option
 
         if (opts.allowMultipleFiles === true) {
             allowMultiple = 'multiple';
-            fileUpload = this.loc('fileInput.fileUpload', {files: 2});
+            fileUpload = this.loc('fileInput.fileUpload', { files: 2 });
         } else {
             allowMultiple = '';
-            fileUpload = this.loc('fileInput.fileUpload', {files: 1});
+            fileUpload = this.loc('fileInput.fileUpload', { files: 1 });
         }
 
         if (this.isAdvancedUpload) {
@@ -319,7 +319,7 @@ Oskari.clazz.define('Oskari.userinterface.component.FileInput', function (option
         var tooltip;
         if (Array.isArray(allowedExtensions) && allowedExtensions.length !== 0) {
             allowedExtensions = '.' + allowedExtensions.join(', .');
-            tooltip = this.loc('fileInput.allowedExtensions', {allowedExtensions: allowedExtensions});
+            tooltip = this.loc('fileInput.allowedExtensions', { allowedExtensions: allowedExtensions });
             elem.prop('title', tooltip);
         }
     },
@@ -333,7 +333,7 @@ Oskari.clazz.define('Oskari.userinterface.component.FileInput', function (option
     },
     // TODO should these be in different place
     exportToFile: function (data, filename, type) {
-        var blob = new Blob([data], {type: type});
+        var blob = new Blob([data], { type: type });
         if (window.navigator.msSaveOrOpenBlob) {
             window.navigator.msSaveBlob(blob, filename);
         } else {

diff --git a/bundles/framework/divmanazer/component/FilterDialog.js b/bundles/framework/divmanazer/component/FilterDialog.js
@@ -283,7 +283,7 @@ Oskari.clazz.define('Oskari.userinterface.component.FilterDialog',
          * @param {boolean} activate
          */
         _toggleClickedFeaturesSelection: function (container, enable, check) {
-            container.find('#analyse-clicked-features').prop({'checked': check, 'disabled': !enable});
+            container.find('#analyse-clicked-features').prop({ 'checked': check, 'disabled': !enable });
         },
         /**
          * Toggles the filter by geometry radios of the filter dialog popup.
@@ -297,13 +297,13 @@ Oskari.clazz.define('Oskari.userinterface.component.FilterDialog',
             if (!enable) {
                 check = false;
             }
-            container.find('#analyse-filter-by-geometry').prop({'checked': check, 'disabled': !enable});
+            container.find('#analyse-filter-by-geometry').prop({ 'checked': check, 'disabled': !enable });
             if (check) {
-                container.find('input[name="filter-by-geometry"]').prop({'disabled': !enable});
+                container.find('input[name="filter-by-geometry"]').prop({ 'disabled': !enable });
                 // check the first option.
-                container.find('#analyse-filter-by-geometry-intersect').prop({'checked': check, 'disabled': !enable});
+                container.find('#analyse-filter-by-geometry-intersect').prop({ 'checked': check, 'disabled': !enable });
             } else {
-                container.find('input[name="filter-by-geometry"]').prop({'checked': check, 'disabled': true});
+                container.find('input[name="filter-by-geometry"]').prop({ 'checked': check, 'disabled': true });
             }
         },
         /**
@@ -315,8 +315,8 @@ Oskari.clazz.define('Oskari.userinterface.component.FilterDialog',
          * @param {boolean} activate
          */
         _toggleBBOXSelection: function (container, check) {
-            container.find('div.bbox-on').find('input[name=analysis-filter-radio]').prop({'checked': check});
-            container.find('div.bbox-off').find('input[name=analysis-filter-radio]').prop({'checked': false});
+            container.find('div.bbox-on').find('input[name=analysis-filter-radio]').prop({ 'checked': check });
+            container.find('div.bbox-off').find('input[name=analysis-filter-radio]').prop({ 'checked': false });
         },
         /**
          * Toggles the property selections of the filter dialog popup.
@@ -329,13 +329,13 @@ Oskari.clazz.define('Oskari.userinterface.component.FilterDialog',
                 bboxOFF = filterContentBBOX.find('div.bbox-off').find('input[name=analysis-filter-radio]').is(':checked');
             if (bboxOFF) {
                 valuesSelection.find('div.values-additional-info').html(this.loc.values.info.bboxOff);
-                valuesSelection.find('div.filter-by-values-container').css({'display': 'block'});
+                valuesSelection.find('div.filter-by-values-container').css({ 'display': 'block' });
             } else if (filterByGeometryChecked) {
                 valuesSelection.find('div.values-additional-info').html(this.loc.values.info.filterByGeometrySelected);
-                valuesSelection.find('div.filter-by-values-container').css({'display': 'none'});
+                valuesSelection.find('div.filter-by-values-container').css({ 'display': 'none' });
             } else {
                 valuesSelection.find('div.values-additional-info').html('');
-                valuesSelection.find('div.filter-by-values-container').css({'display': 'block'});
+                valuesSelection.find('div.filter-by-values-container').css({ 'display': 'block' });
             }
         },
         /**
@@ -362,7 +362,7 @@ Oskari.clazz.define('Oskari.userinterface.component.FilterDialog',
                 this._toggleFilterByGeometrySelection(filterByGeometryDiv, selectedTemporaryFeatures, false);
             } else if (values.noBBOX) {
                 this._toggleBBOXSelection(bboxDiv, false);
-                bboxDiv.find('div.bbox-off').find('input[name=analysis-filter-radio]').prop({'checked': true});
+                bboxDiv.find('div.bbox-off').find('input[name=analysis-filter-radio]').prop({ 'checked': true });
                 this._toggleClickedFeaturesSelection(clickedFeaturesDiv, clickedFeatures, false);
                 this._toggleFilterByGeometrySelection(filterByGeometryDiv, selectedTemporaryFeatures, false);
             // no previous selections (bbox or no bbox, ) and no selected features -> select bbox by default.

diff --git a/bundles/framework/divmanazer/component/Grid.js b/bundles/framework/divmanazer/component/Grid.js
@@ -712,7 +712,7 @@ Oskari.clazz.define('Oskari.userinterface.component.Grid',
                         if (renderer) {
                             value = renderer(value, data);
                         } else if (typeof value === 'number') {
-                            value = me._loc('Grid.cellValue', {value: value});
+                            value = me._loc('Grid.cellValue', { value: value });
                         }
                         cell.append(value);
                         row.append(cell);

diff --git a/bundles/framework/divmanazer/component/GridPaging.js b/bundles/framework/divmanazer/component/GridPaging.js
@@ -59,7 +59,7 @@ Oskari.clazz.category(
                     }
                 };
 
-                var visibleCols = Array.apply(null, {length: groupCols}).map(Number.call, Number);
+                var visibleCols = Array.apply(null, { length: groupCols }).map(Number.call, Number);
 
                 // Get visible cols and shows them
                 // If page is first then show only first cols
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
      */
     Oskari.clazz.define('Oskari.catalogue.bundle.metadatacatalogue.request.AddSearchResultActionRequest',
-    /**
+        /**
      * @method create called automatically on construction
      * @static
      *
@@ Expand Down @@