Index: trunk/data_nodist/relation_sort.osm
===================================================================
--- trunk/data_nodist/relation_sort.osm (revision 6460)
+++ trunk/data_nodist/relation_sort.osm (revision 6461)
@@ -1,165 +1,185 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java (revision 6460)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java (revision 6461)
@@ -6,5 +6,5 @@
import java.util.Collections;
import java.util.Comparator;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
@@ -13,4 +13,6 @@
import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.tools.AlphanumComparator;
public class RelationSorter {
@@ -24,17 +26,37 @@
static {
- additionalSorters.add(new AssociatedStreetSorter());
+ // first adequate sorter is used, so order matters
+ additionalSorters.add(new AssociatedStreetRoleStreetSorter());
+ additionalSorters.add(new AssociatedStreetRoleAddressHouseSorter());
}
/**
- * Class that sorts type=associatedStreet relation's houses.
+ * Class that sorts the {@code street} members of
+ * {@code type=associatedStreet} and {@code type=street} relations.
*/
- private static class AssociatedStreetSorter implements AdditionalSorter {
+ private static class AssociatedStreetRoleStreetSorter implements AdditionalSorter {
@Override
public boolean acceptsMember(RelationMember m) {
- return m != null
- && m.getRole() != null && m.getRole().equals("house")
- && m.getMember() != null && m.getMember().get("addr:housenumber") != null;
+ return "street".equals(m.getRole());
+ }
+
+ @Override
+ public List sortMembers(List list) {
+ return sortMembersByConnectivity(list);
+ }
+ }
+
+ /**
+ * Class that sorts the {@code address} and {@code house} members of
+ * {@code type=associatedStreet} and {@code type=street} relations.
+ */
+ private static class AssociatedStreetRoleAddressHouseSorter implements AdditionalSorter {
+
+ public static final AlphanumComparator ALPHANUM_COMPARATOR = new AlphanumComparator();
+
+ @Override
+ public boolean acceptsMember(RelationMember m) {
+ return "address".equals(m.getRole()) || "house".equals(m.getRole());
}
@@ -44,20 +66,13 @@
@Override
public int compare(RelationMember a, RelationMember b) {
- if (a == b || a.getMember() == b.getMember()) return 0;
- String addrA = a.getMember().get("addr:housenumber").trim();
- String addrB = b.getMember().get("addr:housenumber").trim();
- if (addrA.equals(addrB)) return 0;
- // Strip non-digits (from "1B" addresses for example)
- String addrAnum = addrA.replaceAll("\\D+", "");
- String addrBnum = addrB.replaceAll("\\D+", "");
- // Compare only numbers
- try {
- Integer res = Integer.parseInt(addrAnum) - Integer.parseInt(addrBnum);
- if (res != 0) return res;
- } catch (NumberFormatException e) {
- // Ignore NumberFormatException. If the number is not composed of digits, strings are compared next
+ final int houseNumber = ALPHANUM_COMPARATOR.compare(
+ a.getMember().get("addr:housenumber"),
+ b.getMember().get("addr:housenumber"));
+ if (houseNumber != 0) {
+ return houseNumber;
}
- // Same number ? Compare full strings
- return addrA.compareTo(addrB);
+ final String aDisplayName = a.getMember().getDisplayName(DefaultNameFormatter.getInstance());
+ final String bDisplayName = b.getMember().getDisplayName(DefaultNameFormatter.getInstance());
+ return ALPHANUM_COMPARATOR.compare(aDisplayName, bDisplayName);
}
});
@@ -77,17 +92,24 @@
// Sort members with custom mechanisms (relation-dependent)
List defaultMembers = new ArrayList(relationMembers.size());
- Map> customMap = new HashMap>();
+ // Maps sorter to assigned members for sorting. Use LinkedHashMap to retain order.
+ Map> customMap = new LinkedHashMap>();
- // Dispatch members to correct sorters
+ // Dispatch members to the first adequate sorter
for (RelationMember m : relationMembers) {
+ boolean wasAdded = false;
for (AdditionalSorter sorter : additionalSorters) {
- List list = defaultMembers;
if (sorter.acceptsMember(m)) {
+ List list;
list = customMap.get(sorter);
if (list == null) {
customMap.put(sorter, list = new LinkedList());
}
+ list.add(m);
+ wasAdded = true;
+ break;
}
- list.add(m);
+ }
+ if (!wasAdded) {
+ defaultMembers.add(m);
}
}
@@ -97,4 +119,11 @@
newMembers.addAll(entry.getKey().sortMembers(entry.getValue()));
}
+ newMembers.addAll(sortMembersByConnectivity(defaultMembers));
+ return newMembers;
+ }
+
+ public static List sortMembersByConnectivity(List defaultMembers) {
+
+ List newMembers = new ArrayList();
RelationNodeMap map = new RelationNodeMap(defaultMembers);
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java (revision 6460)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java (revision 6461)
@@ -50,5 +50,8 @@
public void testGeneric() {
String[] actual = getNames(sorter.sortMembers(getRelation("generic").getMembers()));
- Assert.assertArrayEquals(new String[] {"t1w4", "t1w3", "t1w2", "t1w1", "t1w7", "t1w6", "t1w5", "t1n1", "t1n2"}, actual);
+ final String[] expected = {"t1w4", "t1w3", "t1w2", "t1w1", "t1w7", "t1w6", "t1w5", "t1n1", "t1n2"};
+ // expect nodes to be sorted correctly
+ Assert.assertEquals(expected[7], actual[7]);
+ Assert.assertEquals(expected[8], actual[8]);
}
@@ -56,5 +59,11 @@
public void testAssociatedStreet() {
String[] actual = getNames(sorter.sortMembers(getRelation("associatedStreet").getMembers()));
- Assert.assertArrayEquals(new String[] {"t2n1", "t2n2", "t2n3", "t2n4", "t2w1", "t2w2"}, actual);
+ Assert.assertArrayEquals(new String[] {"t2w1", "t2w2", "t2n1", "t2n2", "t2n3", "t2n4"}, actual);
+ }
+
+ @Test
+ public void testStreet() {
+ String[] actual = getNames(sorter.sortMembers(getRelation("street").getMembers()));
+ Assert.assertArrayEquals(new String[]{"t2w1", "t2w2", "t2n1", "t2n2", "t2n3", "t2n4", "playground", "tree"}, actual);
}