Commit graph

262 commits

Author SHA1 Message Date
Dane Springmeyer
4cf1484b53 disable colorize-alpha comp-op as per #1371 2012-08-15 14:46:58 -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
b7aafe51bc update markers line placement tests 2012-07-31 17:53:20 -07:00
Dane Springmeyer
4d2eb73e3b add tests for complex marker rendering functionality 2012-07-31 16:04:42 -07:00
Dane Springmeyer
6c984b4f13 add testcase for #1365 2012-07-31 16:03:51 -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
1a6cbfb568 fix xml comment 2012-07-30 15:54:08 -07:00
Dane Springmeyer
ce7b6a93fb Add test case for #1354 2012-07-30 14:48:32 -07:00
Dane Springmeyer
827b015d15 add a geometry collection to csv wkt test 2012-07-25 16:57:47 -07:00
Dane Springmeyer
3da72ff8cb unmask failing test - refs #1345 2012-07-25 16:37:05 -07:00
Dane Springmeyer
27e9068ccf add test map for colorize-alpha comp-op 2012-07-25 15:04:07 -07:00
Dane Springmeyer
b298e21f8e add test for #997- closes #997 2012-07-25 13:16:46 -07:00
Dane Springmeyer
ad7a02695e fix test markers xml, accidentally changed in 9888ff0d50 2012-07-09 13:38:49 -07:00
Dane Springmeyer
7d9b4ce0da settle upon 'geometry-transform' naming - refs #1276 2012-07-03 18:34:11 -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
7b3e86b59f add test csv file 2012-06-25 14:58: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
43d6de7fa6 add partial test files for second case of #997 2012-05-24 16:57:17 -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
bd7b07d3f9 add missing test files 2012-04-04 14:37:27 -07:00
Dane Springmeyer
46b16c917e support nodata for paletted images and allow user to set nodata on-the-fly - closes #1160 and #1161 - refs #688 and refs #730 and refs #50 and refs #1018 2012-04-03 16:06:36 -07:00
Dane Springmeyer
9d1afbbfc6 Merge branch 'master' of https://github.com/mapnik/mapnik 2012-03-27 18:56:52 -04:00
Dane Springmeyer
dbd4258079 more markers_symbolizer test maps 2012-03-27 18:54:59 -04:00
Dane Springmeyer
ea5a46f230 remove the storage and serialization of 'font-directory' and 'minimum-version' since there is no strong need to have them accessible after initial parsing 2012-03-23 18:14:14 -07:00
Dane Springmeyer
3b498efbd9 fixup font registration code ensuring invalid fonts will warn but not throw and register_fonts will only return success if > one font is registered and none have failed 2012-03-23 15:07:28 -07:00
Ramunas
1ac4c0ca53 remove notices due to inkscape metadata 2012-02-18 10:45:58 +02:00
Hermann Kraus
212171b9ee Add visual test for ShieldSymbolizer. 2012-02-18 01:17:29 +01:00
Hermann Kraus
822786e41c Remove no-text attribute. One can simply leave the text empty if one wants this. 2012-01-29 13:10:14 +01:00
Hermann Kraus
51d8718701 Move tests to new location. 2012-01-25 23:31:07 +01:00
Hermann Kraus
cd5c1c6ab4 Add reference image for formating test. 2012-01-25 23:26:39 +01:00
Hermann Kraus
26c13d4df4 Add tests for text formating. 2012-01-25 18:46:27 +01:00
Hermann Kraus
047cda5d1b Fix some tests. 2012-01-20 00:45:15 +01:00
Hermann Kraus
a1c80d1a4c Add full set of tests for text placement. 2012-01-20 00:18:37 +01:00
Hermann Kraus
537231f60e Remove glyph symbolizer. 2012-01-19 20:34:09 +01:00
Dane Springmeyer
63891cec15 finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around 2012-01-17 01:09:46 -05:00
Hermann Kraus
cbcb545b65 Fix the problem reported in #1003 (NE, NW, SE not working for text-placement=simple).
Add test cases for this problem.

Conflicts:

	src/text_placements.cpp
	tests/data/placement/clean.sh
	tests/data/placement/test.py
2012-01-09 23:30:22 +01:00
Dane Springmeyer
e72330e38c fixup fontset tests 2011-12-22 12:48:11 -08:00
Dane Springmeyer
323c36db61 Merge branch 'geometry_cleanup' 2011-12-22 12:42:05 -08:00
Dane Springmeyer
7b7fc5eb94 add test comparing geometry handling between ogr and shape plugin - currently fails 2011-12-21 12:26:03 -08:00
Dane Springmeyer
c551626916 finish geometry cleanup work by ensuring proper behavior in the ogr plugin with multigeometries 2011-12-21 12:22:05 -08:00
Dane Springmeyer
2d59f401b5 tests for fontsets 2011-12-20 12:46:20 -08:00
Dane Springmeyer
90b5cf69cc update tests as per #992 2011-12-16 07:22:52 -08:00
Dane Springmeyer
754581f278 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
d0cbb77864 add readme to svg test dir 2011-12-12 16:02:12 -08:00
Dane Springmeyer
077eb4c865 add new csv test 2011-12-12 16:00:53 -08:00
Dane Springmeyer
9e924bfa11 add ability to have typed arbitrary parameters in xml - refs #977 2011-12-05 14:46:38 -08:00
Dane Springmeyer
1d408aa485 fixup tests around parameters usage 2011-12-02 18:00:20 -08:00
Dane Springmeyer
bc06b31746 test reading from an empty sqlite db 2011-11-09 17:19:05 -08:00
Dane Springmeyer
6b7635119c Merge branch 'master' into sqlite-refactor 2011-11-04 20:44:15 -07:00
Dane Springmeyer
07a4135651 csv tests for tailing newlines 2011-11-04 07:19:31 -04:00
Dane Springmeyer
909a112a86 remove indexes 2011-11-03 19:50:08 -04:00
Dane Springmeyer
6c8e4b2de0 csv: back off of null and boolean detection since using strings is more predictable across rows 2011-11-02 11:07:59 -04:00
Dane Springmeyer
2d696dc73b update csv test data 2011-11-01 21:15:50 -04:00
Dane Springmeyer
87da27e7ac csv: test for columns that are numbers stored as strings 2011-11-01 20:39:27 -04:00
Dane Springmeyer
4cec91ff82 csv: handle empty headers, an apparently common situation with large government data 2011-11-01 20:33:05 -04:00
Dane Springmeyer
bdb9857cf0 csv: remove protective string checks now that spirit parsing is working 2011-10-31 19:12:13 -04:00
Dane Springmeyer
87769b3147 more robust csv tests 2011-10-31 19:08:07 -04:00
Dane Springmeyer
1830ba403c add testcase csv snippet from datacouch - not yet working (requires json parser) 2011-10-28 17:08:00 -07:00
Dane Springmeyer
a53c61a0c2 ensure the tests can be run even with no datasource plugins 2011-10-28 17:06:23 -07:00
Dane Springmeyer
028d1c4058 make the sqlite tests more robust 2011-10-22 17:31:25 -07:00
Dane Springmeyer
60abc74113 sqlite plugin now autodetects wkb_format thanks to @kunitoki 2011-10-22 17:28:30 -07:00
Artem Pavlenko
664d3c4ca6 Merge pull request #910 from MapQuest/multi-tile-policy
Added a 'multi' tiled raster plugin reader for virtual images
2011-10-21 12:26:44 -07:00
Dane Springmeyer
6de1e75390 csv plugin: also detect lat/lon/long field names as likely geometry columns 2011-10-18 19:27:23 -07:00
Dane Springmeyer
a230f0d4cf add a big group of csv test cases 2011-10-18 18:19:32 -07:00
Matt Amos
20ca69c3ea Added Python test for multi-tile raster policy. 2011-10-18 14:34:58 +01:00
Dane Springmeyer
417508b7bd remove unneeded datasource base 2011-10-14 20:11:09 -07:00
Dane Springmeyer
e2532bb5dc upgrade all 'bad' test maps to new syntax for text symbolizer going forward as per #861 2011-10-03 20:31:40 +00:00
Dane Springmeyer
a36c365da7 upgrade all 'good' test maps to new syntax for text symbolizer going forward as per #861 2011-10-03 20:24:51 +00:00
Dane Springmeyer
fe9a303e6b support south sudanese independence (and ensure tests now pass after sqlite fix) 2011-09-13 00:59:35 +00:00
Dane Springmeyer
91565b7f7a manually fix sqlite/spatialite db test case that had trailing NULL bytes - fixes #872 2011-09-13 00:00:12 +00:00
Dane Springmeyer
b09e3dc945 add image needed for tests 2011-09-11 07:45:54 +00:00
Dane Springmeyer
cf384a60fc avoid accidental reprojection 2011-09-09 15:18:20 +00:00
Dane Springmeyer
7f6d0e30a5 make tests quieter and restrict to only running in the tests/python_tests directory - closes #857 2011-09-02 21:57:14 +00:00
Dane Springmeyer
12345d1269 remove rastercolorizer from glyph symbolizer test 2011-08-30 17:18:51 +00:00
Dane Springmeyer
bb3e01ded8 fix a few xml test maps 2011-08-30 16:58:36 +00:00
Dane Springmeyer
e13b608e6e sqlite: add sample map for using sqlite and attachdb features 2011-08-16 21:23:56 +00:00
Dane Springmeyer
cfe49fcaf6 sqlite: enable dynamic querying of extent as a last fallback for non-spatialite and non-indexed sqlite files 2011-08-13 02:52:46 +00:00
Dane Springmeyer
1805f9c4c9 add test map for using gamma and global alignment to get a seemless crosshatch look 2011-06-28 23:23:33 +00:00
Dane Springmeyer
327ed94f15 tabs -> spaces 2011-05-31 17:12:51 +00:00
Dane Springmeyer
cb3ba2c193 spelling correction 2011-05-17 23:56:27 +00:00
Dane Springmeyer
52ac7d8d3a fix spherical mercator proj4 string in tests to always include +over (to avoid proj4 trying to wrap) and +wktext (to ensure apps like ogr/gdal retain +over during conversion through wkt representation) 2011-05-16 23:55:30 +00:00
Alberto Valverde
0e0c4aa82c integrated test case from #759 2011-05-12 18:09:03 +00:00
Dane Springmeyer
37118c6d5f ensure valid attributes on the RasterSymbolizer and RasterColorizer, warning if not 2011-05-04 01:57:37 +00:00
Dane Springmeyer
d05b0c539f apply major refactor of RasterColorizer by ben moores from https://github.com/BenMoores/mapnik-trunk/wiki/RasterColorizer - closes #523 2011-05-04 00:20:17 +00:00
Dane Springmeyer
5bff82dde7 add test map of point placement on line and polygon geoms 2011-04-30 00:50:02 +00:00
Dane Springmeyer
6df1dd31dd test for reading from csv file 2011-04-29 22:26:50 +00:00
Dane Springmeyer
aaa37d7bc1 add another test shapefile in epsg:3395 2011-04-20 03:13:48 +00:00
Dane Springmeyer
b6723bcfb1 add smaller svg point 2011-04-19 04:28:41 +00:00
Dane Springmeyer
2b4cd5bb51 add test for bounds clipping edge case 2011-04-19 04:28:23 +00:00
Dane Springmeyer
528d5710c8 add an ogr2ogr created sqlite file, and update sqlite XML tests to use new, simplified driver functionalities 2011-04-04 04:01:34 +00:00
Dane Springmeyer
9ec293c503 remove invalid property for point_symbolizer 2011-04-01 06:29:01 +00:00
Dane Springmeyer
25b9a6cf9f make test path relative 2011-02-15 18:45:49 +00:00
Dane Springmeyer
b51d2e2664 upgrade markers_symbolizer examples 2011-02-15 18:42:44 +00:00
Dane Springmeyer
375ece397e update test maps after r2582 2011-02-05 03:21:22 +00:00
Dane Springmeyer
4361177fc2 formatting 2011-02-02 04:56:05 +00:00
Dane Springmeyer
fd2d9d7ff3 enable aliased lines using stroke-gamma for line_symbolizer - closes #689 2011-02-02 01:46:14 +00:00
Dane Springmeyer
c6646176f4 add test stylesheet for interior point functionality 2011-02-01 23:21:32 +00:00
Dane Springmeyer
75649b8863 add 'interior' point placement option to point_symbolizer - closes #709 2011-02-01 08:16:32 +00:00
Dane Springmeyer
cf5811ff3c remove misplaced opacity value 2011-01-31 18:30:14 +00:00
Robert Coup
386a4f5daf #654 - add support for linear and radial gradients in SVG symbols. Thanks to Toby Collett for the coding & Paul Wicks for funding. 2011-01-26 01:18:40 +00:00
Dane Springmeyer
9491fef0dd add a test of using background image with a relative path 2011-01-25 20:23:15 +00:00
Dane Springmeyer
3c8e751887 add another markers point example that fakes a gradient by using stacked points with opacity 2010-12-15 19:52:37 +00:00
Dane Springmeyer
ab78d6deb4 formatting 2010-12-11 01:10:10 +00:00
Dane Springmeyer
c94b66be69 add test map that uses svg transform, displacement and other custom properties 2010-12-11 00:52:13 +00:00
Dane Springmeyer
0791b039d5 Add a test map of the new line breaking added in #584 - working with both literal, escaped break char and read from datasource 2010-12-10 18:40:07 +00:00
Dane Springmeyer
9cdfce0f04 fixup the inline geojson example 2010-11-16 22:03:34 +00:00
Dane Springmeyer
0d15c55e14 add test map for inline geojson (fails currently due to relative paths mucking - likely need to pass extra param for 'string' input rather than file) 2010-11-16 08:21:57 +00:00
Dane Springmeyer
471288a37e add a few stylesheets that test reading json and osm files 2010-11-14 08:56:42 +00:00
Dane Springmeyer
389ad44878 minimum_version was spelled wrong, so version check was not working 2010-11-05 17:40:46 +00:00
Dane Springmeyer
31a6d25e22 fixup raster colorizer example, removing accidental previous changes from brainstorming session 2010-11-01 18:57:44 +00:00
Dane Springmeyer
88ed29c8b7 increment the min_version required for several test maps 2010-10-31 22:04:10 +00:00
Dane Springmeyer
aef676c090 add changes missed in r2287 2010-10-15 02:16:37 +00:00
Dane Springmeyer
ba911c82c1 add a test map for rendering stacked marker circles with no outlines and also outlines with fractional width 2010-10-15 00:13:29 +00:00
Dane Springmeyer
688b1f2299 add an 'extra_attributes' property to the map to store mapnik::parameters that don't make sense as full attributes but need to be carried through from load_map() to save_map() for applications that use mapnik to serialize to xml such as Cascadenik and Quantumnik (currently useful storage for 'minimum_version' and 'font_directory') 2010-10-07 19:34:36 +00:00
Dane Springmeyer
2fc2b4c443 add 'font_directory' attribute to map to allow for regstration of fonts within - in combination with r2025 this closes #168 2010-10-07 01:49:07 +00:00
Dane Springmeyer
58b907a61b catch up tests with change of bgcolor->background-color 2010-10-06 18:59:59 +00:00
Dane Springmeyer
c240208a0f no longer an invalid color representation, so removing test 2010-10-06 18:53:08 +00:00
Dane Springmeyer
9d1f8f013b remove .zip that does not need to be versioned 2010-09-26 23:51:48 +00:00
Dane Springmeyer
dce9986d3d add farsi (rtl) language map in tests from ajashton 2010-09-26 23:50:37 +00:00
Dane Springmeyer
d7740caffc revert unintended changes 2010-09-26 11:50:16 +00:00
Dane Springmeyer
48f7533808 fix text_transform upgrade issue - thx ajashton - closes #621 2010-09-26 11:48:43 +00:00
Dane Springmeyer
c35310445a rename text_convert to text_transform to match css naming convention (also matching enums to css) 2010-09-18 19:10:18 +00:00
Dane Springmeyer
bdb454653a improve the datasource test 2010-08-19 18:52:48 +00:00
Dane Springmeyer
21865fdba1 gussy up the markers_symbolizer example using point placement and ellipses 2010-08-19 18:09:15 +00:00
Dane Springmeyer
b307013ba2 add additional support for dynamically drawing ellipses in the markers_symbolizer, now supporting both line/point placement, metawriters for point placement, and width/height/stroke attributes - TODO - reflect in python bindings, buggy matrix transform for ellipses 2010-08-19 17:33:01 +00:00
Dane Springmeyer
5e441b39b5 add example of using MarkersSymbolizer one lines 2010-08-18 04:11:38 +00:00
Dane Springmeyer
6d697d1c30 add lines to the spatiallite test dataset 2010-08-17 21:48:16 +00:00
Dane Springmeyer
635562ee08 utilize a fractional halo in sqlite test 2010-08-10 23:50:34 +00:00
Dane Springmeyer
59d3b53105 update tests after fix in r2124 for size being required in glyph_symbolizer 2010-08-10 23:45:05 +00:00
Dane Springmeyer
3a59934b90 add xinclude tests/samples 2010-08-10 06:04:10 +00:00
Dane Springmeyer
787374d1b7 update glyph_symbolizer test after fix for #511 2010-08-10 01:01:10 +00:00
Dane Springmeyer
d19f8ac009 fix path to svg file in test map 2010-07-16 06:25:44 +00:00
Dane Springmeyer
2aaeea98b0 add single font for tests 2010-07-15 23:36:48 +00:00
Dane Springmeyer
8fa1dc2402 add simple visual test of text rotation using orientation parameter on text_symbolizer 2010-07-13 02:28:21 +00:00
Dane Springmeyer
a0d589e24c add checker pattern image 2010-06-21 02:57:14 +00:00
Dane Springmeyer
0959f8ef16 + add support to polygon_patter_symbolizer for global pattern alignment in addition to local/feature (default) alignment - closes #203 2010-06-20 22:36:49 +00:00
Dane Springmeyer
fd17b14120 restore rendering of default point_symbolizer square, useful for debugging 2010-06-19 20:32:00 +00:00
Dane Springmeyer
8bf2b2cd81 add tests for svg symbol reading/rendering, tiff/jpeg symbol reading, and a spatiallite datasource 2010-06-03 21:26:33 +00:00
Dane Springmeyer
218c75385d complete XML syntax change from CSSParameter to attributes (for BuildingSymbolizer and RasterSymbolizer) and update tests 2010-06-01 21:58:24 +00:00
Dane Springmeyer
4790c23d43 clean up deprecation warnings in python tests 2010-04-06 06:25:22 +00:00
Alberto Valverde
c79865586b added an angle_mode attribute to GlyphSymbolizer to define the way the angle expression should be interpreted: as an azimuth or as a trigonometric angle 2010-03-22 11:21:17 +00:00
Alberto Valverde
2e04c5422a fixed serialization of expressions in glyph_symbolizer 2010-03-19 11:20:16 +00:00
Alberto Valverde
aea5dd563a XML de/serialization for glyph_symbolizer. Some issues remain regarding unicode expr 2010-03-19 11:19:43 +00:00
Alberto Valverde
fc3a1beeef initial skeleton of glyph_symbolizer (coarsely ported from arrow_symbolizer). Mapnik compiles but symbolizer does nothing useful yet and is going to be heavily modified to make use of expressions to be general enough to be usable for purposes other than rendering arrows representing vector direction/intensity 2010-03-18 20:04:35 +00:00
Alberto Valverde
807881c47a XML deserialization support for a raster_symbolizer with a colorizer 2010-03-12 14:49:34 +00:00
Alberto Valverde
2f1d60b666 pre-eliminary raster coloring support 2010-03-12 13:34:13 +00:00
Dane Springmeyer
afa9d14630 now that we're using an image cache missing images will not/can not throw 2010-03-02 03:31:10 +00:00
Dane Springmeyer
26c596cbf1 add tests for optional attr of symbolizers with images from 0.7.1-dev branch 2010-02-23 02:39:45 +00:00
Dane Springmeyer
6115a1590d add 'gamma' attribute to PolygonSymbolizer, along with tests against simplified world borders shapefile - setting gamma to .5-.7 can remove gaps in processed_p.shp depending on background color - closes #428 2010-01-13 00:31:45 +00:00