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

Merge commit '7cf4a00af9530ba2aa46ba1a4a5cb2cb41fe166a' into harfbuzz

Browse source
This commit is contained in:
Hermann Kraus 2013-03-16 12:13:11 +01:00
commit 3ea335af66
10 changed files with 69 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/input/csv/csv_datasource.cpp
View file

@ -665,7 +665,9 @@ void csv_datasource::parse_csv(T & stream,
}
}
// now, add all values as attributes
// now, add attributes, skipping any WKT or JSON fiels
if ((has_wkt_field) && (i == wkt_idx)) continue;
if ((has_json_field) && (i == json_idx)) continue;
/* First we detect likely strings, then try parsing likely numbers,
finally falling back to string type
* We intentionally do not try to detect boolean or null types

2
plugins/input/gdal/gdal_datasource.cpp
View file

@ -121,7 +121,7 @@ void gdal_datasource::bind() const
double tr[6];
bool bbox_override = false;
boost::optional<std::string> bbox_s = params_.get<std::string>("bbox");
boost::optional<std::string> bbox_s = params_.get<std::string>("extent");
if (bbox_s)
{
MAPNIK_LOG_DEBUG(gdal) << "gdal_datasource: BBox Parameter=" << *bbox_s;

14
plugins/input/raster/raster_datasource.cpp
View file

@ -45,7 +45,7 @@ using mapnik::image_reader;
DATASOURCE_PLUGIN(raster_datasource)
raster_datasource::raster_datasource(const parameters& params, bool bind)
raster_datasource::raster_datasource(parameters const& params, bool bind)
: datasource(params),
desc_(*params.get<std::string>("type"), "utf-8"),
extent_initialized_(false)
@ -62,8 +62,8 @@ raster_datasource::raster_datasource(const parameters& params, bool bind)
filename_ = *file;
multi_tiles_ = *params_.get<bool>("multi", false);
tile_size_ = *params_.get<unsigned>("tile_size", 256);
tile_stride_ = *params_.get<unsigned>("tile_stride", 1);
tile_size_ = *params_.get<unsigned>("tile-size", 256);
tile_stride_ = *params_.get<unsigned>("tile-stride", 1);
format_ = *params_.get<std::string>("format","tiff");
@ -100,8 +100,8 @@ void raster_datasource::bind() const
if (multi_tiles_)
{
boost::optional<unsigned> x_width = params_.get<unsigned>("x_width");
boost::optional<unsigned> y_width = params_.get<unsigned>("y_width");
boost::optional<unsigned> x_width = params_.get<unsigned>("x-width");
boost::optional<unsigned> y_width = params_.get<unsigned>("y-width");
if (! x_width)
{
@ -201,11 +201,11 @@ featureset_ptr raster_datasource::features(query const& q) const
return boost::make_shared<raster_featureset<tiled_multi_file_policy> >(policy, extent_, q);
}
else if (width * height > 512*512)
else if (width * height > (tile_size_ * tile_size_ << 2))
{
MAPNIK_LOG_DEBUG(raster) << "raster_datasource: Tiled policy";
tiled_file_policy policy(filename_, format_, 256, extent_, q.get_bbox(), width_, height_);
tiled_file_policy policy(filename_, format_, tile_size_, extent_, q.get_bbox(), width_, height_);
return boost::make_shared<raster_featureset<tiled_file_policy> >(policy, extent_, q);
}

3
src/agg/process_raster_symbolizer.cpp
View file

@ -83,7 +83,8 @@ void agg_renderer<T>::process(raster_symbolizer const& sym,
if (scaling_method == SCALING_BILINEAR8)
{
scale_image_bilinear8<image_data_32>(target.data_,source->data_, 0.0, 0.0);
} else
}
else
{
double scaling_ratio = ext.width() / source->data_.width();
scale_image_agg<image_data_32>(target.data_,

11
src/symbolizer.cpp
View file

@ -31,15 +31,12 @@ namespace mapnik {
void evaluate_transform(agg::trans_affine& tr, Feature const& feature,
transform_list_ptr const& trans_expr)
{
#ifdef MAPNIK_LOG
MAPNIK_LOG_DEBUG(transform) << "transform: evaluate "
<< (trans_expr
? transform_processor_type::to_string(*trans_expr)
: std::string("null"));
#endif
if (trans_expr)
{
#ifdef MAPNIK_LOG
MAPNIK_LOG_DEBUG(transform) << "transform: evaluate "
<< transform_processor_type::to_string(*trans_expr);
#endif
transform_processor_type::evaluate(tr, feature, *trans_expr);
}
}

40
src/tiff_reader.cpp
View file

@ -23,6 +23,8 @@
// mapnik
#include <mapnik/debug.hpp>
#include <mapnik/image_reader.hpp>
// boost
#include <boost/shared_ptr.hpp>
#include <boost/filesystem/operations.hpp>
// stl
@ -41,6 +43,18 @@ using std::max;
class tiff_reader : public image_reader
{
typedef boost::shared_ptr<TIFF> tiff_ptr;
struct tiff_closer
{
void operator() (TIFF * tif)
{
if (tif != 0)
{
TIFFClose(tif);
}
}
};
private:
std::string file_name_;
int read_method_;
@ -49,6 +63,8 @@ private:
int rows_per_strip_;
int tile_width_;
int tile_height_;
tiff_ptr tif_;
public:
enum TiffType {
generic=1,
@ -116,11 +132,9 @@ void tiff_reader::init()
{
read_method_=stripped;
}
TIFFClose(tif);
}
else
{
TIFFClose(tif);
throw image_reader_exception(msg);
}
}
@ -128,7 +142,6 @@ void tiff_reader::init()
tiff_reader::~tiff_reader()
{
//
}
@ -167,8 +180,6 @@ void tiff_reader::read_generic(unsigned /*x*/,unsigned /*y*/,image_data_32& /*im
if (tif)
{
MAPNIK_LOG_DEBUG(tiff_reader) << "tiff_reader: TODO - tiff is not stripped or tiled";
TIFFClose(tif);
}
}
@ -213,7 +224,6 @@ void tiff_reader::read_tiled(unsigned x0,unsigned y0,image_data_32& image)
}
}
_TIFFfree(buf);
TIFFClose(tif);
}
}
@ -254,21 +264,21 @@ void tiff_reader::read_stripped(unsigned x0,unsigned y0,image_data_32& image)
}
}
_TIFFfree(buf);
TIFFClose(tif);
}
}
TIFF* tiff_reader::load_if_exists(std::string const& filename)
{
TIFF * tif = 0;
boost::filesystem::path path(file_name_);
if (exists(path)) // && is_regular(path)) { -- not supported in boost-1.33.*
if (!tif_)
{
// File path is a full file path and does exist
tif = TIFFOpen(filename.c_str(), "rb");
boost::filesystem::path path(file_name_);
if (boost::filesystem::is_regular(path)) // exists and regular file
{
// File path is a full file path and does exist
tif_ = tiff_ptr(TIFFOpen(filename.c_str(), "rb"), tiff_closer());
}
}
return tif;
}
return tif_.get();
}
} // namespace mapnik

18
src/warp.cpp
View file

@ -47,11 +47,11 @@
namespace mapnik {
void reproject_and_scale_raster(raster & target, raster const& source,
proj_transform const& prj_trans,
double offset_x, double offset_y,
unsigned mesh_size,
double filter_radius,
scaling_method_e scaling_method)
proj_transform const& prj_trans,
double offset_x, double offset_y,
unsigned mesh_size,
double filter_radius,
scaling_method_e scaling_method)
{
CoordTransform ts(source.data_.width(), source.data_.height(),
source.ext_);
@ -160,10 +160,10 @@ void reproject_and_scale_raster(raster & target, raster const& source,
tt.forward(polygon+6, polygon+7);
rasterizer.reset();
rasterizer.move_to_d(polygon[0]-1, polygon[1]-1);
rasterizer.line_to_d(polygon[2]+1, polygon[3]-1);
rasterizer.line_to_d(polygon[4]+1, polygon[5]+1);
rasterizer.line_to_d(polygon[6]-1, polygon[7]+1);
rasterizer.move_to_d(std::floor(polygon[0]), std::floor(polygon[1]));
rasterizer.line_to_d(std::floor(polygon[2]), std::floor(polygon[3]));
rasterizer.line_to_d(std::floor(polygon[4]), std::floor(polygon[5]));
rasterizer.line_to_d(std::floor(polygon[6]), std::floor(polygon[7]));
unsigned x0 = i * mesh_size;
unsigned y0 = j * mesh_size;

12
tests/python_tests/csv_test.py
View file

@ -137,9 +137,9 @@ if 'csv' in mapnik.DatasourceCache.plugin_names():
def test_wkt_field(**kwargs):
ds = get_csv_ds('wkt.csv')
eq_(len(ds.fields()),2)
eq_(ds.fields(),['type','WKT'])
eq_(ds.field_types(),['str','str'])
eq_(len(ds.fields()),1)
eq_(ds.fields(),['type'])
eq_(ds.field_types(),['str'])
fs = ds.all_features()
eq_(len(fs[0].geometries()),1)
eq_(fs[0].geometries()[0].type(),mapnik.DataGeometryType.Point)
@ -396,9 +396,9 @@ if 'csv' in mapnik.DatasourceCache.plugin_names():
eq_(feat['Name'],u"Winthrop, WA")
def validate_geojson_datasource(ds):
eq_(len(ds.fields()),2)
eq_(ds.fields(),['type','GeoJSON'])
eq_(ds.field_types(),['str','str'])
eq_(len(ds.fields()),1)
eq_(ds.fields(),['type'])
eq_(ds.field_types(),['str'])
fs = ds.all_features()
eq_(len(fs[0].geometries()),1)
eq_(fs[0].geometries()[0].type(),mapnik.DataGeometryType.Point)

5
tests/python_tests/json_feature_properties_test.py
View file

@ -3,7 +3,10 @@
from nose.tools import *
import os,sys
import mapnik
import json
try:
import json
except ImportError:
import simplejson as json
chars = [
{

10
tests/visual_tests/compare.py
View file

@ -49,7 +49,7 @@ def compare(actual, expected):
passed += 1
return diff
def summary():
def summary(generate=False):
global errors
global passed
print "-"*80
@ -57,7 +57,13 @@ def summary():
if len(errors) != 0:
for error in errors:
if (error[0] is None):
print "Could not verify %s: No reference image found!" % error[1]
if generate:
actual = open(error[1],'r').read()
open(error[2],'wb').write(actual)
print "Generating reference image: '%s'" % error[2]
continue
else:
print "Could not verify %s: No reference image found!" % error[1]
else:
print "Failed: %d different pixels:\n\t%s (actual)\n\t%s (expected)" % error
sys.exit(1)