Changeset 191 in josm for src/org/openstreetmap

Timestamp:

2007-01-08T06:18:17+01:00 (18 years ago)

Author:

imi

Message:

• added search to toolbar (configurable in preferences)
• added QuickSearch with geonames access (not finished)

Location:

src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• actions/search (added)
• actions/search/QuickSearchAction.java (added)
• actions/search/SearchAction.java (added)
• actions/search/SearchCompiler.java (moved) (moved from src/org/openstreetmap/josm/tools/SearchCompiler.java ) (1 diff)
• actions/search/SelectionWebsiteLoader.java (added)
• data/Bounds.java (modified) (1 diff)
• gui/MainMenu.java (modified) (3 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (6 diffs)

src/org/openstreetmap/josm/Main.java

@@ -30 +30 @@
 import org.openstreetmap.josm.actions.DownloadAction.DownloadTask;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Preferences;
@@ -39 +40 @@
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.dialogs.SelectionListDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -322 +322 @@
                 if (args.containsKey("selection"))
                         for (String s : args.get("selection"))
-                                SelectionListDialog.search(s, SelectionListDialog.SearchMode.add);
+                                SearchAction.search(s, SearchAction.SearchMode.add);
         }
 

src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -1 @@
-package org.openstreetmap.josm.tools;
+package org.openstreetmap.josm.actions.search;
 
 import java.io.IOException;

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

@@ -40 +40 @@
 
         /**
+         * @return Center of the bounding box.
+         */
+        public LatLon center() {
+                // not sure, whether this calculation is right.. maybe there is some
+                // more complex calculation needed to get a center of a spherical
+                // dimension?
+                return new LatLon((min.lat()+max.lat())/2, (min.lon()+max.lon())/2);
+        }
+        
+        /**
          * Extend the bounds if necessary to include the given point.
          */

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

@@ -29 +29 @@
 import org.openstreetmap.josm.actions.UnselectAllAction;
 import org.openstreetmap.josm.actions.UploadAction;
+import org.openstreetmap.josm.actions.search.SearchAction;
 
 /**
@@ -44 +45 @@
         public final Action selectAll = new SelectAllAction();
         public final Action unselectAll = new UnselectAllAction();
+        public final Action search = new SearchAction();
         public final NewAction newAction = new NewAction();
         public final OpenAction open = new OpenAction();
@@ -88 +90 @@
                 editMenu.add(unselectAll);
                 editMenu.addSeparator();
+                editMenu.add(search);
+                editMenu.addSeparator();
                 editMenu.add(reverseSegment);
                 editMenu.add(splitWay);

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

@@ -4 +4 @@
 
 import java.awt.BorderLayout;
-import java.awt.GridBagLayout;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
@@ -11 +10 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedList;
-import java.util.Map;
 
-import javax.swing.ButtonGroup;
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
-import javax.swing.JLabel;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
-import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
 
@@ -37 +25 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.io.OsmIdReader;
-import org.openstreetmap.josm.io.ProgressInputStream;
-import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.SearchCompiler;
-import org.xml.sax.SAXException;
 
 /**
@@ -53 +35 @@
  */
 public class SelectionListDialog extends ToggleDialog implements SelectionChangedListener {
-        public static enum SearchMode {replace, add, remove}
-
-        private static class SelectionWebsiteLoader extends PleaseWaitRunnable {
-                public final URL url;
-                public Collection<OsmPrimitive> sel;
-                private final SearchMode mode;
-                private OsmIdReader idReader = new OsmIdReader();
-                public SelectionWebsiteLoader(String urlStr, SearchMode mode) {
-                        super(tr("Load Selection"));
-                        this.mode = mode;
-                        URL u = null;
-                        try {u = new URL(urlStr);} catch (MalformedURLException e) {}
-                        this.url = u;
-                }
-                @Override protected void realRun() {
-                        Main.pleaseWaitDlg.currentAction.setText(tr("Contact {0}...", url.getHost()));
-                        sel = mode != SearchMode.remove ? new LinkedList<OsmPrimitive>() : Main.ds.allNonDeletedPrimitives();
-                        try {
-                                URLConnection con = url.openConnection();
-                                InputStream in = new ProgressInputStream(con, Main.pleaseWaitDlg);
-                                Main.pleaseWaitDlg.currentAction.setText(tr("Downloading..."));
-                                Map<Long, String> ids = idReader.parseIds(in);
-                                for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
-                                        if (ids.containsKey(osm.id) && osm.getClass().getName().toLowerCase().endsWith(ids.get(osm.id))) {
-                                                if (mode == SearchMode.remove)
-                                                        sel.remove(osm);
-                                                else
-                                                        sel.add(osm);
-                                        }
-                                }
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                                JOptionPane.showMessageDialog(Main.parent, tr("Could not read from url: \"{0}\"",url));
-                        } catch (SAXException e) {
-                                e.printStackTrace();
-                                JOptionPane.showMessageDialog(Main.parent,tr("Parsing error in url: \"{0}\"",url));
-                        }
-                }
-                @Override protected void cancel() {
-                        sel = null;
-                        idReader.cancel();
-                }
-                @Override protected void finish() {
-                        if (sel != null)
-                                Main.ds.setSelected(sel);
-                }
-        }
 
         /**
@@ -138 +73 @@
                 }));
 
-                buttonPanel.add(createButton("Search", "dialogs/search", "Search for objects.", new ActionListener(){
-                        private String lastSearch = "";
-                        public void actionPerformed(ActionEvent e) {
-                                JLabel label = new JLabel(tr("Please enter a search string."));
-                                final JTextField input = new JTextField(lastSearch);
-                                input.setToolTipText(tr("<html>Fulltext search.<ul>" +
-                                                "<li><code>Baker Street</code>  - 'Baker' and 'Street' in any key or name.</li>" +
-                                                "<li><code>\"Baker Street\"</code>  - 'Baker Street' in any key or name.</li>" +
-                                                "<li><code>name:Bak</code>  - 'Bak' anywhere in the name.</li>" +
-                                                "<li><code>-name:Bak</code>  - not 'Bak' in the name.</li>" +
-                                                "<li><code>foot:</code>  - key=foot set to any value." +
-                                "</ul></html>"));
-
-                                JRadioButton replace = new JRadioButton(tr("replace selection"), true);
-                                JRadioButton add = new JRadioButton(tr("add to selection"), false);
-                                JRadioButton remove = new JRadioButton(tr("remove from selection"), false);
-                                ButtonGroup bg = new ButtonGroup();
-                                bg.add(replace);
-                                bg.add(add);
-                                bg.add(remove);
-
-                                JPanel p = new JPanel(new GridBagLayout());
-                                p.add(label, GBC.eop());
-                                p.add(input, GBC.eop().fill(GBC.HORIZONTAL));
-                                p.add(replace, GBC.eol());
-                                p.add(add, GBC.eol());
-                                p.add(remove, GBC.eol());
-                                JOptionPane pane = new JOptionPane(p, JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null){
-                                        @Override public void selectInitialValue() {
-                                                input.requestFocusInWindow();
-                                        }
-                                };
-                                pane.createDialog(Main.parent,tr("Search")).setVisible(true);
-                                if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue()))
-                                        return;
-                                lastSearch = input.getText();
-                                SearchMode mode = replace.isSelected() ? SearchMode.replace : (add.isSelected() ? SearchMode.add : SearchMode.remove);
-                                search(lastSearch, mode);
-                        }
-                }));
+                buttonPanel.add(createButton("Search", "dialogs/search", "Search for objects.", Main.main.menu.search));
 
                 add(buttonPanel, BorderLayout.SOUTH);
@@ -229 +125 @@
                 Main.ds.setSelected(sel);
         }
-
-        public static void search(String search, SearchMode mode) {
-                if (search.startsWith("http://") || search.startsWith("ftp://") || search.startsWith("https://") || search.startsWith("file:/")) {
-                        SelectionWebsiteLoader loader = new SelectionWebsiteLoader(search, mode);
-                        if (loader.url != null) {
-                                Main.worker.execute(loader);
-                                return;
-                        }
-                }
-                Collection<OsmPrimitive> sel = Main.ds.getSelected();
-                SearchCompiler.Match matcher = SearchCompiler.compile(search);
-                for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
-                        if (mode == SearchMode.replace) {
-                                if (matcher.match(osm))
-                                        sel.add(osm);
-                                else
-                                        sel.remove(osm);
-                        } else if (mode == SearchMode.add && !osm.selected && matcher.match(osm))
-                                sel.add(osm);
-                        else if (mode == SearchMode.remove && osm.selected && matcher.match(osm))
-                                sel.remove(osm);
-                }
-                Main.ds.setSelected(sel);
-        }
 }