sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix rasterlite plugin + add visual test - closes #2630

Browse source
This commit is contained in:
Dane Springmeyer 2015-01-09 16:13:04 -08:00
parent ac04512bb5
commit 62dbfeaa28
8 changed files with 168 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/input/rasterlite/rasterlite_featureset.cpp
View file

@ -114,24 +114,16 @@ feature_ptr rasterlite_featureset::get_feature(mapnik::query const& q)
{ {
if (size > 0) if (size > 0)
{ {
mapnik::raster_ptr rasterp = std::make_shared<mapnik::raster>(intersect, width, height, 1.0); mapnik::image_data_rgba8 image(width,height);
mapnik::image_data_rgba8 & image = rasterp->data_;
image.set(0xffffffff);
unsigned char* raster_data = static_cast<unsigned char*>(raster); unsigned char* raster_data = static_cast<unsigned char*>(raster);
unsigned char* image_data = image.getBytes(); unsigned char* image_data = image.getBytes();
std::memcpy(image_data, raster_data, size); std::memcpy(image_data, raster_data, size);
feature->set_raster(std::make_shared<mapnik::raster>(intersect, std::move(image), 1.0));
feature->set_raster(rasterp);
free (raster);
MAPNIK_LOG_DEBUG(rasterlite) << "rasterlite_featureset: Done"; MAPNIK_LOG_DEBUG(rasterlite) << "rasterlite_featureset: Done";
} }
else else
{ {
MAPNIK_LOG_ERROR(rasterlite) << "Rasterlite Plugin: Error " << rasterliteGetLastError (dataset_); MAPNIK_LOG_DEBUG(rasterlite) << "Rasterlite Plugin: Error " << rasterliteGetLastError (dataset_);
} }
} }

72
tests/visual_tests/grids/rasterlite-globe-256-256-1.0-grid-reference.json Normal file
View file

@ -0,0 +1,72 @@
{
"keys": [
""
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
]
}

72
tests/visual_tests/grids/rasterlite-globe-256-256-2.0-grid-reference.json Normal file
View file

@ -0,0 +1,72 @@
{
"keys": [
""
],
"data": {},
"grid": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
]
}

BIN
tests/visual_tests/images/rasterlite-globe-256-256-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
tests/visual_tests/images/rasterlite-globe-256-256-1.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
tests/visual_tests/images/rasterlite-globe-256-256-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
tests/visual_tests/images/rasterlite-globe-256-256-2.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

21
tests/visual_tests/styles/rasterlite-globe.xml Normal file
View file

@ -0,0 +1,21 @@
<!DOCTYPE Map>
<Map srs="+init=epsg:4326">
<Parameters>
<Parameter name="sizes">256,256</Parameter>
<Parameter name="bbox">-180 0 0 85.0511287798066</Parameter>
</Parameters>
<Style name="1">
<Rule>
<RasterSymbolizer opacity=".5"/>
</Rule>
</Style>
<Layer name="globe" srs="+init=epsg:4326">
<StyleName>1</StyleName>
<Datasource>
<Parameter name="type">rasterlite</Parameter>
<Parameter name="table">globe</Parameter>
<Parameter name="file">../../data/rasterlite/globe.sqlite</Parameter>
</Datasource>
</Layer>
</Map>