Changeset 29854 in osm for applications/editors/josm/plugins/opendata/src/org/openstreetmap

Timestamp:

2013-08-21T03:47:16+02:00 (12 years ago)

Author:

donvip

Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:

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

Files:

• OdPlugin.java (modified) (1 diff)
• core/io/NeptuneReader.java (modified) (2 diffs)
• core/io/tabular/SpreadSheetReader.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

@@ -16 +16 @@
 package org.openstreetmap.josm.plugins.opendata;
 
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.marktr;
-
 import java.awt.Image;
 import java.awt.Toolkit;
-import java.awt.event.KeyEvent;
 import java.io.File;
 import java.net.URL;

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

@@ -171 +171 @@
                 return n;
         }
-        
+        /*
         private Node createStopPosition(StopPointType stop) {
                 Node n = createNode(createLatLon(stop));
@@ -179 +179 @@
                 return n;
         }
-
+*/
         protected Relation createRelation(String type){
                 Relation r = new Relation();

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

@@ -213 +213 @@
                         if (i == c.xCol) {
                             coordinate = true;
-                            en.setLocation(parseDouble(fields[i]), en.north());
+                            ens.put(c, new EastNorth(parseDouble(fields[i]), en.north()));
                             if (handler != null) {
                                 handler.setXCol(i);
@@ -219 +219 @@
                         } else if (i == c.yCol) {
                             coordinate = true;
-                            en.setLocation(en.east(), parseDouble(fields[i]));
+                            ens.put(c, new EastNorth(en.east(), parseDouble(fields[i])));
                             if (handler != null) {
                                 handler.setYCol(i);