Changeset 18896 in osm

Timestamp:

2009-12-02T17:35:10+01:00 (15 years ago)

Author:

rcernoch

Message:

CzechAddress: Bugfix 'unassigned houses'

Location:

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress

Files:

• gui/FactoryDialog.form (modified) (1 diff)
• gui/FactoryDialog.java (modified) (3 diffs)
• intelligence/Reasoner.java (modified) (4 diffs)

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.form

@@ -26 +26 @@
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="1" attributes="0">
-                  <Component id="streetComboBox" pref="199" max="32767" attributes="0"/>
+                  <Component id="streetComboBox" pref="175" max="32767" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="relocateButton" min="-2" max="-2" attributes="0"/>
               </Group>
               <Group type="102" alignment="0" attributes="0">
-                  <Component id="keepOddityCheckBox" pref="278" max="32767" attributes="0"/>
+                  <Component id="keepOddityCheckBox" pref="282" max="32767" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.czechaddress.gui;
 
+import java.util.Set;
 import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedListModel;
 import org.openstreetmap.josm.plugins.czechaddress.gui.utils.HalfCookedComboBoxModel;
@@ -182 +183 @@
             } while ((oldNum + newNum) % 2 == 1 &&
                      houseList.getSelectedIndex() != 0);
-            
+
+        // If anything goes wrong, we can silently ignore the errors.
+        // The selected item just does not get updated...
         } catch (Exception exp) {}
     }
@@ -424 +427 @@
             super("nepřiřazené domy");
             Reasoner.getInstance().addListener(this);
-
-            for (AddressElement house : Reasoner.getInstance().getUnassignedElements())
-                if (house instanceof House)
-                    houses.add((House) house);
-
-            Collections.sort(houses);
         }
 

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java

@@ -206 +206 @@
             matches = new HashMap<AddressElement, Integer>();
             primMatchIndex.put(prim, matches);
+            primToUpdate.add(prim);
         }
 
@@ -233 +234 @@
             matches = new HashMap<OsmPrimitive, Integer>();
             elemMatchIndex.put(elem, matches);
+            elemToUpdate.add(elem);
         }
 
@@ -313 +315 @@
     private int getQ(OsmPrimitive prim, AddressElement elem) {
 
-        // TODO: This is a workaround. We should not be here at all.
         if (elemMatchIndex.get(elem) == null) return MATCH_NOMATCH;
         if (primMatchIndex.get(prim) == null) return MATCH_NOMATCH;
@@ -394 +395 @@
      *
      * <p>This method is probably the single most used method of the reasoner.
-     * It allows the unique translation between map and the database.</p>
+     * It allows the unique translation between the map and the database.</p>
      *
      * <p>An element <i>elem</i> and primitive <i>prim</i> can be translated