Commit graph

3210 commits

Author SHA1 Message Date
Artem Pavlenko
9e6e7d0211 delete trailing white space 2012-01-05 11:40:27 +00:00
Artem Pavlenko
0aa44b84f9 don't use boost foreach on geometry_container - type deduction
issues ??
2012-01-05 11:38:43 +00:00
Artem Pavlenko
e33326a561 implement wkb converter for multi geometries 2012-01-05 10:57:22 +00:00
Artem Pavlenko
883615d454 Merge pull request #999 from tarnowsc/master
Bugfix for building symbolizer
2012-01-02 04:37:36 -08:00
Cezary Tarnowski
46a15d50bf bugfix - if geometry is used twice from cache it will be missing walls in building symbolizer 2011-12-30 12:35:28 +01:00
Hermann Kraus
133bd16211 Fix unsigned underflow. 2011-12-23 15:01:28 +01:00
Dane Springmeyer
681930372f Revert "text rendering: only create objects once rather than per geometry part/placement attempt - refs #162"
This reverts commit eaf8d50422.
2011-12-22 15:01:41 -08:00
Dane Springmeyer
f47365a927 text rendering: only create objects once rather than per geometry part/placement attempt - refs #162 2011-12-22 14:48:40 -08:00
Dane Springmeyer
68e5811491 make failing ogr/shape comparison a todo 2011-12-22 14:37:32 -08:00
Dane Springmeyer
5af7afd2c8 add fontset binding 2011-12-22 12:48:41 -08:00
Dane Springmeyer
84b7d198d4 fixup fontset tests 2011-12-22 12:48:11 -08:00
Dane Springmeyer
b820cf7807 Merge branch 'geometry_cleanup' 2011-12-22 12:42:05 -08:00
Dane Springmeyer
2701f93a04 test cleanups 2011-12-22 12:41:51 -08:00
Dane Springmeyer
62983ef214 fix import 2011-12-22 12:20:03 -08:00
Dane Springmeyer
bed779b465 tests: maintain python 2.5 support 2011-12-22 12:19:40 -08:00
Dane Springmeyer
ddeac9a16d more tests for geometry wkt and wkb io 2011-12-21 15:27:53 -08:00
Dane Springmeyer
6a6c493e03 Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-21 12:58:32 -08:00
Dane Springmeyer
3ede1b13db fixup static linking for pgsql2sqlite build 2011-12-21 12:58:10 -08:00
Dane Springmeyer
b12498f967 add test comparing geometry handling between ogr and shape plugin - currently fails 2011-12-21 12:26:03 -08:00
Dane Springmeyer
b6e78ab06b remove last reference to multiple_geometries option 2011-12-21 12:22:43 -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
b06a517f02 initial map deepcopy test 2011-12-20 12:46:35 -08:00
Dane Springmeyer
2c1f5b6ea7 tests for fontsets 2011-12-20 12:46:20 -08:00
Dane Springmeyer
58c00c844a test fontset non-existance 2011-12-20 12:40:14 -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
dd8581bf5a fixup fontset error reporting - a likely problem in mapnik2 upgrade - closes #596 2011-12-20 12:31: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
0f76900d83 add __deepcopy__ impl 2011-12-20 16:44:48 +00:00
Artem Pavlenko
b3b330bcb7 add poor man's deepcopy method :
'''
mapnik::util::deepcopy(map_in,map_out);
'''
2011-12-20 16:26:30 +00:00
Artem Pavlenko
1bc92fccd7 add __deepcopy__ method using native c++ copy semantics 2011-12-20 16:17:20 +00:00
Artem Pavlenko
6c248c70f9 copy filter expressions fix
use const_iterator
2011-12-20 16:16:17 +00:00
Dane Springmeyer
1131d480e9 scons: when linking statically include other required libpq deps 2011-12-19 10:51:38 -08:00
Artem Pavlenko
a99392d3df refactor symbolizer deepcopy semantics into internal structure 2011-12-19 13:30:30 +00:00
Dane Springmeyer
d940a7cc52 renable to_wkt after g++ compile fix in 0aef7cc55a 2011-12-17 11:55:30 -08:00
Artem Pavlenko
365e42cd0e Merge remote-tracking branch 'origin/master' 2011-12-17 11:45:08 +00:00
Artem Pavlenko
843411df86 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
8ae1518351 clear out the config.cache on reset 2011-12-16 18:24:38 -08:00
Dane Springmeyer
b2762b3a91 Merge branch 'master' of https://github.com/mapnik/mapnik 2011-12-16 16:07:57 -08:00
Dane Springmeyer
224f75ff56 scons: python 2.5 compatibility 2011-12-16 10:57:05 -08:00
Dane Springmeyer
05a09de211 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
4b28739274 c++ style cast 2011-12-16 10:06:18 -08:00
Dane Springmeyer
04dd46315e add support for 'intersects' token in sqlite plugin - closes #809 2011-12-16 10:05:54 -08:00
Dane Springmeyer
ea1e5cabb7 more robust sqlite subquery tests and first tests of \!intersects\! token - refs #809 2011-12-16 09:58:09 -08:00
Dane Springmeyer
b518402686 sqlite: when building rtree sql, only try WHERE substitution if not doing join 2011-12-16 08:14:08 -08:00
Dane Springmeyer
0ebf79e5ea sqlite: improve the error message when geometry_field could not be autodetected 2011-12-16 07:48:02 -08:00
Dane Springmeyer
a8aef1f92c update as per #992 2011-12-16 07:41:36 -08:00
Dane Springmeyer
6aefbd0d99 update tests as per #992 2011-12-16 07:22:52 -08:00
Dane Springmeyer
39801bf943 Merge branch 'master' of github.com:mapnik/mapnik 2011-12-16 06:50:32 -08:00
Artem Pavlenko
9fe444ba29 Merge branch 'master' into geometry_cleanup 2011-12-16 09:15:02 +00:00
Dane Springmeyer
d4b85f55f9 Add missing break 2011-12-15 17:18:22 -08:00