Commit graph

901 commits

Author SHA1 Message Date
Hermann Kraus
46272d836b Move more variables from text_placements_info to placement_finder.
Refs #1048.
2012-03-04 13:32:10 +01:00
Hermann Kraus
b4eddaab24 Move variables from text_placements_info to placement_finder.
Reuse placement_finder objects.
Pass feature to placement_finder.
Refs #1048.
2012-03-04 01:49:01 +01:00
Dane Springmeyer
adcce7102d be explicit to avoid compile error if includes change 2012-02-24 16:14:02 -08:00
Artem Pavlenko
8767ca8275 + add set_pixel method 2012-02-23 14:32:20 +00:00
Hermann Kraus
d203d56d34 Update tests. 2012-02-21 10:21:40 +01:00
Artem Pavlenko
f20007a965 + add to_geojson() method to mapnik.Path 2012-02-20 12:05:11 +00:00
Artem Pavlenko
68df26baba + add to_geojson method to mapnik.Feature 2012-02-20 10:55:25 +00:00
Artem Pavlenko
3953a94636 + geojson generator interface 2012-02-20 10:53:58 +00:00
Hermann Kraus
725ceaadc1 Fix problem introduced in 060545b9aa. 2012-02-19 17:12:08 +01:00
Hermann Kraus
6fe0637425 Complete support for formatting types. 2012-02-19 02:03:25 +01:00
Hermann Kraus
3508ec5fb4 Merge branch 'master' into python-textplacement 2012-02-17 20:54:48 +01:00
Hermann Kraus
56004ab181 Python bindings: Rename properties=>defauls, default_format=>format. 2012-02-16 00:27:03 +01:00
Hermann Kraus
ceda45249f Merge branch 'master' into python-textplacement 2012-02-16 00:18:44 +01:00
Dane Springmeyer
81230b2b30 remove uneeded include 2012-02-14 16:05:25 -08:00
Dane Springmeyer
ab11f48ce4 avoid compiler warning 2012-02-13 11:30:27 -08:00
Dane Springmeyer
6b6d069f3e silence compiler warning about signed/unsigned comparison 2012-02-13 11:01:16 -08:00
Hermann Kraus
be0f110a76 Fix spelling error. 2012-02-12 23:00:38 +01:00
Hermann Kraus
2b5274c21b Merge branch 'textplacement-rename' into python-textplacement 2012-02-12 13:57:51 +01:00
Hermann Kraus
52702d3a20 Rename filter_factory to expression. 2012-02-12 13:06:39 +01:00
Hermann Kraus
32b492fac1 Fix includes. 2012-02-12 04:06:34 +01:00
Hermann Kraus
9eccd58ed5 Merge branch 'textplacement-rename' into python-textplacement
Conflicts:
	include/mapnik/text_processing.hpp
2012-02-12 04:01:58 +01:00
Hermann Kraus
69f153bf8f Fix all includes. 2012-02-12 03:55:13 +01:00
Hermann Kraus
86d32afac5 Add string constructor for text node. 2012-02-12 01:49:54 +01:00
Hermann Kraus
c94d32b41b Add bindings for formating::list_node. 2012-02-11 11:21:33 +01:00
Hermann Kraus
060545b9aa Easier and safer thread blocking. Part 2 2012-02-09 00:28:10 +01:00
Hermann Kraus
113d42c2c3 Easier and safer thread blocking. 2012-02-09 00:22:12 +01:00
Hermann Kraus
383ad9dad8 Add explicit namespaces. Old code compiled with clang but not with gcc. 2012-02-09 00:07:55 +01:00
Hermann Kraus
7088f972e5 Work around ugly boost python bug. 2012-02-08 23:00:07 +01:00
Hermann Kraus
c28582a23c Add FormatingFormatNode properties. 2012-02-08 20:39:09 +01:00
Hermann Kraus
4333a99991 Copy&paste error. 2012-02-08 00:59:44 +01:00
Hermann Kraus
e71fffe9ac Fix indention. 2012-02-08 00:44:00 +01:00
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
Dane Springmeyer
56cd9c4d6a python bindings: limit uncessary linking on linux and on osx if '-undefined dynamic_lookup' is used (which is now default) 2011-12-14 11:18:31 -08:00
Dane Springmeyer
c51b7ae878 python bindings: limit uncessary linking on linux and on osx if '-undefined dynamic_lookup' is used (which is now default) 2011-12-14 11:18:31 -08:00
Artem Pavlenko
726cea7ba4 Merge branch 'master' into geometry_cleanup 2011-12-14 14:04:30 +00:00
Artem Pavlenko
ed7abc5c51 Merge branch 'master' into geometry_cleanup 2011-12-14 14:04:30 +00:00
Dane Springmeyer
acb726ce63 serialize relative path to fonts/plugins in python paths.py and re-assemble absolute path dynamically at load time to provide greatest portability 2011-12-13 17:53:31 -08:00
Dane Springmeyer
b45c0322b6 serialize relative path to fonts/plugins in python paths.py and re-assemble absolute path dynamically at load time to provide greatest portability 2011-12-13 17:53:31 -08:00
Dane Springmeyer
5a2da87aa8 removed unused file remaining from old automake system 2011-12-13 17:51:40 -08:00
Dane Springmeyer
61453b3842 removed unused file remaining from old automake system 2011-12-13 17:51:40 -08:00
Dane Springmeyer
382a04f33f python: also include uninstall target for deprecated module name 2011-12-13 11:17:44 -08:00
Dane Springmeyer
c8a71cb07c python: also include uninstall target for deprecated module name 2011-12-13 11:17:44 -08:00
Artem Pavlenko
fad6c614e8 remove title, abstract data members from mapnik::rule 2011-12-13 16:47:45 +00:00
Artem Pavlenko
46fea8e890 remove title, abstract data members from mapnik::rule 2011-12-13 16:47:45 +00:00
Artem Pavlenko
bf9dd32e2c remove title,abstract members from layer class 2011-12-13 16:34:10 +00:00
Artem Pavlenko
d24e0436ea remove title,abstract members from layer class 2011-12-13 16:34:10 +00:00
Artem Pavlenko
7e8e600790 + WKT generator for mapnik::geometry_container 2011-12-12 18:19:52 +00:00
Artem Pavlenko
4f1438db01 + WKT generator for mapnik::geometry_container 2011-12-12 18:19:52 +00:00
Artem Pavlenko
4a29caf96f Merge branch 'master' into geometry_cleanup 2011-12-09 09:29:07 +00:00
Artem Pavlenko
47de1123f0 Merge branch 'master' into geometry_cleanup 2011-12-09 09:29:07 +00:00
Dane Springmeyer
3ed2133e39 maintain boost 1.42 compatibility (fixes nighly debian builds on lucid,maverick,and natty 2011-12-08 17:13:41 -08:00
Dane Springmeyer
262badd209 maintain boost 1.42 compatibility (fixes nighly debian builds on lucid,maverick,and natty 2011-12-08 17:13:41 -08:00
Artem Pavlenko
108d1559c1 Merge branch 'master' into geometry_cleanup 2011-12-08 16:51:21 +00:00
Artem Pavlenko
3a20edbfbd Merge branch 'master' into geometry_cleanup 2011-12-08 16:51:21 +00:00
Artem Pavlenko
cb4152c280 add to_wkt method 2011-12-08 16:08:15 +00:00
Artem Pavlenko
11451a5b90 add to_wkt method 2011-12-08 16:08:15 +00:00
Artem Pavlenko
00ed6ffd5e Merge branch 'master' into geometry_cleanup 2011-12-07 09:29:41 +00:00
Artem Pavlenko
39507d30f0 Merge branch 'master' into geometry_cleanup 2011-12-07 09:29:41 +00:00
Dane Springmeyer
1700ffe9cf remove svn revision reporting as it is not longer relevant to git versioned mapnik 2011-12-06 16:52:50 -08:00
Dane Springmeyer
1190f3003d remove svn revision reporting as it is not longer relevant to git versioned mapnik 2011-12-06 16:52:50 -08:00
Artem Pavlenko
7209988fb0 Simplify geometry model to support: Point/LineString/Polygon
Multi geometries are collections of single geometries
Remove multiple_geometries parameter
2011-12-06 12:53:16 +00:00
Artem Pavlenko
cc60b74921 Simplify geometry model to support: Point/LineString/Polygon
Multi geometries are collections of single geometries
Remove multiple_geometries parameter
2011-12-06 12:53:16 +00:00
Dane Springmeyer
9203639640 fully spell out parameters on the map object - refs #977 2011-12-05 18:05:35 -08:00
Dane Springmeyer
f0241c0170 fully spell out parameters on the map object - refs #977 2011-12-05 18:05:35 -08:00
Dane Springmeyer
742fb891e6 python: fixup mapnik.Path interface (closes #901), add to_wkb method (closes #831), and add tests for both 2011-12-02 19:22:04 -08:00
Dane Springmeyer
8168cf0f96 python: fixup mapnik.Path interface (closes #901), add to_wkb method (closes #831), and add tests for both 2011-12-02 19:22:04 -08:00
Dane Springmeyer
1d408aa485 fixup tests around parameters usage 2011-12-02 18:00:20 -08:00
Dane Springmeyer
e991f3c94e fixup tests around parameters usage 2011-12-02 18:00:20 -08:00
Dane Springmeyer
bc002c1b8e python: refactor interface to mapnik::parameters using poor man's indexingapproach - long term todo is merge mapnik::value_holder and mapnik::value to make this cleaner - refs #976 2011-12-02 17:59:57 -08:00
Dane Springmeyer
ad41bca19a python: refactor interface to mapnik::parameters using poor man's indexingapproach - long term todo is merge mapnik::value_holder and mapnik::value to make this cleaner - refs #976 2011-12-02 17:59:57 -08:00
Dane Springmeyer
4c1d5ef5b6 do not need to point to reference 2011-12-02 17:02:20 -08:00
Dane Springmeyer
dcae156e92 do not need to point to reference 2011-12-02 17:02:20 -08:00
Dane Springmeyer
00707d02ff python: make feature attribute access more pythonic 2011-12-02 15:08:56 -08:00
Dane Springmeyer
86459388c1 python: make feature attribute access more pythonic 2011-12-02 15:08:56 -08:00
Dane Springmeyer
7abee1fd47 python: remove unneeded header for mapnik_feature.cpp 2011-12-02 13:38:10 -08:00
Dane Springmeyer
8a4ba70c48 python: remove unneeded header for mapnik_feature.cpp 2011-12-02 13:38:10 -08:00
Dane Springmeyer
982d8fb321 python: use value_convertor to handle mapnik::parameter value_holder variant 2011-12-02 13:37:26 -08:00
Dane Springmeyer
aaa5d30c64 python: use value_convertor to handle mapnik::parameter value_holder variant 2011-12-02 13:37:26 -08:00
Dane Springmeyer
7b6696ff06 remove last traces of ogcserver 2011-11-23 20:30:53 -08:00
Dane Springmeyer
a1eb094e41 remove last traces of ogcserver 2011-11-23 20:30:53 -08:00
Dane Springmeyer
d7ac269a6c OGCServer now lives at https://github.com/mapnik/OGCServer, remove from python bindings 2011-11-23 20:27:54 -08:00
Dane Springmeyer
ccca5afa89 OGCServer now lives at https://github.com/mapnik/OGCServer, remove from python bindings 2011-11-23 20:27:54 -08:00
Artem Pavlenko
14700dba16 switch back from mapnik2 to mapnik
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
2011-11-23 11:33:58 +00:00
Artem Pavlenko
b689670ffd switch back from mapnik2 to mapnik
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
2011-11-23 11:33:58 +00:00
Dane Springmeyer
39d199aa49 code formatting 2011-11-13 19:54:32 -08:00
Dane Springmeyer
4654312d00 code formatting 2011-11-13 19:54:32 -08:00
Robert Coup
a5e8e70a39 Merge remote branch 'origin/master' 2011-10-31 10:53:35 +13:00
Robert Coup
1dcea7e310 Merge remote branch 'origin/master' 2011-10-31 10:53:35 +13:00
Robert Coup
31f1c6ac8c [fixes #904] Python2.5 compatibility. 2011-10-31 10:53:17 +13:00
Robert Coup
0e390eacfe [fixes #904] Python2.5 compatibility. 2011-10-31 10:53:17 +13:00
kunitoki
c314041a5a - implemented sql query in OGR plugin (closes #472) 2011-10-24 11:53:33 +02:00
kunitoki
088561bd5e - implemented sql query in OGR plugin (closes #472) 2011-10-24 11:53:33 +02:00
Robert Coup
d70e648a9c Merge branch 'master' of github.com:mapnik/mapnik 2011-10-21 23:51:27 -07:00
Robert Coup
eb81e72522 Merge branch 'master' of github.com:mapnik/mapnik 2011-10-21 23:51:27 -07:00
Robert Coup
deb4e6b6c3 Do a proper check for BOOST_PYTHON_LIB in scons, and change it to be only the library name. re: mapnik-packaging:#3 2011-10-21 16:39:35 -07:00
Robert Coup
6639501132 Do a proper check for BOOST_PYTHON_LIB in scons, and change it to be only the library name. re: mapnik-packaging:#3 2011-10-21 16:39:35 -07:00
Dane Springmeyer
e0e47f50dd remove area as it is unused (not needed by anything yet) - closes #846 2011-10-21 15:55:58 -07:00
Dane Springmeyer
d1c8818029 remove area as it is unused (not needed by anything yet) - closes #846 2011-10-21 15:55:58 -07:00
Artem Pavlenko
664d3c4ca6 Merge pull request #910 from MapQuest/multi-tile-policy
Added a 'multi' tiled raster plugin reader for virtual images
2011-10-21 12:26:44 -07:00
Artem Pavlenko
4e22542bce Merge pull request #910 from MapQuest/multi-tile-policy
Added a 'multi' tiled raster plugin reader for virtual images
2011-10-21 12:26:44 -07:00
Artem Pavlenko
986edc3c6e Merge pull request #909 from MapQuest/expose-label-collision-detector
Exposed the label collision detector
2011-10-21 12:20:21 -07:00
Artem Pavlenko
c7e1174d6b Merge pull request #909 from MapQuest/expose-label-collision-detector
Exposed the label collision detector
2011-10-21 12:20:21 -07:00
Dane Springmeyer
bba87fa6df as a followup to fa7efc9390, remove unneeded operator-= from box2d 2011-10-19 21:39:48 -07:00
Dane Springmeyer
6d1cd0aad9 as a followup to fa7efc9390, remove unneeded operator-= from box2d 2011-10-19 21:39:48 -07:00
Artem Pavlenko
911981aefd + various win32 fixes, mainly adding extra namespace qualifiers
for vc++10, MAPNIK_DECL ...
2011-10-19 15:29:24 +01:00
Artem Pavlenko
9088d7bbc8 + various win32 fixes, mainly adding extra namespace qualifiers
for vc++10, MAPNIK_DECL ...
2011-10-19 15:29:24 +01:00
Matt Amos
20ca69c3ea Added Python test for multi-tile raster policy. 2011-10-18 14:34:58 +01:00
Matt Amos
517fc59f77 Added Python test for multi-tile raster policy. 2011-10-18 14:34:58 +01:00
Matt Amos
a2b4f9db59 Use make_shared as suggested by coding guidelines. 2011-10-13 19:34:28 +01:00
Dane Springmeyer
7432e1e55a removing my name from copyright as the intention/convention is for copyright to be help by project founder artem: contributions do not necessitate copyright - TODO: document this on community wiki 2011-10-11 17:52:15 -07:00
Matt Amos
1717104654 Changed copyright notice in line with project convention. 2011-10-12 01:37:44 +01:00
Matt Amos
b05a51c783 Ooops, added missing file from patch. 2011-10-12 01:25:10 +01:00
Matt Amos
b5c4bb77de Exposed the label collision detector outside the agg_render object
and via Python, allowing detectors to be re-used across renderings.
2011-10-12 01:05:35 +01:00
Dane Springmeyer
b785d5ae7f fix perms on the python paths.py file 2011-10-10 17:56:56 -07:00
Artem Pavlenko
7387afd96f + remove the unnecessary empty palette from tostring2
(jonburgess777)
2011-10-03 08:47:25 +00:00
Alberto Valverde
e41abb0e12 add a label attribute to colorizer_stop 2011-09-16 13:32:16 +00:00
Alberto Valverde
97431c8de4 made mesh_size configurable 2011-09-16 12:21:21 +00:00
Dane Springmeyer
8e7950c318 +reflect native c++ core register_fonts function - that works recursively 2011-09-15 20:13:15 +00:00
Dane Springmeyer
da5f283c9e support mixed case file extentions when loading fonts via python wrapper function 2011-09-15 20:11:30 +00:00
Dane Springmeyer
547db300a0 match nodejs bindings for kwarg args when encoding grids 2011-09-15 20:09:28 +00:00
Dane Springmeyer
256937bd4e expose the painted boolean on images and grids to allow api users to know if any features were processed and likely rendered 2011-09-14 19:31:57 +00:00
Artem Pavlenko
d5e57afac0 + move compositing into core lib 2011-09-13 15:31:07 +00:00
Artem Pavlenko
703240cf40 + update to reflect interface changes 2011-09-13 13:23:30 +00:00
Artem Pavlenko
12b6aceeee + add __len__ method 2011-09-13 13:23:23 +00:00
Artem Pavlenko
810b494b60 + reflect valid() method 2011-09-13 13:23:15 +00:00
Artem Pavlenko
1fa78f32e0 + add unified interface to mapnik2.Feature:
add_geometries_from_wkt
    add_geometries_from_wkb
 and mapnik2.Path :
     from_wkt
     from_wkb
TODO: integrate mapnik2.Path with mapnik2.Feature (mapnik 2.1)
2011-09-13 11:54:12 +00:00
Alberto Valverde
9579409940 resurrect add_geometry_from_wkb functionallity in Feature's python binding 2011-09-12 14:43:45 +00:00
Dane Springmeyer
04900c4664 fix tests around line symbolizer 2011-09-12 05:33:13 +00:00
Dane Springmeyer
67d7a3a6f0 add alternative line rasterizer that can be enabled to draw faster lines at the expense of dropping short geometries - for thin lines has nicer look but should not be used with think lines - refs #873 2011-09-09 23:45:49 +00:00
Artem Pavlenko
a59c961c1f + add missing save_to_file overloads
+ remove dummy rgba_palette args
2011-09-09 12:40:30 +00:00
Artem Pavlenko
6575e34973 + add initial support for new WKT path/geometry parser concept 2011-09-08 11:52:59 +00:00
Artem Pavlenko
02c143895d + refactor palette stuff a bit
TODO: We need to change save_to_file|string interface
  to avoid passing dummy rgba_palette objects.
2011-09-07 15:01:25 +00:00
Artem Pavlenko
8b3bb3ccd0 + remove shared_ptr and avoid de-referencing un-initialised shared_ptr 2011-09-07 15:01:16 +00:00
Dane Springmeyer
aa5cfad4b7 add minimum-path-length to text_symbolizer - closes #865 2011-09-04 17:33:48 +00:00
Dane Springmeyer
e69bab2b04 include what you use 2011-09-01 00:42:48 +00:00
Dane Springmeyer
90acfb3e1c +reflect mapnik.Palette in python 2011-08-31 02:28:38 +00:00
Dane Springmeyer
9e87c9f914 apply patch from Peter Körner adding AlsoFilter functionality - closes #820 2011-08-30 17:38:27 +00:00
Dane Springmeyer
22c39d91ba scons: rename all SConscript files to more friendly name of 'build' with a python extension for quick syntax detection in editors 2011-08-30 05:32:01 +00:00
Dane Springmeyer
2c75feed65 scons: fix bug that propagated libmapnik CXXFLAGS too liberally (in this case to plugins) 2011-08-29 23:01:33 +00:00
Dane Springmeyer
d19cf41d05 scons: ditch brittle handling of cairo flags for python bindings, moving to more dimple reading of paths used for libmapnik 2011-08-29 22:17:13 +00:00
Dane Springmeyer
8172dd4550 scons: fixup python paths 2011-08-12 21:43:43 +00:00
Dane Springmeyer
a506c7ba29 fix typo 2011-08-12 00:14:34 +00:00
Dane Springmeyer
82ac99611e add LINKING option to control whether libmapnik is build static or shared and RUNTIME_LINK options to trigger dependency flags to compile against static libs 2011-08-11 19:14:00 +00:00
Dane Springmeyer
46af5ff222 python: shuffle mapnik::value -> python object convertor, and utilize for conversion to correct type in expression evalution 2011-07-27 02:36:59 +00:00
Artem Pavlenko
8bfd5956bc + add remaining compositing modes
(http://www.w3.org/TR/2009/WD-SVGCompositing-20090430/)
  FIXME: move compositing into core lib
2011-07-13 13:23:18 +00:00
Dane Springmeyer
8ec62942ff expressions should evaluate to proper booleans in python 2011-07-12 00:58:37 +00:00
Dane Springmeyer
a6a8e8348a return string repr of types rather than dodgy type conversion in python 2011-07-12 00:58:02 +00:00
Dane Springmeyer
57827813fb handle boolean conversion to python 2011-07-11 22:27:40 +00:00
Dane Springmeyer
563ae20a6e return python 'None' for null values - otherwise we hit runtime error of 'SystemError: NULL result without error in PyObject_Call' 2011-07-11 19:27:38 +00:00
Dane Springmeyer
e84119aed9 directly link libmapnik in plugins (not just darwin) - patch from Stella L. - closes #790 2011-07-05 23:41:17 +00:00
Dane Springmeyer
f47e350121 use 'alignment' keyword in python to match XML in polygon_pattern_symbolizer, closes #203 2011-06-28 23:22:06 +00:00