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

9442 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dane Springmeyer
b860b58f0f comment exit calls in densehashtable - refs #2547 2014-10-27 09:03:05 -07:00
Dane Springmeyer
f34ac45b86 remove unneeded osm files - refs #2547 2014-10-27 08:56:58 -07:00
Jordan Hollinger
d524738ad9 Remove point symbolizer support from group symbolizer. 2014-10-27 09:43:42 -04:00
Jordan Hollinger
ee692eea73 Merge branch 'master' of github.com:mapnik/mapnik into group-markers 
Conflicts:
	include/mapnik/grid/grid_marker_helpers.hpp
	include/mapnik/marker_helpers.hpp
	include/mapnik/renderer_common/process_group_symbolizer.hpp
	src/cairo/process_markers_symbolizer.cpp
	src/renderer_common/process_group_symbolizer.cpp
	tests/visual_tests/images/group-symbolizer-1-512-512-1.0-agg-reference.png
	tests/visual_tests/images/group-symbolizer-1-512-512-1.0-cairo-reference.png
	tests/visual_tests/images/group-symbolizer-1-512-512-2.0-agg-reference.png
	tests/visual_tests/images/group-symbolizer-1-512-512-2.0-cairo-reference.png
 2014-10-27 09:29:45 -04:00
Jordan Hollinger
864426ae54 Add reference images for new visual test group-symbolizer-4. 2014-10-27 07:46:44 -04:00
Jordan Hollinger
6f4593fb4a Update reference images for visual test group-symbolizer-1. 2014-10-27 07:46:44 -04:00
Jordan Hollinger
16b1b5a77c Support markers in group symbolizer. 2014-10-27 07:46:44 -04:00
Jordan Hollinger
bfb8d80e37 Add visual test for several cases of raster and vector markers within group symbolizer. 2014-10-27 07:46:44 -04:00
Jordan Hollinger
85622ab575 Update group symbolizer tests to use markers symbolizers. 2014-10-27 07:46:43 -04:00
Jordan Hollinger
1b15e53b63 Refactor markers dispatchers to use a common base class to share code. 2014-10-27 07:46:43 -04:00
Dane Springmeyer
ecb529cba2 handle boost::spirit::qi::expectation_failure 2014-10-24 21:36:19 -07:00
Dane Springmeyer
f80d1f9c00 support scale_factor in render_with_vars 2014-10-24 21:36:19 -07:00
Dane Springmeyer
ab451cbee2 support unicode keys in dict2attr 2014-10-24 21:36:19 -07:00
artemp
38a169e56e Merge branch 'MapQuest-peucker' 2014-10-24 15:20:25 +01:00
artemp
71085323a7 Merge branch 'peucker' of git://github.com/MapQuest/mapnik into MapQuest-peucker 2014-10-24 15:20:05 +01:00
artemp
ff8b1294a5 Merge branch 'kapouer-patch-3' 2014-10-24 14:39:43 +01:00
Jérémy Lal
87f9481621 Add missing argument to mapnik::raster call 2014-10-24 14:58:16 +02:00
Dane Springmeyer
c3dbd83348 try running benchmarks on travis again 2014-10-23 16:16:51 -07:00
artemp
f686d3de1b update dejavu-fonts-ttf path (v 2.34) 2014-10-23 11:35:20 +01:00
artemp
456ebe006b fix [-Wparentheses] warning 2014-10-23 09:51:45 +01:00
Dane Springmeyer
654c31d72d Add to changelog 2014-10-23 01:36:39 -07:00
Dane Springmeyer
eddbc2d3da copy edit of changelog 2014-10-23 01:20:02 -07:00
Dane Springmeyer
ad52fc7637 get mapnik version in a less brittle way 2014-10-23 01:02:14 -07:00
Dane Springmeyer
2ce6a317dd better defaults for git metadata 2014-10-23 01:00:35 -07:00
Dane Springmeyer
64b614c570 no need to ingore obsolete files [skip ci] 2014-10-23 00:43:23 -07:00
Dane Springmeyer
036a3bb14f only report git metadata for git checkout builds 2014-10-23 00:42:10 -07:00
Dane Springmeyer
f6e077fb08 remove unused scons function 2014-10-23 00:41:06 -07:00
Dane Springmeyer
4621fd6445 fix srs in c++ demo 2014-10-23 00:15:33 -07:00
Dane Springmeyer
520bab27be remove pycairo from python demo - closes #2533 2014-10-23 00:15:19 -07:00
Dane Springmeyer
900def16ae put mapnik-config on PATH [skip ci] 2014-10-23 00:06:40 -07:00
Dane Springmeyer
16ea7d85b2 add to authors 2014-10-23 00:04:52 -07:00
Dane Springmeyer
ed425b7f3f move local boost headers into deps directory 2014-10-22 23:51:44 -07:00
Dane Springmeyer
a0dc3df575 move mapnik-config back to utils/ 2014-10-22 23:46:33 -07:00
Dane Springmeyer
63f2171edc finish removal of workspace dir - amends 27d8cef3c4 2014-10-22 23:37:55 -07:00
Dane Springmeyer
c7fb48eb75 update expected visual test 2014-10-22 15:35:07 -07:00
Dane Springmeyer
a1314935af fix initialization order in proj_transform 2014-10-22 15:34:17 -07:00
Dane Springmeyer
27666bb686 ignore -Wunsequenced warnings 2014-10-22 15:34:04 -07:00
Dane Springmeyer
15a2acf0d5 silence warnings in pgraster plugin - refs #2356 2014-10-22 15:33:25 -07:00
Dane Springmeyer
ca3078938c simplify and install mapnik wkt and json libs 2014-10-22 00:09:22 -07:00
Dane Springmeyer
46a41f3ae1 initialize proj_transform::is_source_equal_dest_ 2014-10-22 00:08:48 -07:00
Dane Springmeyer
e88748c57e stop defaulting to -Wextra [skip ci] 2014-10-21 20:31:48 -07:00
Dane Springmeyer
a00c56f40c travis cannot cope with debug builds 2014-10-21 20:24:11 -07:00
Dane Springmeyer
aae4a20ec9 fix various -Wunused-parameter warnings 2014-10-21 20:23:17 -07:00
Dane Springmeyer
95b301deb4 set ignore unknown pragmas after -Wall and -Wextra 2014-10-21 20:22:33 -07:00
Dane Springmeyer
dcfa056413 merge 2014-10-21 19:49:03 -07:00
Dane Springmeyer
14cf32d9c0 Merge pull request #2542 from mapnik/warnings 
Silence boost warnings using pragmas
 2014-10-21 18:00:00 -07:00
Dane Springmeyer
d25f0c316a silence more warnings 2014-10-21 17:44:47 -07:00
Dane Springmeyer
87192bfcb7 silence more boost warnings 2014-10-21 16:57:44 -07:00
Dane Springmeyer
241c2ebf0b try gcc too 2014-10-21 16:54:53 -07:00
Dane Springmeyer
7acaa3068a silence warning in font_engine_freetype 2014-10-21 16:54:46 -07:00