Verified Commit 2f8bdb6d authored by Martin Raifer's avatar Martin Raifer
Browse files

Merge branch 'master' into 1.1

parents efc6ae93 81098137
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
-----
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment