Changeset 12965 in josm for trunk

Timestamp:

2017-10-09T16:47:21+02:00 (7 years ago)

Author:

bastiK

Message:

MapCSSRendererTest: use proper bounds and avoid 20 px border added by NavigatableComponent

Location:

trunk/test

Files:

• data/renderer/area-fill-color/reference.png (modified) ( previous)
• data/renderer/area-fill-image/reference.png (modified) ( previous)
• data/renderer/area-icon/reference.png (modified) ( previous)
• data/renderer/area-text/reference.png (modified) ( previous)
• data/renderer/node-shapes/reference.png (modified) ( previous)
• data/renderer/node-text/reference.png (modified) ( previous)
• data/renderer/order/reference.png (modified) ( previous)
• data/renderer/way-color/reference.png (modified) ( previous)
• data/renderer/way-dashes-clamp/reference.png (modified) ( previous)
• data/renderer/way-dashes/reference.png (modified) ( previous)
• data/renderer/way-repeat-image-clamp/reference.png (modified) ( previous)
• data/renderer/way-repeat-image/reference.png (modified) ( previous)
• data/renderer/way-text/reference.png (modified) ( previous)
• data/renderer/way-width/reference.png (modified) ( previous)
• functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified) (4 diffs)

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

@@ -31 +31 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -70 +72 @@
     private TestConfig testConfig;
 
+    // development flag - set to true in order to update all reference images
+    private static final boolean UPDATE_ALL = false;
+
     /**
      * The different configurations of this test.
@@ -195 +200 @@
             }
         };
-        nc.zoomTo(testConfig.testArea);
+        ProjectionBounds pb = new ProjectionBounds();
+        pb.extend(Main.getProjection().latlon2eastNorth(testConfig.testArea.getMin()));
+        pb.extend(Main.getProjection().latlon2eastNorth(testConfig.testArea.getMax()));
+        double scale = (pb.maxEast - pb.minEast) / IMAGE_SIZE;
+        nc.zoomTo(pb.getCenter(), scale);
+
         dataSet.allPrimitives().stream().forEach(this::loadPrimitiveStyle);
         dataSet.setSelected(dataSet.allPrimitives().stream().filter(n -> n.isKeyTrue("selected")).collect(Collectors.toList()));
@@ -211 +221 @@
         g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         new StyledMapRenderer(g, nc, false).render(dataSet, false, testConfig.testArea);
+
+        if (UPDATE_ALL) {
+            ImageIO.write(image, "png", new File(testConfig.getTestDirectory() + "/reference.png"));
+            return;
+        }
 
         BufferedImage reference = testConfig.getReference();