Commit graph

6270 commits

Author SHA1 Message Date
Dane Springmeyer
b1c1c86346 make PNG and TIFF support optional - closes #1704 2013-01-29 02:17:37 -05:00
Dane Springmeyer
cf11a27a22 remove hardcoded define to enable proj4 2013-01-29 02:03:04 -05:00
Dane Springmeyer
ba4eeabcd9 Tests: use a proper transform 2013-01-29 01:04:07 -05:00
Dane Springmeyer
ef4ee9efb2 fix tests given new, expected behavior with custom merc<->longlat transformations 2013-01-29 00:55:51 -05:00
Dane Springmeyer
6c911dc43c Merge branch 'master' of github.com:mapnik/mapnik into lazy-proj4 2013-01-28 15:27:18 -05:00
Dane Springmeyer
c9635ef5a3 add more tests for transform directions and lessen strictness to account for minor rounding 2013-01-28 15:27:00 -05:00
Dane Springmeyer
b1581a1942 fall through to using proj4 if we do not have a known transformation 2013-01-28 15:10:24 -05:00
Dane Springmeyer
515ff9ee63 clip before transformations to avoid nan and determine max latitude at compile time rather than hardcoding 85.0511 2013-01-28 15:09:24 -05:00
Dane Springmeyer
5720c0d476 Merge branch 'master' of github.com:mapnik/mapnik into lazy-proj4 2013-01-28 14:03:53 -05:00
Dane Springmeyer
be3cfd5159 fix more mercator proj4 strings 2013-01-28 14:03:32 -05:00
Dane Springmeyer
cda43b42ae throw if attempting to transform between projections that require proj4 support if proj4 is not compiled in 2013-01-28 14:03:07 -05:00
Dane Springmeyer
5b8f018bc6 Merge branch 'master' of github.com:mapnik/mapnik into lazy-proj4 2013-01-28 13:49:14 -05:00
Dane Springmeyer
47ab9913ee make consistent the proj4 string used for spherical mercator across tests and docs 2013-01-28 13:48:13 -05:00
Dane Springmeyer
3969ac246d make proj4 able to be fully disabled at compile time - refs #1703 2013-01-28 13:45:41 -05:00
Dane Springmeyer
76f202732b remove file only currently present in branch 2013-01-28 11:00:13 -05:00
Dane Springmeyer
e7f648eceb enable lazy initialization of proj4 in rendering pipeline - refs #1703 2013-01-28 01:54:35 -05:00
Dane Springmeyer
f8b1520d1a refactor projection interface: 1. cleanup custom lonlat<->merc code. 2. centralize proj4 strings into constants, 3. tweak projection benchmarking to allocate objects in loop so we can test that specifically - refs #1703 2013-01-28 01:47:32 -05:00
Dane Springmeyer
95b29f82b1 iwyu 2013-01-27 23:54:31 -05:00
Dane Springmeyer
e327880eb1 forward declare when possible 2013-01-27 23:53:37 -05:00
Dane Springmeyer
c92c8f1bfd define projection objects before transform to ensure they stay in scope 2013-01-27 17:27:24 -08:00
Dane Springmeyer
57c99a69a2 add tests for longlat/merc transformations 2013-01-27 17:26:54 -08:00
Dane Springmeyer
19526eb7f7 benchmark: add tests for longlat/merc transformations 2013-01-27 17:26:32 -08:00
Dane Springmeyer
430e3d3406 benchmark: number tests, allow dry-run to get test idx #, and allow passing args to only run specific tests 2013-01-27 17:25:58 -08:00
Dane Springmeyer
cb49d9be81 tests: fix more inconsistent projection strings 2013-01-25 01:36:06 -08:00
Dane Springmeyer
4543032a0d fix dynamic prefix detection on linux - closes #1701 2013-01-25 01:18:29 -08:00
Dane Springmeyer
714ecf803d tests: more fixes to make epsg:4326 proj4 string consistent 2013-01-25 01:04:51 -08:00
Dane Springmeyer
ae5f4d26d1 tests: make consistent the proj4 string for epsg:4326 2013-01-25 00:49:55 -08:00
Dane Springmeyer
b987d2287c iwyu 2013-01-25 00:45:58 -08:00
Dane Springmeyer
20718b0585 Merge branch 'master' of github.com:mapnik/mapnik 2013-01-24 22:04:25 -08:00
Dane Springmeyer
790be266f8 iwyu 2013-01-24 22:04:17 -08:00
artemp
730f07fbd6 + fix #1700 2013-01-24 17:28:32 +00:00
artemp
7c229b457d + fix formatting 2013-01-24 13:44:17 +00:00
artemp
57c8b55079 + add geometry conversions tests (clipping,smothing...) 2013-01-24 13:34:00 +00:00
artemp
225362b3f6 + fix to compile in c++11/libc++ mode (clang++ 3.3) 2013-01-24 13:32:43 +00:00
Dane Springmeyer
6f91aaa77d supress ldflags and dep-libs in mapnik-config if we are statically linking deps 2013-01-23 22:00:25 -08:00
Dane Springmeyer
98a145acd0 avoid hardcoding prefix that mapnik-config knows about and rather determine on the fly based on where it is installed (helps with package building and should be harmless otherwise) 2013-01-23 21:58:04 -08:00
Dane Springmeyer
c5837ea2b7 iwyu 2013-01-22 21:23:02 -08:00
Dane Springmeyer
3149c8db3d fixup a few includes around text formatting 2013-01-21 17:05:33 -08:00
Dane Springmeyer
ba6f3cf2ca include cleanup around symbolizer helpers 2013-01-21 14:32:28 -08:00
Dane Springmeyer
70008ca781 iwyu 2013-01-21 14:15:08 -08:00
Dane Springmeyer
d6587d791d avoid aign conversion compiler warnings 2013-01-21 14:13:24 -08:00
Dane Springmeyer
c315e192b7 avoid sign conversion compiler warnings 2013-01-21 14:12:27 -08:00
Dane Springmeyer
9f28010f53 avoid taking const& to a copy (which is what is returned from geom.envelope() currently) 2013-01-21 11:14:32 -08:00
Dane Springmeyer
8a677f9c14 tweak benchmark: add snprintf test, only measure join_all time not thread creation, and use a double test value that converts the same across karma/snprintf/ostringstream 2013-01-21 10:31:16 -08:00
Dane Springmeyer
84197b1b98 speed up snprintf double to string by removing unused code but default to using karma for now given it is more future proof - followup to #1697 2013-01-21 10:25:27 -08:00
Artem Pavlenko
27554cbef8 Merge pull request #1697 from mapnik/faster_to_string
default to fast, simple, and correct (per ostringstream) to_string conversions
2013-01-21 10:01:09 -08:00
Dane Springmeyer
ccd9acfecc default to fast, simple, and correct (per ostringstream) to_string conversions fully removing boost::lexical_cast, disabling karma, and fixing up tests 2013-01-19 10:12:32 -08:00
Dane Springmeyer
82f1a8c200 Add rebuild target to makefile 2013-01-18 19:01:12 -08:00
Dane Springmeyer
7a5e35d0fa Add double to string benchmark and rework tests to support threaded benching as well as serial 2013-01-18 19:00:57 -08:00
Dane Springmeyer
11e38b3e1c Merge branch 'master' of github.com:mapnik/mapnik 2013-01-18 15:01:09 -08:00