Mickey Rose
5ca715c1e0
transform expressions: disallow space-separated compound arguments, refs #1389
2012-08-19 19:30:51 +02:00
Rich Wareham
b085b401db
Move python test maps from 'good_maps' directory
...
If the CirclesDatasource class was not available from the python_plugin_tests module then the 'load_good_maps' test
would fail. The class would not be available if, for example, the python plugin had not been built or if shapely was not
available on the test system. (Pull request #1414 removes the dependency on Shapely.)
The error reporting should be tidied up for this case but for the moment, move the Python plugin's test maps into their
own directory since they're not guaranteed to be 'good maps' in all cases at the moment.
Hopefully addresses issue #1407
2012-08-18 17:38:37 +01:00
Rich Wareham
6867509da8
python plugin: remove Shapely dependency from tests
...
Remove the Shapely dependency by generating the output features directly in WKT format. Update the expected output image
because the circles are now generated directly as 72-sided polygons rather than by buffering a point.
2012-08-18 17:17:14 +01:00
Rich Wareham
0301294c84
python bindings: add wkt_features helper to PythonDatasource
...
The Python plugin datasource helper class already contained a helper for generating WKB features. This patch adds an
almost identical helper for WKT features. This is to facility Python data source who generate their features directly
using the text formatting support in Python.
2012-08-18 17:15:38 +01:00
Dane Springmeyer
854d872447
further flesh out 2.1.0 changelog entries that were missing - refs #1403
2012-08-17 17:14:03 -07:00
Dane Springmeyer
f42805a532
CSV plugin: support reading geojson encoded geometries in various flavors of quoting fun - closes #1392
2012-08-17 13:46:32 -07:00
Dane Springmeyer
99705308a9
add another demo output to gitignore
2012-08-17 10:07:22 -07:00
Dane Springmeyer
1454e3ea97
nicer error message if python-nose is not installed
2012-08-17 09:47:47 -07:00
Dane Springmeyer
39b057e9e4
Add a demo makefile target
2012-08-17 09:47:35 -07:00
Dane Springmeyer
333ab9a37e
only build pgsql2sqlite if boost_program_options is available
2012-08-17 09:37:08 -07:00
Dane Springmeyer
421dedbd11
Merge branch 'master' of github.com:mapnik/mapnik
2012-08-17 09:33:05 -07:00
Dane Springmeyer
6c254999ae
rundemo.cpp - no need to link to boost_program_options - closes #1406
2012-08-17 09:32:55 -07:00
artemp
343318f53b
Merge remote-tracking branch 'origin/master'
2012-08-17 16:58:34 +01:00
Dane Springmeyer
aee29b27ed
only build geojson plugin if >= boost 1.47 is available to avoid potential compiler errors with missing boost/geometry headers if people try to force older boost versions
2012-08-17 08:57:49 -07:00
artemp
f24641e802
+ add envelope() method to mapnik.Path
2012-08-17 16:53:43 +01:00
artemp
b24c2efddc
+ add geojson geometry parsing test
2012-08-17 13:07:32 +01:00
artemp
45515e2b2d
+ it's a TIN (triangulated irregular network) not TIM :D
...
+ fixup wkb parsing test
2012-08-17 12:49:55 +01:00
artemp
258ea94d8d
+ add_geojson and from_geojson methods
...
+ add_wkb,from_wkb throw RuntimeError
+ cleanups
2012-08-17 12:48:41 +01:00
artemp
9810557cdc
+ geojson geometry parser implementation
2012-08-17 12:47:41 +01:00
artemp
21f86761a7
+ json: split feature_grammar into geometry and feature grammars
2012-08-17 11:25:21 +01:00
Dane Springmeyer
97e907d95f
fix test
2012-08-16 19:29:07 -07:00
Dane Springmeyer
ad2250a4b5
back compatibility for raster-mode values using _ and shield-no-text
2012-08-16 19:20:29 -07:00
Dane Springmeyer
62e039d2c9
double grid encoding performance in python - closes #1315
2012-08-16 18:39:11 -07:00
Dane Springmeyer
58d848ae8e
c++ style
2012-08-16 18:25:06 -07:00
Dane Springmeyer
cf3bbb8cf0
csv plugin: be more aggressive about detecting and ignoring blank lines
2012-08-16 18:20:48 -07:00
Dane Springmeyer
2bed3d1acf
add test for reading csv from string
2012-08-16 18:18:00 -07:00
Dane Springmeyer
3cdc0de559
add testcase for #1375
2012-08-16 17:59:03 -07:00
Dane Springmeyer
d95f81a588
c++ style
2012-08-16 17:58:08 -07:00
Dane Springmeyer
25a1643d54
partial revert of e6e32fc and general cleanup to match node-mapnik grid api - refs #1325 and 1315
2012-08-16 17:51:36 -07:00
Dane Springmeyer
9ef6c0dce1
scons: ensure you can build pgsql2sqlite even if the sqlite datasource plugin is not requested
2012-08-16 16:21:10 -07:00
Dane Springmeyer
e0608a4aa4
only throw for unknown attributes if in strict mode
2012-08-16 16:10:23 -07:00
Dane Springmeyer
372f384365
fix typo: missing comma in severity enum
2012-08-16 16:09:52 -07:00
Dane Springmeyer
a986aedd05
remove 'info' and 'fatal' severities for logging to simplify framework - closes #1400
2012-08-16 15:52:32 -07:00
Dane Springmeyer
62d669907b
tests: only run pycairo test if sqlite ds is available
2012-08-16 15:46:40 -07:00
Dane Springmeyer
619af3e3c7
scons: remove boost_python library check - there is not way to include multiple headers and therefore no way to safely include both boost_python and -lpython libs - refs #1394
2012-08-16 14:29:42 -07:00
Dane Springmeyer
7d8bae4131
Merge branch 'master' of github.com:mapnik/mapnik
2012-08-16 14:13:04 -07:00
Dane Springmeyer
57246bb569
scons: better handling of implicit dependencies - also add distclean target - refs #1395 , #1324 , and #1310
2012-08-16 14:12:49 -07:00
Dane Springmeyer
d902de1c08
remove unused member variables
2012-08-16 14:05:55 -07:00
Dane Springmeyer
4cd54f4e0b
fix test
2012-08-16 14:05:39 -07:00
Dane Springmeyer
cbd45941b1
remove unmaintained DTD - refs #1402
2012-08-16 13:05:08 -07:00
Dane Springmeyer
a3e27ed726
Merge branch 'master' of github.com:mapnik/mapnik
2012-08-16 12:29:27 -07:00
Dane Springmeyer
bfc92a469c
fix and doc out behavior of register_fonts
2012-08-16 12:29:13 -07:00
Dane Springmeyer
9964eefb55
remove now unused variable
2012-08-16 12:28:36 -07:00
Dane Springmeyer
d850ee8b76
correct various old trac links to point to github - closes #1396
2012-08-16 12:27:58 -07:00
Dane Springmeyer
a2d6c55478
tests: assume script running "paths_relative_to_script" is in the root mapnik dir not the tests dir
2012-08-16 10:26:39 -07:00
Dane Springmeyer
53685f3f99
scons: create working uninstall target for fonts
2012-08-16 10:05:34 -07:00
Dane Springmeyer
ecb72d6cbc
scons: don't run parseconfig if uninstalling
2012-08-16 10:00:05 -07:00
Dane Springmeyer
636a5dadc5
Merge branch 'master' of github.com:mapnik/mapnik
2012-08-16 08:31:46 -07:00
artemp
02e07f9c9c
+ update scons to the latest version 2.2.0
2012-08-16 12:26:00 +01:00
artemp
8bba93d299
+ don't pass std::string arg by value - use const&
2012-08-16 12:05:31 +01:00
