Changeset 30982 in osm for applications/editors/josm

Timestamp:

2015-02-14T21:48:38+01:00 (10 years ago)

Author:

donvip

Message:

[josm_opendata] fix #josm11097 - correct handling of dates in shapefiles

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java (modified) (11 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java

@@ -17 +17 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -59 +61 @@
     private final ShpHandler handler;
     private final Set<OsmPrimitive> featurePrimitives = new HashSet<>();
-    
+
     public ShpReader(ShpHandler handler) {
         super(handler, NationalHandlers.DEFAULT_SHP_HANDLERS);
@@ -78 +80 @@
         }
     }
-    
-    private void parseFeature(Feature feature, final Component parent) 
+
+    private void parseFeature(Feature feature, final Component parent)
             throws UserCancelException, GeoMathTransformException, FactoryException, GeoCrsException, MismatchedDimensionException, TransformException {
         featurePrimitives.clear();
@@ -86 +88 @@
 
             GeometryDescriptor desc = geometry.getDescriptor();
-            
+
             if (crs == null) {
                 if (desc != null && desc.getCoordinateReferenceSystem() != null) {
@@ -114 +116 @@
                 }
             }
-            
+
             OsmPrimitive primitive = null;
-            
+
             if (geometry.getValue() instanceof Point) {
                 primitive = createOrGetEmptyNode((Point) geometry.getValue());
-                
+
             } else if (geometry.getValue() instanceof GeometryCollection) { // Deals with both MultiLineString and MultiPolygon
                 GeometryCollection mp = (GeometryCollection) geometry.getValue();
-                int nGeometries = mp.getNumGeometries(); 
+                int nGeometries = mp.getNumGeometries();
                 if (nGeometries < 1) {
                     Main.error("empty geometry collection found");
@@ -128 +130 @@
                     Relation r = null;
                     Way w = null;
-                    
+
                     for (int i=0; i<nGeometries; i++) {
                         Geometry g = mp.getGeometryN(i);
@@ -166 +168 @@
                 Main.debug("-------------------------------------------------------------");
             }
-            
+
             if (primitive != null) {
                 // Read primitive non geometric attributes
@@ -178 +180 @@
         transform = null;
         try {
-            if (file != null) { 
+            if (file != null) {
                 Map<String, Serializable> params = new HashMap<>();
                 Charset charset = null;
@@ -205 +207 @@
                     throw new IOException(tr("Unable to find a data store for file {0}", file.getName()));
                 }
-                
+
                 String[] typeNames = dataStore.getTypeNames();
                 String typeName = typeNames[0];
-    
+
                 FeatureSource<?,?> featureSource = dataStore.getFeatureSource(typeName);
                 FeatureCollection<?,?> collection = featureSource.getFeatures();
                 FeatureIterator<?> iterator = collection.features();
-                
+
                 if (instance != null) {
                     instance.beginTask(tr("Loading shapefile ({0} features)", collection.size()), collection.size());
                 }
-                
+
                 int n = 0;
-                
+
                 Component parent = instance != null ? instance.getWindowParent() : Main.parent;
-                
+
                 try {
                     while (iterator.hasNext()) {
@@ -258 +260 @@
         return ds;
     }
-    
+
     private static final void readNonGeometricAttributes(Feature feature, OsmPrimitive primitive) {
-            try {
-        for (Property prop : feature.getProperties()) {
-            if (!(prop instanceof GeometryAttribute)) {
-                Name name = prop.getName();
-                Object value = prop.getValue();
-                if (name != null && value != null) {
-                    String sName = name.toString();
-                    String sValue = value.toString();
-                    if (!sName.isEmpty() && !sValue.isEmpty()) {
-                                               primitive.put(sName, sValue);
-                    }
-                }
-            }
-        }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+        try {
+            for (Property prop : feature.getProperties()) {
+                if (!(prop instanceof GeometryAttribute)) {
+                    Name name = prop.getName();
+                    Object value = prop.getValue();
+                    if (name != null && value != null) {
+                        String sName = name.toString();
+                        String sValue = value.toString();
+                        if (value instanceof Date) {
+                            sValue = new SimpleDateFormat("yyyy-MM-dd").format(value);
+                        }
+                        if (!sName.isEmpty() && !sValue.isEmpty()) {
+                            primitive.put(sName, sValue);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            Main.error(e);
+        }
     }
 
@@ -285 +290 @@
         return n;
     }
-    
+
     @Override
     protected <T extends OsmPrimitive> T addOsmPrimitive(T p) {