Commit graph

971 commits

Author SHA1 Message Date
Dane Springmeyer
edbe5aca32 Merge branch 'master' of github.com:mapnik/mapnik 2013-02-22 13:00:10 -08:00
Dane Springmeyer
bdf1a08f1e ensure python bindings return const params 2013-02-22 12:41:12 -08:00
XinGang Li
7bb5676f11 Let template parameter type same as declaration in hpp file. 2013-02-22 23:59:01 +08:00
XinGang Li
df7db521bb Add parse_image_filters function to avoid python bindings access the internal structs. 2013-02-22 23:58:30 +08:00
Dane Springmeyer
86a873857f simplify scale_denominator interface 2013-02-20 18:02:28 -08:00
Dane Springmeyer
a8599d7c61 remove uneeded default args to projection ctor (also fixes msvc linking) 2013-02-20 10:47:55 -08:00
Dane Springmeyer
808b07ad6c fix error output if svg geometry conversion fails 2013-02-10 06:17:04 -08:00
artemp
ad39c9a16a + symbolizers: add hash impl 2013-02-05 16:53:20 +00:00
artemp
79f0f18f3c + provide both symbols and copy_symbols methods 2013-02-04 19:08:10 +00:00
artemp
16ce1f5bdd + implement Map::styles method returning StyleRange object
```
  import mapnik
  m = mapnik.Map(256,256)
  ...
  for style in m.styles:
      print style
  ```
2013-02-04 18:02:52 +00:00
artemp
69e2174524 + fix return value policy 2013-02-04 17:59:31 +00:00
artemp
14fecfd778 + cleanup style.. 2013-02-04 17:59:09 +00:00
Dane Springmeyer
b1c1c86346 make PNG and TIFF support optional - closes #1704 2013-01-29 02:17:37 -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
b987d2287c iwyu 2013-01-25 00:45:58 -08:00
artemp
8c12d6895f + support unicode names in mapnik.Parameter
(Py_Unicode <-> utf8)
2013-01-17 15:59:42 +00:00
artemp
b5f2c8f9f9 + mapnik.Parameter from Py_Unicode ctor
(stored as utf8 std::string)
2013-01-17 15:17:46 +00:00
Dane Springmeyer
18e23be9c0 merge work from mappy/abonnasseau allowing buffer-size to be overiddend by layer - closes #1566 2013-01-15 18:53:34 -08:00
Dane Springmeyer
6859bea499 iwyu 2013-01-13 21:48:56 -08:00
Dane Springmeyer
bbcd53c6f4 refactor headers involving variant attempting to move as much variant usage out of hpp files to speed up compiles 2013-01-12 21:00:45 -08:00
Dane Springmeyer
2175112edd Merge branch 'master' of github.com:mapnik/mapnik 2013-01-10 23:20:35 -08:00
Dane Springmeyer
ce4d0fcd9e expose contains method (fixes infinite recursion in py3k) 2013-01-10 23:11:45 -08:00
Dane Springmeyer
6128097d78 fix compile with python 3.3.x - closes #1595 2013-01-10 23:04:14 -08:00
Dane Springmeyer
94ff584190 finish complete removal of any trace of cairomm/libsigc++ - amends f25d4d9279 and closes #1681 2013-01-09 12:49:39 -08:00
artemp
f25d4d9279 + implement cairo_context wrapper and remove unnecessary dependencies
( cairomm, libsigc++)
2013-01-09 17:00:30 +00:00
Dane Springmeyer
e0622be27d fixup parameters conversion from python 2013-01-04 11:28:00 -08:00
Dane Springmeyer
098f58a206 Merge branch 'master' of github.com:mapnik/mapnik 2013-01-04 09:46:14 -08:00
artemp
e68a65db33 + returning mapnik::parameter makes more sense in this context (?) 2013-01-04 16:55:18 +00:00
artemp
8e78bb3c20 + return value_holder from get_params_by_index 2013-01-04 16:17:51 +00:00
artemp
9ad93d5b06 + change ctor's order - fixes integer parameters convert/extract 2013-01-04 15:55:34 +00:00
Dane Springmeyer
958dce3783 iwyu 2013-01-03 22:34:31 -08:00
Dane Springmeyer
618e43af06 create path_expression.hpp and leverage to simplify and speed up compiles 2013-01-03 20:00:23 -08:00
Dane Springmeyer
c860c9165e various fixes to includes to include what is used 2013-01-03 18:06:07 -08:00
Dane Springmeyer
00e6316ef8 Merge branch 'master' of github.com:mapnik/mapnik into bigint-feature-id 2012-12-20 17:38:01 -08:00
Dane Springmeyer
5479dfbe0e change mapnik::value::to_bool to return false if a string is empty - closes #1665 2012-12-20 14:24:56 -08:00
Dane Springmeyer
66a5c26fdc leverage mapnik::value_integer for feature.id() and grid rendering buffer - refs #1662 2012-12-19 19:24:52 -08:00
Dane Springmeyer
e53914463a return the grid::value_type instead of hardcoding int 2012-12-19 18:06:51 -08:00
artemp
0eefd304bf cMerge branch 'master' into bigint
Conflicts:
	bindings/python/mapnik_feature.cpp
2012-12-19 09:39:51 +00:00
Dane Springmeyer
4c64fb4b0d fix #1659 but re-break bool->int auto-conversion, which is less of a problem 2012-12-18 20:22:02 -08:00
artemp
f5dd9e53c4 + calc int_parser/generator type from mapnik::value_integer 2012-12-18 18:05:45 +00:00
artemp
a38b252ccd Merge branch 'master' into bigint
Conflicts:
	plugins/input/geojson/geojson_datasource.cpp
	plugins/input/postgis/postgis_featureset.cpp
2012-12-18 13:57:39 +00:00
Dane Springmeyer
c5410fac7e remove bind option for datasources - refs #962 2012-12-17 10:03:07 -08:00
Dane Springmeyer
16aae90bfc iwyu 2012-12-16 12:50:36 -08:00
artemp
3ab9f273d8 + use mapnik values in python converters 2012-12-14 10:24:50 +00:00
artemp
c4bae9d30a Merge branch 'master' into bigint
Conflicts:
	bindings/python/mapnik_feature.cpp
	plugins/input/shape/dbfile.cpp
2012-12-14 10:01:21 +00:00
Dane Springmeyer
9abcda54c7 ensure boolean types are converted first - refs #1642 2012-12-11 19:38:27 -08:00
Dane Springmeyer
2353deced4 enable conversion from Py_None to mapnik::value_null - refs #1642,#794 2012-12-11 18:13:33 -08:00
Dane Springmeyer
6b84269343 add pad method on box2d to help tighten otherwise verbose code 2012-12-11 13:56:25 -08:00
artemp
8fa88a71b6 Merge branch 'master' into bigint 2012-12-03 13:14:31 +00:00
artemp
855aea95e0 + mapnik::value and mapnik::parameters - initial support for 64-bit integers 2012-12-03 13:12:09 +00:00
Dane Springmeyer
be05aa5b60 add palette.to_string() method and add python tests of fixed palette functionality 2012-11-30 12:31:58 -08:00
Dane Springmeyer
bffabbf99d allow input plugins and fonts directories to be set by environment when auto-loaded from python - closes #1594 - refs #1004 2012-11-26 17:44:58 -08:00
Dane Springmeyer
4efb6ea234 round up array length to fix edge case memory corruption in utf grid encoding - closes #1584 and 1585 2012-11-21 19:24:45 -08:00
Dane Springmeyer
f39c3ad857 add marker-multi-policy parameter to support user-configurable rendering behavior for multi-geometries when using either point or interior placement - closes #1573, refs #1555 2012-11-20 17:58:39 -08:00
Dane Springmeyer
eebc8cc73e add image/grid clear methods to make it easier to quickly re-use previously allocated objects for rendering - closes #1571 2012-11-11 21:35:50 -08:00
Alexandre Bonnasseau
267975c388 Coding style correction : tabs to spaces 2012-11-09 11:57:10 +01:00
Alexandre Bonnasseau
efff5f0ef0 Issue #1545 - override buffer-size parameter at layer level - revised 2012-11-08 15:51:22 +01:00
Dane Springmeyer
72124a9f8a apply patch from @lightmare fixing image_filter getter - closes #1534 2012-10-15 08:52:13 -07:00
Dane Springmeyer
ccda92fed1 Revert "finish moving symbolizers out of rule"
This reverts commit 20a317860d.
2012-10-10 10:51:06 -07:00
Dane Springmeyer
20a317860d finish moving symbolizers out of rule 2012-10-10 10:02:45 -07:00
Hermann Kraus
c5e69022cd Fix wrap_before in python.
Closes #1505.
2012-10-06 00:20:58 +02:00
Dane Springmeyer
9b053f493b make src_over the default compositing operation (and an optional kwarg) for im.composite() 2012-10-04 14:19:36 -07:00
Dane Springmeyer
05195ca68d Merge pull request #1444 from sigmapi/issue1107
Fix for issue #1107
2012-10-03 13:06:45 -07:00
Dane Springmeyer
e6f04fd402 new features_at_point tolerance should be optional - make it so in python to avoid test failures after #1499/#503 2012-10-03 12:17:13 -07:00
Dane Springmeyer
7866cc3dec expose more compositing options in python (the non-agg custom ones) to set up for testing as per #1493 and #1369 2012-10-01 17:41:07 -07:00
Dane Springmeyer
09726626cf add 'premultiplied' property on raster symbolizer to allow user to control (in rare cases) the premultiplied status of images in cases where tiffs mis-report it - closes #1512 2012-10-01 16:14:41 -07:00
Dane Springmeyer
e2a76e09b3 use what you include 2012-10-01 15:03:17 -07:00
artemp
01ae1a179d Merge branch 'master' into conv_simplify 2012-09-17 11:35:15 +01:00
Dane Springmeyer
657098fd48 fix git conflicts that snuck into the code 2012-09-14 18:35:54 -07:00
Hermann Kraus
e629cbb1c3 Raise Exception instead of returning None. 2012-09-15 02:06:08 +02:00
Hermann Kraus
1940014a48 Remove deprecation warnings. 2012-09-14 23:25:32 +02:00
Dane Springmeyer
8cfb40ae2f refactor fontsets making them optional on the symbolizer and removing the dangerous default contructor - closes #1483 (TODO - consider modifying insert_fontset to only take single arg of fontset instance) 2012-09-14 14:17:45 -07:00
artemp
fb8f50b0f5 Merge branch 'master' into conv_simplify 2012-09-14 13:15:42 +01:00
Hermann Kraus
d181313e90 Add TextSymbolizer.name in python bindings.
Refs #1482.
2012-09-14 01:56:35 +02: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
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
Konstantin Käfer
ae865a59fb Merge branch 'master' into conv_simplify
Conflicts:
	include/mapnik/vertex_converters.hpp
2012-08-28 20:37:27 +02:00
Dane Springmeyer
5120d0398d add build file for headers and svg/output code directories to hold the svg_renderer used for output - refs #1438 2012-08-27 17:58:49 -07:00
Dane Springmeyer
ac418a7d4e remote the last references 2012-08-27 16:43:40 -07:00
Konstantin Käfer
f5ed45ff80 Merge branch 'master' of git://github.com/mapnik/mapnik into conv_simplify 2012-08-25 15:02:12 +02:00
Panagiotis Skintzos
e34dc99f3a Exposed the label collision detector outside of Cairo renderer and added Python bindings (issue #1107) 2012-08-25 11:43:31 +02:00
Konstantin Käfer
13c46b6cc6 Merge branch 'master' into conv_simplify
Conflicts:
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
2012-08-24 23:29:43 +02:00
Konstantin Käfer
4e1423cefe Merge branch 'master' of git://github.com/mapnik/mapnik into conv_simplify
Conflicts:
	src/cairo_renderer.cpp
2012-08-24 23:24:31 +02:00
Dane Springmeyer
d9fa1cb0c2 remove old $ cruft 2012-08-24 13:49:28 -07:00
Dane Springmeyer
c0539406d8 fix includes post bf3efbeab8 - refs #1435 2012-08-23 11:34:13 -07:00
Dane Springmeyer
ce03b3599b expose svg output for geometries - refs #1437 (TODO: support svg_multi_generator) 2012-08-22 19:13:37 -07:00
Dane Springmeyer
501d322c96 +reflect comp_op, smooth, and clip in python bindings for all relevant symbolizers - closes #1264 2012-08-21 18:05:43 -07:00
Dane Springmeyer
e8101a070a partially repair backward compatibility in python for 'marker-type' - refs #1427 and #1285 2012-08-21 16:36:15 -07:00
Dane Springmeyer
ab5ce64b16 python: add properties to mapnik.Stroke to match xml/svg spec - refs #1427 2012-08-21 15:59:31 -07:00
Dane Springmeyer
6a0df52b1c python: add wrap_character alias to wrap_char - refs #1427 2012-08-21 14:48:10 -07:00
Dane Springmeyer
d069ce7405 apply patch from @lightmare for fixing return of text_transform - closes #1420 2012-08-21 14:37:35 -07:00
Dane Springmeyer
0dec6c69ca +reflect miterlimit in python 2012-08-20 19:19:21 -07:00
Dane Springmeyer
72f967924e +reflect new opacity propert of polygon_pattern_symbolizer in python 2012-08-20 18:52:07 -07:00
Dane Springmeyer
6ca9196c98 remove unused header 2012-08-20 18:22:46 -07:00