Changeset 16100 in josm for trunk

Timestamp:

2020-03-09T00:35:05+01:00 (5 years ago)

Author:

simon04

Message:

see #18468 - MapCSSRendererTest: generate style debugging output

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/RenderingHelper.java (modified) (5 diffs)
• test/data/renderer/node-text2/data.osm (modified) (1 diff)
• test/data/renderer/way-text/data.osm (modified) (1 diff)
• test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingHelper.java

@@ -11 +11 @@
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.util.Collection;
 import java.util.HashMap;
@@ -19 +20 @@
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -24 +26 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
+import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -41 +44 @@
     private Color backgroundColor;
     private boolean fillBackground = true;
+    private PrintStream debugStream;
 
     /**
@@ -183 +187 @@
         smr.setStyles(elemStyles);
         smr.render(ds, false, bounds);
+
+        // For debugging, write computed StyleElement to debugStream for primitives marked with debug=yes
+        if (debugStream != null) {
+            for (OsmPrimitive primitive : ds.allPrimitives()) {
+                if (!primitive.isKeyTrue("debug")) {
+                    continue;
+                }
+                debugStream.println(primitive);
+                for (StyleElement styleElement : elemStyles.get(primitive, scale, nc)) {
+                    debugStream.append(" * ").println(styleElement);
+                }
+            }
+        }
+
         return image;
     }
 
+    void setDebugStream(PrintStream debugStream) {
+        this.debugStream = debugStream;
+    }
 }

trunk/test/data/renderer/node-text2/data.osm

@@ -5 +5 @@
     <tag k='name' v='Hgmpf' />
     <tag k='test' v='text-placement' />
+    <tag k='debug' v='yes' />
   </node>
 </osm>

trunk/test/data/renderer/way-text/data.osm

@@ -44 +44 @@
     <tag k='name' v='An der Actien-Zuckerfabrik' />
     <tag k='test' v='w1' />
+    <tag k='debug' v='yes' />
   </way>
   <way id='-41280' action='modify'>

trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java

@@ -192 +192 @@
         RenderingHelper rh = new RenderingHelper(dataSet, testConfig.getTestArea(), scale, Collections.singleton(sd));
         rh.setFillBackground(false);
+        rh.setDebugStream(System.out);
+        System.out.println("Running " + getClass() + "[" + testConfig.testDirectory + "]");
         BufferedImage image = rh.render();