Merge pull request #218 from geostyler/beta-4

Merge beta branch into master
geostyler · May 30, 2023 · 8d3bff8 · 8d3bff8
2 parents f6eb604 + 4d71bb7
commit 8d3bff8
Show file tree

Hide file tree

Showing 58 changed files with 3,274 additions and 830 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "typescript.tsdk": "node_modules/typescript/lib"
+}
diff --git a/data/mapbox/circle_simplecircle.ts b/data/mapbox/circle_simplecircle.ts
@@ -1,4 +1,6 @@
-const circleSimpleCircle: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const circleSimpleCircle: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Simple Circle',
   layers: [

diff --git a/data/mapbox/expression_case.ts b/data/mapbox/expression_case.ts
@@ -0,0 +1,31 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const expression_case: Omit<MbStyle, 'sources'> = {
+  version: 8,
+  name: 'Expression Case',
+  layers: [
+    {
+      id: 'earthquake_circle',
+      type: 'circle',
+      paint: {
+        'circle-color': [
+          'case',
+          ['<', ['get', 'mag'], 2],
+          '#fed976',
+          ['all', ['>=', ['get', 'mag'], 2], ['<', ['get', 'mag'], 3]],
+          '#feb24c',
+          ['all', ['>=', ['get', 'mag'], 3], ['<', ['get', 'mag'], 4]],
+          '#fd8d3c',
+          ['all', ['>=', ['get', 'mag'], 4], ['<', ['get', 'mag'], 5]],
+          '#fc4e2a',
+          '#e31a1c'
+        ],
+        'circle-opacity': 0.6,
+        'circle-radius': 12
+      }
+    }
+  ]
+};
+
+export default expression_case;
diff --git a/data/mapbox/expression_get.ts b/data/mapbox/expression_get.ts
@@ -0,0 +1,23 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const expression_get: Omit<MbStyle, 'sources'> = {
+  version: 8,
+  name: 'Expression Get',
+  layers: [
+    {
+      id: 'Expression Get',
+      type: 'circle',
+      paint: {
+        'circle-color': '#000000',
+        'circle-radius': ['get', 'population'],
+        'circle-opacity': ['get', 'population_density'],
+        'circle-stroke-width': 2,
+        'circle-stroke-color': '#FF0000',
+        'circle-stroke-opacity': 0.5
+      }
+    }
+  ]
+};
+
+export default expression_get;
diff --git a/data/mapbox/fill_patternfill.ts b/data/mapbox/fill_patternfill.ts
@@ -1,4 +1,6 @@
-const fillSimpleFill: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const fillSimpleFill: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Pattern Fill',
   sprite: 'https://testurl.com',

diff --git a/data/mapbox/fill_simple_outline.ts b/data/mapbox/fill_simple_outline.ts
@@ -0,0 +1,28 @@
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const fillSimpleFillOutline: Omit<MbStyle, 'sources'> = {
+  version: 8,
+  name: 'Simple Fill With outline',
+  layers: [{
+    id: 'r0_sy0_st0',
+    type: 'fill',
+    paint: {
+      'fill-color': '#ff0000'
+    }
+  },
+  {
+    id: 'r0_sy0_st1',
+    type: 'line',
+    paint: {
+      'line-opacity': 0.5,
+      'line-color': '#00ff00',
+      'line-width': 2
+    },
+    layout: {
+      'line-cap': 'butt',
+      'line-join': 'round'
+    }
+  }]
+};
+
+export default fillSimpleFillOutline;
diff --git a/data/mapbox/fill_simplefill.ts b/data/mapbox/fill_simplefill.ts
@@ -1,4 +1,6 @@
-const fillSimpleFill: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const fillSimpleFill: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Simple Fill',
   layers: [

diff --git a/data/mapbox/icon_simpleicon.ts b/data/mapbox/icon_simpleicon.ts
@@ -1,4 +1,6 @@
-const iconSimpleIcon: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const iconSimpleIcon: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Simple Icon',
   sprite: 'https://testurl.com',

diff --git a/data/mapbox/icon_simpleicon_mapboxapi.ts b/data/mapbox/icon_simpleicon_mapboxapi.ts
@@ -1,4 +1,6 @@
-const iconSimpleIcon: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const iconSimpleIcon: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Simple Icon',
   sprite: 'mapbox://sprites/mapbox/streets-v8',

diff --git a/data/mapbox/line_patternline.ts b/data/mapbox/line_patternline.ts
@@ -1,4 +1,6 @@
-const linePatternLine: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const linePatternLine: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Pattern Line',
   sprite: 'https://testurl.com',

diff --git a/data/mapbox/line_simpleline.ts b/data/mapbox/line_simpleline.ts
@@ -1,4 +1,6 @@
-const lineSimpleLine: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const lineSimpleLine: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Simple Line',
   layers: [

diff --git a/data/mapbox/line_simpleline_basefilter.ts b/data/mapbox/line_simpleline_basefilter.ts
@@ -1,4 +1,6 @@
-const lineSimpleLine: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const lineSimpleLine: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Small populated New Yorks',
   layers: [{

diff --git a/data/mapbox/line_simpleline_expression.ts b/data/mapbox/line_simpleline_expression.ts
@@ -0,0 +1,21 @@
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const lineSimpleLine: Omit<MbStyle, 'sources'> = {
+  version: 8,
+  name: 'Simple Line Filter',
+  layers: [{
+    id: 'Small populated New Yorks',
+    type: 'line',
+    paint: {
+      'line-color': '#FF0000',
+      'line-width': ['case',
+        ['==', 'DENSITY', 20],
+        3,
+        ['!=', 'DENSITY', 20],
+        5
+      ]
+    }
+  }]
+};
+
+export default lineSimpleLine;
diff --git a/data/mapbox/line_simpleline_zoom.ts b/data/mapbox/line_simpleline_zoom.ts
@@ -1,4 +1,6 @@
-const lineSimpleLine: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const lineSimpleLine: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Simple Line Filter',
   layers: [{

diff --git a/data/mapbox/multi_rule_line_fill.ts b/data/mapbox/multi_rule_line_fill.ts
@@ -1,4 +1,6 @@
-const multiRuleLineFill: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const multiRuleLineFill: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Rule Line Fill',
   layers: [

diff --git a/data/mapbox/multi_simpleline_simplefill.ts b/data/mapbox/multi_simpleline_simplefill.ts
@@ -1,4 +1,6 @@
-const multiSimpleLineSimpleFill: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const multiSimpleLineSimpleFill: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Simple Line Simple Fill',
   layers: [

diff --git a/data/mapbox/point_placeholderText.ts b/data/mapbox/point_placeholderText.ts
@@ -1,4 +1,6 @@
-const pointPlaceholderText: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const pointPlaceholderText: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Placeholder Text',
   layers: [

diff --git a/data/mapbox/point_placeholderText_simple.ts b/data/mapbox/point_placeholderText_simple.ts
@@ -1,4 +1,6 @@
-const pointPlaceholderText: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const pointPlaceholderText: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Placeholder Text',
   layers: [

diff --git a/data/mapbox/point_simpletext.ts b/data/mapbox/point_simpletext.ts
@@ -1,4 +1,6 @@
-const pointSimpleText: any = {
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const pointSimpleText: Omit<MbStyle, 'sources'> = {
   version: 8,
   name: 'Simple Text',
   layers: [

diff --git a/data/mapbox_metadata/circle_simplecircle.ts b/data/mapbox_metadata/circle_simplecircle.ts
@@ -0,0 +1,34 @@
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const circleSimpleCircle: Omit<MbStyle, 'sources'> = {
+  version: 8,
+  name: 'Simple Circle',
+  layers: [
+    {
+      id: 'r0_sy0_st0',
+      type: 'circle',
+      paint: {
+        'circle-color': '#000000',
+        'circle-radius': 5,
+        'circle-opacity': 1,
+        'circle-stroke-width': 2,
+        'circle-stroke-color': '#FF0000',
+        'circle-stroke-opacity': 0.5
+      }
+    }
+  ],
+  metadata: {
+    'geostyler:ref': {
+      rules: [{
+        name: 'Simple Circle',
+        symbolizers: [
+          [
+            'r0_sy0_st0'
+          ]
+        ]
+      }]
+    }
+  }
+};
+
+export default circleSimpleCircle;
diff --git a/data/mapbox_metadata/expression_case.ts b/data/mapbox_metadata/expression_case.ts
@@ -0,0 +1,43 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import { MbStyle } from '../../src/MapboxStyleParser';
+
+const expression_case: Omit<MbStyle, 'sources'> = {
+  version: 8,
+  name: 'Expression Case',
+  layers: [
+    {
+      id: 'r0_sy0_st0',
+      type: 'circle',
+      paint: {
+        'circle-color': [
+          'case',
+          ['<', ['get', 'mag'], 2],
+          '#fed976',
+          ['all', ['>=', ['get', 'mag'], 2], ['<', ['get', 'mag'], 3]],
+          '#feb24c',
+          ['all', ['>=', ['get', 'mag'], 3], ['<', ['get', 'mag'], 4]],
+          '#fd8d3c',
+          ['all', ['>=', ['get', 'mag'], 4], ['<', ['get', 'mag'], 5]],
+          '#fc4e2a',
+          '#e31a1c'
+        ],
+        'circle-opacity': 0.6,
+        'circle-radius': 12
+      }
+    }
+  ],
+  metadata: {
+    'geostyler:ref': {
+      rules: [{
+        name: 'earthquake_circle',
+        symbolizers: [
+          [
+            'r0_sy0_st0'
+          ]
+        ]
+      }]
+    }
+  }
+};
+
+export default expression_case;