Commit graph

3296 commits

Author SHA1 Message Date
Dane Springmeyer
6d30e8f126 more tests for geometry wkt and wkb io 2011-12-21 15:27:53 -08:00
Dane Springmeyer
fadb593878 Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-21 12:58:32 -08:00
Dane Springmeyer
9f4fa0b820 fixup static linking for pgsql2sqlite build 2011-12-21 12:58:10 -08:00
Dane Springmeyer
7b7fc5eb94 add test comparing geometry handling between ogr and shape plugin - currently fails 2011-12-21 12:26:03 -08:00
Dane Springmeyer
de932bd99b remove last reference to multiple_geometries option 2011-12-21 12:22:43 -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
Tom MacWright
bb5f274265 Adds unbuffered_extent_ to queries from feature_style_processor.
Creates a new constructor for query. Currently this is used
by the jit_datasource.
2011-12-20 16:12:37 -05:00
Dane Springmeyer
ec611832ab initial map deepcopy test 2011-12-20 12:46:35 -08:00
Dane Springmeyer
2d59f401b5 tests for fontsets 2011-12-20 12:46:20 -08:00
Dane Springmeyer
94e44fcd62 test fontset non-existance 2011-12-20 12:40:14 -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
0f0e04e6dc fixup fontset error reporting - a likely problem in mapnik2 upgrade - closes #596 2011-12-20 12:31:38 -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
Artem Pavlenko
47b9da643c add __deepcopy__ impl 2011-12-20 16:44:48 +00:00
Artem Pavlenko
c71a02e24d add poor man's deepcopy method :
'''
mapnik::util::deepcopy(map_in,map_out);
'''
2011-12-20 16:26:30 +00:00
Artem Pavlenko
46d71b90db add __deepcopy__ method using native c++ copy semantics 2011-12-20 16:17:20 +00:00
Artem Pavlenko
43c837399d copy filter expressions fix
use const_iterator
2011-12-20 16:16:17 +00:00
Dane Springmeyer
b51c06f5ad scons: when linking statically include other required libpq deps 2011-12-19 10:51:38 -08:00
Artem Pavlenko
145362c6f7 refactor symbolizer deepcopy semantics into internal structure 2011-12-19 13:30:30 +00:00
Dane Springmeyer
b62cebf9b5 renable to_wkt after g++ compile fix in 0aef7cc55a 2011-12-17 11:55:30 -08:00
Artem Pavlenko
b4fd857a66 Merge remote-tracking branch 'origin/master' 2011-12-17 11:45:08 +00:00
Artem Pavlenko
0aef7cc55a provide attribute customization point :
template <>
struct is_container<mapnik::geometry_container>
    : mpl::false_
{};

TODO: This is somewhat non-intuitive in this context but
keeps gcc and darwin toolsets happy.
2011-12-17 11:41:24 +00:00
Dane Springmeyer
03c254c7f1 clear out the config.cache on reset 2011-12-16 18:24:38 -08:00
Dane Springmeyer
fd895f9533 Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-16 16:07:57 -08:00
Dane Springmeyer
bc7da29e6b scons: python 2.5 compatibility 2011-12-16 10:57:05 -08:00
Dane Springmeyer
261c9e41e5 temporarily comment to_wkt until we can fix compile with g++ (only works currently with clang++) 2011-12-16 10:07:30 -08:00
Dane Springmeyer
5357080dc6 c++ style cast 2011-12-16 10:06:18 -08:00
Dane Springmeyer
0bb2cc2d49 add support for 'intersects' token in sqlite plugin - closes #809 2011-12-16 10:05:54 -08:00
Dane Springmeyer
312e98a869 more robust sqlite subquery tests and first tests of \!intersects\! token - refs #809 2011-12-16 09:58:09 -08:00
Dane Springmeyer
c7a6dc597a sqlite: when building rtree sql, only try WHERE substitution if not doing join 2011-12-16 08:14:08 -08:00
Dane Springmeyer
1b8e49d13b sqlite: improve the error message when geometry_field could not be autodetected 2011-12-16 07:48:02 -08:00
Dane Springmeyer
bc7457097b update as per #992 2011-12-16 07:41:36 -08:00
Dane Springmeyer
90b5cf69cc update tests as per #992 2011-12-16 07:22:52 -08:00
Dane Springmeyer
95264a2dcb Merge branch 'master' of github.com:mapnik/mapnik 2011-12-16 06:50:32 -08:00
Artem Pavlenko
855a2bd49b Merge branch 'master' into geometry_cleanup 2011-12-16 09:15:02 +00:00
Dane Springmeyer
6e18e307ee Add missing break 2011-12-15 17:18:22 -08:00
Artem Pavlenko
6fe8b8ac7e untabify 2011-12-15 14:57:57 +00:00
Dane Springmeyer
6330978cce move the json config into the main script 2011-12-14 15:51:57 -08:00
Dane Springmeyer
80aef18d4d Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-14 11:18:48 -08: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
Artem Pavlenko
726cea7ba4 Merge branch 'master' into geometry_cleanup 2011-12-14 14:04:30 +00:00
Artem Pavlenko
fa458177a4 Merge remote-tracking branch 'origin/master' 2011-12-14 14:01:34 +00:00
Artem Pavlenko
297a47fd26 Merge remote-tracking branch 'tomtom/master' 2011-12-14 13:59:47 +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
5a2da87aa8 removed unused file remaining from old automake system 2011-12-13 17:51:40 -08:00
Dane Springmeyer
5f84df96d4 python 2.5 compatibility 2011-12-13 17:02:00 -08:00
Dane Springmeyer
7a3dbfdad7 Merge branch 'master' of github.com:mapnik/mapnik 2011-12-13 13:52:35 -08:00
Dane Springmeyer
754581f278 tests: no need to test sqlite through ogr anymore - native impl is robust and has its own tests now 2011-12-13 13:52:11 -08:00
Dane Springmeyer
382a04f33f 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