Changeset 29493 in osm for applications/editors/josm/plugins/opendata/src

Timestamp:

2013-04-14T15:54:06+02:00 (11 years ago)

Author:

donvip

Message:

[josm_opendata] Add Toulouse car_sharing dataset

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• OdConstants.java (modified) (1 diff)
• io/tabular/SpreadSheetReader.java (modified) (8 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java

@@ -60 +60 @@
         public static final String PREF_MAXDISTANCE = "opendata.maxdistance";
     public static final double DEFAULT_MAXDISTANCE = 10;
+
+    public static final String PREF_TOLERANCE = "opendata.spreadsheet.tolerance";
+    public static final double DEFAULT_TOLERANCE = 0.1;
 
     public static final String PREF_MODULES = "opendata.modules";

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java

@@ -72 +72 @@
         
         public static class CoordinateColumns {
+        public Projection proj = null;
                 public int xCol = -1;
                 public int yCol = -1;
@@ -77 +78 @@
                         return xCol > -1 && yCol > -1;
                 }
-        @Override
-        public String toString() {
-            return "[xCol=" + xCol + ", yCol=" + yCol + "]";
+        @Override public String toString() {
+            return "CoordinateColumns [proj=" + proj + ", xCol=" + xCol + ", yCol=" + yCol + "]";
         }
         }
@@ -112 +112 @@
                 }
 
-                Projection proj = null;
                 final List<CoordinateColumns> columns = new ArrayList<CoordinateColumns>();
                 
@@ -119 +118 @@
                     if (col.isOk()) {
                     columns.add(col);
-                        if (proj == null) {
-                            proj = pp.getProjection(header[col.xCol], header[col.yCol]);
+                        if (col.proj == null) {
+                            col.proj = pp.getProjection(header[col.xCol], header[col.yCol]);
                         }
                     }
@@ -128 +127 @@
                 final boolean handlerOK = handler != null && handler.handlesProjection();
 
-                if (proj != null) {
+                boolean projFound = false;
+                
+                for (CoordinateColumns c : columns) {
+                    if (c.proj != null) {
+                        projFound = true;
+                        break;
+                    }
+                }
+                
+                if (projFound) {
                         // projection identified, do nothing
                 } else if (!columns.isEmpty()) {
@@ -137 +145 @@
                                         return null; // User clicked Cancel
                                 }
-                                proj = dialog.getProjection();
+                                Projection proj = dialog.getProjection();
+                        for (CoordinateColumns c : columns) {
+                            c.proj = proj;
+                        }
                         }
                         
@@ -149 +160 @@
                         message += "; ";
                     }
-                    message += header[c.xCol]+", "+header[c.yCol];
-                }
-                
-                System.out.println("Loading data using projection "+proj+" ("+message+")");
+                    message += c.proj + "("+header[c.xCol]+", "+header[c.yCol]+")";
+                }
+                
+                System.out.println("Loading data using projections "+message);
                 
                 final DataSet ds = new DataSet();
@@ -204 +215 @@
                                 }
                         }
+                        Node firstNode = null;
                         for (CoordinateColumns c : columns) {
                             Node n = nodes.get(c);
                             EastNorth en = ens.get(c);
                         if (en.isValid()) {
-                                n.setCoor(proj != null && !handlerOK ? proj.eastNorth2latlon(en) : handler.getCoor(en, fields));
+                                n.setCoor(c.proj != null && !handlerOK ? c.proj.eastNorth2latlon(en) : handler.getCoor(en, fields));
                         } else {
                                 System.err.println("Warning: Skipping line "+lineNumber+" because no valid coordinates have been found at columns "+c);
                         }
                         if (n.getCoor() != null) {
-                                ds.addPrimitive(n);
+                            if (firstNode == null) {
+                                firstNode = n;
+                            }
+                            if (n == firstNode || n.getCoor().greatCircleDistance(firstNode.getCoor()) > Main.pref.getDouble(PREF_TOLERANCE, DEFAULT_TOLERANCE)) {
+                                ds.addPrimitive(n);
+                            } else {
+                                nodes.remove(c);
+                            }
                         }
                         }