Merge branch 'master' into greenkeeper/geostyler-4.1.3

geostyler · Jun 17, 2019 · b9be0c0 · b9be0c0
2 parents 02d280f + a50360f
commit b9be0c0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/oltypes.d.ts b/oltypes.d.ts
@@ -2,6 +2,7 @@ declare module 'ol/extent';
 declare module 'ol/geom/Geometry';
 declare module 'ol/style/Style';
 declare module 'ol/geom/Polygon';
+declare module 'ol/geom/Point';
 declare module 'ol/geom/LineString';
 declare module 'ol/render/canvas/Immediate';
 declare module 'ol/transform';
diff --git a/package.json b/package.json
@@ -30,35 +30,35 @@
     "d3": "~5"
   },
   "devDependencies": {
-    "@babel/core": "7.4.4",
+    "@babel/core": "7.4.5",
     "@babel/plugin-proposal-class-properties": "7.4.4",
     "@babel/plugin-proposal-function-bind": "7.2.0",
     "@babel/polyfill": "7.4.4",
-    "@babel/preset-env": "7.4.4",
+    "@babel/preset-env": "7.4.5",
     "@types/jest": "24.0.13",
     "@types/d3-selection": "1.4.1",
     "babel-eslint": "10.0.1",
-    "babel-jest": "24.1.0",
+    "babel-jest": "24.8.0",
     "babel-loader": "8.0.6",
     "babel-plugin-dynamic-import-node": "2.2.0",
-    "babel-plugin-import": "1.11.0",
+    "babel-plugin-import": "1.12.0",
     "canvas": "2.0.0-alpha.1",
-    "coveralls": "3.0.3",
+    "coveralls": "3.0.4",
     "d3": "5.9.2",
     "eslint": "5.16.0",
     "geostyler": "4.1.3",
-    "geostyler-openlayers-parser": "1.1.1",
-    "geostyler-style": "1.1.0",
-    "jest": "24.1.0",
-    "jsdom": "15.1.0",
-    "np": "5.0.1",
-    "ol": "5.3.2",
+    "geostyler-openlayers-parser": "1.1.3",
+    "geostyler-style": "1.2.0",
+    "jest": "24.8.0",
+    "jsdom": "15.1.1",
+    "np": "5.0.3",
+    "ol": "5.3.3",
     "rimraf": "2.6.3",
     "ts-jest": "24.0.2",
-    "tslint": "5.12.1",
+    "tslint": "5.16.0",
     "typedoc": "0.14.2",
-    "typescript": "3.3.3",
-    "webpack": "4.31.0",
-    "webpack-cli": "3.3.2"
+    "typescript": "3.4.5",
+    "webpack": "4.34.0",
+    "webpack-cli": "3.3.4"
   }
 }
diff --git a/src/LegendRenderer/LegendRenderer.ts b/src/LegendRenderer/LegendRenderer.ts
@@ -205,7 +205,9 @@ class LegendRenderer {
     const styleParser = new OlStyleParser();
 
     const style = {
+      name: '',
       rules: [{
+        name: '',
         symbolizers: rule.symbolizers
       }]
     };