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

1474 commits

Author SHA1 Message Date
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