aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jones_s-r@ESDR-LTH4X5R72.scisys-r.local>2017-01-31 14:35:22 +0000
committerunknown <jones_s-r@ESDR-LTH4X5R72.scisys-r.local>2017-01-31 14:35:22 +0000
commite8409a9d38019a88cc74bddb6cce85f244728a7a (patch)
tree39f194b3426a36f619d51b4a7e23085d044556ef
parent5e2fef6aea1dedd357151c7994dc702c603be009 (diff)
downloadgeojson-jackson-e8409a9d38019a88cc74bddb6cce85f244728a7a.tar.gz
LngLatAltSerializer test added and unused code removed
-rw-r--r--src/main/java/org/geojson/jackson/LngLatAltSerializer.java43
-rw-r--r--src/test/java/org/geojson/jackson/LngLatAltSerializerTest.java21
2 files changed, 37 insertions, 27 deletions
diff --git a/src/main/java/org/geojson/jackson/LngLatAltSerializer.java b/src/main/java/org/geojson/jackson/LngLatAltSerializer.java
index e731eb8..ae9a6da 100644
--- a/src/main/java/org/geojson/jackson/LngLatAltSerializer.java
+++ b/src/main/java/org/geojson/jackson/LngLatAltSerializer.java
@@ -1,30 +1,33 @@
package org.geojson.jackson;
+import java.io.IOException;
+
+import org.geojson.LngLatAlt;
+
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
-import org.geojson.LngLatAlt;
-
-import java.io.IOException;
-
-public class LngLatAltSerializer extends JsonSerializer<LngLatAlt> {
- public static final long POW10[] = {1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000};
+public class LngLatAltSerializer extends JsonSerializer<LngLatAlt>
+{
- @Override
- public void serialize(LngLatAlt value, JsonGenerator jgen, SerializerProvider provider) throws IOException,
- JsonProcessingException {
- jgen.writeStartArray();
- jgen.writeNumber(value.getLongitude());
- jgen.writeNumber(value.getLatitude());
- if (value.hasAltitude()) {
- jgen.writeNumber(value.getAltitude());
+ @Override
+ public void serialize(LngLatAlt value, JsonGenerator jgen, SerializerProvider provider)
+ throws IOException, JsonProcessingException
+ {
+ jgen.writeStartArray();
+ jgen.writeNumber(value.getLongitude());
+ jgen.writeNumber(value.getLatitude());
+ if (value.hasAltitude())
+ {
+ jgen.writeNumber(value.getAltitude());
- for(double d : value.getAdditionalElements()) {
- jgen.writeNumber(d);
- }
- }
- jgen.writeEndArray();
- }
+ for (double d : value.getAdditionalElements())
+ {
+ jgen.writeNumber(d);
+ }
+ }
+ jgen.writeEndArray();
+ }
}
diff --git a/src/test/java/org/geojson/jackson/LngLatAltSerializerTest.java b/src/test/java/org/geojson/jackson/LngLatAltSerializerTest.java
index 9e5fd46..ee20e08 100644
--- a/src/test/java/org/geojson/jackson/LngLatAltSerializerTest.java
+++ b/src/test/java/org/geojson/jackson/LngLatAltSerializerTest.java
@@ -1,13 +1,20 @@
package org.geojson.jackson;
+import org.geojson.LngLatAlt;
import org.junit.Assert;
import org.junit.Test;
-public class LngLatAltSerializerTest {
+import com.fasterxml.jackson.databind.ObjectMapper;
- @Test
- public void itShouldFastSerialize() throws Exception {
- String value = LngLatAltSerializer.fastDoubleToString(49.43245, 9);
- Assert.assertEquals("49.43245", value);
- }
-} \ No newline at end of file
+public class LngLatAltSerializerTest
+{
+
+ @Test
+ public void testSerialization() throws Exception
+ {
+ LngLatAlt position = new LngLatAlt(49.43245, 52.42345, 120.34626);
+ String correctJson = "[49.43245,52.42345,120.34626]";
+ String producedJson = new ObjectMapper().writeValueAsString(position);
+ Assert.assertEquals(correctJson, producedJson);
+ }
+}