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

Actual data-based sqlite statistics test, fix kinks in the implementation.

Browse source
This commit is contained in:
Tom MacWright 2012-02-01 15:52:17 -05:00
parent d1c65beb1c
commit ff450b4998
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/input/sqlite/sqlite_datasource.cpp
View file

@ -522,7 +522,7 @@ std::map<std::string, mapnik::parameters> sqlite_datasource::get_statistics() c
{
itr = desc_.get_descriptors().begin();
int col = 0;
for ( ; itr != end; ++itr, ++col) {
for ( ; itr != end; ++itr) {
std::string fld_name = itr->get_name();
if (fld_name != key_field_ &&
itr->get_type() == mapnik::Double ||
@ -533,6 +533,7 @@ std::map<std::string, mapnik::parameters> sqlite_datasource::get_statistics() c
p["max"] = rs->column_double(col);
col++;
p["mean"] = rs->column_double(col);
col++;
stats_[itr->get_name()] = p;
}
}

3
tests/python_tests/sqlite_test.py
View file

@ -41,6 +41,9 @@ if 'sqlite' in mapnik.DatasourceCache.instance().plugin_names():
def test_attachdb_with_multiple_files():
ds = mapnik.SQLite(file='../data/sqlite/world.sqlite', table='world_merc')
stats = ds.statistics()
eq_(stats['pop2005']['min'], 0)
eq_(stats['pop2005']['max'], 1312978855)
eq_(stats['area']['max'], 1638094)
print stats
def test_attachdb_with_absolute_file():