Returns {@code true} even if s1="Nám. Svobody" and + *
Returns {@code true} even if s1="Nam. Svobody" and * s2="Náměstí Svobody".
*/ public static boolean matchAbbrev(String s1, String s2) { - String[] parts1 = s1.split(" +"); - String[] parts2 = s2.split(" +"); + String[] parts1 = anglicize(s1).split(" +"); + String[] parts2 = anglicize(s2).split(" +"); if (parts1.length != parts2.length) @@ -110,5 +111,5 @@ } - String[] noCapitalize = { "Nad", "Pod", "U", "Na" }; + String[] noCapitalize = { "Nad", "Pod", "U", "Na", "Z" }; for (String noc : noCapitalize) result = result.replaceAll(" "+noc+" ", " "+noc.toLowerCase()+" "); @@ -116,3 +117,23 @@ return result; } + + /** + * Remove diacritics from the string. + * + *This method was posted on the + * + * SUN forum by + * + * Alan Moore.
+ */ + public static String anglicize(String str) { + String strNFD = Normalizer.normalize(str, Normalizer.Form.NFD); + StringBuilder sb = new StringBuilder(); + for (char ch : strNFD.toCharArray()) { + if (Character.getType(ch) != Character.NON_SPACING_MARK) { + sb.append(ch); + } + } + return sb.toString(); + } } Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java (revision 15581) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java (revision 15582) @@ -9,5 +9,4 @@ import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.gui.MapFrame; -import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin; import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.House; import org.openstreetmap.josm.plugins.czechaddress.intelligence.Reasoner; @@ -99,9 +98,10 @@ r.closeTransaction(); } + + FactoryDialog.getInstance().selectionListenerActivated = false; FactoryDialog.getInstance().selectNextUnmatchedHouseByCheckBox(); - - // And make the new node selected. - Main.ds.addPrimitive(newNode); + Main.ds.addPrimitive(newNode); Main.ds.setSelected(newNode); + FactoryDialog.getInstance().selectionListenerActivated = true; } } Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java (revision 15582) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ManagerAction.java (revision 15582) @@ -0,0 +1,28 @@ +package org.openstreetmap.josm.plugins.czechaddress.actions; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.plugins.czechaddress.gui.ManagerDialog; +import org.openstreetmap.josm.tools.Shortcut; + +/** + * + * @author Radomír Černoch, radomir.cernoch@gmail.com + */ +public class ManagerAction extends JosmAction { + + public ManagerAction() { + super("Upravit databázi", + null,//"envelope-closed-big.png", + "Upravit jména elemntů dle mapy", + Shortcut.registerShortcut("address:assignaddress", + "Adresy: Přiřadit adresy", + KeyEvent.VK_P, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT), + true); + } + + public void actionPerformed(ActionEvent e) { + (new ManagerDialog()).setVisible(true); + } +} Index: plications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ModifierAction.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ModifierAction.java (revision 15581) +++ (revision ) @@ -1,33 +1,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -package org.openstreetmap.josm.plugins.czechaddress.actions; - -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; -import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.plugins.czechaddress.gui.Renamer; -import org.openstreetmap.josm.tools.Shortcut; - -/** - * - * @author Radomír Černoch, radomir.cernoch@gmail.com - */ -public class ModifierAction extends JosmAction { - - public ModifierAction() { - super("Upravit databázi", - null,//"envelope-closed-big.png", - "Upravit jména elemntů dle mapy", - Shortcut.registerShortcut("address:assignaddress", - "Adresy: Přiřadit adresy", - KeyEvent.VK_P, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT), - true); - } - - public void actionPerformed(ActionEvent e) { - (new Renamer()).setVisible(true); - } -} Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java (revision 15581) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java (revision 15582) @@ -6,5 +6,5 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.plugins.czechaddress.StringUtils; -import org.openstreetmap.josm.plugins.czechaddress.intelligence.Match; +import org.openstreetmap.josm.plugins.czechaddress.intelligence.Reasoner; import org.openstreetmap.josm.plugins.czechaddress.proposal.Proposal; @@ -206,4 +206,8 @@ } + protected int[] getAdditionalFieldMatchList(OsmPrimitive primitive) { + int[] result = {0}; + return result; + } public ListFirst elemtn of the returned array corresponds to the CP + *
First element of the returned array corresponds to the CP * (číslo popisné), the second one to the combination of Street+CO.
*/ @@ -139,5 +138,6 @@ protected int[] getFieldMatchList(OsmPrimitive prim) { int[] result = {0, 0}; - + if (!isMatchable(prim)) return result; + // First field is the AlternateNubmer result[0] = matchField(this.cp, prim.get(PrimUtils.KEY_ADDR_CP)); @@ -150,5 +150,17 @@ return result; } + + @Override + protected int[] getAdditionalFieldMatchList(OsmPrimitive prim) { + int[] result = {0}; + if (!isMatchable(prim)) return result; + + ParentResolver resolver = new ParentResolver(this); + result[0] = matchField(resolver.getIsIn(), prim.get(PrimUtils.KEY_IS_IN)); + return result; + } + + /** * Gives all proposals to make the primitive be an address primitive. @@ -161,5 +173,5 @@ ListHouseReasoner holds the relations between House and OsmPrimitive - * and also tries to keep it consistent with the state of the map. - * Firstly it is initialised by {@code initReasoner()} and subsequently and - * change done to the map should be reflected in HouseReasoner by calling - * {@code addPrimitive} or {@code removePrimitive}.
+ *Reasoner holds the relations between AddressElement and OsmPrimitive + * and also tries to keep it consistent with the state of the map.
+ * + *You can imagine data model as a big matrix, whose rows consist of + * {@code AddressElement}s and columns are {@code OsmPrimitive}s. The cell + * of this matrix is a so-called "quality", which says how well the primitive + * and element fit together (see {@code MATCH_*} for details). + * Through the documentation we will use Q(prim, elem) notation + * for this matrix. The reasoner is memory-efficient iff most of the Q values + * are equal to {@code MATCH_NOMATCH}.
* *NOTE: Currently there is no known way of adding a hook into JOSM - * to detect changed or deleted elements. Therefore every call of - * {@code ensureConsistency()} checks for deleted elements, which is rather - * inefficient. Moreover there is a listener for selectionChanged, which - * checks deselcted items for their change. Again, inefficient.
+ * to detect changed or deleted elements. Therefore there is a + * {@link SelectionMonitor}, which passes every selected primitive to + * the reasoner. * * @author Radomír Černoch radomir.cernoch@gmail.com @@ -34,5 +37,9 @@ public class Reasoner { - /* A list of {@link OsmPrimitive}s, for which there was no suitable match.*/ + public static final int MATCH_OVERWRITE = 4; + public static final int MATCH_ROCKSOLID = 3; + public static final int MATCH_PARTIAL = 2; + public static final int MATCH_CONFLICT = 1; + public static final int MATCH_NOMATCH = 0; private MapThis method must be called before any method, which might + * modify the data in the reasoner. + * The only exception is {@code reset()}.
+ * + *When there's an open transaction, the result of most output methods + * undefined. Exceptions to this rules are indicated.
+ * + *Transactions: This method requires a closed transaction.
+ */ public void openTransaction() { assert primToUpdate.size() == 0; assert elemToUpdate.size() == 0; - } - + assert !transactionOpened; + + primToUpdate.clear(); + elemToUpdate.clear(); + transactionOpened = true; + } + + /** + * Turns the reasoner back into consistent state. + * + *Recreates {@code *BestIndex} indexes, sends notification to + * all listeners about changed elements/primitives and closes + * the transaction.
+ * + *Transactions: This method requires an open transaction.
+ */ public void closeTransaction() { + assert transactionOpened; SetIf the primitive is unknown to the reasoner, it's added. + * Then it updates all cells in the Q matrix's column, which corresponds + * to the provided primitive. In the Q-matrix analogy is roughly equivalent + * to doing an update + *
Transactions: This method requires an open transaction.
+ */ + public void update(OsmPrimitive prim) { + logger.log(Level.FINER, "considering primitive", AddressElement.getName(prim)); + assert transactionOpened; + + + MapIf the primitive is unknown to the reasoner, it's added. + * Then it updates all cells in the Q matrix's row, which corresponds + * to the provided element.In the Q-matrix analogy is roughly equivalent + * to doing an update + *
Transactions: This method requires an open transaction.
+ */ + public void update(AddressElement elem) { + logger.log(Level.FINER, "considering element", elem); + assert transactionOpened; + + MapRegardless of how well the primitive and element pair fits + * together, it assings their Q value to {@code MATCH_OVERWRITE}.
+ * + *Transactions: This method requires an open transaction.
+ */ + public void doOverwrite(OsmPrimitive prim, AddressElement elem) { + logger.log(Level.FINER, "overwriting match", + "elem=„" + elem + "“; " + + "prim=„" + AddressElement.getName(prim) + "“"); + assert transactionOpened; + + update(prim); + update(elem); + putQ(prim, elem, MATCH_OVERWRITE); + + primToUpdate.add(prim); + elemToUpdate.add(elem); + } + + /** + * Sets the relation to its original Q value. + * + *If the element-primitive pair was previously edited by + * {@code doOverwrite()} method, this returns their Q to the + * original value, which is determined by {@code evalQ()}.
+ * + *Transactions: This method requires an open transaction.
+ */ + public void unOverwrite(OsmPrimitive prim, AddressElement elem) { + logger.log(Level.FINER, "unoverwriting match", + "elem=„" + elem + "“; " + + "prim=„" + AddressElement.getName(prim) + "“"); + assert transactionOpened; + + update(prim); + update(elem); + putQ(prim, elem, evalQ(prim, elem, MATCH_NOMATCH)); + + primToUpdate.add(prim); + elemToUpdate.add(elem); + } + + /** + * Returns the Q value of the given primitive-element relation. + */ + private int getQ(OsmPrimitive prim, AddressElement elem) { assert primMatchIndex.get(prim).get(elem) == elemMatchIndex.get(elem).get(prim); @@ -275,7 +321,10 @@ } - public void putQ(OsmPrimitive prim, AddressElement elem, int qVal) { - - if (qVal == Match.MATCH_NOMATCH) { + /** + * Sets the Q value of the given primitive-element relation. + */ + private void putQ(OsmPrimitive prim, AddressElement elem, int qVal) { + + if (qVal == MATCH_NOMATCH) { primMatchIndex.get(prim).remove(elem); elemMatchIndex.get(elem).remove(prim); @@ -286,154 +335,350 @@ } + /** + * Evaluates the Q value between the given primitive and element. + * + *If {@code oldQ} is {@code MATCH_OVERWRITE}, it is preserved.
+ */ + private int evalQ(OsmPrimitive prim, AddressElement elem, Integer oldQ) { + + if (prim.deleted) + return MATCH_NOMATCH; + + if (oldQ == MATCH_OVERWRITE) + return MATCH_OVERWRITE; + + return elem.getQ(prim); + } + +//============================================================================== +// OUTPUT METHODS +//============================================================================== + + /** + * Returns the primitive, which is a unique counterpart of the element. + * + *This method is probably the single most used method of the reasoner. + * It allows the unique translation between map and the database.
+ * + *An element elem and primitive prim can be translated + * between each other iff + *
This method depends on {@code getStrictlyBest()}, which induces its + * complexity properties.
+ * + *Transactions: Can be called regardless of transaction state. + * However if the transaction is closed, its time-complexity reduces to + * constant thanks to using indexes.
+ */ public AddressElement translate(OsmPrimitive prim) { if (prim == null) return null; - AddressElement elem = primBestIndex.get(prim); - if (elemBestIndex.get(elem) == prim) + AddressElement elem = getStrictlyBest(prim); + if (getStrictlyBest(elem) == prim) return elem; + return null; } + /** + * Returns the element, which is a unique counterpart of the primitive. + * + *This method is probably the single most used method of the reasoner. + * It allows the unique translation between map and the database.
+ * + *An element elem and primitive prim can be translated + * between each other iff + *
This method depends on {@code getStrictlyBest()}, which induces its + * complexity properties.
+ * + *Transactions: Can be called regardless of transaction state. + * However if the transaction is closed, its time-complexity reduces to + * constant thanks to using indexes.
+ */ public OsmPrimitive translate(AddressElement elem) { if (elem == null) return null; - OsmPrimitive prim = elemBestIndex.get(elem); - if (primBestIndex.get(prim) == elem) + OsmPrimitive prim = getStrictlyBest(elem); + if (getStrictlyBest(prim) == elem) return prim; + return null; } - public SetThere are two conditions for a primitive to be in a conflict. It must + * be at least partially fitting to some element, but it cannot be + * uniquely translatable. + *
There are two conditions for a element to be in a conflict. It must + * be at least partially fitting to some primitive, but it cannot be + * uniquely translatable. + *
It searches among all Q values corresponding to the given primitive + * and returns a set of all elements, whose relation has the greatest + * Q value. Formally we can write that the output is a set + *
Transactions: Can be called regardless of transaction state.
+ * + * @return A new set, which can be freely manipulated. Changes are not + * reflected in the reasoner. + */ + public SetIt searches among all Q values corresponding to the given element + * and returns a set of all primitives, whose relation has the greatest + * Q value. Formally we can write that the output is a set + *
Transactions: Can be called regardless of transaction state.
+ * + * @return A new set, which can be freely manipulated. Changes are not + * reflected in the reasoner. + */ + public SetIt searches among all Q values corresponding to the given primitive + * and returns such an element, whose relation has the greatest + * Q value. If there are more of them, {@code null} is returned. + * Formally we can write that the output is a primitive + *
If {@code getCandidates(prim)} returns exactly one element, + * this method should return the same one. Otherwise {@code null}.
+ * + *Transactions: Can be called regardless of transaction state. + * However if the transaction is closed, its time-complexity reduces to + * constant thanks to using indexes.
+ */ + public AddressElement getStrictlyBest(OsmPrimitive prim) { + + if (!transactionOpened) + return primBestIndex.get(prim); + + MapIt searches among all Q values corresponding to the given element + * and returns sucha primitive, whose relation has the greatest + * Q value. If there are more of them, {@code null} is returned. + * Formally we can write that the output is a primitive + *
If {@code getCandidates(elem)} returns exactly one primitive, + * this method should return the same one. Otherwise {@code null}.
+ * + *Transactions: Can be called regardless of transaction state. + * However if the transaction is closed, its time-complexity reduces to + * constant thanks to using indexes.
+ */ + public OsmPrimitive getStrictlyBest(AddressElement elem) { + + if (!transactionOpened) + return elemBestIndex.get(elem); + + Map