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

9174 commits

This branch
This branch
All branches
Author SHA1 Message Date
artemp
4fcbeaf706 avoid creating expression_string(str) visitor objects recursively 2014-08-26 11:00:42 +01:00
artemp
0cfbd3c5e8 expression_string : implement function call support 2014-08-26 10:51:55 +01:00
Dane Springmeyer
3e1ab9beab fix gdal compile with msvs 2013 - closes #2257 2014-08-25 17:50:45 -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
70f71790fe simplify expression handling in marker_helpers 2014-08-25 14:51:22 -07:00
Dane Springmeyer
feffa8f53c respect int return type for WebPValidateConfig 2014-08-25 14:38:03 -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
225810e3ee ogr: also accept 'inline' arg like geojson/topojson/csv plugins 2014-08-25 11:59:32 -07:00
artemp
3bd323ca85 expressions - add 'abs' function 2014-08-25 15:13:52 +01:00
artemp
2a254a4017 expressions - refactor function calls into separate compilation unit 2014-08-25 15:06:53 +01:00
artemp
4adb0abb64 expressions - implement unary and binary function expression nodes 
(sample functions: exp, pow, sin, cos, min, max, tan, atan)
 2014-08-25 14:17:18 +01:00
Dane Springmeyer
48c23f27dc remove duplicate calculation of image_ratio 2014-08-24 19:21:54 -07:00
Dane Springmeyer
0b8439c8d2 fix inialization order 2014-08-24 16:37:39 -07:00
Dane Springmeyer
7cb907e13f avoid warning from boost geometry 
Conflicts:
	plugins/input/geojson/geojson_datasource.hpp
 2014-08-24 16:00:27 -07:00
Dane Springmeyer
6fe0f93e70 remove svg renderer test 2014-08-24 13:46:33 -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
4ebf1ae114 Merge pull request #2388 from mapycz/3.x-refactor-markers-placement 
refactor marker placements
 2014-08-24 12:09:23 -07:00
Jiri Drbalek
e1aededb09 refactor marker placements 2014-08-24 18:10:41 +00:00
Dane Springmeyer
45aa09b9bd travis: less JOBS in debug mode [skip ci] 2014-08-22 14:25:27 -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
Dane Springmeyer
b85ac0d6a5 register fonts in nik2img util 2014-08-22 13:22:12 -07:00
Jordan Hollinger
88782a85c8 Minor improvement to repeat handling in collision detector. 2014-08-22 13:38:01 -04: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
3b32185bd9 Merge branch 'master' of https://github.com/IvanSanchez/mapnik 
Conflicts:
	tests/visual_tests/images/polygon-winding-order-300-300-1.0-agg-reference.png
	tests/visual_tests/images/polygon-winding-order-300-300-1.0-cairo-reference.png
	tests/visual_tests/images/polygon-winding-order-300-300-2.0-agg-reference.png
	tests/visual_tests/images/polygon-winding-order-300-300-2.0-cairo-reference.png
 2014-08-22 16:32:29 +02: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
Iván Sánchez Ortega
bebe5e9e3a Added test case for winding order of polygon rings. See mapnik/mapnik#2371 and mapbox/tilemill#2110. 2014-08-22 16:26:02 +02:00
Jordan Hollinger
688dfcabc9 Disallow use of minimum-distance with either repeat-distance or text-margin. 2014-08-22 08:52:45 -04:00
artemp
eb7716aeed expressions - initial function_call framework implementation (TODO) 2014-08-22 12:30:25 +01: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
601ac60c87 travis: fix order of ops 2014-08-21 17:01:51 -07:00
Dane Springmeyer
a85312179c travis: add back libstdc++ upgrade for c++11 support 2014-08-21 16:55:55 -07:00
Dane Springmeyer
5e8efd75d3 port travis fixes from #2380 to master 2014-08-21 16:36:55 -07:00
Dane Springmeyer
8254a5c1e5 enable native svg rendering with 'svg-ng' format in render_to_file refs #2229 2014-08-21 16:15:35 -07:00
Dane Springmeyer
920b92a3ef improve error message when c++11 compiler is not available - refs #2376 2014-08-21 15:03:57 -07:00
artemp
8db68fc5e3 hextree - avoid quantizing images with less than 3 pixels (hextree implementation requirement) 2014-08-21 12:43:43 +01:00
artemp
a4cd4821a0 ohh evil #ifdef/#endif - fix compiling with boost < 1.56 2014-08-21 12:21:47 +01:00
artemp
6dee6c1c86 fix typo :) 2014-08-21 11:40:42 +01:00
artemp
455168c6af topojson - use bulk-loading packing algorithm for rtree creation 
(http://www.boost.org/doc/libs/1_56_0/libs/geometry/doc/html/geometry/spatial_indexes/introduction.html)
use unique_ptr where appropriate
 2014-08-21 11:14:33 +01:00
Jordan Hollinger
c8c792277d Add attribute text-margin in place of minimum-distance. 2014-08-20 19:43:36 -04:00
Dane Springmeyer
bb897e0144 use fast path for bbox reprojection (skipping extra point-sampling) 2014-08-20 14:47:27 -07:00
Dane Springmeyer
22117c6c64 code comments to clarify when/why base_path is needed at parse time when loading from a string 2014-08-20 13:53:25 -07:00
Dane Springmeyer
b9060c038c rapidxml: avoid overhead of stringstream - amends 95d5b73 2014-08-20 13:46:00 -07: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
7de6c181ec Merge pull request #2373 from strk/master-pgraster-credit 
Add mention of CartoDB support in pgraster input plugin code
 2014-08-20 08:42:30 -07:00
Sandro Santilli
01b56c3606 Add mention of CartoDB support in pgraster input plugin code 2014-08-20 17:31:41 +02:00