sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8046 commits 112 branches 95 tags 181 MiB
Commit graph

8046 commits

This branch
This branch
All branches
Author SHA1 Message Date
Artem Pavlenko
b4fd857a66 Merge remote-tracking branch 'origin/master' 2011-12-17 11:45:08 +00:00
Artem Pavlenko
365e42cd0e 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
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
03c254c7f1 clear out the config.cache on reset 2011-12-16 18:24:38 -08:00
Dane Springmeyer
8ae1518351 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
b2762b3a91 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
224f75ff56 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
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
5357080dc6 c++ style cast 2011-12-16 10:06:18 -08:00
Dane Springmeyer
4b28739274 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
04dd46315e 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
ea1e5cabb7 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
b518402686 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
0ebf79e5ea 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
a8aef1f92c 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
6aefbd0d99 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
Dane Springmeyer
39801bf943 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
Artem Pavlenko
9fe444ba29 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
Dane Springmeyer
d4b85f55f9 Add missing break 2011-12-15 17:18:22 -08:00
Artem Pavlenko
6fe8b8ac7e untabify 2011-12-15 14:57:57 +00:00
Artem Pavlenko
f1d9a18bc9 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
d03815276e 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
7b43f7fe58 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
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
Artem Pavlenko
fa458177a4 Merge remote-tracking branch 'origin/master' 2011-12-14 14:01:34 +00:00
Artem Pavlenko
d128333a75 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
Artem Pavlenko
5a654248da 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
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