add tests to TurfMisc.lineSlice (and fix it) (#106)

Author: zugaldia

libjava/lib/src/main/java/com/mapbox/services/commons/geojson/Feature.java

@@ -58,6 +58,7 @@ public Geometry getGeometry() {
      * @return the properties of this feature
      */
     public JsonObject getProperties() {
+        if (properties == null) properties = new JsonObject();
         return properties;
     }
 
@@ -135,7 +136,7 @@ public String toJson() {
      * @param value the String value associated with the member
      */
     public void addStringProperty(String key, String value) {
-        this.properties.addProperty(key, value);
+        getProperties().addProperty(key, value);
     }
 
     /**
@@ -144,7 +145,7 @@ public void addStringProperty(String key, String value) {
      * @param value the Number value associated with the member
      */
     public void addNumberProperty(String key, Number value) {
-        this.properties.addProperty(key, value);
+        getProperties().addProperty(key, value);
     }
 
     /**
@@ -153,7 +154,7 @@ public void addNumberProperty(String key, Number value) {
      * @param value the Boolean value associated with the member
      */
     public void addBooleanProperty(String key, Boolean value) {
-        this.properties.addProperty(key, value);
+        getProperties().addProperty(key, value);
     }
 
     /**
@@ -162,7 +163,7 @@ public void addBooleanProperty(String key, Boolean value) {
      * @param value the Character value associated with the member
      */
     public void addCharacterProperty(String key, Character value) {
-        this.properties.addProperty(key, value);
+        getProperties().addProperty(key, value);
     }
 
     /**
@@ -171,7 +172,7 @@ public void addCharacterProperty(String key, Character value) {
      * @param value the JsonElement value associated with the member
      */
     public void addProperty(String key, JsonElement value) {
-        this.properties.add(key, value);
+        getProperties().add(key, value);
     }
 
     /**
@@ -180,7 +181,7 @@ public void addProperty(String key, JsonElement value) {
      * @return the value of the member, null if it doesn't exist
      */
     public String getStringProperty(String key) {
-        return this.properties.get(key).getAsString();
+        return getProperties().get(key).getAsString();
     }
 
     /**
@@ -189,7 +190,7 @@ public String getStringProperty(String key) {
      * @return the value of the member, null if it doesn't exist
      */
     public Number getNumberProperty(String key) {
-        return this.properties.get(key).getAsNumber();
+        return getProperties().get(key).getAsNumber();
     }
 
     /**
@@ -198,7 +199,7 @@ public Number getNumberProperty(String key) {
      * @return the value of the member, null if it doesn't exist
      */
     public Boolean getBooleanProperty(String key) {
-        return this.properties.get(key).getAsBoolean();
+        return getProperties().get(key).getAsBoolean();
     }
 
     /**
@@ -207,7 +208,7 @@ public Boolean getBooleanProperty(String key) {
      * @return the value of the member, null if it doesn't exist
      */
     public Character getCharacterProperty(String key) {
-        return this.properties.get(key).getAsCharacter();
+        return getProperties().get(key).getAsCharacter();
     }
 
     /**
@@ -216,7 +217,7 @@ public Character getCharacterProperty(String key) {
      * @return the value of the member, null if it doesn't exist
      */
     public JsonElement getProperty(String key) {
-        return this.properties.get(key);
+        return getProperties().get(key);
     }
 
     /**
@@ -225,7 +226,7 @@ public JsonElement getProperty(String key) {
      * @return
      */
     public JsonElement removeProperty(String key) {
-        return this.properties.remove(key);
+        return getProperties().remove(key);
     }
 
     /**
@@ -234,6 +235,6 @@ public JsonElement removeProperty(String key) {
      * @return
      */
     public boolean hasProperty(String key) {
-        return this.properties.has(key);
+        return getProperties().has(key);
     }
 }

libjava/lib/src/test/fixtures/turf-line-slice/line1.geojson

@@ -0,0 +1,21 @@
+{
+  "type": "Feature",
+  "properties": {},
+  "geometry": {
+    "type": "LineString",
+    "coordinates": [
+      [
+        -97.88131713867188,
+        22.466878364528448
+      ],
+      [
+        -97.82089233398438,
+        22.175960091218524
+      ],
+      [
+        -97.6190185546875,
+        21.8704201873689
+      ]
+    ]
+  }
+}

libjava/lib/src/test/fixtures/turf-line-slice/route1.geojson

@@ -0,0 +1,17 @@
+{
+  "type": "Feature",
+  "properties": {},
+  "geometry": {
+    "type": "LineString",
+    "coordinates": [
+      [
+        -121.25447809696198,
+        38.70582415504791
+      ],
+      [
+        -121.25449419021606,
+        38.709767459877554
+      ]
+    ]
+  }
+}

libjava/lib/src/test/fixtures/turf-line-slice/route2.geojson

@@ -0,0 +1,20 @@
+package com.mapbox.services.turf;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+/**
+ * Created by antonio on 7/8/16.
+ */
+public class BaseTurf {
+
+    protected final static double DELTA = 1E-10;
+
+    protected String loadJsonFixture(String folder, String filename) throws IOException {
+        byte[] content = Files.readAllBytes(Paths.get("src/test/fixtures/" + folder + "/" + filename));
+        return new String(content, StandardCharsets.UTF_8);
+    }
+
+}

libjava/lib/src/test/fixtures/turf-line-slice/vertical.geojson

@@ -26,14 +26,7 @@
 /**
  * Created by antonio on 5/12/16.
  */
-public class TurfMeasurementTest {
-
-    private final static double DELTA = 1E-10;
-
-    private String loadJsonFixture(String filename) throws IOException {
-        byte[] content = Files.readAllBytes(Paths.get("src/test/fixtures/turf-line-distance/" + filename));
-        return new String(content, StandardCharsets.UTF_8);
-    }
+public class TurfMeasurementTest extends BaseTurf {
 
     @Rule
     public ExpectedException thrown = ExpectedException.none();
@@ -79,37 +72,37 @@ public void testDistance() throws TurfException {
 
     @Test
     public void testLineDistanceLineString() throws IOException, TurfException {
-        Feature route1 = Feature.fromJson(loadJsonFixture("route1.geojson"));
-        Feature route2 = Feature.fromJson(loadJsonFixture("route2.geojson"));
+        Feature route1 = Feature.fromJson(loadJsonFixture("turf-line-distance", "route1.geojson"));
+        Feature route2 = Feature.fromJson(loadJsonFixture("turf-line-distance", "route2.geojson"));
         assertEquals(Math.round(TurfMeasurement.lineDistance(route1, "miles")), 202);
         assertTrue((TurfMeasurement.lineDistance(route2, "kilometers") - 742) < 1
                 && (TurfMeasurement.lineDistance(route2, "kilometers") - 742) > (-1) );
     }
 
     @Test
     public void testLineDistanceWithGeometries() throws IOException, TurfException {
-        Feature route1 = Feature.fromJson(loadJsonFixture("route1.geojson"));
-        Feature route2 = Feature.fromJson(loadJsonFixture("route2.geojson"));
+        Feature route1 = Feature.fromJson(loadJsonFixture("turf-line-distance", "route1.geojson"));
+        Feature route2 = Feature.fromJson(loadJsonFixture("turf-line-distance", "route2.geojson"));
         assertEquals(Math.round(TurfMeasurement.lineDistance(route1.getGeometry(), "miles")), 202);
         assertTrue((TurfMeasurement.lineDistance(route2.getGeometry(), "kilometers") - 742) < 1
                 && (TurfMeasurement.lineDistance(route2.getGeometry(), "kilometers") - 742) > (-1) );
     }
 
     @Test
     public void testLineDistancePolygon() throws IOException, TurfException {
-        Feature feat = Feature.fromJson(loadJsonFixture("polygon.geojson"));
+        Feature feat = Feature.fromJson(loadJsonFixture("turf-line-distance", "polygon.geojson"));
         assertEquals(Math.round(1000 * TurfMeasurement.lineDistance(feat, "kilometers")), 5599);
     }
 
     @Test
     public void testLineDistanceMultiLineString() throws IOException, TurfException {
-        Feature feat = Feature.fromJson(loadJsonFixture("multilinestring.geojson"));
+        Feature feat = Feature.fromJson(loadJsonFixture("turf-line-distance", "multilinestring.geojson"));
         assertEquals(Math.round(1000 * TurfMeasurement.lineDistance(feat, "kilometers")), 4705);
     }
 
     @Test
     public void testLineDistanceFeatureCollection() throws IOException, TurfException {
-        FeatureCollection feat = FeatureCollection.fromJson(loadJsonFixture("featurecollection.geojson"));
+        FeatureCollection feat = FeatureCollection.fromJson(loadJsonFixture("turf-line-distance", "featurecollection.geojson"));
         assertEquals(Math.round(1000 * TurfMeasurement.lineDistance(feat, "kilometers")), 10304);
     }
 

libjava/lib/src/test/java/com/mapbox/services/turf/BaseTurf.java

@@ -0,0 +1,100 @@
+package com.mapbox.services.turf;
+
+import com.mapbox.services.commons.geojson.Feature;
+import com.mapbox.services.commons.geojson.LineString;
+import com.mapbox.services.commons.geojson.Point;
+import com.mapbox.services.commons.models.Position;
+import com.mapbox.services.commons.turf.TurfException;
+import com.mapbox.services.commons.turf.TurfMisc;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Created by antonio on 7/8/16.
+ */
+public class TurfMiscTest extends BaseTurf {
+
+    @Test
+    public void testTurfLineSliceLine1() throws IOException, TurfException {
+        Point start = Point.fromCoordinates(Position.fromCoordinates(-97.79617309570312, 22.254624939561698));
+        Point stop = Point.fromCoordinates(Position.fromCoordinates(-97.72750854492188, 22.057641623615734));
+
+        Feature line1 = Feature.fromJson(loadJsonFixture("turf-line-slice", "line1.geojson"));
+
+        LineString sliced = TurfMisc.lineSlice(start, stop, line1);
+        assertNotNull(sliced);
+    }
+
+    @Test
+    public void testTurfLineSliceRawGeometry() throws IOException, TurfException {
+        Point start = Point.fromCoordinates(Position.fromCoordinates(-97.79617309570312,22.254624939561698));
+        Point stop = Point.fromCoordinates(Position.fromCoordinates(-97.72750854492188,22.057641623615734));
+
+        Feature line1 = Feature.fromJson(loadJsonFixture("turf-line-slice", "line1.geojson"));
+
+        LineString sliced = TurfMisc.lineSlice(start, stop, (LineString)line1.getGeometry());
+        assertNotNull(sliced);
+    }
+
+    @Test
+    public void testTurfLineSliceLine2() throws TurfException {
+        Point start = Point.fromCoordinates(Position.fromCoordinates(0,0.1));
+        Point stop = Point.fromCoordinates(Position.fromCoordinates(.9,.8));
+
+        ArrayList<Position> coordinates = new ArrayList<>();
+        coordinates.add(Position.fromCoordinates(0, 0));
+        coordinates.add(Position.fromCoordinates(1, 1));
+        LineString line2 = LineString.fromCoordinates(coordinates);
+
+        LineString sliced = TurfMisc.lineSlice(start, stop, line2);
+        assertNotNull(sliced);
+    }
+
+    @Test
+    public void testTurfLineSliceRoute1() throws IOException, TurfException {
+        Point start = Point.fromCoordinates(Position.fromCoordinates(-79.0850830078125,37.60117623656667));
+        Point stop = Point.fromCoordinates(Position.fromCoordinates(-77.7667236328125,38.65119833229951));
+
+        Feature route1 = Feature.fromJson(loadJsonFixture("turf-line-slice", "route1.geojson"));
+
+        LineString sliced = TurfMisc.lineSlice(start, stop, route1);
+        assertNotNull(sliced);
+    }
+
+    @Test
+    public void testTurfLineSliceRoute2() throws IOException, TurfException {
+        Point start = Point.fromCoordinates(Position.fromCoordinates(-112.60660171508789,45.96021963947196));
+        Point stop = Point.fromCoordinates(Position.fromCoordinates(-111.97265625,48.84302835299516));
+
+        Feature route2 = Feature.fromJson(loadJsonFixture("turf-line-slice", "route2.geojson"));
+
+        LineString sliced = TurfMisc.lineSlice(start, stop, route2);
+        assertNotNull(sliced);
+    }
+
+    @Test
+    public void testTurfLineSliceVertical() throws IOException, TurfException {
+        Point start = Point.fromCoordinates(Position.fromCoordinates(-121.25447809696198, 38.70582415504791));
+        Point stop = Point.fromCoordinates(Position.fromCoordinates(-121.25447809696198, 38.70634324369764));
+
+        Feature vertical = Feature.fromJson(loadJsonFixture("turf-line-slice", "vertical.geojson"));
+
+        LineString sliced = TurfMisc.lineSlice(start, stop, vertical);
+        assertNotNull(sliced);
+
+        // No duplicated coords
+        assertEquals(sliced.getCoordinates().size(), 2);
+
+        // Vertical slice does not collapse to 1st coord
+        assertNotEquals(
+                sliced.getCoordinates().get(0).getCoordinates(),
+                sliced.getCoordinates().get(1).getCoordinates());
+    }
+}