Changeset 11054 in josm

Timestamp:

2016-09-26T23:29:19+02:00 (8 years ago)

Author:

michael2402

Message:

Add more crash report info to the StyledMapRenderer. See #13665

Location:

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

Files:

• MapPaintSettings.java (modified) (1 diff)
• StyledMapRenderer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java

@@ -346 +346 @@
         return outlineOnly;
     }
+
+    @Override
+    public String toString() {
+        // This is used for debugging exceptions.
+        return "MapPaintSettings [useRealWidth=" + useRealWidth + ", showDirectionArrow=" + showDirectionArrow
+                + ", showOnewayArrow=" + showOnewayArrow + ", defaultSegmentWidth=" + defaultSegmentWidth
+                + ", showOrderNumber=" + showOrderNumber + ", showHeadArrowOnly=" + showHeadArrowOnly
+                + ", showNamesDistance=" + showNamesDistance + ", useStrokesDistance=" + useStrokesDistance
+                + ", showIconsDistance=" + showIconsDistance + ", selectedNodeSize=" + selectedNodeSize
+                + ", connectionNodeSize=" + connectionNodeSize + ", unselectedNodeSize=" + unselectedNodeSize
+                + ", taggedNodeSize=" + taggedNodeSize + ", fillSelectedNode=" + fillSelectedNode
+                + ", fillUnselectedNode=" + fillUnselectedNode + ", fillTaggedNode=" + fillTaggedNode
+                + ", fillConnectionNode=" + fillConnectionNode + ", outlineOnly=" + outlineOnly + ", selectedColor="
+                + selectedColor + ", relationSelectedColor=" + relationSelectedColor + ", highlightColor="
+                + highlightColor + ", inactiveColor=" + inactiveColor + ", nodeColor=" + nodeColor + ", taggedColor="
+                + taggedColor + ", connectionColor=" + connectionColor + ", taggedConnectionColor="
+                + taggedConnectionColor + "]";
+    }
+
+
 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -83 +83 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
@@ -242 +243 @@
     }
 
+    /**
+     * This stores a style and a primitive that should be painted with that style.
+     */
     public static class StyleRecord implements Comparable<StyleRecord> {
         private final StyleElement style;
@@ -297 +301 @@
         public StyleElement getStyle() {
             return style;
+        }
+
+        /**
+         * Paints the primitive with the style.
+         * @param paintSettings The settings to use.
+         * @param painter The painter to paint the style.
+         */
+        public void paintPrimitive(MapPaintSettings paintSettings, StyledMapRenderer painter) {
+            style.paintPrimitive(
+                    osm,
+                    paintSettings,
+                    painter,
+                    (flags & FLAG_SELECTED) != 0,
+                    (flags & FLAG_OUTERMEMBER_OF_SELECTED) != 0,
+                    (flags & FLAG_MEMBER_OF_SELECTED) != 0
+            );
+        }
+
+        @Override
+        public String toString() {
+            return "StyleRecord [style=" + style + ", osm=" + osm + ", flags=" + flags + "]";
         }
     }
@@ -1828 +1853 @@
             try {
                 for (final OsmPrimitive osm : input) {
-                    if (osm.isDrawable()) {
-                        osm.accept(this);
+                    try {
+                        if (osm.isDrawable()) {
+                            osm.accept(this);
+                        }
+                    } catch (RuntimeException e) {
+                        throw BugReport.intercept(e).put("osm", osm);
                     }
                 }
                 return output;
+            } catch (RuntimeException e) {
+                throw BugReport.intercept(e).put("input-size", input.size()).put("output-size", output.size());
             } finally {
                 MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().unlock();
@@ -1934 +1965 @@
             }
 
-            for (StyleRecord r : allStyleElems) {
-                r.style.paintPrimitive(
-                        r.osm,
-                        paintSettings,
-                        this,
-                        (r.flags & FLAG_SELECTED) != 0,
-                        (r.flags & FLAG_OUTERMEMBER_OF_SELECTED) != 0,
-                        (r.flags & FLAG_MEMBER_OF_SELECTED) != 0
-                );
+            for (StyleRecord record : allStyleElems) {
+                try {
+                    record.paintPrimitive(paintSettings, this);
+                } catch (RuntimeException e) {
+                    throw BugReport.intercept(e).put("record", record);
+                }
             }
 
@@ -1948 +1976 @@
 
             benchmark.renderDone();
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e)
+                    .put("data", data)
+                    .put("circum", circum)
+                    .put("scale", scale)
+                    .put("paintSettings", paintSettings)
+                    .put("renderVirtualNodes", renderVirtualNodes);
         } finally {
             data.getReadLock().unlock();