Changeset 80 in josm for src/org/openstreetmap

Timestamp:

2006-04-03T23:12:07+02:00 (19 years ago)

Author:

imi

Message:

• hardened gpx import (clean out empty ways or segments with from=to)
• removed Java6-only stuff

Location:

src/org/openstreetmap/josm

Files:

• Main.java (modified) (4 diffs)
• gui/IconToggleButton.java (modified) (1 diff)
• gui/dialogs/ToggleDialog.java (modified) (2 diffs)
• io/GpxReader.java (modified) (3 diffs)
• tools/TileCache.java (modified) (1 diff)

src/org/openstreetmap/josm/Main.java

@@ -35 +35 @@
 import org.openstreetmap.josm.actions.UndoAction;
 import org.openstreetmap.josm.actions.UploadAction;
-import org.openstreetmap.josm.actions.WmsServerAction;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -85 +84 @@
         private OpenAction openAction;
         private DownloadAction downloadAction;
-    private Action wmsServerAction;
+    //private Action wmsServerAction;
         
         /**
@@ -102 +101 @@
                 downloadAction = new DownloadAction();
                 Action uploadAction = new UploadAction();
-                wmsServerAction = new WmsServerAction();
+                //wmsServerAction = new WmsServerAction();
         openAction = new OpenAction();
                 Action saveAction = new SaveAction();
@@ -325 +324 @@
                         mapFrame.setVisible(true);
                 }
-        //TODO: This is really hacky to unselect the action when the layer gets
-        // deleted. The whole mapView/mapFrame/layer concept needs refactoring!
-                if (mapFrame == null && (Boolean)wmsServerAction.getValue(Action.SELECTED_KEY))
-                        wmsServerAction.putValue(Action.SELECTED_KEY, false);
         }
         /**

src/org/openstreetmap/josm/gui/IconToggleButton.java

@@ -21 +21 @@
                 super(action);
                 setText(null);
-                
+
                 // Tooltip
                 String toolTipText = "";

src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -7 +7 @@
 
 import javax.swing.AbstractButton;
-import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -53 +52 @@
                     EventQueue.invokeLater(new Runnable(){
                         public void run() {
-                            action.putValue(Action.SELECTED_KEY, true);
+                                action.putValue("active", true);
                             action.actionPerformed(null);
                         }

src/org/openstreetmap/josm/io/GpxReader.java

@@ -8 +8 @@
 import java.io.Reader;
 import java.util.HashMap;
+import java.util.Iterator;
 
 import org.jdom.Element;
@@ -102 +103 @@
                         addNode(data, node);
                 }
-        
+
                 // read ways (and line segments)
                 for (Object wayElement : e.getChildren("trk", GPX))
@@ -112 +113 @@
                                 osm.id = 0;
                 
+                // clean up the data a bit (remove broken stuff)
+                // remove line segments with from==to
+                for (Iterator<LineSegment> it = data.lineSegments.iterator(); it.hasNext();) {
+                        LineSegment ls = it.next();
+                        if (ls.from.equals(ls.to)) {
+                                it.remove();
+                                for (Way w : data.ways)
+                                        w.segments.remove(ls);
+                        }
+                }
+                // remove double line segments (remove only subsequent doubles yet)
+                for (Iterator<Way> it = data.ways.iterator(); it.hasNext();) {
+                        LineSegment ls = null;
+                        for (Iterator<LineSegment> its = it.next().segments.iterator(); its.hasNext();) {
+                                LineSegment cur = its.next();
+                                if (ls != null && ls.equals(cur))
+                                        its.remove();
+                                ls = cur;
+                        }
+                }
+                // remove empty ways
+                for (Iterator<Way> it = data.ways.iterator(); it.hasNext();)
+                        if (it.next().segments.isEmpty())
+                                it.remove();
+
                 return data;
         }

src/org/openstreetmap/josm/tools/TileCache.java

@@ -28 +28 @@
  * 
  * The tile identifier is an 32-bit integer whose bits are ordered in pairs of two.
- * If bit0 (the LSB) is 0, then the tile is right of the equator (0°). If bit1 is 0, it
- * is in the northern hemisphere. The next two bits representing the quarter within
- * the first quarter, so bit2 equals to 0 means, it is in the right half of the
- * quarter, represented by bit0 and bit1.
+ * If bit0 (the LSB) is 0, then the tile is right of the equator (0 grad). If bit1 
+ * is 0, it is in the northern hemisphere. The next two bits representing the 
+ * quarter within the first quarter, so bit2 equals to 0 means, it is in the right 
+ * half of the quarter, represented by bit0 and bit1.
  */
 public class TileCache {