Merge pull request #162 from KaiVolland/update-geostyler-style

KaiVolland · web-flow · commit fca72c246474 · 2022-11-24T13:28:19.000+01:00
Update geostyler-style to v7
diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
 
     steps:
     - name: Checkout sources
diff --git a/.github/workflows/on-push-master.yml b/.github/workflows/on-push-master.yml
@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
 
     steps:
     - name: Checkout sources
diff --git a/data/mapbox/icon_simpleicon.ts b/data/mapbox/icon_simpleicon.ts
@@ -1,13 +1,13 @@
 const iconSimpleIcon: any = {
-  "version": 8,
-  "name": "Simple Icon",
-  "sprite": "https://testurl.com",
-  "layers": [
+  version: 8,
+  name: 'Simple Icon',
+  sprite: 'https://testurl.com',
+  layers: [
     {
-      "id": "Simple Icon",
-      "type": "symbol",
-      "layout": {
-        "icon-image": "poi"
+      id: 'Simple Icon',
+      type: 'symbol',
+      layout: {
+        'icon-image': 'poi'
       }
     }
   ]
diff --git a/data/mapbox/icon_simpleicon_mapboxapi.ts b/data/mapbox/icon_simpleicon_mapboxapi.ts
@@ -1,13 +1,13 @@
 const iconSimpleIcon: any = {
-  "version": 8,
-  "name": "Simple Icon",
-  "sprite": "mapbox://sprites/mapbox/streets-v8",
-  "layers": [
+  version: 8,
+  name: 'Simple Icon',
+  sprite: 'mapbox://sprites/mapbox/streets-v8',
+  layers: [
     {
-      "id": "Simple Icon",
-      "type": "symbol",
-      "layout": {
-        "icon-image": "poi"
+      id: 'Simple Icon',
+      type: 'symbol',
+      layout: {
+        'icon-image': 'poi'
       }
     }
   ]
diff --git a/data/mapbox/line_patternline.ts b/data/mapbox/line_patternline.ts
@@ -1,20 +1,20 @@
 const linePatternLine: any = {
-  "version": 8,
-  "name": "Pattern Line",
-  "sprite": 'https://testurl.com',
-  "layers": [
+  version: 8,
+  name: 'Pattern Line',
+  sprite: 'https://testurl.com',
+  layers: [
     {
-      "id": "Pattern Line",
-      "type": "line",
-      "paint": {
-        "line-color": "#000000",
-        "line-width": 3,
-        "line-dasharray": [13, 37],
-        "line-pattern": "poi"
+      id: 'Pattern Line',
+      type: 'line',
+      paint: {
+        'line-color': '#000000',
+        'line-width': 3,
+        'line-dasharray': [13, 37],
+        'line-pattern': 'poi'
       },
-      "layout": {
-        "line-cap": "round",
-        "line-join": "miter"
+      layout: {
+        'line-cap': 'round',
+        'line-join': 'miter'
       }
     }
   ]
diff --git a/data/mapbox/line_simpleline.ts b/data/mapbox/line_simpleline.ts
@@ -1,18 +1,18 @@
 const lineSimpleLine: any = {
-  "version": 8,
-  "name": "Simple Line",
-  "layers": [
+  version: 8,
+  name: 'Simple Line',
+  layers: [
     {
-      "id": "Simple Line",
-      "type": "line",
-      "paint": {
-        "line-color": "#000000",
-        "line-width": 3,
-        "line-dasharray": [13, 37]
+      id: 'Simple Line',
+      type: 'line',
+      paint: {
+        'line-color': '#000000',
+        'line-width': 3,
+        'line-dasharray': [13, 37]
       },
-      "layout": {
-        "line-cap": "round",
-        "line-join": "miter"
+      layout: {
+        'line-cap': 'round',
+        'line-join': 'miter'
       }
     }
   ]
diff --git a/data/mapbox/line_simpleline_basefilter.ts b/data/mapbox/line_simpleline_basefilter.ts
@@ -1,24 +1,24 @@
 const lineSimpleLine: any = {
   version: 8,
-  name: "Small populated New Yorks",
+  name: 'Small populated New Yorks',
   layers: [{
-    id: "Small populated New Yorks",
-    type: "line",
-    filter: ["all",
-      ["==", "NAME", "New York"],
-      ["==", "TEST_BOOL", "true"],
-      ["==", "TEST", null],
-      ["*=", "TEST2", "*York*"],
-      ["*=", "TEST1", "*New*"],
-      ["!", [">", "POPULATION", "100000"]],
-      ["any",
-        ["==", "TEST2", "1"],
-        ["==", "TEST2", "2"]
+    id: 'Small populated New Yorks',
+    type: 'line',
+    filter: ['all',
+      ['==', 'NAME', 'New York'],
+      ['==', 'TEST_BOOL', 'true'],
+      ['==', 'TEST', null],
+      ['*=', 'TEST2', '*York*'],
+      ['*=', 'TEST1', '*New*'],
+      ['!', ['>', 'POPULATION', '100000']],
+      ['any',
+        ['==', 'TEST2', '1'],
+        ['==', 'TEST2', '2']
       ]
     ],
     paint: {
-      "line-color": "#FF0000",
-      "line-width": 3
+      'line-color': '#FF0000',
+      'line-width': 3
     }
   }]
 };
diff --git a/data/mapbox/line_simpleline_zoom.ts b/data/mapbox/line_simpleline_zoom.ts
@@ -1,14 +1,14 @@
 const lineSimpleLine: any = {
-  "version": 8,
-  "name": "Simple Line Filter",
-  "layers": [{
-  "id": "Small populated New Yorks",
-  "type": "line",
-  "minzoom": 5.5,
-  "maxzoom": 10,
-  "paint": {
-      "line-color": "#FF0000",
-      "line-width": 5
+  version: 8,
+  name: 'Simple Line Filter',
+  layers: [{
+    id: 'Small populated New Yorks',
+    type: 'line',
+    minzoom: 5.5,
+    maxzoom: 10,
+    paint: {
+      'line-color': '#FF0000',
+      'line-width': 5
     }
   }]
 };
diff --git a/data/mapbox/multi_rule_line_fill.ts b/data/mapbox/multi_rule_line_fill.ts
@@ -1,25 +1,25 @@
 const multiRuleLineFill: any = {
-  "version": 8,
-  "name": "Rule Line Fill",
-  "layers": [
+  version: 8,
+  name: 'Rule Line Fill',
+  layers: [
     {
-      "id": "Line Rule",
-      "type": "line",
-      "paint": {
-        "line-color": "#000000",
-        "line-width": 3,
-        "line-dasharray": [13, 37]
+      id: 'Line Rule',
+      type: 'line',
+      paint: {
+        'line-color': '#000000',
+        'line-width': 3,
+        'line-dasharray': [13, 37]
       },
-      "layout": {
-        "line-cap": "round",
-        "line-join": "miter"
+      layout: {
+        'line-cap': 'round',
+        'line-join': 'miter'
       }
     }, {
-      "id": "Fill Rule",
-      "type": "fill",
-      "paint": {
-        "fill-color": "#000000",
-        "fill-opacity": 1
+      id: 'Fill Rule',
+      type: 'fill',
+      paint: {
+        'fill-color': '#000000',
+        'fill-opacity': 1
       }
     }
   ]
diff --git a/data/mapbox/multi_simpleline_simplefill.ts b/data/mapbox/multi_simpleline_simplefill.ts
@@ -1,25 +1,25 @@
 const multiSimpleLineSimpleFill: any = {
-  "version": 8,
-  "name": "Simple Line Simple Fill",
-  "layers": [
+  version: 8,
+  name: 'Simple Line Simple Fill',
+  layers: [
     {
-      "id": "Simple Line Simple Fill",
-      "type": "line",
-      "paint": {
-        "line-color": "#000000",
-        "line-width": 3,
-        "line-dasharray": [13, 37]
+      id: 'Simple Line Simple Fill',
+      type: 'line',
+      paint: {
+        'line-color': '#000000',
+        'line-width': 3,
+        'line-dasharray': [13, 37]
       },
-      "layout": {
-        "line-cap": "round",
-        "line-join": "miter"
+      layout: {
+        'line-cap': 'round',
+        'line-join': 'miter'
       }
     }, {
-      "id": "Simple Line Simple Fill",
-      "type": "fill",
-      "paint": {
-        "fill-color": "#000000",
-        "fill-opacity": 1
+      id: 'Simple Line Simple Fill',
+      type: 'fill',
+      paint: {
+        'fill-color': '#000000',
+        'fill-opacity': 1
       }
     }
   ]
diff --git a/data/mapbox/point_placeholderText.ts b/data/mapbox/point_placeholderText.ts
@@ -1,20 +1,20 @@
 const pointPlaceholderText: any = {
-  "version": 8,
-  "name": "Placeholder Text",
-  "layers": [
+  version: 8,
+  name: 'Placeholder Text',
+  layers: [
     {
-      "id": "Placeholder Text",
-      "type": "symbol",
-      "layout": {
-        "text-field": ["format",
-          "Area: ", {},
-          ["get", "area"], {},
-          "km2", {}
+      id: 'Placeholder Text',
+      type: 'symbol',
+      layout: {
+        'text-field': ['format',
+          'Area: ', {},
+          ['get', 'area'], {},
+          'km2', {}
         ]
       },
-      "paint": {
-        "text-color": "#000000",
-        "text-opacity": 1
+      paint: {
+        'text-color': '#000000',
+        'text-opacity': 1
       }
     }
   ]
diff --git a/data/styles/fill_patternfill.ts b/data/styles/fill_patternfill.ts
@@ -10,7 +10,7 @@ const fillPatternFill: Style = {
       opacity: 1,
       graphicFill: {
         kind: 'Icon',
-        image: "/sprites/?name=poi&baseurl=" + encodeURIComponent("https://testurl.com")
+        image: '/sprites/?name=poi&baseurl=' + encodeURIComponent('https://testurl.com')
       }
     }]
   }]
diff --git a/data/styles/icon_simpleicon.ts b/data/styles/icon_simpleicon.ts
@@ -1,12 +1,12 @@
-import { Style } from "geostyler-style";
+import { Style } from 'geostyler-style';
 
 const iconSimpleIcon: Style = {
-  "name": "Simple Icon",
-  "rules": [{
-    "name": "Simple Icon",
-    "symbolizers": [{
-      "kind": "Icon",
-      "image": "/sprites/?name=poi&baseurl=" + encodeURIComponent("https://testurl.com")
+  name: 'Simple Icon',
+  rules: [{
+    name: 'Simple Icon',
+    symbolizers: [{
+      kind: 'Icon',
+      image: '/sprites/?name=poi&baseurl=' + encodeURIComponent('https://testurl.com')
     }]
   }]
 };
diff --git a/data/styles/icon_simpleicon_mapboxapi.ts b/data/styles/icon_simpleicon_mapboxapi.ts
@@ -1,12 +1,12 @@
-import { Style } from "geostyler-style";
+import { Style } from 'geostyler-style';
 
 const iconSimpleIcon: Style = {
-  "name": "Simple Icon",
-  "rules": [{
-    "name": "Simple Icon",
-    "symbolizers": [{
-      "kind": "Icon",
-      "image": "/sprites/?name=poi&baseurl=" + encodeURIComponent("https://api.mapbox.com/sprites/mapbox/streets-v8")
+  name: 'Simple Icon',
+  rules: [{
+    name: 'Simple Icon',
+    symbolizers: [{
+      kind: 'Icon',
+      image: '/sprites/?name=poi&baseurl=' + encodeURIComponent('https://api.mapbox.com/sprites/mapbox/streets-v8')
     }]
   }]
 };
diff --git a/data/styles/line_patternline.ts b/data/styles/line_patternline.ts
@@ -1,19 +1,19 @@
-import { Style } from "geostyler-style";
+import { Style } from 'geostyler-style';
 
 const linePatternLine: Style = {
-  "name": "Pattern Line",
-  "rules": [{
-    "name": "Pattern Line",
-    "symbolizers": [{
-      "kind": "Line",
-      "color": "#000000",
-      "width": 3,
-      "dasharray": [13, 37],
-      "cap": "round",
-      "join": "miter",
-      "graphicFill": {
+  name: 'Pattern Line',
+  rules: [{
+    name: 'Pattern Line',
+    symbolizers: [{
+      kind: 'Line',
+      color: '#000000',
+      width: 3,
+      dasharray: [13, 37],
+      cap: 'round',
+      join: 'miter',
+      graphicFill: {
         kind: 'Icon',
-        image: "/sprites/?name=poi&baseurl=" + encodeURIComponent("https://testurl.com")
+        image: '/sprites/?name=poi&baseurl=' + encodeURIComponent('https://testurl.com')
       }
     }]
   }]
diff --git a/data/styles/line_simpleline.ts b/data/styles/line_simpleline.ts
diff --git a/data/styles/multi_simpleline_simplefill.ts b/data/styles/multi_simpleline_simplefill.ts
diff --git a/jest.config.js b/jest.config.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/src/MapboxStyleParser.spec.ts b/src/MapboxStyleParser.spec.ts
diff --git a/src/MapboxStyleParser.ts b/src/MapboxStyleParser.ts

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`const iconSimpleIcon: any = {`
`2`		`- "version": 8,`
`3`		`- "name": "Simple Icon",`
`4`		`- "sprite": "https://testurl.com",`
`5`		`- "layers": [`
	`2`	`+ version: 8,`
	`3`	`+ name: 'Simple Icon',`
	`4`	`+ sprite: 'https://testurl.com',`
	`5`	`+ layers: [`
`6`	`6`	`{`
`7`		`- "id": "Simple Icon",`
`8`		`- "type": "symbol",`
`9`		`- "layout": {`
`10`		`- "icon-image": "poi"`
	`7`	`+ id: 'Simple Icon',`
	`8`	`+ type: 'symbol',`
	`9`	`+ layout: {`
	`10`	`+ 'icon-image': 'poi'`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`]`