Changeset 1200 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-01-01T17:17:44+01:00 (15 years ago)

Author:

stoecker

Message:

add error handling for multipolygon drawing

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• Node.java (modified) (1 diff)
• OsmPrimitive.java (modified) (3 diffs)
• Relation.java (modified) (2 diffs)
• Way.java (modified) (1 diff)
• visitor/MapPaintVisitor.java (modified) (14 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -91 +91 @@
             name = get("name");
             if (name == null)
-                name = id == 0 ? "" : ""+id;
+                name = id == 0 ? tr("node") : ""+id;
             name += " (" + coor.latToString(mCord) + ", " + coor.lonToString(mCord) + ")";
         }

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.osm;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -34 +37 @@
      */
     public Map<String, String> keys;
+
+    /**
+     * The key/value list for this primitive.
+     */
+    public Collection<String> errors;
 
     /**
@@ -314 +322 @@
         }
     }
+
+    public void putError(String text, Boolean isError)
+    {
+        if(errors == null)
+            errors = new ArrayList<String>();
+        String s = isError ? tr("Error: {0}", text) : tr("Warning: {0}", text);
+System.out.println(s);
+        errors.add(s);
+    }
+    public void clearErrors()
+    {
+        errors = null;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -78 +78 @@
         } else {
             name = get("type");
-            // FIXME add names of members
             if (name == null)
                 name = tr("relation");
@@ -89 +88 @@
             int mbno = members.size();
             name += trn("{0} member", "{0} members", mbno, mbno) + ")";
+            if(errors != null)
+                name = "*"+name;
         }
         return name;

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -113 +113 @@
 
             int nodesNo = new HashSet<Node>(nodes).size();
-            name += trn(" ({0} node)", " ({0} nodes)", nodesNo, nodesNo);
+            String nodes = trn("{0} node", "{0} nodes", nodesNo, nodesNo);
+            name += (name.length() > 0) ? " ("+nodes+")" : nodes;
         }
         return name;

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BasicStroke;
@@ -212 +213 @@
     }
 
-    public Collection<Way> joinWays(Collection<Way> join)
+    public Collection<Way> joinWays(Collection<Way> join, OsmPrimitive errs)
     {
         Collection<Way> res = new LinkedList<Way>();
@@ -290 +291 @@
             if(!w.isClosed())
             {
-System.out.println("ERROR: multipolygon way is not closed." + w);
+                if(errs != null)
+                {
+                    errs.putError(tr("multipolygon way ''{0}'' is not closed.",
+                    w.getName()), true);
+                }
             }
             res.add(w);
@@ -296 +301 @@
 
         return res;
+    }
+
+    public void drawSelectedRelation(Relation r)
+    {
+        for (RelationMember m : r.members)
+        {
+            if (!m.member.incomplete && !m.member.deleted
+            && !(m.member instanceof Relation))
+            {
+                /* nodes drawn on second call */
+                if(!(m.member instanceof Node))
+                    drawSelected(m.member, styles.get(m.member), true, true);
+                alreadyDrawn.add(m.member);
+            }
+        }
     }
 
@@ -348 +368 @@
         {
             if(r.selected)
-            {
-                for (RelationMember m : r.members)
-                {
-                    if (!m.member.incomplete && !m.member.deleted
-                    && !(m.member instanceof Relation))
-                    {
-                        /* nodes drawn on second call */
-                        if(!(m.member instanceof Node))
-                            drawSelected(m.member, styles.get(m.member), true, true);
-                        alreadyDrawn.add(m.member);
-                    }
-                }
-            }
+                drawSelectedRelation(r);
             return;
         }
@@ -368 +376 @@
         Collection<Way> innerclosed = new LinkedList<Way>();
         Collection<Way> outerclosed = new LinkedList<Way>();
+        Boolean incomplete = false;
+
+        r.clearErrors();
 
         for (RelationMember m : r.members)
         {
-            if (!m.member.incomplete && !m.member.deleted)
+            if(m.member.incomplete)
+                incomplete = true;
+            else if(m.member.deleted)
+                r.putError(tr("Deleted member ''{0}'' in relation.",
+                m.member.getName()), true);
+            else
             {
                 if(m.member instanceof Way)
@@ -378 +394 @@
                     if(w.nodes.size() < 2)
                     {
-System.out.println("ERROR: Way with less than two points " + w);
+                        r.putError(tr("Way ''{0}'' with less than two points.",
+                        w.getName()), true);
                     }
                     else if("inner".equals(m.role))
@@ -386 +403 @@
                     else
                     {
-System.out.println("ERROR: No useful role for Way " + w);
+                        r.putError(tr("No useful role ''{0}'' for Way ''{1}''.",
+                        m.role == null ? "" : m.role, w.getName()), true);
                         if(m.role == null || m.role.length() == 0)
                             outer.add(w);
@@ -396 +414 @@
                 {
                     /* nodes drawn on second call */
-System.out.println("ERROR: Non-Way in multipolygon " + m.member);
+                    r.putError(tr("Non-Way ''{0}'' in multipolygon.",
+                    m.member.getName()), true);
                 }
             }
@@ -426 +445 @@
             if(join.size() != 0)
             {
-                for(Way w : joinWays(join))
+                for(Way w : joinWays(join, incomplete ? null : r))
                     outerclosed.add(w);
             }
@@ -439 +458 @@
             if(join.size() != 0)
             {
-                for(Way w : joinWays(join))
+                for(Way w : joinWays(join, incomplete ? null : r))
                     innerclosed.add(w);
             }
@@ -504 +523 @@
                     if(wayStyle.equals(innerStyle))
                     {
-System.out.println("WARNING: Inner waystyle equals multipolygon for way " + wInner);
+                        r.putError(tr("Style for inner way ''{0}'' equals multipolygon.",
+                        wInner.getName()), false);
                         if(!r.selected)
                             alreadyDrawnAreas.add(wInner);
@@ -528 +548 @@
                     && !wayStyle.equals(outerStyle))
                     {
-System.out.println("ERROR: Outer waystyle does not match multipolygon for way " + wOuter);
+                        r.putError(tr("Style for outer way ''{0}'' mismatches.",
+                        wOuter.getName()), true);
                     }
                     if(r.selected)
@@ -540 +561 @@
             }
         }
+        else if(r.selected)
+            drawSelectedRelation(r);
     }