Index: /trunk/test/data/renderer/node-shapes-combined/data.osm
===================================================================
--- /trunk/test/data/renderer/node-shapes-combined/data.osm (revision 12978)
+++ /trunk/test/data/renderer/node-shapes-combined/data.osm (revision 12978)
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/test/data/renderer/node-shapes-combined/style.mapcss
===================================================================
--- /trunk/test/data/renderer/node-shapes-combined/style.mapcss (revision 12978)
+++ /trunk/test/data/renderer/node-shapes-combined/style.mapcss (revision 12978)
@@ -0,0 +1,59 @@
+
+/**
+ * 3 Tests: relative symbol-stroke-width, alignment and stacking of stroke & fill for shapes
+ */
+node[test=pentagon1]
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-stroke-color: gold;
+ symbol-stroke-opacity: 0.9;
+ symbol-stroke-width: 10;
+}
+node[test=pentagon1]::stroke-casing
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-stroke-color: #ddd;
+ symbol-stroke-opacity: 0.6;
+ symbol-stroke-width: +8;
+ z-index: -10;
+}
+node[test=pentagon1]::fill
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-fill-color: darkblue;
+ symbol-fill-opacity: 1.0;
+ z-index: -15;
+}
+node[test=pentagon2]
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-stroke-color: blue;
+ symbol-stroke-opacity: 0.9;
+ symbol-stroke-width: 10;
+}
+node[test=pentagon2]::fill-above
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-fill-color: white;
+ symbol-fill-opacity: 0.3;
+ z-index: 2;
+}
+node[test=pentagon3]
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-fill-color: darkgreen;
+}
+node[test=pentagon3]::stroke-above
+{
+ symbol-shape: pentagon;
+ symbol-size: 50;
+ symbol-stroke-color: yellow;
+ symbol-stroke-width: 1.0;
+ z-index: 1;
+}
Index: /trunk/test/data/renderer/node-shapes-default/data.osm
===================================================================
--- /trunk/test/data/renderer/node-shapes-default/data.osm (revision 12978)
+++ /trunk/test/data/renderer/node-shapes-default/data.osm (revision 12978)
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
Index: /trunk/test/data/renderer/node-shapes-default/style.mapcss
===================================================================
--- /trunk/test/data/renderer/node-shapes-default/style.mapcss (revision 12978)
+++ /trunk/test/data/renderer/node-shapes-default/style.mapcss (revision 12978)
@@ -0,0 +1,9 @@
+/**
+ * Test default values.
+ * This should display a circle although neither size nor color are specified
+ */
+node[test=circle]
+{
+ symbol-shape: circle;
+}
+
Index: /trunk/test/data/renderer/node-shapes2/data.osm
===================================================================
--- /trunk/test/data/renderer/node-shapes2/data.osm (revision 12978)
+++ /trunk/test/data/renderer/node-shapes2/data.osm (revision 12978)
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/test/data/renderer/node-shapes2/style.mapcss
===================================================================
--- /trunk/test/data/renderer/node-shapes2/style.mapcss (revision 12978)
+++ /trunk/test/data/renderer/node-shapes2/style.mapcss (revision 12978)
@@ -0,0 +1,35 @@
+meta {
+ title: "MapCSS tests: node symbols";
+}
+
+node[ test:fill ]
+{
+ symbol-size: 50;
+ symbol-fill-color: purple;
+}
+node[ test:fill = circle ] { symbol-shape : circle ; } /* whitespace at all possible places */
+node[test:fill=square]{symbol-shape:square;} /* no whitespace at all */
+node[ test:fill = triangle ] { symbol-shape: triangle; }
+node[ test:fill = pentagon ] { symbol-shape: pentagon }
+node[ test:fill = hexagon ] { symbol-shape: hexagon; }
+node[ test:fill = heptagon ] { symbol-shape: heptagon; }
+node[ test:fill = octagon ] { symbol-shape: octagon; }
+node[ test:fill = nonagon ] {symbol-shape: nonagon; }
+node[ test:fill = decagon ] { symbol-shape: decagon; }
+
+node[ test:stroke ]
+{
+ symbol-size: 50;
+ symbol-stroke-color: purple;
+}
+node[ test:stroke = circle ] { symbol-shape: circle; }
+node[ test:stroke = square ] { symbol-shape: square; }
+node[ test:stroke = triangle ] { symbol-shape: triangle; }
+node[ test:stroke = triangle ] { symbol-shape: triangle; }
+node[ test:stroke = pentagon ] { symbol-shape: pentagon; }
+node[ test:stroke = hexagon ] { symbol-shape: hexagon; }
+node[ test:stroke = heptagon ] { symbol-shape: heptagon; }
+node[ test:stroke = octagon ] { symbol-shape: octagon; }
+node[ test:stroke = nonagon ] { symbol-shape: nonagon; }
+node[ test:stroke = decagon ] { symbol-shape: decagon; }
+
Index: /trunk/test/data/renderer/node-text2/data.osm
===================================================================
--- /trunk/test/data/renderer/node-text2/data.osm (revision 12978)
+++ /trunk/test/data/renderer/node-text2/data.osm (revision 12978)
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
Index: /trunk/test/data/renderer/node-text2/style.mapcss
===================================================================
--- /trunk/test/data/renderer/node-text2/style.mapcss (revision 12978)
+++ /trunk/test/data/renderer/node-text2/style.mapcss (revision 12978)
@@ -0,0 +1,55 @@
+
+/**
+ * Text placement test
+ */
+node[test=text-placement]::* {
+ font-size: 10;
+ text: auto;
+ symbol-shape: square;
+ symbol-size: 50;
+ symbol-fill-opacity: 0.0;
+}
+node[test=text-placement]::above_center {
+ text-anchor-vertical: above;
+ text-anchor-horizontal: center;
+ text-color: gold;
+}
+node[test=text-placement]::top_left {
+ text-anchor-vertical: top;
+ text-anchor-horizontal: left;
+ text-color: yellow;
+}
+node[test=text-placement]::top_right {
+ text-anchor-vertical: top;
+ text-anchor-horizontal: right;
+ text-color: green;
+}
+node[test=text-placement]::center_center {
+ text-anchor-vertical: center;
+ text-anchor-horizontal: center;
+ text-color: white;
+}
+node[test=text-placement]::center_right {
+ text-anchor-vertical: center;
+ text-anchor-horizontal: right;
+ text-color: magenta;
+}
+node[test=text-placement]::bottom_left {
+ text-anchor-vertical: bottom;
+ text-anchor-horizontal: left;
+ text-color: blue;
+}
+node[test=text-placement]::bottom_right {
+ text-anchor-vertical: bottom;
+ text-anchor-horizontal: right;
+ text-color: lime;
+}
+node[test=text-placement]::below_center {
+ text-anchor-vertical: below;
+ text-anchor-horizontal: center;
+ text-color: red;
+}
+node[test=text-placement] {
+ symbol-fill-color: blue;
+ symbol-fill-opacity: 0.4;
+}
Index: /trunk/test/data/renderer/relation-linkselector/data.osm
===================================================================
--- /trunk/test/data/renderer/relation-linkselector/data.osm (revision 12978)
+++ /trunk/test/data/renderer/relation-linkselector/data.osm (revision 12978)
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/test/data/renderer/relation-linkselector/style.mapcss
===================================================================
--- /trunk/test/data/renderer/relation-linkselector/style.mapcss (revision 12978)
+++ /trunk/test/data/renderer/relation-linkselector/style.mapcss (revision 12978)
@@ -0,0 +1,9 @@
+canvas {
+ default-points: false;
+ default-lines: true;
+}
+
+relation[test=role1] >[outer] way[test=role1_outer] { width: 4; color: navy; }
+
+relation[test=role1] >[role=inner][index=5] way { width: 4; color: lime; }
+
Index: /trunk/test/data/renderer/relation-parentselector/data.osm
===================================================================
--- /trunk/test/data/renderer/relation-parentselector/data.osm (revision 12978)
+++ /trunk/test/data/renderer/relation-parentselector/data.osm (revision 12978)
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/test/data/renderer/relation-parentselector/style.mapcss
===================================================================
--- /trunk/test/data/renderer/relation-parentselector/style.mapcss (revision 12978)
+++ /trunk/test/data/renderer/relation-parentselector/style.mapcss (revision 12978)
@@ -0,0 +1,11 @@
+canvas {
+ default-points: false;
+ default-lines: true;
+}
+
+area[landuse=quarry][test=parent] { fill-color : #aaa; }
+
+way[barrier=fence] { width: 2; color: #F0F050; }
+
+way[barrier=fence] < area[landuse=quarry][test=parent] { fill-color : #f70; }
+
Index: /trunk/test/data/renderer/way-dashes2/data.osm
===================================================================
--- /trunk/test/data/renderer/way-dashes2/data.osm (revision 12978)
+++ /trunk/test/data/renderer/way-dashes2/data.osm (revision 12978)
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/test/data/renderer/way-dashes2/style.mapcss
===================================================================
--- /trunk/test/data/renderer/way-dashes2/style.mapcss (revision 12978)
+++ /trunk/test/data/renderer/way-dashes2/style.mapcss (revision 12978)
@@ -0,0 +1,34 @@
+
+/**
+ * Dashes Test
+ * 1. Basic test - pattern should not be broken at way nodes
+ * 2. Transparent and with background color. The foreground and background dashes must not overlap.
+ * 3. Dashes offset - cuts off the first dash segment
+ */
+
+canvas {
+ default-points: false;
+ default-lines: false;
+}
+
+way[test=dash1] {
+ width: 10;
+ color: blue;
+ dashes: 30,4,17,14;
+}
+way[test=dash2] {
+ width: 10;
+ color: blue;
+ opacity: 0.3;
+ dashes: 30,4,17,14;
+ dashes-background-color: gold;
+ dashes-background-opacity: 0.3;
+}
+way[test=dash3] {
+ width: 10;
+ color: blue;
+ dashes: 30,4,17,14;
+ dashes-background-color: gold;
+ dashes-offset:30;
+}
+
Index: /trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (revision 12977)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (revision 12978)
@@ -117,5 +117,21 @@
/** Tests text along a way */
- new TestConfig("way-text", AREA_DEFAULT)
+ new TestConfig("way-text", AREA_DEFAULT),
+
+ /** Another test for node shapes */
+ new TestConfig("node-shapes2").setImageWidth(600),
+ /** Tests default values for node shapes */
+ new TestConfig("node-shapes-default"),
+ /** Tests node shapes with both fill and stroke combined */
+ new TestConfig("node-shapes-combined"),
+ /** Another test for dashed ways */
+ new TestConfig("way-dashes2"),
+ /** Tests node text placement */
+ new TestConfig("node-text2"),
+ /** Tests relation link selector */
+ new TestConfig("relation-linkselector"),
+ /** Tests parent selector on relation */
+ new TestConfig("relation-parentselector")
+
).map(e -> new Object[] {e, e.testDirectory})
.collect(Collectors.toList());
@@ -162,11 +178,11 @@
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;
+ pb.extend(Main.getProjection().latlon2eastNorth(testConfig.getTestArea().getMin()));
+ pb.extend(Main.getProjection().latlon2eastNorth(testConfig.getTestArea().getMax()));
+ double scale = (pb.maxEast - pb.minEast) / testConfig.imageWidth;
RenderingHelper.StyleData sd = new RenderingHelper.StyleData();
sd.styleUrl = testConfig.getStyleSourceUrl();
- RenderingHelper rh = new RenderingHelper(dataSet, testConfig.testArea, scale, Collections.singleton(sd));
+ RenderingHelper rh = new RenderingHelper(dataSet, testConfig.getTestArea(), scale, Collections.singleton(sd));
rh.setFillBackground(false);
BufferedImage image = rh.render();
@@ -180,6 +196,6 @@
// now compute differences:
- assertEquals(IMAGE_SIZE, reference.getWidth());
- assertEquals(IMAGE_SIZE, reference.getHeight());
+ assertEquals(image.getWidth(), reference.getWidth());
+ assertEquals(image.getHeight(), reference.getHeight());
StringBuilder differences = new StringBuilder();
@@ -246,6 +262,8 @@
private static class TestConfig {
private final String testDirectory;
- private final Bounds testArea;
+ private Bounds testArea;
private final ArrayList fonts = new ArrayList<>();
+ private DataSet ds;
+ private int imageWidth = IMAGE_SIZE;
TestConfig(String testDirectory, Bounds testArea) {
@@ -254,4 +272,13 @@
}
+ TestConfig(String testDirectory) {
+ this.testDirectory = testDirectory;
+ }
+
+ public TestConfig setImageWidth(int imageWidth) {
+ this.imageWidth = imageWidth;
+ return this;
+ }
+
public TestConfig usesFont(String string) {
this.fonts.add(string);
@@ -272,5 +299,15 @@
public DataSet getOsmDataSet() throws FileNotFoundException, IllegalDataException {
- return OsmReader.parseDataSet(new FileInputStream(getTestDirectory() + "/data.osm"), null);
+ if (ds == null) {
+ ds = OsmReader.parseDataSet(new FileInputStream(getTestDirectory() + "/data.osm"), null);
+ }
+ return ds;
+ }
+
+ public Bounds getTestArea() throws FileNotFoundException, IllegalDataException {
+ if (testArea == null) {
+ testArea = getOsmDataSet().getDataSourceBounds().get(0);
+ }
+ return testArea;
}