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

- occi.input: improved determination of layer envelope by querying the spatial index metadata

Browse source 
- occi.input: added optional estimate_extent parameter (much like pgsql.input)
- occi.input: added prefetch of 100 rows in spatial queries (must be tunable)
- occi.input: commented a console debug clog output that was flooding my bash
This commit is contained in:
Lucio Asnaghi 2009-02-23 17:16:09 +00:00
parent 72c9d29ea6
commit 4de010b840
3 changed files with 95 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
plugins/input/occi/occi_datasource.cpp
View file

@ -70,7 +70,7 @@ DATASOURCE_PLUGIN(occi_datasource)
occi_datasource::occi_datasource(parameters const& params)
: datasource (params),
table_(*params.get<std::string>("table","")),
geometry_field_(*params.get<std::string>("geometry_field","")),
geometry_field_(*params.get<std::string>("geometry_field","GEOLOC")),
type_(datasource::Vector),
extent_initialized_(false),
desc_(*params.get<std::string>("type"),"utf-8"),
@ -248,36 +248,104 @@ Envelope<double> occi_datasource::envelope() const
{
if (extent_initialized_) return extent_;
double lox, loy, hix, hiy;
occi_connection_ptr conn (pool_);
std::ostringstream s;
s << "select min(c.x), min(c.y), max(c.x), max(c.y) from ";
s << " (select sdo_aggr_mbr(" << geometry_field_ << ") shape from " << table_ << ") a, ";
s << " table (sdo_util.getvertices(a.shape)) c";
try
boost::optional<std::string> estimate_extent = params_.get<std::string>("estimate_extent");
if (estimate_extent && *estimate_extent == "true")
{
ResultSet* rs = conn.execute_query (s.str());
if (rs && rs->next ())
std::ostringstream s;
s << "select min(c.x), min(c.y), max(c.x), max(c.y) from ";
s << " (select sdo_aggr_mbr(" << geometry_field_ << ") shape from " << table_ << ") a, ";
s << " table (sdo_util.getvertices(a.shape)) c";
try
{
try
ResultSet* rs = conn.execute_query (s.str());
if (rs && rs->next ())
{
double lox = lexical_cast<double>(rs->getDouble(1));
double loy = lexical_cast<double>(rs->getDouble(2));
double hix = lexical_cast<double>(rs->getDouble(3));
double hiy = lexical_cast<double>(rs->getDouble(4));
extent_.init (lox,loy,hix,hiy);
extent_initialized_ = true;
}
catch (bad_lexical_cast &ex)
{
clog << ex.what() << endl;
try
{
lox = lexical_cast<double>(rs->getDouble(1));
loy = lexical_cast<double>(rs->getDouble(2));
hix = lexical_cast<double>(rs->getDouble(3));
hiy = lexical_cast<double>(rs->getDouble(4));
extent_.init (lox,loy,hix,hiy);
extent_initialized_ = true;
}
catch (bad_lexical_cast &ex)
{
clog << ex.what() << endl;
}
}
}
catch (SQLException &ex)
{
throw datasource_exception(ex.getMessage());
}
}
catch (SQLException &ex)
else
{
throw datasource_exception(ex.getMessage());
{
std::ostringstream s;
s << "select dim.sdo_lb as lx, dim.sdo_ub as ux from ";
s << SDO_GEOMETRY_METADATA_TABLE << " m, table(m.diminfo) dim ";
s << " where lower(m.table_name) = '" << table_ << "' and dim.sdo_dimname = 'X'";
try
{
ResultSet* rs = conn.execute_query (s.str());
if (rs && rs->next ())
{
try
{
lox = lexical_cast<double>(rs->getDouble(1));
hix = lexical_cast<double>(rs->getDouble(2));
}
catch (bad_lexical_cast &ex)
{
clog << ex.what() << endl;
}
}
}
catch (SQLException &ex)
{
throw datasource_exception(ex.getMessage());
}
}
{
std::ostringstream s;
s << "select dim.sdo_lb as ly, dim.sdo_ub as uy from ";
s << SDO_GEOMETRY_METADATA_TABLE << " m, table(m.diminfo) dim ";
s << " where lower(m.table_name) = '" << table_ << "' and dim.sdo_dimname = 'Y'";
try
{
ResultSet* rs = conn.execute_query (s.str());
if (rs && rs->next ())
{
try
{
loy = lexical_cast<double>(rs->getDouble(1));
hiy = lexical_cast<double>(rs->getDouble(2));
}
catch (bad_lexical_cast &ex)
{
clog << ex.what() << endl;
}
}
}
catch (SQLException &ex)
{
throw datasource_exception(ex.getMessage());
}
}
extent_.init (lox,loy,hix,hiy);
extent_initialized_ = true;
}
return extent_;

2
plugins/input/occi/occi_featureset.cpp
View file

@ -189,7 +189,7 @@ void occi_featureset::convert_geometry (SDOGeometry* geom, feature_ptr feature)
int lrsvalue = (gtype - dimensions * 1000) / 100;
int geomtype = (gtype - dimensions * 1000 - lrsvalue * 100);
#ifdef MAPNIK_DEBUG
#if 0
clog << "-----------Geometry Object ------------" << endl;
clog << "SDO GTYPE = " << gtype << endl;
clog << "SDO DIMENSIONS = " << dimensions << endl;

4
plugins/input/occi/occi_types.hpp
View file

@ -150,6 +150,10 @@ public:
close_query (false);
stmt_ = conn_->createStatement (s);
stmt_->setPrefetchRowCount (100);
stmt_->setPrefetchMemorySize (0);
rs_ = stmt_->executeQuery ();
return rs_;