Merge pull request #77 from annarieger/ol5-upgrade

Ol5 upgrade
geostyler · Jan 7, 2019 · ee0ac0b · ee0ac0b
2 parents e1a5df3 + b56e721
commit ee0ac0b
Show file tree

Hide file tree

Showing 31 changed files with 159 additions and 150 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Please provide related issues here https://github.com/terrestris/geostyler/issue
 ES6:
 ```js
 import OpenLayersParser from "geostyler-openlayers-parser";
-import OlLayerVector from "ol/layer/vector";
+import OlLayerVector from "ol/layer/Vector";
 
 const pointSimplePoint = {
   name: "OL Style",

diff --git a/data/olStyles/line_simpleline.ts b/data/olStyles/line_simpleline.ts
@@ -1,5 +1,5 @@
-import OlStyle from 'ol/style/style';
-import OlStyleStroke from 'ol/style/stroke';
+import OlStyle from 'ol/style/Style';
+import OlStyleStroke from 'ol/style/Stroke';
 
 const olSimpleLine = new OlStyle({
   stroke: new OlStyleStroke({

diff --git a/data/olStyles/multi_simplefillSimpleline.ts b/data/olStyles/multi_simplefillSimpleline.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleStroke from 'ol/style/stroke';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleStroke from 'ol/style/Stroke';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleFill = new OlStyle({
   fill: new OlStyleFill({

diff --git a/data/olStyles/multi_simplelineLabel.ts b/data/olStyles/multi_simplelineLabel.ts
@@ -1,7 +1,7 @@
-import OlStyle from 'ol/style/style';
-import OlStyleStroke from 'ol/style/stroke';
-import OlStyleFill from 'ol/style/fill';
-import OlStyleText from 'ol/style/text';
+import OlStyle from 'ol/style/Style';
+import OlStyleStroke from 'ol/style/Stroke';
+import OlStyleFill from 'ol/style/Fill';
+import OlStyleText from 'ol/style/Text';
 
 const olSimpleLine = new OlStyle({
   stroke: new OlStyleStroke({
@@ -23,7 +23,7 @@ const olStyledLabel = new OlStyle({
     }),
     offsetX: 0,
     offsetY: 5
-  }) 
+  })
 });
 
 export default [olSimpleLine, olStyledLabel];
diff --git a/data/olStyles/multi_twoRulesSimplepoint.ts b/data/olStyles/multi_twoRulesSimplepoint.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleCircle from 'ol/style/circle';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleCircle from 'ol/style/Circle';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimplePoint1 = new OlStyle({
   image: new OlStyleCircle({

diff --git a/data/olStyles/point_icon.ts b/data/olStyles/point_icon.ts
@@ -1,5 +1,5 @@
-import OlStyle from 'ol/style/style';
-import OlStyleIcon from 'ol/style/icon';
+import OlStyle from 'ol/style/Style';
+import OlStyleIcon from 'ol/style/Icon';
 
 const olIconPoint = new OlStyle({
   image: new OlStyleIcon({

diff --git a/data/olStyles/point_simplebackslash.ts b/data/olStyles/point_simplebackslash.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleSlash = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simplecarrow.ts b/data/olStyles/point_simplecarrow.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleCarrow = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simplecross.ts b/data/olStyles/point_simplecross.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleCross = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simpledot.ts b/data/olStyles/point_simpledot.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleCircle from 'ol/style/circle';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleCircle from 'ol/style/Circle';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleDot = new OlStyle({
   image: new OlStyleCircle({

diff --git a/data/olStyles/point_simplehorline.ts b/data/olStyles/point_simplehorline.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleHorline = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simpleoarrow.ts b/data/olStyles/point_simpleoarrow.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleOarrow = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simpleplus.ts b/data/olStyles/point_simpleplus.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimplePlus = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simplepoint.ts b/data/olStyles/point_simplepoint.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleCircle from 'ol/style/circle';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleCircle from 'ol/style/Circle';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimplePoint = new OlStyle({
   image: new OlStyleCircle({

diff --git a/data/olStyles/point_simpleslash.ts b/data/olStyles/point_simpleslash.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleSlash = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simplesquare.ts b/data/olStyles/point_simplesquare.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleSquare = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simplestar.ts b/data/olStyles/point_simplestar.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleStar = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simpletimes.ts b/data/olStyles/point_simpletimes.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleTimes = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simpletriangle.ts b/data/olStyles/point_simpletriangle.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleTriangle = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simplevertline.ts b/data/olStyles/point_simplevertline.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleVertline = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_simplex.ts b/data/olStyles/point_simplex.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlStyleFill from 'ol/style/Fill';
 
 const olSimpleX = new OlStyle({
   image: new OlStyleRegularshape({

diff --git a/data/olStyles/point_styledLabel_static.ts b/data/olStyles/point_styledLabel_static.ts
@@ -1,7 +1,7 @@
-import OlStyleText from 'ol/style/text';
-import OlStyleStroke from 'ol/style/stroke';
-import OlStyleFill from 'ol/style/fill';
-import OlStyle from 'ol/style/style';
+import OlStyleText from 'ol/style/Text';
+import OlStyleStroke from 'ol/style/Stroke';
+import OlStyleFill from 'ol/style/Fill';
+import OlStyle from 'ol/style/Style';
 
 const olPointStyledLabel = new OlStyle({
   text: new OlStyleText({

diff --git a/data/olStyles/point_styledlabel.ts b/data/olStyles/point_styledlabel.ts
@@ -1,6 +1,6 @@
-import OlStyleText from 'ol/style/text';
-import OlStyleStroke from 'ol/style/stroke';
-import OlStyleFill from 'ol/style/fill';
+import OlStyleText from 'ol/style/Text';
+import OlStyleStroke from 'ol/style/Stroke';
+import OlStyleFill from 'ol/style/Fill';
 
 const olPointStyledLabel = (feature: ol.Feature, res: number) => {
   return new OlStyleText({
@@ -18,7 +18,7 @@ const olPointStyledLabel = (feature: ol.Feature, res: number) => {
     offsetX: 0,
     offsetY: 5,
     rotation: Math.PI / 4
-  }); 
+  });
 };
 
 export default olPointStyledLabel;
diff --git a/data/olStyles/polygon_transparentpolygon.ts b/data/olStyles/polygon_transparentpolygon.ts
@@ -1,6 +1,6 @@
-import OlStyle from 'ol/style/style';
-import OlStyleStroke from 'ol/style/stroke';
-import OlStyleFill from 'ol/style/fill';
+import OlStyle from 'ol/style/Style';
+import OlStyleStroke from 'ol/style/Stroke';
+import OlStyleFill from 'ol/style/Fill';
 
 const olPolygonTransparentPolygon = new OlStyle({
   stroke: new OlStyleStroke({

diff --git a/dev-build.config.js b/dev-build.config.js
@@ -25,20 +25,20 @@ module.exports = {
   },
   externals: [
     {
-      'ol/style/style': 'ol.style.Style',
+      'ol/style/Style': 'ol.style.Style',
       'ol/style': 'ol.style',
-      'ol/style/image': 'ol.style.Image',
-      'ol/style/stroke': 'ol.style.Stroke',
-      'ol/style/text': 'ol.style.Text',
-      'ol/style/circle': 'ol.style.Circle',
-      'ol/style/icon': 'ol.style.Icon',
-      'ol/style/regularshape': 'ol.style.RegularShape',
-      'ol/style/fill': 'ol.style.Fill',
-      'ol/map': 'ol.Map',
-      'ol/source/tilewms': 'ol.source.TileWMS',
-      'ol/source/imagewms': 'ol.source.ImageWMS',
-      'ol/layer/group': 'ol.layer.Group',
-      'ol/layer/base': 'ol.layer.Base',
+      'ol/style/Image': 'ol.style.Image',
+      'ol/style/Stroke': 'ol.style.Stroke',
+      'ol/style/Text': 'ol.style.Text',
+      'ol/style/Circle': 'ol.style.Circle',
+      'ol/style/Icon': 'ol.style.Icon',
+      'ol/style/RegularShape': 'ol.style.RegularShape',
+      'ol/style/Fill': 'ol.style.Fill',
+      'ol/Map': 'ol.Map',
+      'ol/source/TileWMS': 'ol.source.TileWMS',
+      'ol/source/ImageWMS': 'ol.source.ImageWMS',
+      'ol/layer/Group': 'ol.layer.Group',
+      'ol/layer/Base': 'ol.layer.Base',
       'ol/proj': 'ol.proj'
     }
   ],

diff --git a/index.d.ts b/index.d.ts
@@ -1,2 +1,13 @@
 declare module 'geostyler-openlayers-parser';
 declare module '@terrestris/ol-util/dist/MapUtil/MapUtil';
+
+declare module 'ol/Feature';
+declare module 'ol/geom/Point';
+declare module 'ol/style/Circle';
+declare module 'ol/style/Fill';
+declare module 'ol/style/Icon';
+declare module 'ol/style/Image';
+declare module 'ol/style/RegularShape';
+declare module 'ol/style/Stroke';
+declare module 'ol/style/Style';
+declare module 'ol/style/Text';
diff --git a/package.json b/package.json
@@ -25,12 +25,12 @@
   },
   "homepage": "https://github.com/terrestris/geostyler-openlayers-parser#readme",
   "dependencies": {
-    "@terrestris/ol-util": "0.5.0",
+    "@terrestris/ol-util": "1.6.0",
     "geostyler-style": "0.14.2",
     "lodash": "4.17.11"
   },
   "peerDependencies": {
-    "ol": "4.6.5"
+    "ol": "~5.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json && npm run build:browser",
@@ -46,10 +46,8 @@
   },
   "devDependencies": {
     "@babel/polyfill": "7.2.5",
-    "@terrestris/ol-util": "0.5.0",
     "@types/jest": "23.3.11",
     "@types/node": "10.12.18",
-    "@types/ol": "4.6.3",
     "awesome-typescript-loader": "4.0.1",
     "babel-core": "6.26.3",
     "babel-jest": "23.6.0",
@@ -59,7 +57,7 @@
     "jest": "23.6.0",
     "jest-preset-typescript": "1.2.0",
     "np": "3.1.0",
-    "ol": "4.6.5",
+    "ol": "5.3.0",
     "ts-jest": "22.4.6",
     "tslint": "5.11.0",
     "typescript": "3.1.2",

diff --git a/src/OlStyleParser.spec.ts b/src/OlStyleParser.spec.ts
@@ -1,10 +1,10 @@
-import OlStyle from 'ol/style/style';
-import OlStyleText from 'ol/style/text';
-import OlStyleFill from 'ol/style/fill';
-import OlStyleCircle from 'ol/style/circle';
-import OlStyleIcon from 'ol/style/icon';
-import OlStyleRegularshape from 'ol/style/regularshape';
-import OlFeature from 'ol/feature';
+import OlStyle from 'ol/style/Style';
+import OlStyleText from 'ol/style/Text';
+import OlStyleFill from 'ol/style/Fill';
+import OlStyleCircle from 'ol/style/Circle';
+import OlStyleIcon from 'ol/style/Icon';
+import OlStyleRegularshape from 'ol/style/RegularShape';
+import OlFeature from 'ol/Feature';
 import ol from 'ol';
 
 import OlStyleParser, { OlParserStyleFct } from './OlStyleParser';
@@ -919,7 +919,7 @@ describe('OlStyleParser implements StyleParser', () => {
 
           const expecSymb1 = multi_twoRulesSimplepoint.rules[0].symbolizers[0] as MarkSymbolizer;
           const expecSymb2 = multi_twoRulesSimplepoint.rules[1].symbolizers[0] as MarkSymbolizer;
-          
+
           const olCircle1 = styles[0].getImage() as OlStyleCircle;
           expect(olCircle1).toBeDefined();
           expect(olCircle1.getRadius()).toBeCloseTo(expecSymb1.radius);