Refactor geofence classes

1 files changed, 15 insertions, 22 deletions

diff --git a/src/test/java/org/traccar/geofence/GeofencePolygonTest.java b/src/test/java/org/traccar/geofence/GeofencePolygonTest.java
index 1b8de68ad..5baecd771 100644
--- a/src/test/java/org/traccar/geofence/GeofencePolygonTest.java
+++ b/src/test/java/org/traccar/geofence/GeofencePolygonTest.java
@@ -19,41 +19,34 @@ public class GeofencePolygonTest {
     @Test
     public void testPolygonWkt() throws ParseException {
         String test = "POLYGON ((55.75474 37.61823, 55.75513 37.61888, 55.7535 37.6222, 55.75315 37.62165))";
-        GeofenceGeometry geofenceGeometry = new GeofencePolygon();
-        geofenceGeometry.fromWkt(test);
+        GeofenceGeometry geofenceGeometry = new GeofencePolygon(test);
         assertEquals(geofenceGeometry.toWkt(), test);
     }
 
     @Test
     public void testContainsPolygon() throws ParseException {
-        String test = "POLYGON ((55.75474 37.61823, 55.75513 37.61888, 55.7535 37.6222, 55.75315 37.62165))";
-        GeofenceGeometry geofenceGeometry = new GeofencePolygon();
-        geofenceGeometry.fromWkt(test);
-        assertTrue(geofenceGeometry.containsPoint(55.75476, 37.61915));
-        assertFalse(geofenceGeometry.containsPoint(55.75545, 37.61921));
-
+        GeofenceGeometry geofenceGeometry = new GeofencePolygon(
+                "POLYGON ((55.75474 37.61823, 55.75513 37.61888, 55.7535 37.6222, 55.75315 37.62165))");
+        assertTrue(geofenceGeometry.containsPoint(null, null, 55.75476, 37.61915));
+        assertFalse(geofenceGeometry.containsPoint(null, null, 55.75545, 37.61921));
     }
     
     @Test
     public void testContainsPolygon180() throws ParseException {
-        String test = "POLYGON ((66.9494 179.838, 66.9508 -179.8496, 66.8406 -180.0014))";
-        GeofenceGeometry geofenceGeometry = new GeofencePolygon();
-        geofenceGeometry.fromWkt(test);
-        assertTrue(geofenceGeometry.containsPoint(66.9015, -180.0096));
-        assertTrue(geofenceGeometry.containsPoint(66.9015, 179.991));
-        assertFalse(geofenceGeometry.containsPoint(66.8368, -179.8792));
-
+        GeofenceGeometry geofenceGeometry = new GeofencePolygon(
+                "POLYGON ((66.9494 179.838, 66.9508 -179.8496, 66.8406 -180.0014))");
+        assertTrue(geofenceGeometry.containsPoint(null, null, 66.9015, -180.0096));
+        assertTrue(geofenceGeometry.containsPoint(null, null, 66.9015, 179.991));
+        assertFalse(geofenceGeometry.containsPoint(null, null, 66.8368, -179.8792));
     }
     
     @Test
     public void testContainsPolygon0() throws ParseException {
-        String test = "POLYGON ((51.1966 -0.6207, 51.1897 0.4147, 50.9377 0.5136, 50.8675 -0.6082))";
-        GeofenceGeometry geofenceGeometry = new GeofencePolygon();
-        geofenceGeometry.fromWkt(test);
-        assertTrue(geofenceGeometry.containsPoint(51.0466, -0.0165));
-        assertTrue(geofenceGeometry.containsPoint(51.0466, 0.018));
-        assertFalse(geofenceGeometry.containsPoint(50.9477, 0.5836));
-
+        GeofenceGeometry geofenceGeometry = new GeofencePolygon(
+                "POLYGON ((51.1966 -0.6207, 51.1897 0.4147, 50.9377 0.5136, 50.8675 -0.6082))");
+        assertTrue(geofenceGeometry.containsPoint(null, null, 51.0466, -0.0165));
+        assertTrue(geofenceGeometry.containsPoint(null, null, 51.0466, 0.018));
+        assertFalse(geofenceGeometry.containsPoint(null, null, 50.9477, 0.5836));
     }
 
 }