Commit graph

11019 commits

Author SHA1 Message Date
Dane Springmeyer
5d7c43457e Merge pull request #2825 from mapycz/improve-interior
improve interior placement
2015-05-20 10:37:39 -07:00
Dane Springmeyer
6537183f86 Merge pull request #2827 from mapycz/visual-tests-parallel
visual tests: set number of parallel threads by JOBS environment variable
2015-05-20 10:17:00 -07:00
Dane Springmeyer
6a7d785557 Merge pull request #2826 from mapycz/improve-visual-test-3
improve visual tests
2015-05-20 10:16:52 -07:00
Dane Springmeyer
adf85264c1 Merge pull request #2832 from afflerbach/unused-nodes-error-message
Message about unused text nodes now also contains line numbers.
2015-05-20 10:08:21 -07:00
Jörg Afflerbach
b385c71789 Message about unused text nodes now also contains line numbers.
Helped me a lot when I needed to find a superfluous `-->` in a large `map.xml`.
2015-05-20 18:55:29 +02:00
artemp
a8a90b7656 use std::lock_guard instead of unique_lock (better fit for the job) 2015-05-20 16:12:22 +01:00
artemp
433741877d fix - use std::size_t to avoid narrowing 2015-05-20 11:31:41 +01:00
artemp
6c14ff9b7a fix char type 2015-05-20 11:31:24 +01:00
Dane Springmeyer
093d857ddc Add support for 64 bit field types in GDAL 2.0 - closes #2685 2015-05-19 22:39:39 -07:00
Jiri Drbalek
b5c2b98412 visual tests: set number of parallel threads by JOBS environment variable 2015-05-19 18:05:38 +00:00
Jiri Drbalek
5ad9b4531c visual tests: allow style paths in command line arguments 2015-05-19 17:30:58 +00:00
Jiri Drbalek
8519bde143 visual tests: drop config.cpp 2015-05-19 17:30:58 +00:00
Jiri Drbalek
3db7b0ca9b visual tests: use boost::filesystem::path for paths 2015-05-19 17:30:58 +00:00
Blake Thompson
c37720066d Merge pull request #2824 from zerebubuth/test/port-python-tests
Port some python tests
2015-05-19 08:33:43 -05:00
artemp
3ce65e8b65 rename view_to_string to view_to_stream and tempalate on stream type 2015-05-19 11:58:20 +01:00
artemp
05b5d16e87 more std::size_t fixes (consistent usage) 2015-05-19 11:43:39 +01:00
artemp
64979f24b7 use enumeration type ! 2015-05-19 11:30:51 +01:00
artemp
3b5a8f354f use std::size_t 2015-05-19 11:17:01 +01:00
Jiri Drbalek
efd554a04e interior placement: always compute center of the longest segment 2015-05-19 08:37:57 +00:00
Matt Amos
0db207d076 Bump submodule hash for new test data file. 2015-05-19 00:33:46 +01:00
Matt Amos
782a949543 Use approx when testing floating point approximate equality. 2015-05-18 22:53:11 +01:00
Matt Amos
369887428e Use REQUIRE_THROWS instead of manually checking with try/catch. 2015-05-18 22:40:34 +01:00
Matt Amos
26f233c505 Test failure on thrown exception is already handled by the test framework. 2015-05-18 22:37:13 +01:00
Matt Amos
2bb50371ca Need optional I/O header on clang++, apparently. 2015-05-18 22:34:34 +01:00
Matt Amos
a16b6156ed Ported CSV tests from Python. 2015-05-18 22:14:37 +01:00
Matt Amos
818ede5b93 Ported box2d_test.py 2015-05-18 15:10:55 +01:00
Matt Amos
8e62007e4f Added port of agg_rasterizer_integer_overflow_test.py 2015-05-18 14:46:01 +01:00
Matt Amos
468bc5257b Re-order libs to satify correct link order for ICU symbols from mapnik-json library. 2015-05-18 14:45:30 +01:00
artemp
bf6b7d79bd use if/else if ... 2015-05-18 11:21:56 +01:00
Dane Springmeyer
b2691f5906 Merge pull request #2819 from mapycz/fix-boost-scoped-enum
fix compilation error due to boost scoped enum with boost < 1.51
2015-05-18 00:07:28 -07:00
Dane Springmeyer
4034c7f1f0 Merge pull request #2820 from mapycz/fix-deprecation-warning
fix deprecation warning
2015-05-18 00:07:01 -07:00
Jiri Drbalek
5ab59c860d fix deprecation warning 2015-05-18 08:01:27 +00:00
Jiri Drbalek
848044e8c4 fix compilation error due to boost scoped enum with boost < 1.51 2015-05-17 19:44:48 +00:00
Dane Springmeyer
476e65e921 Merge pull request #2816 from zerebubuth/fix/boost-scoped-enum-c++11-abi
Fix compilation error due to Boost scoped enum & C++11 mode.
2015-05-16 17:20:57 -07:00
Matt Amos
a5cf088568 Fix compilation error due to Boost scoped enum & C++11 mode.
Boost versions before 1.57 are broken when the system package and Mapnik are compiled against different standards. On Ubuntu 14.04 using boost 1.54, it breaks scoped enums. It's a bit of a hack to just turn it off like this, but seems the only available work-around. See https://svn.boost.org/trac/boost/ticket/6779 for more details.
2015-05-16 21:41:40 +01:00
Blake Thompson
4d7c31abba Updated test data again 2015-05-15 17:09:42 -05:00
Dane Springmeyer
a3ac9dbca2 remove unused boost/math include and typedefs 2015-05-15 14:43:42 -07:00
Dane Springmeyer
2a1005c040 avoid warnings in geometry_equal test 2015-05-15 14:43:42 -07:00
Dane Springmeyer
7a0cf4d750 fix unused typedef warning in image_util 2015-05-15 14:43:42 -07:00
Dane Springmeyer
f1e6be4572 silence boost warning in geojson_datasource 2015-05-15 14:43:42 -07:00
Blake Thompson
cf3ff82f1a Also allow the possibility for negative values being passed to image option values 2015-05-15 15:51:53 -05:00
Blake Thompson
4fce3a7451 Updates to fix failing image options 2015-05-15 15:25:52 -05:00
Blake Thompson
219ad1f2cc Updated min zoom and max zoom to use maximum scale denom and minimum scale denominator #1447 2015-05-15 14:34:12 -05:00
Blake Thompson
776f9aee9a Updates to test/data 2015-05-15 13:54:24 -05:00
Dane Springmeyer
8aec508e10 put nik2img on PATH [skip ci] 2015-05-15 11:49:01 -07:00
Dane Springmeyer
1aa02e2081 tweak doc on updating visual tests [skip ci] 2015-05-15 11:33:38 -07:00
Dane Springmeyer
c6c0c5907f update visual tests and data 2015-05-15 11:33:20 -07:00
Dane Springmeyer
77cf3697ae move sourcing of mapnik-settings.env to localize.sh 2015-05-15 11:28:55 -07:00
Blake Thompson
3e24c5a417 Doh, fixing stupid C++ that I wrote after properly writing a unit test 2015-05-15 13:21:51 -05:00
Blake Thompson
90de0d65cb Corrected errors in palette unit test and corrected logic in bounding box projection transform 2015-05-15 12:15:27 -05:00