Commit graph

673 commits

Author SHA1 Message Date
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