Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix marker-multi-policy test. Closes #1612 #1613

Closed
wants to merge 1 commit into from

2 participants

@strk

The test was indeed bogus (didn't set bbox correctly).
I took the chance to also simplify the data.
Closes #1612

@strk

NOTE: the failing travis is unrelated (missing Rakefile)

@springmeyer
Owner

I would really prefer fixes go into master and then once clearly working then backported.

@strk

I've split up the tasks between the fix for whole multi-centroid computation and marker-multi-policy test running, so they don't mix up each other.
This one is safe to merge as it simply fixes the testcase.
#1615 is the equivalent for master.

The case used in that test is not affected by the "whole-multi-centroid" bug and I hadn't found an easy way to affect it, so gave up and added a new test for that bug instead.

@springmeyer
Owner

this one won't merge automatically. working on integrating manually.

@strk

Thanks a lot Dane, 2.1.1 is going to rock ! :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 29, 2012
  1. @strk
This page is out of date. Refresh to see the latest.
View
4 tests/visual_tests/data/marker-multi-policy.csv
@@ -1,3 +1,3 @@
i|wkt
-1|MULTIPOLYGON(((-10 -50,-21.7157287525381 -78.2842712474619,-49.9999999999999 -90,-78.2842712474618 -78.284271247462,-90 -50.0000000000001,-78.284271247462 -21.7157287525382,-50.0000000000002 -10,-21.7157287525383 -21.7157287525379,-10 -50)),((90 -50,78.2842712474619 -78.2842712474619,50.0000000000001 -90,21.7157287525382 -78.284271247462,10 -50.0000000000001,21.715728752538 -21.7157287525382,49.9999999999998 -10,78.2842712474617 -21.7157287525379,90 -50)),((90 50,50.0000000000001 10,10 49.9999999999999,49.9999999999998 90,90 50)))
-2|MULTIPOLYGON(((-52 40,-60 32,-68 40,-60 48,-52 40)),((-60 50,-80 30,-100 49.9999999999999,-80.0000000000001 70,-60 50)),((-52 60,-60 52,-68 60,-60 68,-52 60)))
+1|MULTIPOLYGON(((90 40,50 0,10 40,50 80,90 40)),((190 40,150 0,110 40,150 80,190 40)),((190 140,150 100,110 140,150 180,190 140)))
+2|MULTIPOLYGON(((48 130,40 122,32 130,40 138,48 130)),((40 140,20 120,0 140,20 160,40 140)),((48 150,40 142,32 150,40 158,48 150)))
View
BIN  tests/visual_tests/images/marker-multi-policy-600-reference.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  tests/visual_tests/styles/marker-multi-policy.xml
@@ -1,4 +1,4 @@
-<Map maximum-extent="-100,-100,100,100">
+<Map maximum-extent="0,0,190,180">
<Style name="each">
<Rule>
<Filter>[i] = 1</Filter>
View
3  tests/visual_tests/test.py
@@ -27,7 +27,8 @@
{'name': "lines-2", 'sizes': sizes_few_square},
{'name': "lines-3", 'sizes': sizes_few_square},
{'name': "lines-shield", 'sizes': sizes_few_square},
- {'name': "marker-multi-policy", 'sizes':[(600,400)]},
+ {'name': "marker-multi-policy", 'sizes':[(600,400)],
+ 'bbox': mapnik.Box2d(0, 0, 190, 180)},
{'name': "simple-E"},
{'name': "simple-NE"},
{'name': "simple-NW"},
Something went wrong with that request. Please try again.