Dane Springmeyer
2143dbe7ef
allow postgres tests to pass if postgres is not running: followup to #2725
2015-03-06 17:08:41 -08:00
Blake Thompson
95f98e5311
Merge branch 'master' of github.com:mapnik/mapnik
2015-03-06 17:24:34 -06:00
Blake Thompson
61abe608ee
Added the ability to get_type from an image, fixed possible bugs associated with image copy.
2015-03-06 17:24:23 -06:00
Dane Springmeyer
051462e00f
fix postgis error reporting - closes #2725
2015-03-06 14:01:22 -08:00
artemp
aa5ae6b843
update markers_symbolizer to work with mapnik-geometry (work-in-progress)
2015-03-05 15:07:23 +01:00
artemp
3ddfe34aa5
Merge branch 'master' into mapnik-geometry
2015-03-04 10:30:08 +01:00
Dane Springmeyer
5a4e821cae
fix save_map test for multipolygon-centroid-postgis.xml by avoiding whitespace usage
2015-02-25 20:09:24 -08:00
Dane Springmeyer
cce06dfe45
fix datasource type used
2015-02-25 19:07:35 -08:00
Dane Springmeyer
bd5b5bd258
Add missing test files
2015-02-25 18:57:29 -08:00
Dane Springmeyer
ea35569a51
do not generate sqlite spatial index on the fly
2015-02-25 18:57:00 -08:00
Dane Springmeyer
a6df5f9056
tests for line wrap bug (currently non-ideal) refs #2701
2015-02-25 18:54:31 -08:00
Dane Springmeyer
d9d63bb5ca
add tests for #2078 and #2151 (currently non-ideal results)
2015-02-25 18:51:57 -08:00
Dane Springmeyer
1506a1d867
avoid : in image paths - refs #2717
2015-02-25 15:25:10 -08:00
Dane Springmeyer
2818ff96e8
test reversed point geojson
2015-02-23 23:52:54 -08:00
Dane Springmeyer
6c57c08a53
add more cxx tests of new geometry
2015-02-23 23:45:11 -08:00
Blake Thompson
8153c1a9fd
Removed get_pixel_color from python bindings and added new parameter to get_pixel so that it will return color on demand.
2015-02-23 10:27:00 -06:00
Dane Springmeyer
d603becc28
update expected tests (straggler after png hextree fix)
2015-02-22 23:28:35 -08:00
Blake Thompson
5180168491
Merge branch 'master' into release/image_data_any
2015-02-18 23:03:51 -06:00
Blake Thompson
b2c1c86d99
Merge branch 'master' into release/image_data_Any
...
Conflicts:
benchmark/test_polygon_clipping.cpp
2015-02-16 14:37:01 -06:00
Blake Thompson
0cd9c1fc34
Updated image_any building switch statement to support all the correct types, added tests for all the new data formats with get and set in python.
2015-02-16 14:23:55 -06:00
Dane Springmeyer
203ce8b9a6
renable polygon clipping tests despite current flaws
2015-02-15 14:00:20 -08:00
Dane Springmeyer
1ebd6afd9c
improve sql subselect parsing + add tests - closes #2704
2015-02-13 01:26:19 -08:00
Dane Springmeyer
54dc9dd0f3
add shapeindex tests - refs #2703
2015-02-13 00:05:34 -08:00
Dane Springmeyer
df60a2f37f
more tests for object stringify in geojson plugin - refs #2678
2015-02-12 11:37:46 -08:00
artemp
3aaac077cb
add test_large_geojson_properties
2015-02-12 15:53:29 +01:00
Dane Springmeyer
89a58c5879
Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any
2015-02-11 10:01:42 -08:00
Dane Springmeyer
41ed56df14
Merge branch 'master' of github.com:mapnik/mapnik into vertex_adapter
2015-02-09 18:16:57 -08:00
Dane Springmeyer
578f8a7c29
report proj4 string in extra metadata for ogr plugin - refs #2650
2015-02-09 15:46:00 -08:00
Blake Thompson
d31bf5b171
Updated tests from cast to copy
2015-02-09 13:46:48 -08:00
Jiri Drbalek
02dff77fff
add visual test - marker direction
2015-02-07 12:23:36 +00:00
artemp
e19fdad3a6
implement vertex interface in vertex_adapter and make mapnik::geometry_type immutable
2015-02-06 16:45:51 +01:00
Jiri Drbalek
35d6769448
update visual tests - prefer hyphens as word separator in enums
2015-02-06 15:42:43 +00:00
Blake Thompson
06ef081282
Another set of fixes for the compare SSE code, added test where it was failing
2015-02-04 18:26:18 -06:00
Blake Thompson
c0fcf48019
Fixed issues with SSE compare when the threshold is greater then zero. Added several new SSE methods for unsigned integers.
2015-02-04 17:46:18 -06:00
Blake Thompson
ffb34544e6
Merge branch 'master' into release/image_data_any
2015-02-04 15:46:54 -06:00
Blake Thompson
2b8bd59d82
A large set of updates:
...
* Added new gray data types adding those to the variants and updating all the code necessary for them
* Added basic SSE to the image compare method, (only for RGBA) must be enabled with the -DSSE_MATH flag this is not yet put into the build process in any location.
* Fixed the resulting image for some TIFF visual tests, most likely they were incorrect due to fixes in TIFF reader
* Added some MAPNIK_DECL where necessary to grid rendering.
* Added support for more data types in GDAL plugin with grayscale images.
* Added views for all the new gray data types
* Updated python bindings for new gray data types.
Ref #2681
2015-02-04 15:41:58 -06:00
artemp
8faf04663c
update tests/python_tests/geojson_plugin_test.py
2015-02-04 18:34:53 +01:00
artemp
3331368e05
amend test
2015-02-04 18:29:03 +01:00
artemp
ae9eafa2c1
allow "stringified" nested objects and arrays as feature property
2015-02-04 18:28:47 +01:00
Jiri Drbalek
56adb32701
add visual test - text upright
2015-02-03 16:32:23 +00:00
Dane Springmeyer
0e017be98d
merge with master + fixups
2015-02-03 00:38:55 -08:00
Dane Springmeyer
71e7faed0d
Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any
...
Conflicts:
tests/python_tests/image_test.py
tests/python_tests/image_tiff_test.py
tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-1.0-agg-reference.png
tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-2.0-agg-reference.png
2015-02-03 00:05:15 -08:00
Dane Springmeyer
d915e1e634
update a few more visual tests
2015-02-02 21:26:09 -08:00
Dane Springmeyer
3e43c692cc
update visual test images after #2671
2015-02-02 20:23:45 -08:00
Dane Springmeyer
d9e49fd09a
tests: support regenerating test images in more python tests
2015-02-02 19:00:09 -08:00
Dane Springmeyer
c361e538f7
Merge pull request #2671 from sarametz/png8_encoding_bug
...
Png8 encoding bug
2015-02-02 14:08:05 -08:00
Dane Springmeyer
625a37ed12
test both geojson.input and ogr.input - refs #2666
2015-02-02 10:58:03 -08:00
Dane Springmeyer
33a7bbb4e1
Merge branch 'master' of github.com:mapnik/mapnik into kurdish-text-visual-test
2015-02-02 10:54:20 -08:00
Dane Springmeyer
956d936162
fix pep8 linter command + update a few linted files
2015-02-02 10:38:08 -08:00
Dane Springmeyer
7d78115886
pyflakes driven python file cleanup
2015-02-02 10:38:08 -08:00
Dane Springmeyer
0d6c10a2fa
fix gamma misuage in image_encoding_speed_test
2015-02-02 10:38:08 -08:00
Dane Springmeyer
851597f3f0
add visual test for reading GeoJSON GeometryCollection
2015-02-02 10:38:08 -08:00
Dane Springmeyer
a67e0dec12
python test cleanup
2015-02-02 10:38:08 -08:00
Dane Springmeyer
21862d57c0
re-enable webp tests + update expected images after #2662
2015-02-02 10:38:08 -08:00
Sara Metz
f38d2ee69b
Fixes bugs that cause tests in PR #2599 to fail
2015-01-30 10:40:50 +13:00
Robert Coup
44500b9a71
Test for 2px png8 encoding bug (hextree & octree)
2015-01-30 10:15:10 +13:00
Blake Thompson
826e13f911
Renamed background to fill, added numeric casting to fill utility, changed clog uses to MAPNIK_LOG, changed the implementation of fill some so that it only used a single template
2015-01-29 13:27:42 -07:00
Dane Springmeyer
b13dfaf644
amend 89b3e108e6 by fixing image size to be square
2015-01-29 10:24:40 -08:00
Dane Springmeyer
89b3e108e6
add testcase for kurdish language - refs #2666
2015-01-29 10:19:15 -08:00
Blake Thompson
de99180a44
Added new image_cast method and added its bindings to python, added two new properities to images: offset and scaling. Added way to cast between image types with offset and scaling. Added new unit tests for color and casting. Made it so that pixel setting doesn't result in overflows or underflows. Made the return of get_pixel, dynamic based on what is passed to it. Added new methods for setting pixels that are doubles and ints.
2015-01-28 20:20:14 -06:00
artemp
610f01bd0b
update params_test - #2651
2015-01-28 12:56:10 +01:00
Dane Springmeyer
dfb6116786
Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any
...
Conflicts:
tests/python_tests/pgraster_test.py
2015-01-27 15:19:12 -08:00
Robert Coup
93f67f9bc9
Merge pull request #2657 from rcoup/antimeridian-box-projection-2648
...
Handle bounds reprojections which cross the anti-meridian. Fixes #2648
2015-01-28 11:44:50 +13:00
Dane Springmeyer
d38b3bb2cf
respect alpha in cairo comparisons (reasons for ignoring it once no longer apply - refs #2662 )
2015-01-27 14:38:38 -08:00
Dane Springmeyer
6d5e2b1865
add support for UPDATE=1 to update visual tests (whether failing or not)
2015-01-27 14:29:48 -08:00
Robert Coup
65ef3bc625
Handle bounds reprojections which cross the anti-meridian. #2648
...
When doing an envelope-points reprojection to a geographic CS, check
the points stay in clockwise order. Otherwise expand the resulting bounds
to include the world.
Includes visual test. Cairo tests aren't finding differences, but the renderer
is doing the right thing.
2015-01-28 11:18:16 +13:00
Dane Springmeyer
584ca5d92f
drop pixel threshold to 0 - refs #2662 and #2663
2015-01-27 12:26:28 -08:00
Dane Springmeyer
44ceb77438
try zero thresholds for visual tests - refs #2662
2015-01-27 11:28:33 -08:00
Dane Springmeyer
7d8be57d81
visual tests coming soon via image_data_any branch - for now remove failing pgraster tests - refs #2639
2015-01-26 22:36:38 -08:00
Dane Springmeyer
5de637854d
comment params test for now to get travis green - refs #2651
2015-01-26 22:35:36 -08:00
Dane Springmeyer
d94f5a0cee
get pgraster tests passing again + update expected images - refs #2639
2015-01-26 22:14:38 -08:00
Dane Springmeyer
c8f70d3260
embed help text labeling expected vs actual for side-by-side images
2015-01-26 21:58:27 -08:00
Dane Springmeyer
ebfbbef454
add visual tests for pgraster to try to make sense of failures
2015-01-26 21:36:47 -08:00
Dane Springmeyer
921c058d7d
use image.blend is gone so use image.composite
2015-01-26 21:35:35 -08:00
Dane Springmeyer
f176630fcf
remove invalid tests - will be fixed by proper tests coming via image_any branch from @flippmoke
2015-01-26 16:52:31 -08:00
Blake Thompson
31a0caf2e4
Merge branch 'master' into release/image_data_any
2015-01-25 14:09:29 -06:00
Blake Thompson
5d9f047002
Fixed some issues in color and bindings where you could create a color and premultiplied was not set and it was resulting in it being assigned randomly, causing some issues at runtime.
...
Updated some images in visual tests that were orginally set prior to all tiffs being premultiplied, this was causing a slight difference in a few pixels.
Updated the tiff tests a lot.
Fixed tiff reader so that it always considers everything read from RGB or RGBA as premultiplied. This is due to the fact that RGBA reader always premultiplies the alpha no matter its original form.
Put in a fix so that the file does not exist no longer shows up in the test running.
Fixed some failing tests in the c++ test due to tiffs now always being premultiplied for RGB(A)
2015-01-24 20:48:15 -06:00
Blake Thompson
a100b2fe1f
Fixed the issues associated with TIFFs, now they always will return as premultiplied in the event they are rgba8 due to the way that the TIFF reader operates. Also added premultiply as a flag inside color class and exposed many of its components, made it so that setting and getting pixels took into consideration the state of the color and the image when dealing with the two.
2015-01-23 18:08:59 -06:00
Dane Springmeyer
ec111c8a27
add extra metadata to lyr desc + use for srid/keyfield in postgis - closes #2650
2015-01-22 18:44:56 -08:00
Blake Thompson
490645d2e3
Perhaps a solution to TIFF IO problems
2015-01-22 20:36:45 -06:00
Dane Springmeyer
fcdc826294
Add (currently failing) test for #2651
2015-01-22 18:25:37 -08:00
Blake Thompson
51172c8fdf
Move image_data.hpp to image.hpp and renamed most everything from image_data to image alone. This might lead to the need to clean up some variables that are currently named image through out the code at some time, but I think in the long term is much better as image is a better name for the base class.
2015-01-22 11:39:37 -06:00
Blake Thompson
e01ce5b7d6
Changed image_data_gray* to image_gray* Ref #2633 .
2015-01-21 21:08:04 -06:00
Blake Thompson
22a384ef33
Moved image_data_rgba8 to image_rgba8. Ref #2633
2015-01-21 20:31:02 -06:00
Blake Thompson
0f388ed68f
Changed the name of image_data_any to image_any. Moved header file for image_data_any to image_any. Ref #2633
2015-01-21 19:40:12 -06:00
Blake Thompson
93f835177b
Removed all the code for the previous type of image and image_32. Ref #2633
2015-01-21 17:57:16 -06:00
Blake Thompson
badb0c9a97
This is a complete removal of code that utilizes image_32 in the library. It is a sweeping change that does some of the following:
...
* Changes all agg_renderers to use a image_data_any variant (only image_data_rgba8 is implemented currently)
* Changes the marker and marker_cache to use image_data_any images
* Changes the symbolizers so that they must be aware of the source data type they are attempting to render and the render type that is expected to be rendered into.
* Moves many utilities into image_utils, that were previously in image_32.
The kicker is that this still isn't working perfectly yet, but I am commiting so I don't have tears in case everything is lost on my computer.
Ref #2633
2015-01-20 18:30:10 -06:00
Blake Thompson
35be6117c8
Merge branch 'master' into release/image_data_any
2015-01-16 13:09:25 -06:00
Blake Thompson
aebb6fee58
Removed the background and set/get background from image_32 class. Removed clear method from image_32. Added new fill method for image_data_any, that allows many generic types to fill an image.
...
Ref #2633
2015-01-16 13:06:52 -06:00
Blake Thompson
5bc83eee49
Added a new test for set_color_to_alpha
2015-01-15 21:03:42 -06:00
Blake Thompson
3b1c99ff1b
Moved set_alpha to src/image_util.cpp and out of image_32. Added a boolean response to premultiply_alpha and demultiply_alpha so that if it is changed in set_alpha and other locations like the python bindings for composite that the image can be restored to its original state. Removed blend from python bindings.
...
Ref #2633
2015-01-15 17:57:21 -06:00
Dane Springmeyer
b55d5def0d
sync with latest master/3.x
2015-01-14 18:35:40 -08:00
Blake Thompson
42c7d7ddf2
Merge branch 'release/image_data_any' into feature/premultiply_demultiply_move
2015-01-14 15:37:06 -06:00
Blake Thompson
4184f75011
Moved premultiply and demultiply out of image_32 and other parts of the code. The image_data object is now responsible for keeping track of its own premultiplied_alpha status. Created a new utility method in image_util to preform premultiplication.
...
Added visitor pattern to several different methods as well to prepare for image_data_any including compositing.
Ref #2633
2015-01-14 12:42:30 -06:00
Dane Springmeyer
056feb4daa
add text-transform:reverse + full test coverage for text-transform uppercase/lowercase/capitalize - closes #2634
2015-01-12 15:38:21 -08:00
Dane Springmeyer
62dbfeaa28
fix rasterlite plugin + add visual test - closes #2630
2015-01-09 16:13:04 -08:00
Dane Springmeyer
6580ff784f
add unit tests for rasterlite plugin
2015-01-09 15:36:41 -08:00
Dane Springmeyer
c7bb16fcd9
amend/partially revert #2609
2015-01-09 12:11:41 -08:00
Dane Springmeyer
bfb0878147
add to map deprecations tests
2015-01-09 10:59:18 -08:00
Dane Springmeyer
32586c6462
add test ensuring we can still parse deprecated styling properties
2015-01-09 10:48:50 -08:00
