Skip to content

Make sure feature properties are properly serialized #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zugaldia merged 1 commit into from
Sep 12, 2016
Merged

Make sure feature properties are properly serialized #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libjava/lib/src/main/java/com/mapbox/services/commons/geojson/Feature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void setId(String id) {
* @since 1.0.0
*/
public static Feature fromGeometry(Geometry geometry) {
return new Feature(geometry, null, null);
return new Feature(geometry, new JsonObject(), null);
}

/**
Expand Down
25 changes: 25 additions & 0 deletions libjava/lib/src/test/java/com/mapbox/services/geojson/FeatureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
package com.mapbox.services.geojson;

import com.google.gson.JsonObject;
import com.mapbox.services.commons.geojson.Feature;
import com.mapbox.services.commons.geojson.LineString;
import com.mapbox.services.commons.models.Position;

import org.junit.Test;

import java.util.Arrays;
import java.util.List;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

public class FeatureTest extends BaseGeoJSON {

Expand All @@ -22,4 +29,22 @@ public void toJson() {
compareJson(BaseGeoJSON.SAMPLE_FEATURE, geo.toJson());
}

@Test
public void testNullProperties() {
List<Position> coordinates = Arrays.asList(Position.fromCoordinates(0.1, 2.3), Position.fromCoordinates(4.5, 6.7));
LineString line = LineString.fromCoordinates(coordinates);
Feature feature = Feature.fromGeometry(line);
assertTrue(feature.toJson().contains("\"properties\":{}"));
}

@Test
public void testNonNullProperties() {
List<Position> coordinates = Arrays.asList(Position.fromCoordinates(0.1, 2.3), Position.fromCoordinates(4.5, 6.7));
LineString line = LineString.fromCoordinates(coordinates);
JsonObject properties = new JsonObject();
properties.addProperty("key", "value");
Feature feature = Feature.fromGeometry(line, properties);
assertTrue(feature.toJson().contains("\"properties\":{\"key\":\"value\"}"));
}

}