Added exception handling for geoJSON mixed property types

pentaho-gis-plugins/src/main/java/com/atolcd/pentaho/di/gis/io/GeoJSONReader.java

@@ -26,6 +26,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -65,8 +66,7 @@ public GeoJSONReader(String fileName, String geometryFieldName, String charsetNa
 
         if (this.json instanceof FeatureCollection) {
 
-            org.wololo.geojson.Feature geoJsonfeature = ((FeatureCollection) json).getFeatures()[0];
-            for (Map.Entry<String, Object> entry : geoJsonfeature.getProperties().entrySet()) {
+            for (Map.Entry<String, Object> entry : selectPropertyTypes(((FeatureCollection) json)).entrySet()) {
 
                 Field field = null;
                 String fieldName = entry.getKey();
@@ -92,6 +92,14 @@ public GeoJSONReader(String fileName, String geometryFieldName, String charsetNa
 
                     field = new Field(fieldName, FieldType.DATE, null, null);
 
+                }else if (value == null) {
+                	// Should log this
+                	field = new Field(fieldName, FieldType.STRING, null, null);
+
+                }else {
+                	// Should log this
+                	field = new Field(fieldName, FieldType.STRING, null, null);
+
                 }
 
                 this.fields.add(field);
@@ -105,6 +113,19 @@ public GeoJSONReader(String fileName, String geometryFieldName, String charsetNa
         }
     }
 
+	private Map<String, Object> selectPropertyTypes(FeatureCollection collection) {
+		Map<String, Object> props = new HashMap<String, Object>();
+
+		for (org.wololo.geojson.Feature f : collection.getFeatures()) {
+			for (Map.Entry<String, Object> entry : f.getProperties().entrySet()) {
+				if (entry.getValue() != null) {
+					props.put(entry.getKey(), entry.getValue());
+				}
+			}
+		}
+		return props;
+	}
+
     public List<Feature> getFeatures() {
 
         List<Feature> features = new ArrayList<Feature>();

pentaho-gis-plugins/src/main/java/com/atolcd/pentaho/di/gis/io/features/FeatureConverter.java

@@ -198,7 +198,8 @@ public static Object[] getRow(RowMetaInterface rowMeta, Feature feature) throws
             Object value = null;
 
             Object featureValue = feature.getValue(field);
-            if (featureValue != null) {
+            try {
+            	if (featureValue != null) {
 
                 if (field.getType().equals(FieldType.GEOMETRY)) {
 
@@ -212,19 +213,34 @@ public static Object[] getRow(RowMetaInterface rowMeta, Feature feature) throws
 
                     value = valueMeta.getDate(featureValue);
 
-                } else if (field.getType().equals(FieldType.DOUBLE)) {
+				} else if (field.getType().equals(FieldType.DOUBLE)) {
 
-                    value = valueMeta.getNumber(featureValue);
+					try {
 
-                } else if (field.getType().equals(FieldType.LONG)) {
+						 value = valueMeta.getNumber(Double.parseDouble(String.valueOf(featureValue)));
 
-                    value = valueMeta.getInteger(Long.parseLong(String.valueOf(featureValue)));
+						} catch (NumberFormatException e) {
 
-                } else {
-                    value = valueMeta.getString(String.valueOf(featureValue));
-                }
+						 value = valueMeta.getNumber(Long.valueOf((String.valueOf(featureValue))).doubleValue());
 
-            }
+    					}
+
+				    } else if (field.getType().equals(FieldType.LONG)) {
+
+						value = valueMeta.getInteger(Long.parseLong(String.valueOf(featureValue)));
+
+				    } else {
+
+				        value = valueMeta.getString(String.valueOf(featureValue));
+
+				    }
+
+				}
+			} catch (NumberFormatException e) {
+				value = null;
+			} catch (KettleValueException e) {
+				value = null;
+			}
 
             row[fieldIndex] = value;