sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9547 commits 112 branches 95 tags 181 MiB
Commit graph

1605 commits

Author SHA1 Message Date
Dane Springmeyer
b8a0c16213 add visual test for wrap-character - refs #2333 2014-09-19 16:55:34 -07:00
Dane Springmeyer
0c901f790e respect halo-transform in grid_renderer 2014-09-19 15:37:13 -07:00
Dane Springmeyer
fee3a5568c add an inline postgis test 2014-09-19 15:26:07 -07:00
Dane Springmeyer
de717d5d1b update visual tests after #2377 2014-09-19 15:21:14 -07:00
Dane Springmeyer
d91bf978fd minor visual test updates after #2416 2014-09-19 14:52:00 -07:00
Dane Springmeyer
753cd5d6a0 Merge pull request #2416 from mapycz/add-font-features 
add font-feature-settings
 2014-09-19 14:30:17 -07:00
Dane Springmeyer
f67e300286 Merge pull request #2418 from mapycz/fix-image-painted 
fix image painted
 2014-09-19 14:07:39 -07:00
Dane Springmeyer
ce5926f8bc Merge pull request #2421 from strk/master-srid-in-test 
Add missing input srid in test
 2014-09-19 13:49:08 -07:00
Dane Springmeyer
07a152f044 visual tests: test grids + 2x scale_factor 2014-09-18 15:26:50 -07:00
Dane Springmeyer
013aea0e18 fix feature test to expect exception 2014-09-18 14:44:38 -07:00
Jiri Drbalek
9a85d7dab2 update visual tests 2014-09-17 19:33:30 +00:00
Jiri Drbalek
57be44d815 text ligatures off when character-spacing > 0 2014-09-17 19:22:14 +00:00
Jiri Drbalek
81dcb4e3e1 add visual test font-feature-settings 2014-09-17 19:22:14 +00:00
Sandro Santilli
576e56ec17 Add missing input srid in test 
Happens to work without srid specification due to && operator not
re-checking in newer postgis, but would fail with older postgis.
 2014-09-17 15:48:16 +02:00
Jiri Drbalek
dc57f7251c add c++ test image painted 2014-09-16 18:57:29 +02:00
artemp
cdf6cf6e99 fix feature_test 2014-09-12 17:22:02 +01:00
Dane Springmeyer
7fdae08ce1 unmask now fixed raster warping test - amends db39528231 - refs #1913 2014-09-11 10:22:19 -07:00
artemp
246336d2b1 Merge branch 'min-dist-compatibility' of git://github.com/MapQuest/mapnik into MapQuest-min-dist-compatibility 2014-09-10 16:20:36 +01:00
Jordan Hollinger
9b5a9dfe3e Change text-margin option to margin. 2014-09-10 07:45:41 -04:00
Dane Springmeyer
479b9e13d0 Merge pull request #2383 from MapQuest/min-dist-compatibility 
3.x -> 2.3.x compatibility for minimum-distance
 2014-09-06 22:50:13 -07:00
Dane Springmeyer
54b2880e53 markers: support offset, geometry-transform, and simplify - closes #2108 2014-09-06 21:27:15 -07:00
Dane Springmeyer
43795532e5 get visual tests running on windows 2014-09-06 23:04:01 +00:00
Dane Springmeyer
8b059b0d42 initial tests for marker avoid-edges - 2727eddf9 2014-09-05 09:25:34 -07:00
Dane Springmeyer
492e084714 add copy ctor to rule: avoids last copy of syms in load_map - closes #1293 2014-09-04 22:03:54 -07:00
Dane Springmeyer
1c0de9e978 add visual test for fitting markers between text - refs #1666 2014-09-04 20:35:14 -07:00
Dane Springmeyer
1b8e74e8a9 Merge branch 'master' of github.com:mapnik/mapnik 2014-09-04 20:02:42 -07:00
Dane Springmeyer
25a41ae31b restore value hash + add test harness 2014-09-04 19:38:53 -07:00
Dane Springmeyer
3025b0e9e4 fix save_map test on windows 2014-09-05 02:34:25 +00:00
Dane Springmeyer
cdefc71488 Revert "start fixing visual tests to run on windows" 
This reverts commit 79c6ab46a5.
 2014-09-04 16:40:28 -07:00
Dane Springmeyer
7ee9f3268a Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-09-04 13:06:02 -07:00
Dane Springmeyer
f73eef6f7a rollback png8 default in 2.3.x - closes #2110 2014-09-04 12:08:47 -07:00
Dane Springmeyer
2cc7c5a4f7 attempt to get all save_map tests working cross platform 2014-09-04 09:48:04 -07:00
Dane Springmeyer
7d5d02e031 Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-09-04 09:22:53 -07:00
Dane Springmeyer
b6bd5d744e travis: more debugging of mapnik-test-data 2014-09-03 12:29:10 -07:00
Dane Springmeyer
55a0ce5fdb update visual tests after #2399 2014-09-03 11:57:24 -07:00
Dane Springmeyer
21d213a653 travis: debug mapnik-test-data 2014-09-02 13:17:35 -07:00
Dane Springmeyer
27fbd2dcbe add https://github.com/mapbox/mapnik-test-data to tests - /cc @GretaCB 2014-09-02 11:55:09 -07:00
Dane Springmeyer
58a8f19b16 add csv test with utf8 data inlined 2014-08-31 20:28:51 -07:00
Dane Springmeyer
4227862660 fix broken path remove on windows 2014-08-31 20:24:41 -07:00
Dane Springmeyer
dbdf9c8180 don't test whitespace 2014-08-31 20:14:15 -07:00
Dane Springmeyer
cfe79a6fe3 make sure postgis test does not run on windows if no server is availabl 2014-08-31 20:09:16 -07:00
Dane Springmeyer
79c6ab46a5 start fixing visual tests to run on windows 2014-08-31 08:08:52 +00:00
Dane Springmeyer
3004dfc8c1 fix conversions test with msvs 2014 2014-08-29 18:52:52 -07:00
Dane Springmeyer
8d7bf7a8da fix imagedata visability on windows 2014-08-29 11:01:04 -07:00
Dane Springmeyer
8e8bc6c745 dodge linking error with image_data on windows - refs #2396 2014-08-28 20:52:18 -07:00
Dane Springmeyer
e146dee620 c++ style 2014-08-28 19:06:03 -07:00
artemp
ecfaec1027 rename ctrans.hpp to view_transform.hpp 2014-08-28 10:29:04 +01:00
artemp
de22d5900c rename CoordTransform to view_transform to better reflect its purpose and be consistent 2014-08-28 10:17:15 +01:00
Dane Springmeyer
9b782d05f4 Merge pull request #2382 from IvanSanchez/master 
Testcase for polygon rings winding order
 2014-08-26 21:28:25 -07:00
Dane Springmeyer
6b86b10a3f ptree parser does not trim CDATA the same, so remove trailing whitespace to avoid test failures in save_map_test.py 2014-08-26 08:43:57 -07:00
Dane Springmeyer
6bdb2ebbf1 Add visual test 2014-08-25 17:36:22 -07:00
Dane Springmeyer
8e996e10ab add support for windows unicode paths in rapidxml loader 
Conflicts:
	src/rapidxml_loader.cpp
 2014-08-25 15:43:43 -07:00
Dane Springmeyer
1011e9d3c7 Add from_geojson test that validates current behavior - refs #2390 2014-08-25 12:04:35 -07:00
Dane Springmeyer
f6eca08c8d remove svg renderer test since its not actually asserting anything useful 2014-08-24 13:46:33 -07:00
Dane Springmeyer
d02f29255c add visual test mimicking a typographic map 
- Helps prepare for #2377 more
 - More details on typographic maps at http://store.axismaps.com
 - See also #2385 and #678
 2014-08-22 13:52:52 -07:00
Jordan Hollinger
cf8d1873bc Update visual test repeat-labels-1 to test minimum-distance functionality. 2014-08-22 10:53:00 -04:00
Iván Sánchez Ortega
dd4e2336c4 Added test case for winding order of polygon rings. See mapnik/mapnik#2371 and mapbox/tilemill#2110. 2014-08-22 16:31:01 +02:00
Dane Springmeyer
3e7f66c4a6 fix visual tests (removing accidental debug boxes) 2014-08-21 22:45:25 -07:00
Dane Springmeyer
7b56c71b89 add visual test for #983 2014-08-21 22:42:57 -07:00
Jordan Hollinger
a28d3dd99c Handle text-margin, repeat-distance, and backward compatible minimum-distance in placement_finder. Update visual tests. 2014-08-21 20:49:00 -04:00
Dane Springmeyer
aa11335e70 ensure positions (multidimensional coords) works - refs #2319 2014-08-20 12:44:24 -07:00
Dane Springmeyer
889be25706 remove unneccessary error trapping 2014-08-20 12:40:29 -07:00
Dane Springmeyer
d5f7eeef6c tests for reversed order of type/coordinates in geojson geometry - refs #2319 2014-08-20 12:11:55 -07:00
Dane Springmeyer
144d9a41f0 update expected test after 41064ed49d 2014-08-19 08:35:57 -07:00
Dane Springmeyer
e768117862 update expected image after pixel snapping change 2014-08-18 20:11:20 -07:00
Dane Springmeyer
41064ed49d pixel snapping for shields (and points) - closes #1866/refs #1316/amends 2fcd53134 2014-08-18 19:45:21 -07:00
Dane Springmeyer
d6c59d96ec fix simply option + tests for #1484 and #1992 2014-08-18 19:23:50 -07:00
artemp
801848ac97 Merge branch 'jh-min-repeat-distance' of git://github.com/MapQuest/mapnik into MapQuest-jh-min-repeat-distance 
Conflicts:
	include/mapnik/renderer_common/process_group_symbolizer.hpp
	src/text/text_properties.cpp
 2014-08-18 14:05:14 +01:00
Dane Springmeyer
a4c926ac8a don't throw for OGR layers with no features - refs #2260 #2352 #2354 
Conflicts:
	tests/python_tests/ogr_test.py
 2014-08-15 19:49:33 -07:00
Dane Springmeyer
faeb12f5e9 tests: fix warnings in pgraster test 2014-08-14 12:53:33 -07:00
Dane Springmeyer
9c0f315588 clean up icu singletons to avoid valgrind seeing memory leak in hb_shape 2014-08-14 12:47:51 -07:00
Dane Springmeyer
0d47deb169 fix pgraster/postgis logic to skip tests if there is no postgres server running 2014-08-13 09:04:54 -07:00
Dane Springmeyer
5db9daaff1 fix compile error in svg_renderer_tests/path_element_test.cpp - refs #2355 2014-08-12 23:37:29 -07:00
Dane Springmeyer
7da05accc0 Merge branch 'master' of github.com:mapnik/mapnik into custom-variant-2 2014-08-12 23:19:26 -07:00
Dane Springmeyer
78258a9459 quiet pgraster tests by default 2014-08-12 20:30:21 -07:00
Dane Springmeyer
4e12b999f0 pull in pgraster plugin by @strk from 2.3.x to master/3.x - refs #2329 #1660 2014-08-12 15:03:51 -07:00
Dane Springmeyer
8b6a0a32f6 improve interior position algorithm - patch from @mrwojo - closes #2137 2014-08-12 14:42:51 -07:00
Dane Springmeyer
a000df5e46 add testcase from #2137 2014-08-12 14:33:59 -07:00
artemp
6136a32092 Merge branch 'master' into custom-variant-2 2014-08-12 19:44:37 +01:00
Dane Springmeyer
c604e925f5 apply #2350 to master/3.x too 2014-08-12 11:44:34 -07:00
Dane Springmeyer
072a914906 add visual test confirming ttc are read okay - refs #2274 2014-08-12 11:34:48 -07:00
Dane Springmeyer
5b3340413b update visual tests after fix in 04e4b47 - refs #2348 2014-08-12 11:33:52 -07:00
Dane Springmeyer
3715217b2d Add string2bool test 2014-08-12 11:32:34 -07:00
Dane Springmeyer
bd66ead3fd adapt csv tests to boolean change - refs #1540 2014-08-12 11:32:02 -07:00
artemp
95cea92a4a convert all boost::variant to util::variant 
apart from topojson (TODO)
 2014-08-12 13:40:45 +01:00
Dane Springmeyer
f76ea12700 enable other test from #2349 2014-08-11 23:08:17 -07:00
Dane Springmeyer
01c6b42269 Merge pull request #2349 from plepe/allow-overlap-ignore-placement 
allow-overlap, ignore-placement
 2014-08-11 19:54:51 -07:00
Dane Springmeyer
a966929571 add license ref for NotoSans 2014-08-11 19:26:26 -07:00
Dane Springmeyer
19c6e26c5c tests for ttc support in master/3.x - refs #2274 2014-08-11 19:25:30 -07:00
Jordan Hollinger
c63e3a55f1 Merge branch 'master' of github.com:mapnik/mapnik into jh-min-repeat-distance 2014-08-11 17:43:51 -04:00
Dane Springmeyer
7a0d316593 update visual tests after fix from 9a1639a1d6 2014-08-11 11:47:11 -07:00
Stephan Bösch-Plepelits
ec3a2dd08b Tests for PointSymbolizer.allow-overlap and .ignore-placement with expr 2014-08-11 15:55:38 +02:00
Jordan Hollinger
726274c2c9 Merge branch 'master' of github.com:mapnik/mapnik into jh-min-repeat-distance 2014-08-11 09:48:04 -04:00
Stephan Bösch-Plepelits
7815d9c6f0 Tests for TextSymbolizer.allow-overlap: true/false/expr 2014-08-11 15:40:52 +02:00
artemp
eff7fb2f94 Merge branch '3.x-szn-markers-symbolizer-vertex-placements' of git://github.com/mapycz/mapnik into mapycz-3.x-szn-markers-symbolizer-vertex-placements 2014-08-08 12:15:53 +01:00
artemp
09e78e3ee9 remove unused includes 2014-08-08 12:14:11 +01:00
Jiri Drbalek
04effe9a36 remove duplicate import 2014-08-08 06:34:33 +00:00
Jiri Drbalek
3e5b850328 visual tests - markers placement methods vertex-first and vertex-last 2014-08-08 06:34:33 +00:00
Dane Springmeyer
b172129026 fix visual tests 2014-08-06 13:11:08 -07:00
Dane Springmeyer
eb2393f6a3 remove silly string compare between features (attributes is more explicit) 2014-08-06 11:40:45 -07:00
artemp
0490b7887c text_symbolizer - ``geometry-transform`` support 2014-08-06 14:54:38 +01:00
Dane Springmeyer
9efed3edaf visual tests for patterns + svg - refs #1010 2014-08-05 14:02:57 -07:00
Dane Springmeyer
76bd45fa30 fix order of smooth/offset - same bug as #2202 but for patterns 2014-08-05 13:54:10 -07:00
Dane Springmeyer
2a7fc29e42 add support for opacity with svgs in pattern symbolizers - refs #1010 2014-08-05 13:48:40 -07:00
Dane Springmeyer
2f9bb66ab0 update expected test images for patterns after cairo fixes - refs #1386 and #1010 2014-08-05 12:34:57 -07:00
Dane Springmeyer
99a46f6910 re-enable glyph_info caching - refs #2326, #2265, #2334 2014-08-04 19:50:16 -07:00
Dane Springmeyer
05f49f9cac visual tests - keep default debug severity levels 2014-08-04 19:18:38 -07:00
Dane Springmeyer
fb12fc8b68 default to global alignment for polygon patterns - refs #2325 2014-08-04 16:20:12 -07:00
Dane Springmeyer
75248e3376 remove obsolete wrap-character option for text symbolizer - closes #2333 2014-08-04 12:52:46 -07:00
Dane Springmeyer
2b1ab49463 finish python bindings + tests for #1448 and #1432 2014-08-04 12:10:26 -07:00
Dane Springmeyer
532c03552d remove invalid csv line 2014-08-03 21:28:36 -07:00
Jordan Hollinger
8c052878b1 Add additional test cases to demonstrate use of new attribute repeat-distance by itself and combined with minimum-distance. 2014-08-03 16:11:22 -04:00
jhollinger2
0aad860a75 Add repeat-distance to text symbolizer properties. 
Update collision detector to handle minimum-distance and repeat-distance seperately.
Update placement_finder to use repeat-distance.
Update group symbolizer to handle minimum-distance and repeat-distance.
 2014-08-03 16:10:21 -04:00
jhollinger2
9f741c21b5 Change back the logger severity. 2014-08-03 15:27:55 -04:00
Jordan Hollinger
c35658050f Add test cases to demonstrate repeated labels with and without minimum-distance. 2014-08-03 12:52:32 -04:00
Stephan Bösch-Plepelits
002c90f6a5 Tests: expressions for horizontal- and vertical-alignment (and dy) 2014-08-01 13:19:32 +02:00
Stephan Bösch-Plepelits
ec39301d5e Tests: expressions for horizontal-alignment in TextSymbolizer 2014-08-01 10:07:43 +02:00
Dane Springmeyer
c6a291271f fix conditional pixel snapping for marker rasters 2014-07-31 00:49:00 -07:00
Dane Springmeyer
cc0e9d53a0 add debug symbolizer to group symbolizer visual tests 2014-07-31 00:20:28 -07:00
Dane Springmeyer
9ac581a67e update marker tests after d685307250 + add collision boxes to variety of test images 2014-07-30 23:46:12 -07:00
Dane Springmeyer
d685307250 fix regression in raster marker collision box placement - refs #2295 2014-07-30 22:50:01 -07:00
Dane Springmeyer
f1cffaeb1f Start fixing placement of raster markers with cairo renderer 2014-07-30 21:57:16 -07:00
Dane Springmeyer
d793539497 Add marker-symbolizer with raster + expressions test 2014-07-30 21:30:54 -07:00
Dane Springmeyer
2a18280dc5 Add support for dynamic expressions for dasharrays - closes #2168 2014-07-30 16:02:23 -07:00
Dane Springmeyer
b7ecd00c31 complete support for face-name/fontset-name in <Format> node - closes #1900 2014-07-30 14:16:32 -07:00
Dane Springmeyer
350c2c29bd drop karma confix + solve conflicting spirit headers - closes #2323 2014-07-30 13:06:08 -07:00
Dane Springmeyer
65452698ff visual tests: generate failure report even if you ctrl-c the process early 2014-07-29 17:23:09 -07:00
Dane Springmeyer
0215a3cf04 stop accidentally overwriting expected test images 2014-07-29 17:22:36 -07:00
Dane Springmeyer
13c59729ae Merge pull request #2321 from plepe/bug-1900 
Visual tests for issue #1900 (face-name and fontset-name in Format)
 2014-07-29 17:06:02 -07:00
Dane Springmeyer
1fa31d5d20 remove force-odd-labels - refs #2120 2014-07-29 14:37:29 -07:00
Dane Springmeyer
8cae95d98d disable failing test until #2319 is fixed 2014-07-29 14:36:58 -07:00
Stephan Bösch-Plepelits
a48ed22a06 Use points.csv instead of points.osm 
- for mapnik/mapnik#1900
 2014-07-29 14:46:14 +02:00
Stephan Bösch-Plepelits
8a5f03b923 Visual Tests for issue mapnik/mapnik#1900 
Conflicts:
	tests/visual_tests/test.py
 2014-07-29 12:47:20 +02:00
Dane Springmeyer
e525ca28b5 Re-instate skipping of proj_transform failures - closes #2147 2014-07-28 20:46:30 -07:00
Dane Springmeyer
cdb075f75f make clipping off by default - closes #2146 2014-07-28 20:31:10 -07:00
Dane Springmeyer
8feedd94cd rename mapnik::boolean to mapnik::boolean_type - closes #1899 2014-07-28 19:46:49 -07:00
Dane Springmeyer
51be686f6c remove paths-from-xml option in load_map parsing - closes #1893 2014-07-28 19:33:48 -07:00
Dane Springmeyer
914b4c2e8b support for inline topojson (in memory string) - closes #2058 2014-07-28 19:26:35 -07:00
Dane Springmeyer
3cb26311fb fix topojson tests 2014-07-28 19:14:12 -07:00
Dane Springmeyer
7521243a7a visual test for text-halo-transform - refs #2125 2014-07-28 18:56:57 -07:00
Dane Springmeyer
8ae5d322db fix geojson plugin by avoiding static const grammar for now 2014-07-28 18:44:55 -07:00
Dane Springmeyer
c8ecff7ba1 reduce tolerance of cairo test on linux - closes #2302 2014-07-28 17:05:15 -07:00
Dane Springmeyer
7f0029eb0b implement inline (in-memory string) support for GeoJSON plugin - refs #2058 2014-07-28 16:16:10 -07:00
Dane Springmeyer
ba1127ea57 add (currently failing) test for #2319 2014-07-28 16:15:34 -07:00
Dane Springmeyer
ddda3dc56d fix geojson plugin test 2014-07-28 13:07:27 -07:00
Dane Springmeyer
34bbf36e3a Revert "return code 0 to gracefully exit if python bindings are not available" 
This reverts commit 2f08dc29ef.

Conflicts:
	tests/run_tests.py
	tests/visual_tests/test.py
 2014-07-25 11:49:05 -07:00
artemp
e6a21253e1 tests fix : rename ExpressionFormat to Format 2014-07-25 14:29:46 +01:00
Dane Springmeyer
ae1c88fb13 fix import 2014-07-24 19:00:15 -07:00
Dane Springmeyer
2f08dc29ef return code 0 to gracefully exit if python bindings are not available 2014-07-24 18:58:03 -07:00
Dane Springmeyer
c5be70ff65 refactor spirit grammars 2014-07-24 14:31:59 -07:00
Dane Springmeyer
8dcd85a708 iwyu 2014-07-23 14:02:36 -07:00
Dane Springmeyer
cccb610976 fix xml round-tripping test 2014-07-23 13:00:34 -07:00
Dane Springmeyer
97b27c54c0 fix compile of svg renderer tests 2014-07-23 12:36:36 -07:00
artemp
8502019310 more format_properties expessions 2014-07-23 18:09:18 +01:00
artemp
e67f046a0e start re-factoring char_property (TODO: change name!) 2014-07-23 16:19:14 +01:00
Dane Springmeyer
3de2457799 fwd declare layer 2014-07-22 23:11:12 -07:00
Dane Springmeyer
64e70fb374 iwyu 2014-07-22 22:40:39 -07:00
Dane Springmeyer
62324714c1 dodge unimportant failing test (should throw) with old proj4 - closes #2309 2014-07-22 14:58:12 -07:00
Dane Springmeyer
d770afdb0d lower visual test threshold for agg on linux - refs #2309 2014-07-22 14:55:06 -07:00
Dane Springmeyer
ed6e16b92c again even smaller text size for lohit bengali test - refs #2309 2014-07-22 14:53:30 -07:00
Dane Springmeyer
f86ef33307 smaller text size for lohit bengali test - refs #2309 2014-07-22 14:52:34 -07:00
Dane Springmeyer
8301e28b13 more marker tests on polygons - able to detect change from ecc5acbdb9 2014-07-22 12:17:40 -07:00
Dane Springmeyer
006c460c9c fix use of comp-op as data-driven expression 2014-07-22 10:52:30 -07:00
artemp
8cc9b06e12 visual tests: update to reflect #2308 change 2014-07-22 11:02:08 +01:00
Dane Springmeyer
0b1ad62cf5 Merge pull request #2300 from strk/master-false-negatives 
Fix false negative responses from python tests
 2014-07-14 19:43:11 -07:00
Dane Springmeyer
998b10be12 fix compile of svg test 2014-07-14 11:42:23 -07:00
Sandro Santilli
cd21789111 Fix false negative responses from python tests 
Closes #2298
 2014-07-14 18:34:20 +02:00
artemp
4afd98a34a text_properties : store 'orientation' parameter in symbolizer_base::value_type 2014-07-11 14:43:56 +01:00
artemp
fe215a684e c++11 style : replace (almost) all typedef with type alias's 2014-07-07 18:23:15 +01:00
Dane Springmeyer
5688a93858 update expected text images - refs #2277 #2276 2014-06-20 20:29:01 -07:00
Dane Springmeyer
8c3683f41f updated expected test images after #2272 2014-06-19 16:41:45 -07:00
Dane Springmeyer
f523acdee4 add testcase for halo-comp-op - refs #2267 2014-06-19 16:28:28 -07:00
Dane Springmeyer
e974279f1a update expected images again (not sure what went wrong before) refs #1313 - amends 66905ca69f 2014-06-19 10:23:23 -07:00
Dane Springmeyer
66905ca69f update expected images after 68a5cc55a6 - refs #1313 2014-06-19 09:53:07 -07:00
Dane Springmeyer
118cce8d58 add test for #2240 2014-06-17 22:19:17 -07:00
Dane Springmeyer
6571508576 Merge branch 'master' of github.com:mapnik/mapnik 2014-06-17 21:42:42 -07:00
artemp
6669765ce1 visual tests : add text-halo-opacity 2014-06-17 17:22:05 +01:00
Dane Springmeyer
6e6c9f21ac improve png comparison tests 
Conflicts:
	tests/python_tests/png_encoding_test.py
 2014-06-16 09:52:26 -07:00
Dane Springmeyer
cc874364b2 allow external image data - refs #2002 
Conflicts:
	include/mapnik/image_data.hpp
	tests/cpp_tests/image_io_test.cpp
 2014-06-16 09:52:25 -07:00
artemp
3ded23fbab move make_unique out of std namespace and allow building with c++14 compilers 
( -std=c++1y )
 2014-06-12 15:14:05 +01:00
Dane Springmeyer
d0b357cab7 scons: support MAPNIK_NAME option to customize libmapnik name for custom packaging 2014-06-09 13:55:56 -07:00
artemp
b6bab7d0bb move cairo renderer into its own subdir 2014-06-06 13:38:00 +01:00
Dane Springmeyer
961e160ff9 update test image after #2264 2014-06-05 11:26:30 -07:00
artemp
6297c72f02 preserve old MemoryDatasource interface in Python 2014-05-30 11:03:57 +01:00
artemp
f9cf23b59f memory_datasource: support datasource interface 2014-05-30 10:16:49 +01:00
Dane Springmeyer
f88e602dcc more tests for handling of empty Parameters 2014-05-28 14:32:52 -07:00
artemp
aa5bff2a3f fix test name 2014-05-28 15:23:36 +01:00
artemp
01ac0fb7d9 more copy/move tests 2014-05-28 15:19:14 +01:00
artemp
d311fa11cd initial copy/move test 2014-05-28 11:24:50 +01:00
Dane Springmeyer
6610fcc297 fix skipping of empty text nodes in rapidxml parser (matches libxml2) - closes #2253 2014-05-23 10:42:55 -07:00
Dane Springmeyer
c0559a80bd tests for #2245 2014-05-16 12:22:48 -07:00
Dane Springmeyer
e300a41dca variables now available as postgis datasource tokens 2014-05-13 20:47:22 -07:00
Dane Springmeyer
2f8451b99a variables support for cairo/grid/svg 2014-05-13 18:24:17 -07:00
Dane Springmeyer
2c661ed3d5 support for render time variables 2014-05-11 13:08:24 -07:00
Dane Springmeyer
33acec6dcb make css_value_broken truly broken with latest mapnik - refs #2237 2014-05-05 17:12:45 -07:00
Dane Springmeyer
5ddde3c885 stop testing bogus wkb since it will crash wkb reader - refs #2236 2014-05-05 17:05:00 -07:00
Dane Springmeyer
ef837eb92f c++11 optimizations for faster map loading 2014-04-28 17:10:00 -07:00
Dane Springmeyer
5beac8fa2b update expecte test images accidentally overwritten from 2.3.x merge 2014-04-27 08:50:50 -07:00
Dane Springmeyer
10ce32696a add support for halo-rasterizer for shields - closes #2226 
Conflicts:
	src/load_map.cpp
	tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-1.0-agg-reference.png
	tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-2.0-agg-reference.png
 2014-04-25 16:07:03 -07:00
Dane Springmeyer
72fd84f872 write test output to tmp 2014-04-24 23:54:33 -07:00
Dane Springmeyer
4724eaaf9e update a few visual tests 2014-04-24 23:51:29 -07:00
Dane Springmeyer
9adbfa59e7 disable python symbolizer attribute access tests for now 2014-04-24 22:44:33 -07:00
Dane Springmeyer
297442b7c6 fix postgis tests 2014-04-24 22:24:22 -07:00
Dane Springmeyer
f7cd4ded03 disable python plugin tests since they are so brittle and I'm too impatient to fix 2014-04-24 22:22:37 -07:00
Dane Springmeyer
f3a824c2cc grid renderer: remove old method and fix tests 2014-04-24 22:18:36 -07:00
Dane Springmeyer
4502ef2c83 fix symbolizer introspection test 2014-04-24 22:09:07 -07:00
Dane Springmeyer
06bbedaffb fix raster colorizer access from python 2014-04-24 22:01:58 -07:00
Dane Springmeyer
874cd00a2d update a few visual tests 2014-04-24 21:53:17 -07:00
Dane Springmeyer
9e9747ffad Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 
Conflicts:
	src/agg/process_building_symbolizer.cpp
	src/cairo_context.cpp
	src/cairo_renderer.cpp
	src/grid/process_building_symbolizer.cpp
	src/grid/process_line_pattern_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
	tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
	tests/python_tests/images/support/marker-text-line-scale-factor-1.png
	tests/python_tests/images/support/marker-text-line-scale-factor-10.png
	tests/python_tests/images/support/marker-text-line-scale-factor-100.png
	tests/python_tests/images/support/marker-text-line-scale-factor-2.png
	tests/python_tests/images/support/marker-text-line-scale-factor-5.png
	tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
	tests/visual_tests/test.py
 2014-04-24 21:44:28 -07:00
Dane Springmeyer
67357568a5 move line rendering tests to visual tests 2014-04-24 21:00:00 -07:00
Dane Springmeyer
cc855ac7e2 update expected visual tests - 39737c5f1d accidentaly overwrote some using 2.3.x code 2014-04-24 19:16:00 -07:00
Dane Springmeyer
39737c5f1d Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	.travis.yml
	CHANGELOG.md
	bindings/python/build.py
	include/mapnik/feature_style_processor_context.hpp
	include/mapnik/feature_style_processor_impl.hpp
	include/mapnik/json/feature_collection_grammar.hpp
	include/mapnik/json/feature_collection_parser.hpp
	include/mapnik/json/feature_generator_grammar.hpp
	include/mapnik/json/feature_parser.hpp
	include/mapnik/json/geojson_generator.hpp
	include/mapnik/json/geometry_generator_grammar.hpp
	include/mapnik/json/geometry_parser.hpp
	plugins/input/gdal/gdal_featureset.cpp
	plugins/input/geojson/geojson_datasource.cpp
	plugins/input/occi/occi_featureset.cpp
	plugins/input/osm/osm_featureset.cpp
	plugins/input/postgis/build.py
	plugins/input/postgis/connection.hpp
	src/agg/agg_renderer.cpp
	src/build.py
	src/cairo_context.cpp
	src/datasource_cache.cpp
	src/grid/process_line_symbolizer.cpp
	src/grid/process_polygon_pattern_symbolizer.cpp
	src/grid/process_polygon_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/json/feature_grammar.cpp
	tests/cpp_tests/fontset_runtime_test.cpp
	tests/visual_tests/images/collision-600-400-1.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png
	tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png
	tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png
	tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png
	tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png
	tests/visual_tests/test.py
 2014-04-24 14:50:55 -07:00
Dane Springmeyer
83c0db36cb add support for rendering (vs skipping) 3D and 4D postgis geometries like POINTZM, LINESTRINGZM, and POLYGONZM - closes #44 2014-04-09 19:40:14 -04:00
Dane Springmeyer
0e8fa50215 update a few expected tests due to differences I presume are related to freetype version 2014-04-09 00:42:06 -04:00
Dane Springmeyer
fa745d9e76 update more expected tests - refs #2207 2014-04-09 00:32:45 -04:00
Dane Springmeyer
ca0f3da780 update expected test image - refs #2207 2014-04-08 23:15:49 -04:00
Dane Springmeyer
103e874f25 fix #2202 2014-04-03 17:15:57 -07:00
Dane Springmeyer
659772168b add (currently buggy) visual test images for #2202 2014-04-03 17:12:18 -07:00
Dane Springmeyer
a5ee9cbcb9 add testcase for #2202 2014-04-03 16:57:11 -07:00
Dane Springmeyer
e94876ebe4 Merge pull request #2160 from MapQuest/expr-v2-group-symbolizer 
Group Symbolizer
 2014-04-03 11:52:21 -07:00
Dane Springmeyer
2c8cf76808 update a few expected tests 2014-04-01 19:41:57 -07:00
Dane Springmeyer
af64692dcc visual test threshold of 2 on OS X 2014-04-01 18:15:31 -07:00
Dane Springmeyer
818e87dce4 update tests 2014-04-01 17:34:24 -07:00
Dane Springmeyer
e15e64a5a9 update test images after bc1c723 - refs #2196 2014-03-31 21:26:42 -07:00
Dane Springmeyer
947f7a4b33 use COMPUTE_THRESHOLD=0 on os x, update expected test images 2014-03-31 21:15:35 -07:00
Dane Springmeyer
1baeac34c7 use make_unique 2014-03-18 14:10:02 -07:00
Dane Springmeyer
c9e3248cec more auto_ptr usage to avoid bare geometry pointers 2014-03-12 13:11:51 -07:00
Dane Springmeyer
66654683a2 work in progress: fix some expressions tests disable others 2014-03-10 13:30:49 -07:00
Dane Springmeyer
811e93cdc4 update visual tests against freetype 2.5.3 2014-03-10 11:38:42 -07:00
Dane Springmeyer
6433d9482e Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 
Conflicts:
	include/mapnik/symbolizer.hpp
	src/agg/agg_renderer.cpp
	src/agg/process_line_pattern_symbolizer.cpp
	src/agg/process_line_symbolizer.cpp
	src/agg/process_polygon_pattern_symbolizer.cpp
	src/agg/process_polygon_symbolizer.cpp
	src/cairo_renderer.cpp
	src/feature_type_style.cpp
	src/grid/process_line_pattern_symbolizer.cpp
	src/grid/process_line_symbolizer.cpp
	src/grid/process_markers_symbolizer.cpp
	src/grid/process_polygon_pattern_symbolizer.cpp
	src/grid/process_polygon_symbolizer.cpp
 2014-03-10 00:05:56 -07:00
Oliver Tonnhofer
5dedae4320 testcase for #2170 2014-03-08 19:54:05 -08:00
Dane Springmeyer
21555b51c2 avoid double application of scale_factor - refs #1926 2014-02-27 13:28:25 -08:00
Dane Springmeyer
0d122c9878 update more tests after e49f63730e - refs #1926 2014-02-27 13:28:17 -08:00
Dane Springmeyer
3dd05bd171 support scale_factor in geometry-transform translate and scale - refs #1926 2014-02-27 13:28:03 -08:00
Dane Springmeyer
b1cfe548b0 avoid double application of scale_factor - refs #1926 2014-02-27 13:20:58 -08:00
Dane Springmeyer
f7a0dadf33 update more tests after e49f63730e - refs #1926 2014-02-27 13:08:45 -08:00
Dane Springmeyer
e49f63730e support scale_factor in geometry-transform translate and scale - refs #1926 2014-02-27 11:55:58 -08:00
Dane Springmeyer
277ae93d2c make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165 
Conflicts:
	src/agg/agg_renderer.cpp
 2014-02-27 11:17:09 -08:00
Dane Springmeyer
4e957c9cac make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165 2014-02-27 10:11:17 -08:00
Jordan Hollinger
533820c63f Merge branch 'expr-v2' of github.com:mapnik/mapnik into expr-v2-group-symbolizer 
Conflicts:
	src/text/placement_finder.cpp
	tests/visual_tests/test.py
 2014-02-25 14:21:51 -05:00
Jordan Hollinger
08ea56996a Add shield symbolizer support in group symbolizer processing. 
Update some test cases to use ShieldSymbolizer instead of point and text.
 2014-02-25 08:53:35 -05:00
Dane Springmeyer
14c02e76a7 Merge pull request #2138 from MapQuest/jmh-text-layouts 
Multiple text layouts in text symbolizer
 2014-02-18 17:59:56 -08:00
Jordan Hollinger
07dc6e37a2 Merge branch 'expr-v2' of github.com:mapnik/mapnik into expr-v2-group-symbolizer 
Conflicts:
	include/mapnik/attribute_collector.hpp
 2014-02-18 18:22:01 -05:00
Matt Amos
a25b480593 Python interface for group symbolizer. 
Boost::Python interface, and added a test to check that it works.
Looks like it fails at the moment due to other changes - a lot of
the python symbolizer tests show the same thing.
 2014-02-18 16:38:58 -05:00
Jordan Hollinger
bbd2cfd40f Grid renderer implementation for group symbolizer. 
This uses common process_group_symbolizer for most of the work.
Add reference grids for visual tests.
 2014-02-18 16:37:41 -05:00
Matt Amos
7e25a220a8 Implement debug symbolizer for Cairo. Update tests for debug symbolizer. 
Debug symbolizer is useful, and used in a bunch of tests. This
adds debug symbolizer support for Cairo to make it closer to the
capabilities of AGG.

Adding debug symbolizer for Cairo meant that red boxes appeared in
many of the visual test outputs. This commit replaces them with
the output, after visual inspection. They should now be closer to
the output of the AGG test cases.
 2014-02-18 15:53:55 -05:00
Matt Amos
44e69e9b05 Cairo renderer implementation of group symbolizer. 
This uses the renderer_common header to do most of the heavy
lifting, but otherwise is very similar to the AGG renderer
implementation.

Add cairo ref images for group symbolizer tests.
 2014-02-18 15:45:11 -05:00
Matt Amos
f8097748a4 Added more tests for group symbolizer. 
The first test shows how an obstacle under the group being displayed
will cause the whole group to not display. Above is an replica of
the same layout using non-grouped symbolizers, which shows that
only the parts which intersect the obstacle will not be drawn.

The second is a line placement test, which just tests placement
of groups on a line with variable spacing.

The third is a test of repeat key in group symbolizer.
The test shows two items with different repeat keys ("foo" and "bar")
and rows of other group symbolizers sensitive to either one. The
reference images show that the "bar"-sensitive rows are displaced
by the "bar" item, but not the "foo" item.
 2014-02-18 15:06:40 -05:00
Matt Amos
efc29649ab Added test for group symbolizer, fixed segfault. 
Segfault was due to `glyph_position` structs keeping a pointer to
`glyph_info` objects which went out of scope at a different time.
The (rather ugly) fix for the moment is to copy that information
into the thunk object.
 2014-02-18 14:06:05 -05:00
Stephan Bösch-Plepelits
96e5129c9a Create tests for point-symbolizer, using expressions for parameters 
- there are two versions:
  - point-symbolizer-expressions: file
  - point-symbolizer-expressions-all: additionally test
    allow-overlap, opacity, transform, ignore-placement, comp-op
    which are not supported right now
 2014-02-11 04:27:36 +01:00