Commit graph

720 commits

Author SHA1 Message Date
Hermann Kraus
6121e47f50 Thread safety for python. Closes #1063. 2012-02-08 00:40:02 +01:00
Hermann Kraus
c966a07b86 Add wrapper fro formating::format_node. 2012-02-06 01:10:09 +01:00
Hermann Kraus
487a4a3219 Add shortcuts. 2012-02-06 00:33:47 +01:00
Hermann Kraus
86d2db8538 Remove deprecated TextSymbolizer functions.
Move to mapnik_text_placement.cpp.
2012-02-05 23:47:32 +01:00
Hermann Kraus
75026700b9 Add second constructor for TextSymbolizer. 2012-02-05 21:58:39 +01:00
Hermann Kraus
c07c5594c9 Correctly wrap FormatingNode. 2012-02-05 21:27:29 +01:00
Hermann Kraus
fae698bc59 Consistent formating. 2012-02-05 15:45:30 +01:00
Hermann Kraus
37b2054041 Copy constructor for CharProperties. 2012-02-05 15:11:08 +01:00
Hermann Kraus
099ec85da6 Implement add_expression and helper classes.
Update test.
2012-02-05 04:09:09 +01:00
Hermann Kraus
263f5708f3 More processed_text bindings. 2012-02-05 01:47:49 +01:00
Hermann Kraus
ded95dd1e4 Temporary fix for #1063. 2012-02-05 01:27:50 +01:00
Hermann Kraus
197af707b1 Remove debuging output. 2012-02-05 00:52:09 +01:00
Hermann Kraus
2f144d6ccb Python bindings for formating::text_node. 2012-02-04 04:32:32 +01:00
Hermann Kraus
593c8a4838 Correctly register objects. 2012-02-03 23:24:32 +01:00
Hermann Kraus
a140c9ef40 Add python bindings for text_placements and text_placement_info. 2012-02-03 13:54:49 +01:00
Hermann Kraus
99a58ff2ba Add Python wrapper for formating::node. 2012-02-03 02:01:01 +01:00
Hermann Kraus
f64190e47f Make TextSymbolizer default constructable and add "placements" property. 2012-02-03 02:00:21 +01:00
Dane Springmeyer
f310148337 whitespace fixes (using format_source_files.sh) 2012-02-01 17:30:26 -08:00
Dane Springmeyer
07d7d7d537 convert to using feature_ptr rather than const& for renderers 2012-02-01 16:37:05 -08:00
Dane Springmeyer
915addc51d update grid rendering interface to new feature impl 2012-02-01 10:43:23 -08:00
Artem Pavlenko
e4f7f1074a + validate input tuple length
+ fix index in extract<double>
2012-01-31 20:46:36 +00:00
Hermann Kraus
d2e26b5495 Python bindings for char_properties. 2012-01-31 18:28:02 +01:00
Artem Pavlenko
796bd5d8c2 remove duplicate enumeration registration 2012-01-31 16:51:14 +00:00
Artem Pavlenko
b90de4874c Merge branch 'textplacement-merge' into feature-text-merge
Conflicts:
	docs/textrendering.gv
	include/mapnik/building_symbolizer.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_placements.hpp
	include/mapnik/text_placements_list.hpp
	include/mapnik/text_placements_simple.hpp
	include/mapnik/text_processing.hpp
	plugins/input/shape/shape_utils.hpp
	src/agg/process_shield_symbolizer.cpp
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
	src/grid/process_shield_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/load_map.cpp
	src/placement_finder.cpp
	src/shield_symbolizer.cpp
	src/text_placements.cpp
	src/text_processing.cpp
	src/text_symbolizer.cpp
	tests/visual_tests/clean.sh
	tests/visual_tests/test.py

Merge herm/textplacement-merge
2012-01-31 11:09:55 +00:00
Artem Pavlenko
39bafa0cf1 add push_new member function which allows modifying
current features context (useful when datasource schema
is unknown, so we update context as we go along).
2012-01-30 14:05:41 +00:00
Hermann Kraus
e4340c0f89 Python bindings for text_symbolizer_properties. 2012-01-30 03:32:25 +01:00
Hermann Kraus
49a3b3c52c Make code easier to read by using std::pair instead of boost::tuple for position. 2012-01-29 17:33:43 +01:00
Hermann Kraus
822786e41c Remove no-text attribute. One can simply leave the text empty if one wants this. 2012-01-29 13:10:14 +01:00
Artem Pavlenko
d1f16bb227 merge textplacement-merge into feature_impl 2012-01-26 13:04:08 +00:00
Artem Pavlenko
d146bcc380 Merge branch 'master' into feature_impl 2012-01-25 10:04:03 +00:00
Hermann Kraus
0c5fc9f246 Merge pull request #1050 from rfw/text-placements-python
Add text placements to Python API.
2012-01-24 18:11:13 -08:00
Tony Young
d0d692cb82 Add text placements to Python API. 2012-01-25 12:57:26 +13:00
Artem Pavlenko
c88d7e723d + access feature_kv_iterator directly on mapnik::Feature::begin()/end()
+ avoid using 'feature' as variable name as mapnik::Feature will be renamed to mapnik::feature
+ revert 'describe' to 'attributes' (original name fits better in this context I think)
+ make attributes a Puython property
2012-01-24 14:48:30 +00:00
Dane Springmeyer
803a705774 add a method to get simple dictionary of feature attributes, remove old/deprecated feature access 2012-01-24 00:27:27 -08:00
Artem Pavlenko
663b4adfa2 feature_impl : add get paths by const reference method
python : fix helper functions declarations
2012-01-23 14:22:14 +00:00
Hermann Kraus
21a58b7b7a Add missing includes. 2012-01-20 22:43:05 +01:00
Hermann Kraus
7a4dda929a Add H_AUTO to python bindings. 2012-01-20 22:19:48 +01:00
Hermann Kraus
e977df778a Remove unused "anchor" attribute from Text/ShieldSymbolizer. 2012-01-20 00:09:25 +01:00
Artem Pavlenko
7601095e24 move context's typedef inside to avoid poluting global namespace 2012-01-19 17:36:27 -05:00
Artem Pavlenko
3e016f52e7 add __getitem__(self, index) 2012-01-19 16:57:46 -05:00
Artem Pavlenko
096082ba9b Merge branch 'master' into feature_impl 2012-01-19 16:11:03 -05:00
Hermann Kraus
537231f60e Remove glyph symbolizer. 2012-01-19 20:34:09 +01:00
Artem Pavlenko
e7fdf1fa51 more files... 2012-01-19 12:57:34 -05:00
Artem Pavlenko
6dc4aaac9d more files... 2012-01-19 12:57:34 -05:00
Artem Pavlenko
ab314b44a4 + use mapnik::gamma_method_e for all symbolizers
+ fixes #1042 : avoid pushin duplcaite name into boost.python registry
2012-01-19 12:45:24 -05:00
Artem Pavlenko
0f002077e1 + use mapnik::gamma_method_e for all symbolizers
+ fixes #1042 : avoid pushin duplcaite name into boost.python registry
2012-01-19 12:45:24 -05:00
Artem Pavlenko
554341bee1 + cleanup
+ add __getitem__ back
2012-01-18 14:34:22 -05:00
Artem Pavlenko
a6a540cb68 Merge branch 'master' into feature_impl 2012-01-18 09:40:55 -05:00
Artem Pavlenko
034b270eb4 Merge pull request #1023 from tarnowsc/master
Making the gamma-method for polygon symbolizer
2012-01-18 06:35:54 -08:00
Artem Pavlenko
8fd505790e Merge pull request #1023 from tarnowsc/master
Making the gamma-method for polygon symbolizer
2012-01-18 06:35:54 -08:00
Artem Pavlenko
63a3399036 Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl 2012-01-17 17:58:34 -05:00
Dane Springmeyer
820b9a2b25 merge master with feature_impl 2012-01-17 17:47:27 -05:00
Artem Pavlenko
97e090b150 feature_kv_iterator::value_type to python converter 2012-01-17 17:33:43 -05:00
Artem Pavlenko
50b5d06a48 Merge remote-tracking branch 'origin/feature_impl' into feature_impl
Conflicts:
	include/mapnik/feature.hpp
2012-01-17 12:39:16 -05:00
Artem Pavlenko
7944d31c2e use key_value (typedef to std::string)
throw std::out_of_range if key doesn't exist
add has_key(key_value const&) method
2012-01-17 11:23:32 -05:00
Dane Springmeyer
136239f88b remove mapnik::point_datasource from c++ and mapnik.PointDatasource from python bindings 2012-01-17 09:58:45 -05:00
Dane Springmeyer
63891cec15 finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around 2012-01-17 01:09:46 -05:00
Dane Springmeyer
b0d0d06564 finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around 2012-01-17 01:09:46 -05:00
Dane Springmeyer
66a0cfc81f refactor 2012-01-14 22:35:40 -08:00
Dane Springmeyer
834310f2d8 refactor 2012-01-14 22:35:40 -08:00
Cezary Tarnowski
93ff232ca2 #1023 making gamma power default, making gamma-method awailable for polygon pattern symolizer and stroke 2012-01-13 18:20:03 +01:00
Cezary Tarnowski
53fc770495 #1023 making gamma power default, making gamma-method awailable for polygon pattern symolizer and stroke 2012-01-13 18:20:03 +01:00
Artem Pavlenko
a3c338c835 cleanup 2012-01-13 16:31:13 +00:00
Cezary Tarnowski
e7a751987d Merge remote-tracking branch 'upstream/master' 2012-01-13 14:49:59 +01:00
Cezary Tarnowski
afa8ecefc4 Merge remote-tracking branch 'upstream/master' 2012-01-13 14:49:59 +01:00
Artem Pavlenko
5ded118402 avoid wrapping boost::shared_ptr directly 2012-01-13 12:08:09 +00:00
Artem Pavlenko
8de670ecb9 + add mapnik.Context
+ implement __setitem__
+ fix mapnik.Feature ctor - now requires Context obj
2012-01-13 12:03:26 +00:00
Cezary Tarnowski
c007a608ff Adding gamma-method to polygon symbolizer 2012-01-12 16:58:10 +01:00
Cezary Tarnowski
c7cfdef8d4 Adding gamma-method to polygon symbolizer 2012-01-12 16:58:10 +01:00
Artem Pavlenko
0eb8e2d246 temp fix to compile FIXME 2012-01-12 10:04:49 +00:00
Dane Springmeyer
acc0d6e302 cleanup python datasource api simplifying access to descriptors 2012-01-11 20:03:47 -08:00
Dane Springmeyer
2a137908c3 cleanup python datasource api simplifying access to descriptors 2012-01-11 20:03:47 -08:00
Dane Springmeyer
90cf1a226a use declared iterator 2012-01-09 08:38:46 -08:00
Dane Springmeyer
f8b9cb4db4 use declared iterator 2012-01-09 08:38:46 -08:00
Dane Springmeyer
baa0fa37b4 fix compile with older boost 2012-01-06 16:22:39 -08:00
Dane Springmeyer
954cb664ba fix compile with older boost 2012-01-06 16:22:39 -08:00
Dane Springmeyer
5b36ac6f47 fix compile with older boost - fixes #1007 2012-01-05 16:45:12 -08:00
Dane Springmeyer
94ae30d7a2 fix compile with older boost - fixes #1007 2012-01-05 16:45:12 -08:00
Artem Pavlenko
db9021b929 + add to_wkb method for mapnik.Path object
+ reflect byte order enum in Python : mapnik.wkbByteOrder.XDR|NDR
+ refactor boost_version to avoid duplicatiuon
2012-01-05 11:56:38 +00:00
Artem Pavlenko
71c275b86b + add to_wkb method for mapnik.Path object
+ reflect byte order enum in Python : mapnik.wkbByteOrder.XDR|NDR
+ refactor boost_version to avoid duplicatiuon
2012-01-05 11:56:38 +00:00
Dane Springmeyer
712553acea add fontset binding 2011-12-22 12:48:41 -08:00
Dane Springmeyer
5af7afd2c8 add fontset binding 2011-12-22 12:48:41 -08:00
Dane Springmeyer
323c36db61 Merge branch 'geometry_cleanup' 2011-12-22 12:42:05 -08:00
Dane Springmeyer
b820cf7807 Merge branch 'geometry_cleanup' 2011-12-22 12:42:05 -08:00
Dane Springmeyer
c551626916 finish geometry cleanup work by ensuring proper behavior in the ogr plugin with multigeometries 2011-12-21 12:22:05 -08:00
Dane Springmeyer
89a09208e8 finish geometry cleanup work by ensuring proper behavior in the ogr plugin with multigeometries 2011-12-21 12:22:05 -08:00
Dane Springmeyer
d7c720f0af python: reflect fontsets to enable fuller test of map.deepcopy - closes #348 2011-12-20 12:34:27 -08:00
Dane Springmeyer
bbeeaada4d python: reflect fontsets to enable fuller test of map.deepcopy - closes #348 2011-12-20 12:34:27 -08:00
Dane Springmeyer
5d46850222 python: allow box2d to be returned as optional (None) to support map.maximum_extent 2011-12-20 10:42:38 -08:00
Dane Springmeyer
4cc1bb0e04 python: allow box2d to be returned as optional (None) to support map.maximum_extent 2011-12-20 10:42:38 -08:00
Artem Pavlenko
47b9da643c add __deepcopy__ impl 2011-12-20 16:44:48 +00:00
Artem Pavlenko
0f76900d83 add __deepcopy__ impl 2011-12-20 16:44:48 +00:00
Artem Pavlenko
46d71b90db add __deepcopy__ method using native c++ copy semantics 2011-12-20 16:17:20 +00:00
Artem Pavlenko
1bc92fccd7 add __deepcopy__ method using native c++ copy semantics 2011-12-20 16:17:20 +00:00
Dane Springmeyer
bc7da29e6b scons: python 2.5 compatibility 2011-12-16 10:57:05 -08:00
Dane Springmeyer
224f75ff56 scons: python 2.5 compatibility 2011-12-16 10:57:05 -08:00
Dane Springmeyer
90b5cf69cc update tests as per #992 2011-12-16 07:22:52 -08:00
Dane Springmeyer
6aefbd0d99 update tests as per #992 2011-12-16 07:22:52 -08:00
Artem Pavlenko
855a2bd49b Merge branch 'master' into geometry_cleanup 2011-12-16 09:15:02 +00:00
Artem Pavlenko
9fe444ba29 Merge branch 'master' into geometry_cleanup 2011-12-16 09:15:02 +00:00