Merge branch 'master' into 1.1

CHANGELOG.md

+1.1.2
+-----
+
+* Fix more spelling of keywords in error messages.
+
 1.1.1
 -----
 
 * Improve documentation by adding some examples to readme.
-* Fix spelling of keywords in error messages. 
 
 1.1.0
 -----

README.md

@@ -15,7 +15,7 @@ Add the module to your maven dependencies (`pom.xml`):
 <dependency>
   <groupId>org.heigit.ohsome</groupId>
   <artifactId>ohsome-filter</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.2</version>
 </dependency>
 …
 <repository>

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>org.heigit.ohsome</groupId>
   <artifactId>ohsome-filter</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <description>A flexible filtering library for OSM entities.</description>
   <packaging>jar</packaging>
 

src/main/java/org/heigit/ohsome/filter/FilterParser.java

@@ -101,15 +101,15 @@ public class FilterParser {
     final Parser<FilterExpression> unit = ref.lazy().between(parensStart, parensEnd)
         .or(filter);
     final Parser<String> and = whitespace
-        .followedBy(Patterns.string("and").toScanner("AND"))
+        .followedBy(Patterns.string("and").toScanner("and"))
         .followedBy(whitespace)
         .map(ignored -> "or");
     final Parser<String> or = whitespace
-        .followedBy(Patterns.string("or").toScanner("OR"))
+        .followedBy(Patterns.string("or").toScanner("or"))
         .followedBy(whitespace)
         .map(ignored -> "or");
     final Parser<String> not = whitespace
-        .followedBy(Patterns.string("not").toScanner("NOT"))
+        .followedBy(Patterns.string("not").toScanner("not"))
         .followedBy(whitespace)
         .map(ignored -> "not");
     final Parser<FilterExpression> parser = new OperatorTable<FilterExpression>()