Changeset 28703 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java

Timestamp:

2012-09-11T09:55:54+02:00 (13 years ago)

Author:

larry0ua

Message:

'RelToolbox: added warning messages to the warning icon hint'

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java (modified) (10 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java

@@ -1 +1 @@
 package relcontext.relationfix;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
@@ -15 +17 @@
 import org.openstreetmap.josm.data.osm.Way;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 public class AssociatedStreetFixer extends RelationFixer {
 
@@ -26 +26 @@
         public boolean isRelationGood(Relation rel) {
                 for (RelationMember m : rel.getMembers()) {
-                if (m.getType().equals(OsmPrimitiveType.NODE) && !"house".equals(m.getRole()))
+                if (m.getType().equals(OsmPrimitiveType.NODE) && !"house".equals(m.getRole())) {
+                    setWarningMessage(tr("Node without 'house' role found"));
                         return false;
-                if (m.getType().equals(OsmPrimitiveType.WAY) && !("house".equals(m.getRole()) || "street".equals(m.getRole())))
+                }
+                if (m.getType().equals(OsmPrimitiveType.WAY) && !("house".equals(m.getRole()) || "street".equals(m.getRole()))) {
+                    setWarningMessage(tr("Way without 'house' or 'street' role found"));
+                    return false;
+                }
+                if (m.getType().equals(OsmPrimitiveType.RELATION) && !"house".equals(m.getRole())) {
+                    setWarningMessage(tr("Relation without 'house' role found"));
                         return false;
-                if (m.getType().equals(OsmPrimitiveType.RELATION) && !"house".equals(m.getRole()))
-                        return false;
+                }
         }
                 // relation should have name
                 if (!rel.hasKey("name")) {
+                    setWarningMessage(tr("Relation does not have name"));
                         return false;
                 }
@@ -40 +47 @@
                 String streetName = rel.get("name");
                 for (RelationMember m : rel.getMembers()) {
-                        if (m.getRole().equals("street") && !m.getWay().get("name").equals(streetName))
-                                return false;
+                        if (m.getRole().equals("street") && !m.getWay().get("name").equals(streetName)) {
+                            setWarningMessage(tr("Relation has streets with different names"));
+                            return false;
+                        }
                 }
+                clearWarningMessage();
                 return true;
         }
 
-        @Override
+    @Override
         public Command fixRelation(Relation source) {
                 // any way with highway tag -> street
@@ -54 +64 @@
                 Relation rel = new Relation(source);
                 boolean fixed = false;
-                
+
                 for (int i = 0; i < rel.getMembersCount(); i++) {
                         RelationMember m = rel.getMember(i);
-                        
+
                         if (m.isNode()) {
                                 Node node = m.getNode();
-                                if (!"house".equals(m.getRole()) && 
+                                if (!"house".equals(m.getRole()) &&
                                                 (node.hasKey("building") || node.hasKey("addr:housenumber"))) {
                                         fixed = true;
@@ -70 +80 @@
                                         fixed = true;
                                         rel.setMember(i, new RelationMember("street", way));
-                                } else if (!"house".equals(m.getRole()) && 
+                                } else if (!"house".equals(m.getRole()) &&
                                                 (way.hasKey("building") || way.hasKey("addr:housenumber"))) {
                                         fixed = true;
@@ -77 +87 @@
                         } else if (m.isRelation()) {
                                 Relation relation = m.getRelation();
-                                if (!"house".equals(m.getRole()) && 
+                                if (!"house".equals(m.getRole()) &&
                                                 (relation.hasKey("building") || relation.hasKey("addr:housenumber") || "multipolygon".equals(relation.get("type")))) {
                                         fixed = true;
@@ -84 +94 @@
                         }
                 }
-                
+
                 // fill relation name
                 Map<String, Integer> streetNames = new HashMap<String, Integer>();
-                for (RelationMember m : rel.getMembers()) 
+                for (RelationMember m : rel.getMembers())
                         if ("street".equals(m.getRole()) && m.isWay()) {
                                 String name = m.getWay().get("name");
                                 if (name == null || name.isEmpty()) continue;
-                                
+
                                 Integer count = streetNames.get(name);
-                                
+
                                 streetNames.put(name, count != null? count + 1 : 1);
                         }
@@ -104 +114 @@
                         }
                 }
-                
-                if (!rel.hasKey("name")) {
+
+                if (!rel.hasKey("name") && !commonName.isEmpty()) {
                         fixed = true;
                         rel.put("name", commonName);
@@ -111 +121 @@
                         commonName = ""; // set empty common name - if we already have name on relation, do not overwrite it
                 }
-                
+
                 List<Command> commandList = new ArrayList<Command>();
                 if (fixed) {
                         commandList.add(new ChangeCommand(source, rel));
                 }
-                
+
                 /*if (!commonName.isEmpty())
                 // fill common name to streets
-                for (RelationMember m : rel.getMembers()) 
+                for (RelationMember m : rel.getMembers())
                         if ("street".equals(m.getRole()) && m.isWay()) {
                                 String name = m.getWay().get("name");
                                 if (commonName.equals(name)) continue;
-                                
+
                                 // TODO: ask user if he really wants to overwrite street name??
-                                
+
                                 Way oldWay = m.getWay();
                                 Way newWay = new Way(oldWay);
                                 newWay.put("name", commonName);
-                                
+
                                 commandList.add(new ChangeCommand(oldWay, newWay));
                         }