Changeset 28710 in osm for applications/editors/josm/plugins/reltoolbox

Timestamp:

2012-09-11T17:57:32+02:00 (12 years ago)

Author:

larry0ua

Message:

'RelToolbox: update validations for associatedStreet'

Location:

applications/editors/josm/plugins/reltoolbox

Files:

• build.xml (modified) (1 diff)
• src/relcontext/relationfix/AssociatedStreetFixer.java (modified) (1 diff)

applications/editors/josm/plugins/reltoolbox/build.xml

@@ -30 +30 @@
 <project name="reltoolbox" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="RelToolbox: fix possible NPE in associatedStreet fixer"/>
+    <property name="commit.message" value="RelToolbox: update validations for associatedStreet"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="5018"/>

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

@@ -49 +49 @@
                 for (RelationMember m : rel.getMembers()) {
                         if ("street".equals(m.getRole()) && !streetName.equals(m.getWay().get("name"))) {
-                            setWarningMessage(tr("Relation has streets with different names"));
-                            return false;
+                            String anotherName = m.getWay().get("name");
+                            if (anotherName != null && !anotherName.isEmpty()) {
+                            setWarningMessage(tr("Relation has streets with different names"));
+                            return false;
+                            }
                         }
                 }