Merge dee49cb into dacab6f

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.eslintrc

@@ -0,0 +1,38 @@
+{
+  "extends": [
+    "eslint:recommended"
+  ],
+  "plugins": [],
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "parser": "babel-eslint",
+  "globals": {
+    "Promise": false
+  },
+  "rules": {
+    "indent": ["error", 2, { "SwitchCase": 1 }],
+    "linebreak-style": ["error", "unix"],
+    "quotes": ["error", "single", { "allowTemplateLiterals": true }],
+    "semi": ["error", "always"],
+    "one-var": ["error", "never"],
+    "no-confusing-arrow": "error",
+    "no-unused-vars": ["error", {
+      "ignoreRestSiblings": true
+    }],
+    "key-spacing": ["error", {
+      "beforeColon": false,
+      "afterColon": true
+    }],
+    "require-jsdoc": ["error", {
+      "require": {
+        "FunctionDeclaration": true,
+        "MethodDefinition": true,
+        "ClassDeclaration": true,
+        "ArrowFunctionExpression": true
+      }
+    }],
+    "space-infix-ops": ["error", {"int32Hint": false}]
+  }
+}

package.json

@@ -4,6 +4,8 @@
   "description": "A set of helper classes for working with openLayers",
   "main": "src/index.js",
   "scripts": {
+    "lint": "eslint --ext js src/",
+    "pretest": "npm run lint",
     "test": "jest --maxWorkers=4",
     "test:watch": "jest --watchAll",
     "coveralls": "cat coverage/lcov.info | coveralls",
@@ -48,13 +50,14 @@
     "babel-preset-stage-0": "6.24.1",
     "canvas-prebuilt": "1.6.5-prerelease.1",
     "coveralls": "3.0.2",
+    "eslint": "5.0.1",
     "jest": "23.5.0",
     "node-pre-gyp": "0.11.0",
     "np": "3.0.4",
-    "ol": "4.6.5",
+    "ol": "5.1.3",
     "whatwg-fetch": "2.0.4"
   },
   "peerDependencies": {
-    "ol": "~4.0"
+    "ol": "~5.0"
   }
 }

src/AnimateUtil/AnimateUtil.js

@@ -1,6 +1,6 @@
-import OlObservable from 'ol/observable';
-import OlGeomPoint from 'ol/geom/point';
-import OlGeomLineString from 'ol/geom/linestring';
+import OlGeomPoint from 'ol/geom/Point';
+import OlGeomLineString from 'ol/geom/LineString';
+import { unByKey } from 'ol/Observable';
 
 /**
  * This class provides some static methods which might be helpful when working
@@ -68,7 +68,7 @@ class AnimateUtil {
         }
 
         if (elapsed > duration || actualFrames >= expectedFrames) {
-          OlObservable.unByKey(listenerKey);
+          unByKey(listenerKey);
           resolve(featureToMove);
         }
         // tell OL3 to continue postcompose animation

src/AnimateUtil/AnimateUtil.spec.js

@@ -1,7 +1,7 @@
 /*eslint-env jest*/
-import OlGeomPoint from 'ol/geom/point';
-import OlFeature from 'ol/feature';
-import OlStyleStyle from 'ol/style/style';
+import OlGeomPoint from 'ol/geom/Point';
+import OlFeature from 'ol/Feature';
+import OlStyleStyle from 'ol/style/Style';
 
 import AnimateUtil from '../AnimateUtil/AnimateUtil';
 import TestUtil from '../TestUtil';

src/CapabilitiesUtil/CapabilitiesUtil.js

@@ -1,6 +1,6 @@
-import OlWMSCapabilities from 'ol/format/wmscapabilities';
-import OlSourceImageWMS from 'ol/source/imagewms';
-import OlLayerImage from 'ol/layer/image';
+import OlWMSCapabilities from 'ol/format/WMSCapabilities';
+import OlSourceImageWMS from 'ol/source/ImageWMS';
+import OlLayerImage from 'ol/layer/Image';
 
 import get from 'lodash/get.js';
 

src/CapabilitiesUtil/CapabilitiesUtil.spec.js

@@ -1,5 +1,5 @@
 /*eslint-env jest*/
-import OlLayerImage from 'ol/layer/image';
+import OlLayerImage from 'ol/layer/Image';
 import { CapabilitiesUtil } from '../index';
 
 const layerTitle =  'OpenStreetMap WMS - by terrestris';

src/FeatureUtil/FeatureUtil.spec.js

@@ -1,7 +1,7 @@
 /*eslint-env jest*/
 
-import OlFeature from 'ol/feature';
-import OlGeomPoint from 'ol/geom/point';
+import OlFeature from 'ol/Feature';
+import OlGeomPoint from 'ol/geom/Point';
 
 import {
   FeatureUtil,

src/FileUtil/FileUtil.js

@@ -1,6 +1,6 @@
-import OlFormatGeoJSON from 'ol/format/geojson';
-import OlLayerVector from 'ol/layer/vector';
-import OlSourceVector from 'ol/source/vector';
+import OlFormatGeoJSON from 'ol/format/GeoJSON';
+import OlLayerVector from 'ol/layer/Vector';
+import OlSourceVector from 'ol/source/Vector';
 import shp from 'shpjs';
 
 /**