Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Improved handling of GeoJSONPoint invalid values

Rich Turner2e4154bf6b6d
diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
index 6c938aba9..e50093133 100644
--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
@@ -570,19 +570,7 @@ public class JsonRulesBuilder extends RulesBuilder {
add().name(rule.name)
.description(rule.description)
.priority(rule.priority)
- .when(facts -> {
- Object result;
- try {
- result = condition.evaluate(facts);
- } catch (Exception ex) {
- throw new RuntimeException("Error evaluating condition of rule '" + rule.name + "': " + ex.getMessage(), ex);
- }
- if (result instanceof Boolean) {
- return result;
- } else {
- throw new IllegalArgumentException("Error evaluating condition of rule '" + rule.name + "': result is not boolean but " + result);
- }
- })
+ .when(condition::evaluate)
.then(action);
return this;
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.java
index 054416d0d..4d2c6ec33 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.java
@@ -113,9 +113,9 @@ public class RulesBuilder {
throw new IllegalArgumentException("Error evaluating condition of rule '" + builder.name + "': result is not boolean but " + result);
}
})
- .then(facts -> {
- builder.action.execute((RulesFacts) facts);
- }).build();
+ .then(facts -> builder.action.execute((RulesFacts) facts))
+ .build();
+
rules.add(rule);
}
return rules.toArray(new Rule[rules.size()]);
diff --git a/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.java b/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.java
index f56932869..ff4a3c554 100644
--- a/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.java
+++ b/model/src/main/java/org/openremote/model/geo/GeoJSONPoint.java
@@ -24,6 +24,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.util.StdConverter;
import com.vividsolutions.jts.geom.Coordinate;
+import java.util.Objects;
+
import static org.openremote.model.geo.GeoJSONPoint.TYPE;
@JsonTypeName(TYPE)
@@ -49,6 +51,9 @@ public class GeoJSONPoint extends GeoJSONGeometry {
@JsonCreator
public GeoJSONPoint(@JsonProperty("coordinates") Coordinate coordinates) {
super(TYPE);
+ Objects.requireNonNull(coordinates);
+ coordinates.x = Math.min(180d, Math.max(-180d, coordinates.x));
+ coordinates.y = Math.min(90d, Math.max(-90d, coordinates.y));
this.coordinates = coordinates;
}
diff --git a/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.java b/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.java
index f1590b9d9..06bcc4c5d 100644
--- a/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/RadialGeofencePredicate.java
@@ -137,6 +137,9 @@ public class RadialGeofencePredicate extends GeofencePredicate {
return false;
}
+ coordinate.x = Math.min(180d, Math.max(-180d, coordinate.x));
+ coordinate.y = Math.min(90d, Math.max(-90d, coordinate.y));
+
GeodeticCalculator calculator = new GeodeticCalculator();
calculator.setStartingGeographicPoint(lng, lat);
calculator.setDestinationGeographicPoint(coordinate.x, coordinate.y);
diff --git a/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.java b/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.java
index 32dd284f1..a3ff866bb 100644
--- a/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/RectangularGeofencePredicate.java
@@ -132,6 +132,9 @@ public class RectangularGeofencePredicate extends GeofencePredicate {
return false;
}
+ coordinate.x = Math.min(180d, Math.max(-180d, coordinate.x));
+ coordinate.y = Math.min(90d, Math.max(-90d, coordinate.y));
+
Envelope envelope = new Envelope(lngMin,
lngMax,
latMin,