Changeset 137 in josm for src

Timestamp:

2006-09-08T20:38:05+02:00 (18 years ago)

Author:

imi

Message:

• updated Romanian translation (thanks Ovidiu)
• added feature to specify "draw-lines-between-points" for a specific layer (thanks Rob)
• added feature to remove segments from a way when deleting a point (thanks Dean)
• added feature to sort geoimages and raw gps points after time (thanks Jon)

Location:

src/org/openstreetmap/josm

Files:

• actions/DownloadIncompleteAction.java (modified) (1 diff)
• actions/mapmode/AddNodeAction.java (modified) (1 diff)
• actions/mapmode/DeleteAction.java (modified) (5 diffs)
• data/Preferences.java (modified) (1 diff)
• gui/layer/GeoImageLayer.java (modified) (8 diffs)
• gui/layer/RawGpsLayer.java (modified) (5 diffs)

src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java

@@ -44 +44 @@
 
                 private DownloadTask(Collection<OsmPrimitive> toDownload) {
-                        super(trn("Downloading {0} segments", "Downloading {0} segment", toDownload.size(), toDownload.size()));
+                        super(trn("Downloading {0} segment", "Downloading {0} segments", toDownload.size(), toDownload.size()));
                         reader = new ObjectListDownloader(toDownload);
                         reader.setProgressInformation(currentAction, progress);

src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java

@@ -133 +133 @@
                 }
                 Main.main.editLayer().add(c);
+                Main.ds.setSelected(n);
                 Main.map.mapView.repaint();
         }

src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -11 +11 @@
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.Map.Entry;
 
@@ -134 +135 @@
          * If deleting a node which is part of exactly two segments, and both segments
          * have no conflicting keys, join them and remove the node.
+         * If the two segments are part of the same way, remove the deleted segment
+         * from the way.
          * 
          * @param selection The objects to delete.
@@ -181 +184 @@
                         seg2 = s;
                 }
-                for (Way w : Main.ds.ways)
-                        if (!w.deleted && (w.segments.contains(seg1) || w.segments.contains(seg2)))
-                                return tr("Used in a way.");
                 if (seg1.from == seg2.from || seg1.to == seg2.to)
                         return tr("Wrong direction of segments.");
@@ -189 +189 @@
                         if (seg2.keySet().contains(e.getKey()) && !seg2.get(e.getKey()).equals(e.getValue()))
                                 return tr("Conflicting keys");
+                ArrayList<Way> ways = new ArrayList<Way>(2);
+                for (Way w : Main.ds.ways) {
+                        if (w.deleted)
+                                continue;
+                        if ((w.segments.contains(seg1) && !w.segments.contains(seg2)) || (w.segments.contains(seg2) && !w.segments.contains(seg1)))
+                                return tr("Segments are part of different ways.");
+                        if (w.segments.contains(seg1) && w.segments.contains(seg2))
+                                ways.add(w);
+                }
                 Segment s = new Segment(seg1);
                 s.to = seg2.to;
@@ -195 +204 @@
                 else if (seg2.keys != null)
                         s.keys.putAll(seg2.keys);
-                Command[] cmds = new Command[]{
-                        new ChangeCommand(seg1, s), 
-                        new DeleteCommand(Arrays.asList(new OsmPrimitive[]{n, seg2}))};
-                Main.main.editLayer().add(new SequenceCommand(tr("Delete Node"), Arrays.asList(cmds)));
+                Collection<Command> cmds = new LinkedList<Command>();
+                for (Way w : ways) {
+                        Way copy = new Way(w);
+                        copy.segments.remove(seg2);
+                        cmds.add(new ChangeCommand(w, copy));
+                }
+                cmds.add(new ChangeCommand(seg1, s));
+                cmds.add(new DeleteCommand(Arrays.asList(new OsmPrimitive[]{n, seg2})));
+                Main.main.editLayer().add(new SequenceCommand(tr("Delete Node"), cmds));
                 return null;
     }

src/org/openstreetmap/josm/data/Preferences.java

@@ -47 +47 @@
         }
 
+        synchronized final public boolean hasKey(final String key) {
+                return properties.containsKey(key);
+        }
         synchronized final public String get(final String key) {
                 if (!properties.containsKey(key))

src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java

@@ -24 +24 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedList;
@@ -67 +68 @@
 public class GeoImageLayer extends Layer {
 
-        private static final class ImageEntry {
+        private static final class ImageEntry implements Comparable<ImageEntry> {
                 File image;
                 Date time;
@@ -73 +74 @@
                 EastNorth pos;
                 Icon icon;
+                public int compareTo(ImageEntry image) {
+                        return time.compareTo(image.time);
+                }               
         }
 
@@ -89 +93 @@
                         LinkedList<TimedPoint> gps = new LinkedList<TimedPoint>();
 
-                        // check the gps layer for time loops (and process it on the way)
-                        Date last = null;
+                        // Extract dates and locations from GPS input
                         for (Collection<GpsPoint> c : gpsLayer.data) {
                                 for (GpsPoint p : c) {
@@ -102 +105 @@
                     }
                                         gps.add(new TimedPoint(d, p.eastNorth));
-                                        if (last != null && last.after(d))
-                                                throw new IOException(tr("Time loop in gps data."));
-                                        last = d;
                                 }
                         }
@@ -168 +168 @@
         }
 
-        private static final class TimedPoint {
+        private static final class TimedPoint implements Comparable<TimedPoint> {
                 Date time;
                 EastNorth pos;
@@ -175 +175 @@
                         this.pos = pos;
                 }
+                public int compareTo(TimedPoint point) {
+                        return time.compareTo(point.time);
+                }
         }
 
@@ -185 +188 @@
         private GeoImageLayer(final ArrayList<ImageEntry> data, LinkedList<TimedPoint> gps) {
                 super(tr("Geotagged Images"));
+                Collections.sort(data);
+                Collections.sort(gps);                                  
                 this.data = data;
                 this.gps = gps;

src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

@@ -15 +15 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.Box;
+import javax.swing.ButtonGroup;
 import javax.swing.Icon;
 import javax.swing.JColorChooser;
@@ -20 +22 @@
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
+import javax.swing.JRadioButton;
 import javax.swing.JSeparator;
 import javax.swing.filechooser.FileFilter;
@@ -115 +118 @@
                 boolean force = Main.pref.getBoolean("draw.rawgps.lines.force");
                 boolean lines = Main.pref.getBoolean("draw.rawgps.lines");
+                String linesKey = "draw.rawgps.lines.layer "+name;
+                if (Main.pref.hasKey(linesKey))
+                        lines = Main.pref.getBoolean(linesKey);
                 boolean large = Main.pref.getBoolean("draw.rawgps.large");
                 for (Collection<GpsPoint> c : data) {
@@ -167 +173 @@
 
         @Override public Component[] getMenuEntries() {
+                JMenuItem line = new JMenuItem(tr("Customize line drawing"), ImageProvider.get("mapmode/addsegment"));
+                line.addActionListener(new ActionListener(){
+                        public void actionPerformed(ActionEvent e) {
+                                JRadioButton[] r = new JRadioButton[3];
+                                r[0] = new JRadioButton(tr("Use global settings."));
+                                r[1] = new JRadioButton(tr("Draw lines between points for this layer."));
+                                r[2] = new JRadioButton(tr("Do not draw lines between points for this layer."));
+                                ButtonGroup group = new ButtonGroup();
+                                Box panel = Box.createVerticalBox();
+                                for (JRadioButton b : r) {
+                                        group.add(b);
+                                        panel.add(b);
+                                }
+                                String propName = "draw.rawgps.lines.layer "+name;
+                                if (Main.pref.hasKey(propName))
+                                        group.setSelected(r[Main.pref.getBoolean(propName) ? 1:2].getModel(), true);
+                                else
+                                        group.setSelected(r[0].getModel(), true);
+                                int answer = JOptionPane.showConfirmDialog(Main.parent, panel, tr("Select line drawing options"), JOptionPane.OK_CANCEL_OPTION);
+                                if (answer == JOptionPane.CANCEL_OPTION)
+                                        return;
+                                if (group.getSelection() == r[0].getModel())
+                                        Main.pref.put(propName, null);
+                                else
+                                        Main.pref.put(propName, group.getSelection() == r[1].getModel());
+                                Main.map.repaint();
+                        }
+                });
+
                 JMenuItem color = new JMenuItem(tr("Customize Color"), ImageProvider.get("colorchooser"));
                 color.addActionListener(new ActionListener(){
@@ -228 +263 @@
                                 new JMenuItem(new GpxExportAction(this)),
                                 color,
+                                line,
                                 tagimage,
                                 new JMenuItem(new ConvertToDataLayerAction()),