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

451 commits

Author SHA1 Message Date
artemp
a513d3f97d + code: avoid exposing unsafe static methods in datasource_cache ( #1451) 
+ python: remove redundent 'instance' method (mapnik.DatasourceCache)
+ python: reflect plugin_directories method
+ tests: update python usage

TODO: consider using similar approach in FontEngine etc..
TODO: consider returning reference from singleton::instance() to
      safeguard from accidental deleting a 'singleton' pointer
 2012-09-05 12:53:37 +01:00
Dane Springmeyer
f5cf5aa09d start reporting geometry type in geojson plugin 2012-09-03 10:01:01 -07:00
Dane Springmeyer
d054178a75 add grayscale conversion test - refs #1454 2012-08-31 19:12:12 -07:00
Dane Springmeyer
6450d33462 update tests images after change made to agg src_over in #1452, refs #1369 2012-08-31 18:16:49 -07:00
Dane Springmeyer
affecb0f32 csv plugin: support single row data and fix warning when no data can be parsed 2012-08-31 12:07:35 -07:00
Dane Springmeyer
6aa9043352 improve upon premultiplied alpha tests in a51678d307 2012-08-28 18:53:27 -07:00
Dane Springmeyer
52c180aebc fixup json escaping test 2012-08-25 11:05:01 -07:00
Dane Springmeyer
4f4902611b only run tests if shape plugin is available 2012-08-23 14:41:45 -07:00
Dane Springmeyer
769fc8948e fix test failure after c3dae01055 - refs #1399,#1282, and #1433 2012-08-22 18:17:43 -07:00
Dane Springmeyer
bf559f9720 add tests for symbolizer clip/transform/smooth/comp_op from python - refs #1264 2012-08-21 18:18:20 -07:00
Dane Springmeyer
e8101a070a partially repair backward compatibility in python for 'marker-type' - refs #1427 and #1285 2012-08-21 16:36:15 -07:00
Dane Springmeyer
dc1ab040f3 move box2d tests to standlone test 2012-08-21 16:21:28 -07:00
Dane Springmeyer
e63b19cc42 no need for test comments 2012-08-21 16:19:15 -07:00
Dane Springmeyer
ab5ce64b16 python: add properties to mapnik.Stroke to match xml/svg spec - refs #1427 2012-08-21 15:59:31 -07:00
Dane Springmeyer
6a0df52b1c python: add wrap_character alias to wrap_char - refs #1427 2012-08-21 14:48:10 -07:00
Dane Springmeyer
0c6030303d Add a (currently) failing test for #1420 2012-08-21 14:27:57 -07:00
Dane Springmeyer
ac313cf907 add note about expected test failure with gdal older than 1.9 2012-08-21 11:47:15 -07:00
Dane Springmeyer
b76c8e5c64 +reflect building symbolizer in python 2012-08-20 18:17:00 -07:00
Dane Springmeyer
9273f861bc reflect all new style properties in python - refs #1264 2012-08-20 17:17:37 -07:00
Dane Springmeyer
cc2c819931 remove layer test which is now standalone 2012-08-20 16:27:29 -07:00
Dane Springmeyer
55646ce236 fix group_by on layer to be std::string const& and reflect in python 2012-08-20 16:26:41 -07:00
Dane Springmeyer
3be516a805 Merge pull request #1416 from mirecta/transform_expr-sep 
transform expressions: whitespace/comma argument separation rules
 2012-08-20 14:28:54 -07:00
Dane Springmeyer
83d247a793 Merge pull request #1414 from rjw57/rjw57-remove-shapely-python-plugin-tests 
Remove shapely dependency from python plugin tests
 2012-08-20 14:26:45 -07:00
Dane Springmeyer
b1e9c738ee Merge pull request #1415 from rjw57/rjw57-issue-1407 
Move python test maps from 'good_maps' directory
 2012-08-20 14:25:13 -07:00
Dane Springmeyer
9f7e033dbc csv plugin: be more permissive when headers length > column length but more strict when the opposite is true - closes #1417 2012-08-20 14:06:07 -07:00
Mickey Rose
cbaf80f574 transform expressions: add parsing tests 2012-08-20 02:24:34 +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
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
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
Dane Springmeyer
62e039d2c9 double grid encoding performance in python - closes #1315 2012-08-16 18:39:11 -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
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
636a5dadc5 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-16 08:31:46 -07:00
Dane Springmeyer
af413aa959 conditionally run tests based on availability of datasources 2012-08-15 19:22:47 -07:00
Dane Springmeyer
91b15c4cdf remove python pickling for map/style/rule/symbolizers/fontset/query - refs #1391 2012-08-15 13:55:36 -07:00
Dane Springmeyer
b8a0587c29 disable deepcopy in python bindings until this is more solid - refs #1390 2012-08-15 13:27:44 -07:00
Dane Springmeyer
9e85944d93 remove unneeded import 2012-08-15 13:27:10 -07:00
artemp
aecf0531f5 + remove metawriters for the upcoming 2.1 release 2012-08-15 09:47:03 +01:00
Dane Springmeyer
f057f43dac fix grid/markers tests after a57996e661 - refs #1309 2012-08-14 17:20:19 -07:00
Dane Springmeyer
d7d088cc97 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-14 09:04:06 -07:00
Dane Springmeyer
d8bb4050c5 minor grid rendering test touchups 2012-08-13 16:52:31 -07:00
Dane Springmeyer
e07c04ed7b Merge branch 'master' of github.com:mapnik/mapnik 2012-08-08 10:19:25 -07:00
Dane Springmeyer
f53549ca65 add empty geom test 2012-08-08 10:19:16 -07:00
artemp
92eff33433 + update tests to use Python iterator protocol 2012-08-08 17:31:30 +01:00
artemp
d7fa56b307 Merge remote-tracking branch 'origin/master' 2012-08-07 11:39:11 +01:00
artemp
ee6ddbf2c8 + correct fill_opacity test value 2012-08-07 11:36:44 +01:00
Dane Springmeyer
3965e2e9e3 new test image after color burn fixes 2012-08-06 11:40:14 -07:00
Artem Pavlenko
189322ef9f Merge pull request #1337 from rjw57/rjw57-python-plugin 
Request for comments: python: a new plugin to use arbitrary Python as a data source
 2012-08-06 05:09:29 -07:00
Dane Springmeyer
9284c6369d correct rendering behavior of marker-opacity, which should not, as per svg, override fill-opacity and stroke-opacity but should combine with it 2012-08-03 14:14:03 -07:00
Dane Springmeyer
a51678d307 first, not yet fully working attemp to validate pixel alpha status - refs #1369 2012-08-03 14:13:13 -07:00
Dane Springmeyer
cd73d391f7 unmask second, previously crashing svg rendering/compositing test 2012-08-03 09:43:33 -07:00
Dane Springmeyer
e62739d146 fix render_marker for grid renderer and other minor syncing - refs #1309 2012-08-02 13:10:05 -07:00
Dane Springmeyer
a22b31b0cc switch out new test image since there is no visual difference to the old one 2012-08-01 16:43:47 -07:00
Dane Springmeyer
f60f40c939 Merge pull request #1157 from mapnik/stroke-as-reference 
make stroke property on line_symbolizer a reference when accessed from python (not a copy)
 2012-07-31 18:20:55 -07:00
Dane Springmeyer
3867a75adf comment crashing test 2012-07-31 16:42:07 -07:00
Dane Springmeyer
4d2eb73e3b add tests for complex marker rendering functionality 2012-07-31 16:04:42 -07:00
Dane Springmeyer
cb246a436f update the grid rendering tests with new expected results (should now be passing) 2012-07-31 13:16:41 -07:00
Rich Wareham
156a7590f4 python: a new plugin to use arbitrary Python as a data source 
This plugin allows you to write data sources in the Python programming language.
This is useful if you want to rapidly prototype a plugin, perform some custom
manipulation on data or if you want to bind mapnik to a datasource which is most
conveniently accessed through Python.

The plugin may be used from the existing mapnik Python bindings or it can embed
the Python interpreter directly allowing it to be used from C++, XML or even
JavaScript.

Mapnik already has excellent Python bindings but they only directly support
calling *into* mapnik *from* Python. This forces mapnik and its input plugins to
be the lowest layer of the stack. The role of this plugin is to allow mapnik to
call *into* Python itself. This allows mapnik to sit as rendering middleware
between a custom Python frontend and a custom Python datasource. This increases
the utility of mapnik as a component in a larger system.

There already exists MemoryDatasource which can be used to dynamically create
geometry in Python. It suffers from the problem that it does not allow
generating only the geometry which is seen by a particular query. Similarly the
entire geometry must exist in memory before rendering can progress. By using a
custom iterator object or by using generator expressions this plugin allows
geometry to be created on demand and to be destroyed after use. This can have a
great impact on memory efficiency. Since geometry is generated on-demand as
rendering progresses there can be arbitrarily complex 'cleverness' optimising
the geometry generated for a particular query. Obvious examples of this would
be generating only geometry within the query bounding box and generating
geometry with an appropriate level of detail for the output resolution.
 2012-07-31 17:05:27 +01:00
Dane Springmeyer
0d97b851fa markers: support opacity on bitmaps, and move to supporting both opacity and fill-opacity 2012-07-30 18:31:21 -07:00
Dane Springmeyer
3da72ff8cb unmask failing test - refs #1345 2012-07-25 16:37:05 -07:00
Dane Springmeyer
4ad15db23d collect attribute descriptions in geojson plugin (TODO: sorting of attributes is returned in reverse order) 2012-07-25 16:11:51 -07:00
Dane Springmeyer
fa052c5021 amend 516f7c7 to suport filtering on collections and rename line to linestring for consistency - refs #546 2012-07-25 14:43:32 -07:00
Dane Springmeyer
b298e21f8e add test for #997- closes #997 2012-07-25 13:16:46 -07:00
Dane Springmeyer
cc8f86e873 ensure simple invalid inputs to wkb do not crash - closes #1333 2012-07-25 11:14:23 -07:00
Dane Springmeyer
cccb916924 cleanup wkb descriptions to be proper wkt 2012-07-20 15:25:14 -07:00
Dane Springmeyer
537ce09336 also test return value from add_wkb 2012-07-20 15:13:36 -07:00
Dane Springmeyer
b0cb5b04de more empty geometry wkb tests - refs #1305, #1333 2012-07-20 14:57:20 -07:00
Dane Springmeyer
942fa1233f add wkb test that currently crashes - refs #1305, #1132 2012-07-20 12:29:18 -07:00
Rich Wareham
7b3baee3a1 python bindings: export Query.resolution property as a tuple 
Although the mapnik::query class is exposed to the Python bindings, the
resolution attribute is a raw boost::tuple. If you attempt to access
this tuple from Python, boost complains strongly.

This patch adds the required magic to marshal the raw boost::tuple which
is query::resolution_type into an honest-to-goodness Python tuple.
 2012-07-19 19:35:20 +01:00
Dane Springmeyer
587f0131a2 add tests for grid rendering with point_symbolizer 2012-07-18 17:29:22 -07:00
Dane Springmeyer
bc8d6568f5 sync line rendering between grid and agg - refs #1309 2012-07-12 19:34:39 -07:00
Dane Springmeyer
214b24ed12 finish updating marker tests - closes #1304 2012-07-12 19:21:04 -07:00
Dane Springmeyer
34aa050521 update tests to work with new svg-based grid rendering - closes #1304 2012-07-12 19:02:52 -07:00
Dane Springmeyer
0c37819989 remove duplicate grid rendering test 2012-07-12 19:01:31 -07:00
Dane Springmeyer
d721cdb6b9 re-expose raster scaling in tests 2012-07-06 16:48:37 -07:00
Dane Springmeyer
9888ff0d50 remove geometry type tests for postgis that are not longer valid with postgis 2.0 2012-06-29 16:52:54 -07:00
Dane Springmeyer
67e9b0d616 move marker width/height to expressions - closes #1102 and replaces #1255 2012-06-28 19:54:25 -07:00
Dane Springmeyer
9e8f815b07 add a few more filter tests - all should pass cleanly 2012-06-26 18:55:58 -07:00
Dane Springmeyer
c38598e9ad allow the ogr shapefile reading test to pass with latest gdal 2012-06-26 18:25:56 -07:00
Dane Springmeyer
37c9142515 csv plugin: also detect fields named 'lng' as longitude 2012-06-25 10:18:09 -07:00
Dane Springmeyer
5b61c093e5 initialize grid buffers to std::numeric_limits<int>::min() and use that value to mean no-hit or non-interactive pixels - closes #1065 2012-06-23 22:41:07 -04:00
Dane Springmeyer
63bd634536 set encoding for test file 2012-06-22 10:15:10 -04:00
Dane Springmeyer
eb4740b50f fix behavior of compositing via python api now that we have premultiplication issues sorted out in core - refs #1262 and #314 and #1211 2012-06-21 15:44:57 -04:00
Mickey Rose
2a7634693f add python test: set ShieldSymbolizer's transform 2012-06-07 17:12:38 +02:00
Artem Pavlenko
03e6f9d023 Merge pull request #1245 from simonsonc/png-exceptions 
Catch and throw PNG exceptions - fixes #1213
 2012-06-07 04:00:40 -07:00
Dane Springmeyer
957c40f763 move to int32 for grid rendering buffer - closes #1196 2012-06-06 16:36:38 -07:00
Carl Simonson
cd7ad3e15e Catch and throw PNG exceptions - fixes #1213 
The png library uses setjmp/longjmp to throw exceptions when reading. If this
is not set up, the png library calls abort(). This change handles the errors
and throws a C++ exception instead.

This issue was found by testing images from pngsuite at
http://www.schaik.com/pngsuite/. These images are included and a unit test was
added to test both images that should be successful and images that should
throw an exception.
 2012-06-06 17:52:41 -05:00
Dane Springmeyer
11e81fdb03 finish exposing markers symbolizer in python - closes #612 2012-06-04 13:42:51 -07:00
Dane Springmeyer
e1fa732f90 add test for alpha blending during bilinear scaling - refs #997 2012-05-24 16:39:24 -07:00
Dane Springmeyer
a567c02306 Revert "update test images used for validating compositing" 
This reverts commit ac2d935c28.
 2012-05-24 11:05:17 -07:00
Dane Springmeyer
975242e597 disable non-critical failing test on ubuntu 2012-05-23 15:40:25 -07:00
Dane Springmeyer
3178b96d67 overwrite the tiff test images again 2012-05-14 14:13:32 -07:00
Dane Springmeyer
ac2d935c28 update test images used for validating compositing 2012-05-11 15:42:50 -07:00
Dane Springmeyer
3531cb6fff update expected images from test output since minor differences occur from new compositing 2012-05-11 07:28:23 -07:00
Dane Springmeyer
61d3cf635a Merge pull request #1172 from caffeinate/master 
MarkersSymbolizer - stroke/fill python bindings
 2012-04-19 12:15:43 -07:00
Dane Springmeyer
f977134afd touch sqlite tests further 2012-04-18 16:06:18 -07:00