Index: applications/editors/josm/plugins/czechaddress/build.xml =================================================================== --- applications/editors/josm/plugins/czechaddress/build.xml (revision 15194) +++ applications/editors/josm/plugins/czechaddress/build.xml (revision 15201) @@ -97,4 +97,5 @@ + Index: applications/editors/josm/plugins/czechaddress/nbproject/project.xml =================================================================== --- applications/editors/josm/plugins/czechaddress/nbproject/project.xml (revision 15194) +++ applications/editors/josm/plugins/czechaddress/nbproject/project.xml (revision 15201) @@ -5,45 +5,4 @@ czechaddress - - - - java - src - - - - - dist - - - clean - - - doc - - - run - - - clean - dist - - - - - - - src - - - - - - - - - - - @@ -61,4 +20,10 @@ java src + UTF-8 + + + + java + tests UTF-8 @@ -86,9 +51,4 @@ - - folder - dist - compile - @@ -96,4 +56,8 @@ src + + + + tests @@ -115,6 +79,11 @@ src - ../../core/build:../../core/src + ../../core/build:../../core/src:tests/junit-4.5.jar doc + 1.5 + + + tests + 1.5 Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java (revision 15194) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java (revision 15201) @@ -24,4 +24,6 @@ import org.openstreetmap.josm.plugins.czechaddress.parser.MvcrParser; import org.openstreetmap.josm.plugins.czechaddress.actions.FactoryAction; +import org.openstreetmap.josm.plugins.czechaddress.actions.HelpAction; +import org.openstreetmap.josm.plugins.czechaddress.actions.ModifierAction; import org.openstreetmap.josm.plugins.czechaddress.actions.SplitAreaByEmptyWayAction; import org.openstreetmap.josm.plugins.czechaddress.gui.FactoryDialog; @@ -68,5 +70,5 @@ final MvcrParser parser = new MvcrParser(); //parser.setFilter(null, null, null, ""); - //parser.setFilter("BRNO", "BRNO", null, null); + parser.setFilter("HUSTOPEČE", "HUSTOPEČE", null, null); parser.setTargetDatabase(mainDatabase); parser.setStorageDir(pluginDir); @@ -112,10 +114,17 @@ // Move houses from list of Houses to list of AddressElements. - List tmp1 = location.getAllHouses(); - ArrayList tmp2 = new ArrayList(tmp1.size()); - for (House h : tmp1) tmp2.add(h); + List houses = location.getAllHouses(); + ArrayList pool + = new ArrayList(houses.size()); + for (House house : houses) pool.add(house); + + + /*Capitalizator cap = new Capitalizator(Main.ds.allPrimitives(), + location.getStreets()); + for (Street s : cap.getClassifiedItems()) + System.out.println(s.toString() + " --> " + cap.translate(s).getName());*/ // And add them to the reasoner. - mainReasoner = new Reasoner(tmp2); + mainReasoner = new Reasoner(pool); mainReasoner.addPrimitives(Main.ds.allPrimitives()); } @@ -186,4 +195,6 @@ menuItems.add(MainMenu.add(czechMenu, new GroupManipulatorAction())); menuItems.add(MainMenu.add(czechMenu, new ConflictResolveAction())); + menuItems.add(MainMenu.add(czechMenu, new ModifierAction())); + menuItems.add(MainMenu.add(czechMenu, new HelpAction())); return; } Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java (revision 15194) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java (revision 15201) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.plugins.czechaddress; + +import org.openstreetmap.josm.data.coor.LatLon; /** @@ -30,3 +32,54 @@ } + public static String coordinateToString(double coor) { + double degrees = Math.floor(coor); + double minutes = Math.floor( 60*(coor-degrees) ); + double seconds = 60*60*(coor-degrees-minutes/60); + + return String.valueOf(Math.round( degrees)) + "°" + + String.valueOf(Math.round( minutes)) + "'" + + String.valueOf(Math.round(100*seconds)/100.0) + "\""; + } + + public static String latLonToString(LatLon position) { + assert position != null; + //if (position == null) return ""; + + return "(lat: " + coordinateToString(position.lat()) + + " lon: " + coordinateToString(position.lon()) + ")"; + } + + /** + * String matcher with abbreviations + * + *

Returns {@code true} even if s1="Nám. Svobody" and + * s2="Náměstí Svobody".

+ */ + public boolean matchAbbrev(String s1, String s2) { + String[] parts1 = s1.split(" +"); + String[] parts2 = s2.split(" +"); + + if (parts1.length != parts2.length) + return false; + + for (int i=0; i + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + <Editor/> + <Renderer/> + </Column> + <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="false"> + <Title/> + <Editor/> + <Renderer/> + </Column> + </TableColumnModel> + </Property> + <Property name="columnSelectionAllowed" type="boolean" value="true"/> + <Property name="tableHeader" type="javax.swing.table.JTableHeader" editor="org.netbeans.modules.form.editors2.JTableHeaderEditor"> + <TableHeader reorderingAllowed="true" resizingAllowed="true"/> + </Property> + </Properties> + </Component> + </SubComponents> + </Container> + </SubComponents> + </Container> + </SubComponents> + </Container> + </SubComponents> +</Form> Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/DatabaseModifier.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/DatabaseModifier.java (revision 15201) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/DatabaseModifier.java (revision 15201) @@ -0,0 +1,223 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +/* + * DatabaseModifier.java + * + * Created on 24.5.2009, 18:03:35 + */ + +package org.openstreetmap.josm.plugins.czechaddress.gui; + +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.List; +import javax.swing.JTable; +import javax.swing.event.TableModelListener; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableModel; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin; +import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement; +import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.Street; +import org.openstreetmap.josm.plugins.czechaddress.intelligence.Capitalizator; + +/** + * + * @author radek + */ +public class DatabaseModifier extends ExtendedDialog { + + StreetModel<Street> streetModel = new StreetModel<Street>(); + + /** Creates new form DatabaseModifier */ + public DatabaseModifier() { + + super(Main.parent, "Upravit databázi", + new String[] { "OK", "Zrušit"}, true); + initComponents(); + + Capitalizator cap = new Capitalizator( + Main.ds.allPrimitives(), + CzechAddressPlugin.getLocation().getStreets()); + + for (Street capStreet : cap.getCapitalised()) { + assert cap.translate(capStreet).get("name") != null : capStreet; + + String elemName = capStreet.getName(); + String primName = cap.translate(capStreet).get("name"); + + if (!elemName.equals(primName)) { + streetModel.elems.add(capStreet); + streetModel.names.add(primName); + } + } + + streetTable.setModel(streetModel); + streetTable.setDefaultRenderer( Street.class, + new StreetRenderer()); + + // And finalize initializing the form. + setupDialog(mainPanel, new String[] { "ok.png", "cancel.png" }); + setAlwaysOnTop(false); + + // TODO: Why does it always crash if the modality is set in constructor? + setModal(false); + } + + @Override + protected void buttonAction(ActionEvent evt) { + super.buttonAction(evt); + setVisible(false); + } + + /** This method is called from within the constructor to + * initialize the form. + * WARNING: Do NOT modify this code. The content of this method is + * always regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents + private void initComponents() { + + mainPanel = new javax.swing.JPanel(); + tabbedPane = new javax.swing.JTabbedPane(); + streetScrollPane = new javax.swing.JScrollPane(); + streetTable = new javax.swing.JTable(); + + setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); + getContentPane().setLayout(new java.awt.GridLayout(1, 0)); + + streetTable.setModel(new javax.swing.table.DefaultTableModel( + new Object [][] { + {null, null}, + {null, null}, + {null, null}, + {null, null} + }, + new String [] { + "Původní název", "Návrh z mapy" + } + ) { + Class[] types = new Class [] { + java.lang.Object.class, java.lang.String.class + }; + boolean[] canEdit = new boolean [] { + false, true + }; + + public Class getColumnClass(int columnIndex) { + return types [columnIndex]; + } + + public boolean isCellEditable(int rowIndex, int columnIndex) { + return canEdit [columnIndex]; + } + }); + streetTable.setColumnSelectionAllowed(true); + streetScrollPane.setViewportView(streetTable); + streetTable.getColumnModel().getSelectionModel().setSelectionMode(javax.swing.ListSelectionModel.SINGLE_INTERVAL_SELECTION); + streetTable.getColumnModel().getColumn(1).setResizable(false); + + tabbedPane.addTab("Ulice", streetScrollPane); + + javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel); + mainPanel.setLayout(mainPanelLayout); + mainPanelLayout.setHorizontalGroup( + mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 476, Short.MAX_VALUE) + ); + mainPanelLayout.setVerticalGroup( + mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(mainPanelLayout.createSequentialGroup() + .addComponent(tabbedPane, javax.swing.GroupLayout.PREFERRED_SIZE, 289, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(25, Short.MAX_VALUE)) + ); + + getContentPane().add(mainPanel); + + pack(); + }// </editor-fold>//GEN-END:initComponents + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JPanel mainPanel; + private javax.swing.JScrollPane streetScrollPane; + private javax.swing.JTable streetTable; + private javax.swing.JTabbedPane tabbedPane; + // End of variables declaration//GEN-END:variables + + private class StreetRenderer extends DefaultTableCellRenderer { + + @Override + public Component getTableCellRendererComponent(JTable table, + Object value, boolean isSelected, boolean hasFocus, + int row, int column) { + Component c = super.getTableCellRendererComponent(table, value, + isSelected, hasFocus, row, column); + + System.out.println("Tady som! " + value); + + if (value instanceof AddressElement) + setText(((AddressElement) value).getName() ); + + return c; + } + } + + private class StreetModel<Element> implements TableModel { + + List<Element> elems = new ArrayList<Element>(); + List<String> names = new ArrayList<String>(); + + public int getRowCount() { + assert elems.size() == names.size(); + return elems.size(); + } + + public int getColumnCount() { + return 2; + } + + public String getColumnName(int columnIndex) { + if (columnIndex == 0) return "Původní název"; + if (columnIndex == 1) return "Navržený název"; + assert false : columnIndex; + return null; + } + + public Class<?> getColumnClass(int columnIndex) { + if (columnIndex == 0) return AddressElement.class; + if (columnIndex == 1) return String.class; + assert false : columnIndex; + return null; + } + + public boolean isCellEditable(int rowIndex, int columnIndex) { + return columnIndex == 1; + } + + public Object getValueAt(int rowIndex, int columnIndex) { + if (columnIndex == 0) return elems.get(rowIndex); + if (columnIndex == 1) return names.get(rowIndex); + assert false : columnIndex; + return null; + } + + public void setValueAt(Object aValue, int rowIndex, int columnIndex) { + assert columnIndex == 1; + names.set(rowIndex, (String) aValue); + } + + public void addTableModelListener(TableModelListener l) { + + } + + public void removeTableModelListener(TableModelListener l) { + + } + } +} Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java =================================================================== --- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java (revision 15201) +++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java (revision 15201) @@ -0,0 +1,98 @@ +package org.openstreetmap.josm.plugins.czechaddress.intelligence; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.event.TableModelListener; +import javax.swing.table.TableModel; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.plugins.czechaddress.NotNullList; +import org.openstreetmap.josm.plugins.czechaddress.StringUtils; +import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement; +import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.Street; + +/** + * Updates the names in the database according the map. + * + * @author Radomír Černoch, radomir.cernoch@gmail.com + */ +public class Capitalizator { + + Map<Street, OsmPrimitive> map; + Logger logger = Logger.getLogger(Capitalizator.class.getName()); + + public Capitalizator(List<OsmPrimitive> prims, List<Street> elems) { + + int expResults = elems.size()/2; + + map = new HashMap<Street, OsmPrimitive>(expResults); + ExecutorService serv = Executors.newCachedThreadPool(); + Map<Street, Future<OsmPrimitive>> results + = new HashMap<Street, Future<OsmPrimitive>>(expResults); + + for (Street elem : elems) + results.put(elem, serv.submit(new StreetMatcher(elem, prims))); + + for (Street elem : results.keySet()) { + try { + + OsmPrimitive match = results.get(elem).get(); + if (match == null) continue; + + map.put(elem, match); + + } catch (InterruptedException ex) { + logger.log(Level.SEVERE, "Thread interrupted during matching", ex); + } catch (ExecutionException ex) { + logger.log(Level.SEVERE, "Unknown error during matching", ex); + } + } + } + + private class StreetMatcher implements Callable { + + private AddressElement elem; + private List<OsmPrimitive> prims; + private StringUtils strUtils = new StringUtils(); + + public StreetMatcher(AddressElement elem, List<OsmPrimitive> prims) { + this.elem = elem; + this.prims = prims; + } + + public OsmPrimitive call() throws Exception { + + OsmPrimitive candidate = null; + for (OsmPrimitive prim : prims) { + + if (prim.get("name") == null) + continue; + + if (prim.get("name").equals(elem.getName())) + return prim; + + if (strUtils.matchAbbrev(prim.get("name"), elem.getName())) + candidate = prim; + } + + return candidate; + } + } + + public OsmPrimitive translate(Street elem) { + return map.get(elem); + } + + public Set<Street> getCapitalised() { + return map.keySet(); + } +}