Commit graph

9717 commits

Author SHA1 Message Date
artemp
f5b4ff9429 Merge branch 'master' into conv_simplify 2012-09-10 10:26:14 +01:00
Hermann Kraus
99265b22ac Add simple render script. 2012-09-10 02:42:59 +02:00
Hermann Kraus
0744362481 Fix tests broken by a513d3f97d. 2012-09-08 00:43:32 +02:00
Dane Springmeyer
0de2beac3e improve interplay of maximum-extent and map.zoom_all, now properly clipping to maximum-extent - closes #1473 2012-09-07 10:36:14 -07:00
artemp
29423cfc1c Merge branch 'master' into conv_simplify
Conflicts:
	bindings/python/mapnik_markers_symbolizer.cpp
	plugins/input/ogr/ogr_index_featureset.cpp
	plugins/input/shape/dbfile.cpp
	plugins/input/shape/shapefile.hpp
	src/load_map.cpp
2012-09-07 16:46:02 +01:00
artemp
967d6110bf + singleton: return ref from instance() method 2012-09-07 16:23:03 +01:00
artemp
11e6ba0c09 + make client methods non-static in classes derived from
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
2012-09-07 14:56:30 +01:00
artemp
8fa0742a53 + make client methods non-static in classes derived from
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
2012-09-07 14:51:25 +01:00
artemp
5f8bb423e8 Merge branch 'conv_simplify' of git://github.com/kkaefer/mapnik into kkaefer-conv_simplify 2012-09-06 13:12:39 +01:00
artemp
a513d3f97d + code: avoid exposing unsafe static methods in datasource_cache ( #1451)
+ python: remove redundent 'instance' method (mapnik.DatasourceCache)
+ python: reflect plugin_directories method
+ tests: update python usage

TODO: consider using similar approach in FontEngine etc..
TODO: consider returning reference from singleton::instance() to
      safeguard from accidental deleting a 'singleton' pointer
2012-09-05 12:53:37 +01:00
artemp
69fb17cd3c + port 170e23440f to master 2012-09-05 10:58:21 +01:00
Hermann Kraus
786f798cab Use double instead of unsigned while parsing XML.
Closes #1469.
2012-09-05 02:15:58 +02:00
Dane Springmeyer
59129a7a2b rename variable to avoid confusion with text_size 2012-09-04 14:35:03 -07:00
Dane Springmeyer
0e0cd08ccb ensure opacity naming fix works - closes #1470 2012-09-04 13:30:24 -07:00
Dane Springmeyer
d133db55f6 remove unused style 2012-09-04 13:21:40 -07:00
Dane Springmeyer
b385370126 fix spelling of opacity in text/formatting - refs #1470 2012-09-04 13:17:09 -07:00
Axel Haustant
866256c01c Set JOBS=2 (best build time) 2012-09-04 16:30:43 +02:00
Axel Haustant
384ff45444 Do not install ccache and gain time on apt installations 2012-09-04 16:30:18 +02:00
Axel Haustant
15ecc6b7cd Do not use ccache 2012-09-04 11:01:11 +02:00
Dane Springmeyer
28063e28aa update the demo/tests - refs #1460 2012-09-03 15:33:14 -07:00
Dane Springmeyer
f29726edf1 no need for a default message for datasource_exception 2012-09-03 11:41:51 -07:00
Dane Springmeyer
f73168a4cc scons: remove helloworld plugin if out of date and make warning yellow not red 2012-09-03 11:29:14 -07:00
Dane Springmeyer
449aff6432 comment failing agg blending tests 2012-09-03 10:52:51 -07:00
Dane Springmeyer
551f1e0c66 c++ style 2012-09-03 10:52:36 -07:00
Dane Springmeyer
ac8e22a781 bindings: get_filename - no need for const here 2012-09-03 10:52:26 -07:00
Dane Springmeyer
a12b8f1d2f c++ style 2012-09-03 10:27:48 -07:00
Dane Springmeyer
56ae40d059 c++ style 2012-09-03 10:02:39 -07:00
Dane Springmeyer
f5cf5aa09d start reporting geometry type in geojson plugin 2012-09-03 10:01:01 -07:00
Dane Springmeyer
f334085079 remove duplicate include 2012-09-03 09:59:58 -07:00
Axel Haustant
08b5a81b64 Added Travis CI badge to README.md 2012-09-02 16:20:37 +02:00
Axel Haustant
021f2939b6 Initial Travis CI configuration. 2012-09-02 16:19:11 +02:00
Dane Springmeyer
b8f6b16a56 more portable rounding behavior - refs ##1454 2012-08-31 20:31:06 -07:00
Dane Springmeyer
d054178a75 add grayscale conversion test - refs #1454 2012-08-31 19:12:12 -07:00
Dane Springmeyer
6450d33462 update tests images after change made to agg src_over in #1452, refs #1369 2012-08-31 18:16:49 -07:00
Dane Springmeyer
bc3c7b4b40 optimize the agg compositing test build 2012-08-31 18:15:56 -07:00
Dane Springmeyer
5e84ce0dfc agg compositing: change src_over alpha to avoid pixel artifacts by reordering computations and add basic tests comparing src_over composting to normal agg alpha blending - closes #1452 - refs #1313, #1454, #1369 2012-08-31 18:04:08 -07:00
Dane Springmeyer
ac320b2d1a agg: spelling fix 2012-08-31 17:52:01 -07:00
Dane Springmeyer
afae890dcb Merge branch 'master' of https://github.com/mapnik/mapnik 2012-08-31 21:49:26 +00:00
Dane Springmeyer
f983a73feb avoid gcc compiler warnings after 352ad7499d - refs #1383 2012-08-31 21:49:06 +00:00
Dane Springmeyer
affecb0f32 csv plugin: support single row data and fix warning when no data can be parsed 2012-08-31 12:07:35 -07:00
Dane Springmeyer
c1102cbb7a Add group-by layer option to CHANGELOG for 2.0.0 2012-08-30 23:35:11 -07:00
Dane Springmeyer
3d9aa3db10 avoid double drawing of lines with RASTERIZER_FAST 2012-08-30 23:34:43 -07:00
Dane Springmeyer
2e44e8c470 postgis: do not attempt to parse an empty extent string 2012-08-30 15:04:05 -07:00
Dane Springmeyer
90391f3bee remove unused typedef 2012-08-29 18:39:16 -07:00
Dane Springmeyer
d0aeba2f32 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-29 16:33:59 -07:00
Dane Springmeyer
25ff820891 Merge pull request #1450 from rundel/master
path_parse simplification
2012-08-29 16:33:37 -07:00
Dane Springmeyer
9a8051fcf0 scons: remove dependence of agg headers on libmapnik to avoid constant re-installs 2012-08-29 14:47:01 -07:00
Colin Rundel
bd5df80f75 Minimal roll back const changes
Changes to expression_ptr and path_expression_ptr are causing runtime issues with the python bindings
2012-08-29 16:41:48 -04:00
Colin Rundel
dc3763885c More parser clean up - color parser
Dropped color_factory class in favor of single color_parser function. Moved implementation to new color_factory.cpp since it is odd to have two headers (color.hpp, color_factory.hpp) and only one source file.
2012-08-29 16:41:48 -04:00
Colin Rundel
10001f1d4b Expression parsing simplification
Similar idea to path expression parsing cleanup
2012-08-29 16:41:44 -04:00