Merge pull request #105 from nls-jajuko/double-id-writer

Use DToA.dtoa() to format ID when data type is double

src/hakunapi-core/src/main/java/fi/nls/hakunapi/core/property/HakunaPropertyWriters.java

@@ -8,6 +8,7 @@
 import fi.nls.hakunapi.core.ObjectArrayValueContainer;
 import fi.nls.hakunapi.core.SingleFeatureWriter;
 import fi.nls.hakunapi.core.ValueProvider;
+import fi.nls.hakunapi.core.util.DToA;
 
 public final class HakunaPropertyWriters {
 
@@ -166,12 +167,19 @@ public static HakunaPropertyWriter getIdPropertyWriter(FeatureType ft, String la
             };
         case DOUBLE:
             return (vp, i, writer) -> {
-                writeStartFeature(ft, layerName, writer, type, vp.getObject(i).toString());
-            };
+                writeStartFeature(ft, layerName, writer, type, doubleAsID(vp.getDouble(i)));
+            };  
         default:
             throw new IllegalArgumentException("Invalid type for id property");
         }
     }
+
+    protected static String doubleAsID(Double d) {      
+        byte[] b = new byte[24];
+        int len = DToA.dtoa(d, b, 0, 0, 8);
+        return new String(b, 0, len);
+    }
+
 
     private static void writeStartFeature(FeatureType ft, String layerName, FeatureWriter writer, HakunaPropertyType type, Object value) throws Exception {
         if (writer instanceof FeatureCollectionWriter) {

src/hakunapi-core/src/test/java/fi/nls/hakunapi/core/property/HakunaPropertyWritersTest.java

@@ -0,0 +1,18 @@
+package fi.nls.hakunapi.core.property;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class HakunaPropertyWritersTest {
+
+    @Test
+    public void testDoubleAsID() {
+
+        assertEquals("1.7976931348623157E308", HakunaPropertyWriters.doubleAsID(Double.MAX_VALUE));
+        assertEquals("9223372036854775807", HakunaPropertyWriters.doubleAsID(Double.valueOf(Long.MAX_VALUE)));
+
+        assertEquals("17263226", HakunaPropertyWriters.doubleAsID(1.7263226E7));
+        assertEquals("2010474", HakunaPropertyWriters.doubleAsID(2010474.0));
+    }
+}