Updates geostyler-style and ol

- geostyler-style 4.0.0 - ol 6.5.0
geostyler · Apr 13, 2021 · 2654085 · 2654085
1 parent fccd405
commit 2654085
Show file tree

Hide file tree

Showing 16 changed files with 79 additions and 68 deletions.
diff --git a/data/styles/filter_invalidFilter.ts b/data/styles/filter_invalidFilter.ts
@@ -17,15 +17,15 @@ const filterInvalidFilter: Style = {
       ],
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF0000',
         radius: 10
       }]
     }, {
       name: 'OL Style Rule 1',
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF0000',
         radius: 6
       }]

diff --git a/data/styles/filter_nestedFilter.ts b/data/styles/filter_nestedFilter.ts
@@ -20,15 +20,15 @@ const filterNestedFilter: Style = {
       ],
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF0000',
         radius: 10
       }]
     }, {
       name: 'OL Style Rule 1',
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF0000',
         radius: 6
       }]

diff --git a/data/styles/filter_simpleFilter.ts b/data/styles/filter_simpleFilter.ts
@@ -12,15 +12,15 @@ const filterSimpleFilter: Style = {
       ],
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF0000',
         radius: 10
       }]
     }, {
       name: 'OL Style Rule 1',
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF0000',
         radius: 6
       }]

diff --git a/data/styles/multi_twoRulesSimplepoint.ts b/data/styles/multi_twoRulesSimplepoint.ts
@@ -7,7 +7,7 @@ const multiTwoRulesSimplepoint: Style = {
       name: 'OL Style Rule 0',
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF0000',
         radius: 6
       }]
@@ -16,7 +16,7 @@ const multiTwoRulesSimplepoint: Style = {
       name: 'OL Style Rule 1',
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF1111',
         radius: 4
       }]

diff --git a/data/styles/point_simplecross.ts b/data/styles/point_simplecross.ts
@@ -7,7 +7,7 @@ const pointSimpleCross: Style = {
       name: 'OL Style Rule 0',
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Cross',
+        wellKnownName: 'cross',
         color: '#FF0000',
         radius: 6,
         rotate: 0

diff --git a/data/styles/point_simplepoint.ts b/data/styles/point_simplepoint.ts
@@ -7,7 +7,7 @@ const pointSimplePoint: Style = {
       name: 'OL Style Rule 0',
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF0000',
         radius: 6
       }]

diff --git a/data/styles/point_simplepoint_filter.ts b/data/styles/point_simplepoint_filter.ts
@@ -17,7 +17,7 @@ const pointSimplePoint: Style = {
       },
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF0000',
         radius: 6,
         strokeColor: '#000000',

diff --git a/data/styles/point_simplesquare.ts b/data/styles/point_simplesquare.ts
@@ -7,7 +7,7 @@ const pointSimpleSquare: Style = {
       name: 'OL Style Rule 0',
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Square',
+        wellKnownName: 'square',
         color: '#FF0000',
         radius: 6,
         rotate: 0

diff --git a/data/styles/point_simplestar.ts b/data/styles/point_simplestar.ts
@@ -7,7 +7,7 @@ const pointSimpleStar: Style = {
       name: 'OL Style Rule 0',
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Star',
+        wellKnownName: 'star',
         color: '#FF0000',
         radius: 6,
         rotate: 0

diff --git a/data/styles/point_simpletriangle.ts b/data/styles/point_simpletriangle.ts
@@ -7,7 +7,7 @@ const pointSimpleTriangle: Style = {
       name: 'OL Style Rule 0',
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Triangle',
+        wellKnownName: 'triangle',
         color: '#FF0000',
         radius: 6,
         rotate: 0

diff --git a/data/styles/point_simplex.ts b/data/styles/point_simplex.ts
@@ -7,7 +7,7 @@ const pointSimpleX: Style = {
       name: 'OL Style Rule 0',
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'X',
+        wellKnownName: 'x',
         color: '#FF0000',
         radius: 6,
         rotate: 0

diff --git a/data/styles/scaleDenom_line_circle.ts b/data/styles/scaleDenom_line_circle.ts
@@ -26,7 +26,7 @@ const scaleDenomLineCircle: Style = {
       },
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF0000',
         radius: 6
       }]

diff --git a/data/styles/scaleDenom_line_circle_overlap.ts b/data/styles/scaleDenom_line_circle_overlap.ts
@@ -26,7 +26,7 @@ const scaleDenomLineCircleOverlap: Style = {
       },
       symbolizers: [{
         kind: 'Mark',
-        wellKnownName: 'Circle',
+        wellKnownName: 'circle',
         color: '#FF0000',
         radius: 6
       }]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
   "homepage": "/~https://github.com/geostyler/geostyler-openlayers-parser#readme",
   "dependencies": {
     "@terrestris/ol-util": "^4.0.1",
-    "geostyler-style": "^3.0.0",
+    "geostyler-style": "^4.0.0",
     "lodash": "^4.17.15"
   },
   "peerDependencies": {
@@ -63,7 +63,7 @@
     "jest": "^26.1.0",
     "jest-canvas-mock": "^2.2.0",
     "np": "^7.4.0",
-    "ol": "^6.3.1",
+    "ol": "^6.5.0",
     "terser-webpack-plugin": "^3.0.6",
     "ts-loader": "^7.0.5",
     "typescript": "^4.2.3",