Dane Springmeyer
1131d480e9
scons: when linking statically include other required libpq deps
2011-12-19 10:51:38 -08: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
Artem Pavlenko
f1d9a18bc9
untabify
2011-12-15 14:57:57 +00:00
Dane Springmeyer
d03815276e
move the json config into the main script
2011-12-14 15:51:57 -08:00
Dane Springmeyer
7b43f7fe58
Merge branch 'master' of https://github.com/mapnik/mapnik
2011-12-14 11:18:48 -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
ed7abc5c51
Merge branch 'master' into geometry_cleanup
2011-12-14 14:04:30 +00:00
Artem Pavlenko
d128333a75
Merge remote-tracking branch 'origin/master'
2011-12-14 14:01:34 +00:00
Artem Pavlenko
5a654248da
Merge remote-tracking branch 'tomtom/master'
2011-12-14 13:59:47 +00: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
61453b3842
removed unused file remaining from old automake system
2011-12-13 17:51:40 -08:00
Dane Springmeyer
53dd1be72a
python 2.5 compatibility
2011-12-13 17:02:00 -08:00
Dane Springmeyer
eafb8c810b
Merge branch 'master' of github.com:mapnik/mapnik
2011-12-13 13:52:35 -08:00
Dane Springmeyer
9ac6e4b12e
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
c8a71cb07c
python: also include uninstall target for deprecated module name
2011-12-13 11:17:44 -08:00
Artem Pavlenko
46fea8e890
remove title, abstract data members from mapnik::rule
2011-12-13 16:47:45 +00:00
Artem Pavlenko
d24e0436ea
remove title,abstract members from layer class
2011-12-13 16:34:10 +00:00
Artem Pavlenko
98e8164ce1
+ support GEOMETRYCOLLECTION in WKT generator
2011-12-13 16:33:27 +00:00
Cezary Tarnowski
fbe8829791
Changing the gamma for better visual effect
2011-12-13 15:40:47 +01:00
Cezary Tarnowski
79af8fdbc9
refactoring following comment on pull request
2011-12-13 15:28:18 +01:00
Artem Pavlenko
20f1d45218
Merge remote-tracking branch 'origin/master'
2011-12-13 10:36:43 +00:00
Dane Springmeyer
e3d9bc2c6e
add readme to svg test dir
2011-12-12 16:02:12 -08:00
Dane Springmeyer
7ea7838f21
add new csv test
2011-12-12 16:00:53 -08:00
Dane Springmeyer
143efad7cd
csv plugin: allow values with leading zeros to stay as strings - closes #993 - refs https://github.com/mapbox/tilemill/issues/1007
2011-12-12 15:55:33 -08:00
Artem Pavlenko
4f1438db01
+ WKT generator for mapnik::geometry_container
2011-12-12 18:19:52 +00:00
Artem Pavlenko
c2c363e005
Merge remote-tracking branch 'origin/geometry_cleanup' into geometry_cleanup
2011-12-12 17:17:46 +00:00
Dane Springmeyer
51bd04c448
Merge branch 'master' of github.com:mapnik/mapnik into geometry_cleanup
2011-12-12 08:31:23 -08:00
Dane Springmeyer
c837078b38
sqlite: fixup rtree bbox entries to use cumulative extent of multipolygons to avoid contraint errors
2011-12-12 08:30:46 -08:00
Cezary Tarnowski
0882f0e668
Merge branch 'master' of https://github.com/mapnik/mapnik
2011-12-12 11:29:00 +01:00
Artem Pavlenko
afe488f214
Merge branch 'master' into geometry_cleanup
2011-12-12 10:17:25 +00:00
Artem Pavlenko
7422f33811
copy fontsets
2011-12-12 10:16:39 +00:00
Artem Pavlenko
bf4f442b8d
Merge branch 'master' into geometry_cleanup
2011-12-12 09:20:21 +00:00
Dane Springmeyer
e5ab14a298
Merge pull request #916 from kkaefer/grouped-rendering
...
Grouped rendering
2011-12-11 22:36:22 -08:00
Artem Pavlenko
02dce6a756
make shape_io work with geometry_container concept
2011-12-09 12:25:13 +00:00