From ad632dac12235278c4c7df1a5ca8b9609e460f71 Mon Sep 17 00:00:00 2001
From: Kai Volland <volland@terrestris.de>
Date: Mon, 27 Sep 2021 11:51:40 +0200
Subject: [PATCH 1/3] introduce BetweenFilter

---
 style.ts      | 9 +++++++--
 typeguards.ts | 8 +++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/style.ts b/style.ts
index f6564b204..03ed1c9ce 100644
--- a/style.ts
+++ b/style.ts
@@ -31,7 +31,7 @@ export type PropertyValue = string | number | boolean | null;
 /**
  * The possible Operators used for comparison Filters.
  */
-export type ComparisonOperator = '==' | '*=' | '!=' | '<' | '<=' | '>' | '>=';
+export type ComparisonOperator = '==' | '*=' | '!=' | '<' | '<=' | '>' | '>=' | '<x<';
 
 /**
  * The possible Operators used for combination Filters.
@@ -69,6 +69,11 @@ export type StrMatchesFunctionFilter = [
  */
 export type FunctionFilter = StrMatchesFunctionFilter;
 
+/**
+ * A Filter that checks if a property value is between to values.
+ */
+export type BetweenFilter = ['<x<', PropertyName | FunctionFilter, number, number];
+
 /**
  * A ComparisonFilter compares a value of an object (by key) with an expected
  * value.
@@ -77,7 +82,7 @@ export type ComparisonFilter = [
   ComparisonOperator,
   PropertyName | FunctionFilter,
   PropertyValue
-];
+] | BetweenFilter;
 
 /**
  * A CombinationFilter combines N Filters with a logical OR / AND operator.
diff --git a/typeguards.ts b/typeguards.ts
index d650f2349..fc4f78efe 100644
--- a/typeguards.ts
+++ b/typeguards.ts
@@ -52,7 +52,7 @@ export const isOperator = (got: any): got is Operator => {
     isNegationOperator(got);
 };
 export const isComparisonOperator = (got: any): got is ComparisonOperator => {
-  return ['==', '*=' , '!=' , '<' , '<=' , '>' , '>='].includes(got);
+  return ['==', '*=' , '!=' , '<' , '<=' , '>' , '>=', '<x<'].includes(got);
 };
 export const isCombinationOperator = (got: any): got is CombinationOperator => {
   return ['&&', '||'].includes(got);
@@ -72,11 +72,13 @@ export const isFilter = (got: any): got is Filter => {
     isNegationFilter(got);
 };
 export const isComparisonFilter = (got: any): got is ComparisonFilter => {
+  const expectedLength = got[0] === '<x<' ? 4 : 3;
   return Array.isArray(got) &&
-    got.length === 3 &&
+    got.length === expectedLength &&
     isComparisonOperator(got[0]) &&
     (isFunctionFilter(got[1]) || _isString(got[1])) &&
-    isPropertyValue(got[2]);
+    isPropertyValue(got[2]) &&
+    (got[0] !== '<x<' || _isNumber(got[3]));
 };
 export const isCombinationFilter = (got: any): got is CombinationFilter => {
   return Array.isArray(got) &&

From b5b93c3ce43658888b1f825ff92105c24b5606ad Mon Sep 17 00:00:00 2001
From: Kai Volland <volland@terrestris.de>
Date: Mon, 27 Sep 2021 12:04:45 +0200
Subject: [PATCH 2/3] fix samples

---
 examples/parsersample.ts | 21 ++++++++++++++-------
 examples/rastersample.ts |  2 +-
 examples/sample.ts       |  5 +++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/examples/parsersample.ts b/examples/parsersample.ts
index 11ca2e454..32090f31e 100644
--- a/examples/parsersample.ts
+++ b/examples/parsersample.ts
@@ -1,4 +1,5 @@
-import { Style, StyleParser, UnsupportedProperties } from 'index';
+import { Style, StyleParser, UnsupportedProperties } from '../index';
+import { ReadStyleResult, WriteStyleResult } from '../style';
 
 export class SampleParser implements StyleParser {
 
@@ -20,15 +21,21 @@ export class SampleParser implements StyleParser {
 
   title = 'Sample Parser';
 
-  writeStyle(geoStylerStyle: Style): Promise<string> {
-    return new Promise<string>(() => 'sample');
+  writeStyle(geoStylerStyle: Style): Promise<WriteStyleResult> {
+    return new Promise<WriteStyleResult>(() => {
+      return {
+        output: 'sample'
+      };
+    });
   }
 
-  readStyle(sldString: string): Promise<Style> {
-    return new Promise<Style>(() => {
+  readStyle(sldString: string): Promise<ReadStyleResult> {
+    return new Promise<ReadStyleResult>(() => {
       return {
-        name: 'Samplestyle',
-        rules: []
+        output: {
+          name: 'Samplestyle',
+          rules: []
+        }
       };
     });
   }
diff --git a/examples/rastersample.ts b/examples/rastersample.ts
index c2ef25bd7..9eef35f81 100644
--- a/examples/rastersample.ts
+++ b/examples/rastersample.ts
@@ -1,4 +1,4 @@
-import { Style } from 'index';
+import { Style } from '../index';
 
 const sampleRasterStyle: Style = {
   name: 'Sample Raster Style',
diff --git a/examples/sample.ts b/examples/sample.ts
index d3ccde3c4..d1df0f140 100644
--- a/examples/sample.ts
+++ b/examples/sample.ts
@@ -1,4 +1,4 @@
-import { Style } from 'index';
+import { Style } from '../index';
 
 const sampleStyle: Style = {
   name: 'Sample Point Style',
@@ -7,7 +7,8 @@ const sampleStyle: Style = {
       name: 'Young Peter',
       filter: ['&&',
         ['==', 'name', 'Peter'],
-        ['<=', 'age', 12]
+        ['<=', 'age', 12],
+        ['<x<', 'height', 1, 2]
       ],
       scaleDenominator: {
         min: 500,

From 548a2b9f47d6ba8e27b751e4aacb8c7d0d738e9b Mon Sep 17 00:00:00 2001
From: Kai Volland <volland@terrestris.de>
Date: Mon, 27 Sep 2021 14:06:49 +0200
Subject: [PATCH 3/3] transform BetweenFilter to RangeFilter (inclusive)

---
 examples/sample.ts | 2 +-
 style.ts           | 8 ++++----
 typeguards.ts      | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/sample.ts b/examples/sample.ts
index d1df0f140..544ac82d0 100644
--- a/examples/sample.ts
+++ b/examples/sample.ts
@@ -8,7 +8,7 @@ const sampleStyle: Style = {
       filter: ['&&',
         ['==', 'name', 'Peter'],
         ['<=', 'age', 12],
-        ['<x<', 'height', 1, 2]
+        ['<=x<=', 'height', 1, 2]
       ],
       scaleDenominator: {
         min: 500,
diff --git a/style.ts b/style.ts
index 03ed1c9ce..6e92f08d6 100644
--- a/style.ts
+++ b/style.ts
@@ -31,7 +31,7 @@ export type PropertyValue = string | number | boolean | null;
 /**
  * The possible Operators used for comparison Filters.
  */
-export type ComparisonOperator = '==' | '*=' | '!=' | '<' | '<=' | '>' | '>=' | '<x<';
+export type ComparisonOperator = '==' | '*=' | '!=' | '<' | '<=' | '>' | '>=' | '<=x<=';
 
 /**
  * The possible Operators used for combination Filters.
@@ -70,9 +70,9 @@ export type StrMatchesFunctionFilter = [
 export type FunctionFilter = StrMatchesFunctionFilter;
 
 /**
- * A Filter that checks if a property value is between to values.
+ * A Filter that checks if a property is in a range of two values (inclusive).
  */
-export type BetweenFilter = ['<x<', PropertyName | FunctionFilter, number, number];
+export type RangeFilter = ['<=x<=', PropertyName | FunctionFilter, number, number];
 
 /**
  * A ComparisonFilter compares a value of an object (by key) with an expected
@@ -82,7 +82,7 @@ export type ComparisonFilter = [
   ComparisonOperator,
   PropertyName | FunctionFilter,
   PropertyValue
-] | BetweenFilter;
+] | RangeFilter;
 
 /**
  * A CombinationFilter combines N Filters with a logical OR / AND operator.
diff --git a/typeguards.ts b/typeguards.ts
index fc4f78efe..05648ab64 100644
--- a/typeguards.ts
+++ b/typeguards.ts
@@ -52,7 +52,7 @@ export const isOperator = (got: any): got is Operator => {
     isNegationOperator(got);
 };
 export const isComparisonOperator = (got: any): got is ComparisonOperator => {
-  return ['==', '*=' , '!=' , '<' , '<=' , '>' , '>=', '<x<'].includes(got);
+  return ['==', '*=' , '!=' , '<' , '<=' , '>' , '>=', '<=x<='].includes(got);
 };
 export const isCombinationOperator = (got: any): got is CombinationOperator => {
   return ['&&', '||'].includes(got);
@@ -72,13 +72,13 @@ export const isFilter = (got: any): got is Filter => {
     isNegationFilter(got);
 };
 export const isComparisonFilter = (got: any): got is ComparisonFilter => {
-  const expectedLength = got[0] === '<x<' ? 4 : 3;
+  const expectedLength = got[0] === '<=x<=' ? 4 : 3;
   return Array.isArray(got) &&
     got.length === expectedLength &&
     isComparisonOperator(got[0]) &&
     (isFunctionFilter(got[1]) || _isString(got[1])) &&
     isPropertyValue(got[2]) &&
-    (got[0] !== '<x<' || _isNumber(got[3]));
+    (got[0] !== '<=x<=' || _isNumber(got[3]));
 };
 export const isCombinationFilter = (got: any): got is CombinationFilter => {
   return Array.isArray(got) &&