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

4961 commits

This branch
This branch
All branches
Author SHA1 Message Date
Artem Pavlenko
34470af474 + allow empty arrays in "coordinates" property 2012-06-14 14:40:14 +01:00
Dane Springmeyer
d33496baa7 split up code that handles datasource plugin registration 2012-06-13 19:25:59 -04:00
Dane Springmeyer
5df056ae4c scons: expose CUSTOM_CFLAGS to enable custom CFLAGS to be used during the configure stage 2012-06-13 17:17:58 -04:00
Dane Springmeyer
fa46f97b73 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-13 17:10:27 -04:00
Dane Springmeyer
30559a0610 scons: also set LINKFLAGS/LDFLAGS up front to ensure they are used in configure checks 2012-06-13 17:10:15 -04:00
Dane Springmeyer
c3d0d415d5 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-13 13:04:17 -04:00
Artem Pavlenko
e89eb99e28 + geojson input plugin (thanks, @tmcw!) 2012-06-13 13:30:58 +01:00
Dane Springmeyer
db9c1127fe Merge branch 'master' of github.com:mapnik/mapnik 2012-06-12 17:36:39 -04:00
Artem Pavlenko
1f383abbad + fix conflict 2012-06-12 14:18:29 +01:00
Artem Pavlenko
1774456a2e + fix GeoJSON output in metawriter_json 
(FIXME: output proper geometry types - don't shortcut to Multi***)

Conflicts:

	include/mapnik/metawriter_json.hpp
 2012-06-12 14:05:53 +01:00
Dane Springmeyer
b8e0366fdf improve readibility of error output from visual tests 2012-06-07 15:26:50 -05:00
Dane Springmeyer
eb8f27bee7 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-07 13:17:44 -05:00
Artem Pavlenko
51650b0ea6 Merge pull request #1246 from mirecta/transform_expr 
set transform expression from python
 2012-06-07 10:14:37 -07:00
Mickey Rose
2a7634693f add python test: set ShieldSymbolizer's transform 2012-06-07 17:12:38 +02:00
Mickey Rose
1e3c48afb1 split parse_transform.hpp, set dynamic transform expression from python 2012-06-07 17:06:45 +02:00
Dane Springmeyer
51d3310012 grid encoding: reuse key string 2012-06-07 07:27:42 -07:00
Dane Springmeyer
9adff38041 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-07 04:13:24 -07:00
Artem Pavlenko
03e6f9d023 Merge pull request #1245 from simonsonc/png-exceptions 
Catch and throw PNG exceptions - fixes #1213
 2012-06-07 04:00:40 -07:00
Artem Pavlenko
013f0aa62f + add templated ctor and avoid including agg_trans_affine.h 2012-06-07 11:51:23 +01:00
Artem Pavlenko
6a4c207254 + make it compile against latyest master (FIXME) 2012-06-07 11:46:50 +01:00
Artem Pavlenko
11c34b1599 Merge branch 'transform_expr' of https://github.com/mirecta/mapnik 2012-06-07 10:20:05 +01:00
Dane Springmeyer
f374d01896 only mark deprecated api names for removal at major versions to ensure we are semver compatible - thanks @migurski - closes #1129 2012-06-06 17:32:16 -07:00
Dane Springmeyer
957c40f763 move to int32 for grid rendering buffer - closes #1196 2012-06-06 16:36:38 -07:00
Dane Springmeyer
c29c18e8df expose a get_pixel method on mapnik::grid (for testing purposes) 2012-06-06 16:34:45 -07:00
Dane Springmeyer
76211243a4 remove now unused blending modes as they have been replaced with AGG compositing modes - refs #1206 2012-06-06 16:16:30 -07:00
Carl Simonson
cd7ad3e15e Catch and throw PNG exceptions - fixes #1213 
The png library uses setjmp/longjmp to throw exceptions when reading. If this
is not set up, the png library calls abort(). This change handles the errors
and throws a C++ exception instead.

This issue was found by testing images from pngsuite at
http://www.schaik.com/pngsuite/. These images are included and a unit test was
added to test both images that should be successful and images that should
throw an exception.
 2012-06-06 17:52:41 -05:00
Mickey Rose
bd9609c370 new feature: transform expressions are now dynamic 
(cherry picked from commit 173c402b5c142310087246b0ea54dbec54edcac8)

Conflicts:

	include/mapnik/vertex_converters.hpp
	src/agg/process_markers_symbolizer.cpp
	src/agg/process_point_symbolizer.cpp
	src/agg/process_polygon_pattern_symbolizer.cpp
	src/load_map.cpp
 2012-06-06 17:34:26 +02:00
Mickey Rose
dad0bdacfc add value_null operators, improve is_null, move mapnik::value definition into separate namespace 
(cherry picked from commit 653bca6bea1abb2e45c66e76fd5e4fe7dc10a91a)
 2012-06-06 17:34:17 +02:00
Mickey Rose
d346c57e17 agg::trans_affine: add static const identity, make mul/div operators const 
(cherry picked from commit db47a6c9bad5828fe62b5c1c05661118e23ad218)
 2012-06-06 17:34:08 +02:00
Mickey Rose
46c2d1c710 add operators for computing the envelope of a transformed box2d 
(cherry picked from commit 9ad342cbed150948561c08e98957bc014dedc7f3)
 2012-06-06 17:34:02 +02:00
Dane Springmeyer
291bc9b8ba explicitly include projection header 2012-06-04 17:16:44 -07:00
Dane Springmeyer
eb779b1580 only link libjpeg if we are building with jpeg support 2012-06-04 15:23:08 -07:00
Dane Springmeyer
11e81fdb03 finish exposing markers symbolizer in python - closes #612 2012-06-04 13:42:51 -07:00
Dane Springmeyer
f3073f3693 agg/grid renderers - match cairo by using buffered detector dimensions for placement_finder collision tests 2012-06-04 13:41:35 -07:00
Dane Springmeyer
c8c2d98c0e avoid compiler warnings with msvc 2012-06-04 11:36:27 -07:00
Dane Springmeyer
857a6950f7 fix warning message for pending features for markers 2012-06-04 11:11:29 -07:00
Dane Springmeyer
d7d346d799 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-02 11:21:52 -07:00
Artem Pavlenko
024ebfdfe3 + better not to use errno (via perror) for std::iostreams 
(it works with gcc and friends but non-standard)
 2012-06-01 12:19:42 +01:00
Artem Pavlenko
edd5148aa4 Merge pull request #1239 from simonsonc/viewer-wheel-event 
viewer: add mouse wheel zooming
 2012-06-01 01:10:12 -07:00
Carl Simonson
c696c85dd4 viewer: add mouse wheel zooming 
This change makes the viewer zoom in and out when using the scroll wheel.
The zoom tracks the position of the mouse pointer when zooming in so that
the map will be centered under the mouse after a zoom.
 2012-05-31 19:27:19 -05:00
Dane Springmeyer
9f83f84983 Merge pull request #1238 from simonsonc/viewer-exceptions 
viewer: show more exception messages
 2012-05-31 16:38:14 -07:00
Carl Simonson
963cd83f98 viewer: show more exception messages 
When trying to render the map widget in the viewer, we catch exceptions
and print out the message to stderr. The only exceptions that are printed
are mapnik::config_error messages. mapnik can throw more errors, so this
change makes it catch all std::exceptions.
 2012-05-31 18:11:10 -05:00
Artem Pavlenko
404ddf329d Revert "+ avoid copying" 
This reverts commit de71db7d38.

Conflicts:

	include/mapnik/vertex_converters.hpp
 2012-05-31 15:55:20 +01:00
Artem Pavlenko
bf7500a8b0 Merge pull request #1234 from mirecta/unary_expr 
unary minus operator on mapnik::value and in expression_grammar
 2012-05-31 05:51:07 -07:00
Artem Pavlenko
90c3415d9b + don't premultiply pattern source 
+ cleanup
 2012-05-31 13:26:16 +01:00
Artem Pavlenko
500f57cf60 + make vertex() and rewind() methods const 
+ remove unused coord_transforms
+ rename coord_transform2 to coord_transform
 2012-05-31 12:13:09 +01:00
Artem Pavlenko
6190cf22f1 + pass Args by const-ref 2012-05-31 10:40:23 +01:00
Artem Pavlenko
7eb8d175da + cleanup 2012-05-31 09:37:00 +01:00
Artem Pavlenko
de71db7d38 + avoid copying 2012-05-31 09:33:55 +01:00
Artem Pavlenko
6e23b64244 + don't draw 'frame' to match AGG renderer output 2012-05-30 16:29:39 +01:00