Changeset 23853 in osm

Timestamp:

2010-10-26T21:30:10+02:00 (14 years ago)

Author:

oliverw

Message:

• Put map panel onto tab instead of BorderLayout.EAST
• Select best matching street for unresolved address

Location:

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit

Files:

• AddressEditContainer.java (modified) (1 diff)
• AddressNode.java (modified) (1 diff)
• StringUtils.java (added)
• gui/AddressEditDialog.java (modified) (10 diffs)

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java

@@ -139 +139 @@
                         
                         if (sNode != null) {
+                                // TODO: Check if sgemnt really belongs to the street, even if the
+                                // names are the same.
                                 sNode.addStreetSegment(newSegment);
                         } else {

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressNode.java

@@ -14 +14 @@
 package org.openstreetmap.josm.plugins.addressEdit;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java

@@ -34 +34 @@
 import javax.swing.JSeparator;
 import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
@@ -41 +42 @@
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
-import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
@@ -49 +49 @@
 import org.openstreetmap.josm.plugins.addressEdit.INodeEntity;
 import org.openstreetmap.josm.plugins.addressEdit.StreetNode;
-import org.openstreetmap.josm.plugins.addressEdit.StreetSegmentNode;
+import org.openstreetmap.josm.plugins.addressEdit.StringUtils;
 
 public class AddressEditDialog extends JFrame implements ActionListener, ListSelectionListener, IAddressEditContainerListener {
@@ -64 +64 @@
         private JTable unresolvedTable;
         private JTable incompleteTable;
-        private JTable streetList;
+        private JTable streetTable;
         
         private AssignAddressToStreetAction resolveAction = new AssignAddressToStreetAction();
@@ -96 +96 @@
                         /* Panel for street table */
                         JPanel streetPanel = new JPanel(new BorderLayout());
-                        streetList = new JTable(new StreetTableModel(editContainer));
-                        streetList.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-                        streetList.getSelectionModel().addListSelectionListener(this);
-                        
-                        JScrollPane scroll1 = new JScrollPane(streetList);
+                        streetTable = new JTable(new StreetTableModel(editContainer));
+                        streetTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+                        streetTable.getSelectionModel().addListSelectionListener(this);
+                        
+                        JScrollPane scroll1 = new JScrollPane(streetTable);
                         streetPanel.add(scroll1, BorderLayout.CENTER);
                         
@@ -112 +112 @@
                         unresolvedTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
                         unresolvedTable.getSelectionModel().addListSelectionListener(this);
+                        unresolvedTable.getSelectionModel().addListSelectionListener(new IncompleteAddressListener());
                         
                         JScrollPane scroll2 = new JScrollPane(unresolvedTable);
@@ -138 +139 @@
                         incompletePanel.setMinimumSize(new Dimension(350, 200));
                         
+                        
+                        
                         /* Edit panel for incomplete addresses */
                         JPanel incompleteEditPanel = new JPanel();
                         incompleteEditPanel.setMinimumSize(new Dimension(350, 300));
-                        
-                        /* Combine panels */
-                        JSplitPane unresSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, streetPanel, unresolvedPanel);
-                        JSplitPane addrSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, incompleteEditPanel, incompletePanel);                     
-                        JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, unresSplitPane, addrSplitPane);
-                        
+
                         /* Map Panel */
                         JPanel mapPanel = new JPanel(new BorderLayout());
@@ -152 +150 @@
                         mapPanel.add(mapViewer, BorderLayout.CENTER);
                         mapPanel.setMinimumSize(new Dimension(200, 200));
-                        mapLabel = createHeaderLabel(tr("Map"));
-                        mapPanel.add(mapLabel, BorderLayout.NORTH);
-                        mapPanel.add(new JSeparator(), BorderLayout.SOUTH);
                         mapViewer.setVisible(false);
                         
+                        JTabbedPane tab = new JTabbedPane();
+                        tab.addTab(tr("Properties"), incompleteEditPanel);
+                        tab.addTab(tr("Map"), mapPanel);
+                        
+                        /* Combine panels */
+                        JSplitPane unresSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, streetPanel, unresolvedPanel);
+                        JSplitPane addrSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, tab, incompletePanel);                     
+                        JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, unresSplitPane, addrSplitPane);
+                        
                         this.getContentPane().add(pane, BorderLayout.CENTER);
-                        this.getContentPane().add(mapPanel, BorderLayout.EAST);
+                        //this.getContentPane().add(mapPanel, BorderLayout.SOUTH);
                 } else {
                         this.getContentPane().add(new JLabel(tr("(No data)")), BorderLayout.CENTER);
@@ -218 +222 @@
                 
                 AddressEditSelectionEvent ev = new AddressEditSelectionEvent(e.getSource(),
-                                streetList, unresolvedTable, incompleteTable, editContainer);
+                                streetTable, unresolvedTable, incompleteTable, editContainer);
                 
                 for (AbstractAddressEditAction action : actions) {
@@ -274 +278 @@
                 updateHeaders();
         }
+        
+        /**
+         * Special listener to react on selection changes in the incomplete address list. 
+         * It searches the street table for the streets which matches best matching to the
+         * street name given in the address.
+         *   
+         * @author Oliver Wieland <oliver.wieland@online.de> 
+         */
+        
+        class IncompleteAddressListener implements ListSelectionListener {
+
+                @Override
+                public void valueChanged(ListSelectionEvent e) {
+                        if (unresolvedTable.getSelectedRowCount() == 1) {
+                                String streetOfAddr = (String) unresolvedTable.
+                                                                                        getModel().getValueAt(unresolvedTable.getSelectedRow(), 0);
+                                
+                                int maxScore = 0, score = 0, row = -1;
+                                for (int i = 0; i < streetTable.getRowCount(); i++) {
+                                        String streetName = (String) streetTable.getModel().getValueAt(i, 1);
+                                        
+                                        score = StringUtils.lcsLength(streetOfAddr, streetName);
+                                        if (score > maxScore) {
+                                                maxScore = score;
+                                                row = i; 
+                                        }
+                                }
+                                
+                                if (row > 0) {
+                                        streetTable.getSelectionModel().clearSelection();
+                                        streetTable.getSelectionModel().addSelectionInterval(row, row);
+                                        streetTable.scrollRectToVisible(streetTable.getCellRect(row, 0, true));
+                                }
+                        }                       
+                }
+                
+        }
 
 }