Changeset 142 in josm

Timestamp:

2006-09-24T11:15:39+02:00 (18 years ago)

Author:

imi

Message:

• added External Tool support (no gui configuration yet)
• applied patch for bug that Save action does not set filename (thanks Dean)
• fixed case sensitiveness of search tool (now insensitive, like google)

Files:

• data/empty.xml (modified) (1 diff)
• src/org/openstreetmap/josm/Main.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/ExternalToolsAction.java (added)
• src/org/openstreetmap/josm/actions/SaveAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MapStatus.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/SearchCompiler.java (modified) (3 diffs)

data/empty.xml

@@ +1 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <osm version='0.3' generator='JOSM'>
+  <node id='1' lat='67.99839775928415' lon='-59.66292134831462' />
+  <node id='2' lat='43.00883564541926' lon='-6.269662921348315' />
+  <node id='-3' lat='19.054463960754692' lon='-66.94382022471912' />
+  <node id='-4' lat='-24.68228648077048' lon='-40.651685393258425' />
+  <node id='-5' lat='-34.84314824807727' lon='-13.146067415730338' />
+  <segment id='-6' from='1' to='2' />
+  <segment id='-7' from='2' to='-3' />
+  <segment id='-8' from='-5' to='-4' />
+  <way id='-9'>
+    <seg id='-6' />
+    <seg id='-7' />
+  </way>
+  <way id='-10'>
+    <seg id='-8' />
+  </way>
 </osm>

src/org/openstreetmap/josm/Main.java

@@ -32 +32 @@
 import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.actions.ExitAction;
+import org.openstreetmap.josm.actions.ExternalToolsAction;
 import org.openstreetmap.josm.actions.GpxExportAction;
 import org.openstreetmap.josm.actions.OpenAction;
@@ -204 +205 @@
                 mainMenu.add(editMenu);
 
+                JMenu externalMenu = ExternalToolsAction.buildMenu();
+                if (externalMenu != null)
+                        mainMenu.add(externalMenu);
+
                 mainMenu.add(new JSeparator());
                 final JMenu helpMenu = new JMenu(tr("Help"));

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

@@ -43 +43 @@
 
                 save(file);
+                Main.main.editLayer().name = file.getName();
+                Main.main.editLayer().associatedFile = file;
+                Main.parent.repaint();
         }
 

src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data.coor;
 
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.projection.Projection;
 
@@ -42 +43 @@
         }
 
+        /**
+         * @return <code>true</code> if this is within the given bounding box.
+         */
+        public boolean isWithin(Bounds b) {
+                return lat() >= b.min.lat() && lat() <= b.max.lat() && lon() > b.min.lon() && lon() < b.max.lon();
+        }
+        
     @Override public String toString() {
         return "LatLon[lat="+lat()+",lon="+lon()+"]";

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -5 +5 @@
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 
@@ -43 +44 @@
 
         /**
-     * A list of listeners to selection changed events.
-     */
-    transient Collection<SelectionChangedListener> listeners = new LinkedList<SelectionChangedListener>();
+         * A list of listeners to selection changed events.
+         */
+        transient Collection<SelectionChangedListener> listeners = new LinkedList<SelectionChangedListener>();
 
         /**
@@ -106 +107 @@
                 fireSelectionChanged(Arrays.asList(new OsmPrimitive[]{osm}));
         }
-        
+
         /**
          * Remove the selection from every value in the collection.
@@ -133 +134 @@
 
         /**
-     * Remember to fire an selection changed event. A call to this will not fire
-     * the event immediately. For more, @see SelectionChangedListener
-     */
-    public void fireSelectionChanged(Collection<? extends OsmPrimitive> sel) {
+         * Remember to fire an selection changed event. A call to this will not fire
+         * the event immediately. For more, @see SelectionChangedListener
+         */
+        public void fireSelectionChanged(Collection<? extends OsmPrimitive> sel) {
                 for (SelectionChangedListener l : listeners)
                         l.selectionChanged(sel);
-    }
+        }
 
         /**
-     * Add a listener to the selection changed listener list. If <code>null</code>
-     * is passed, nothing happens.
-     * @param listener The listener to add to the list.
-     */
-    public void addSelectionChangedListener(SelectionChangedListener listener) {
-        if (listener != null)
-                listeners.add(listener);
-    }
+         * Add a listener to the selection changed listener list. If <code>null</code>
+         * is passed, nothing happens.
+         * @param listener The listener to add to the list.
+         */
+        public void addSelectionChangedListener(SelectionChangedListener listener) {
+                if (listener != null)
+                        listeners.add(listener);
+        }
 
         /**
-     * Remove a listener from the selection changed listener list. 
-     * If <code>null</code> is passed, nothing happens.
-     * @param listener The listener to remove from the list.
-     */
-    public void removeSelectionChangedListener(SelectionChangedListener listener) {
-        if (listener != null)
-                listeners.remove(listener);
-    }
+         * Remove a listener from the selection changed listener list. 
+         * If <code>null</code> is passed, nothing happens.
+         * @param listener The listener to remove from the list.
+         */
+        public void removeSelectionChangedListener(SelectionChangedListener listener) {
+                if (listener != null)
+                        listeners.remove(listener);
+        }
 
         public void addAllSelectionListener(DataSet ds) {
                 listeners.addAll(ds.listeners);
-    }
+        }
+
+        /**
+         * Compares this and the parameter dataset and return <code>true</code> if both
+         * contain the same data primitives (ignoring the selection)
+         */
+        public boolean realEqual(Collection<OsmPrimitive> other) {
+                Collection<OsmPrimitive> my = allPrimitives();
+
+                if (my.size() != other.size())
+                        return false;
+
+                Iterator<OsmPrimitive> it = other.iterator();
+                for (OsmPrimitive osm : my)
+                        if (!osm.realEqual(it.next()))
+                                return false;
+
+                return true;
+        }
 }

src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java

@@ -18 +18 @@
         
         private final DataSet ds;
+        private final boolean includeReferences;
+        
+        public AddVisitor(DataSet ds, boolean includeReferences) {
+                this.ds = ds;
+                this.includeReferences = includeReferences;
+        }
         
         public AddVisitor(DataSet ds) {
-                this.ds = ds;
+                this(ds, false);
         }
         
         public void visit(Node n) {
-                ds.nodes.add(n);
+                if (!includeReferences || !ds.nodes.contains(n))
+                        ds.nodes.add(n);
         }
-        public void visit(Segment ls) {
-                ds.segments.add(ls);
+        public void visit(Segment s) {
+                ds.segments.add(s);
+                if (includeReferences && !s.incomplete) {
+                        if (!ds.nodes.contains(s.from))
+                                s.from.visit(this);
+                        if (!ds.nodes.contains(s.to))
+                                s.to.visit(this);
+                }
         }
-        public void visit(Way t) {
-                ds.ways.add(t);
+        public void visit(Way w) {
+                ds.ways.add(w);
+                if (includeReferences)
+                        for (Segment s : w.segments)
+                                if (!ds.segments.contains(s))
+                                        s.visit(this);
         }
 }

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

@@ -174 +174 @@
                                         }
                                 } catch (ConcurrentModificationException x) {
+                                } catch (NullPointerException x) {
                                 }
                         }

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

@@ -78 +78 @@
                         if (value == null)
                                 return notValue;
-                        return (value.indexOf(this.value) != -1) != notValue;
+                        return (value.toLowerCase().indexOf(this.value.toLowerCase()) != -1) != notValue;
                 }
                 @Override public String toString() {return key+"="+(notValue?"!":"")+value;}
@@ -90 +90 @@
                                 return s.equals("");
                         for (Entry<String, String> e : osm.keys.entrySet())
-                                if (e.getKey().indexOf(s) != -1 || e.getValue().indexOf(s) != -1)
+                                if (e.getKey().toLowerCase().indexOf(s.toLowerCase()) != -1 
+                                                || e.getValue().toLowerCase().indexOf(s.toLowerCase()) != -1)
                                         return true;
                         return false;
@@ -111 +112 @@
                 @Override public String toString() {return "type="+type;}
         }
-        
+
         private static class Modified extends Match {
                 @Override public boolean match(OsmPrimitive osm) {