8010d5433f
2. Pass resolution to bbox query
3. Use variant<int,double,string> as parameter value e.g in Python:
ds = Raster(file="/path/to/file",lox = 12312.4,.....)
Added extractor facility to work with mapnik::parameter (C++):
mapnik::parameters params;
params["parameter0"] = 123.456;
params["parameter1"] = "123.456"; // initialize with string extract double later
boost::optional<double> val0 = params.get<double>("parameter0");
if (val0)
{
std::cout << *val0;
}
// with default value. NOTE: there is no 'parameter2' in params
boost::optional<double> val2 = params.get<double>("parameter2",654.321);
std::cout << * val2;
//
4. Added Gdal factory method in __init__.py
ds = Gdal(file="/tmp/file.tiff")
121 lines
3.8 KiB
C++
121 lines
3.8 KiB
C++
/*****************************************************************************
|
|
*
|
|
* This file is part of Mapnik (c++ mapping toolkit)
|
|
*
|
|
* Copyright (C) 2006 Artem Pavlenko
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*
|
|
*****************************************************************************/
|
|
|
|
//$Id: postgisfs.cc 34 2005-04-04 13:27:23Z pavlenko $
|
|
|
|
#include <boost/algorithm/string.hpp>
|
|
#include <mapnik/global.hpp>
|
|
#include <mapnik/wkb.hpp>
|
|
#include <mapnik/unicode.hpp>
|
|
#include "postgis.hpp"
|
|
|
|
using boost::lexical_cast;
|
|
using boost::bad_lexical_cast;
|
|
using boost::trim;
|
|
using std::string;
|
|
using mapnik::Feature;
|
|
using mapnik::geometry_ptr;
|
|
using mapnik::byte;
|
|
using mapnik::geometry_utils;
|
|
|
|
postgis_featureset::postgis_featureset(boost::shared_ptr<ResultSet> const& rs,
|
|
std::string const& encoding,
|
|
unsigned num_attrs=0)
|
|
: rs_(rs),
|
|
num_attrs_(num_attrs),
|
|
tr_(new transcoder(encoding)),
|
|
totalGeomSize_(0),
|
|
count_(0) {}
|
|
|
|
feature_ptr postgis_featureset::next()
|
|
{
|
|
if (rs_->next())
|
|
{
|
|
feature_ptr feature(new Feature(count_));
|
|
int size=rs_->getFieldLength(0);
|
|
const char *data = rs_->getValue(0);
|
|
geometry_ptr geom = geometry_utils::from_wkb(data,size);
|
|
totalGeomSize_+=size;
|
|
|
|
if (geom)
|
|
{
|
|
feature->set_geometry(geom);
|
|
|
|
for (unsigned pos=1;pos<num_attrs_+1;++pos)
|
|
{
|
|
std::string name = rs_->getFieldName(pos);
|
|
const char* buf=rs_->getValue(pos);
|
|
int oid = rs_->getTypeOID(pos);
|
|
|
|
if (oid==23) //int4
|
|
{
|
|
int val = int4net(buf);
|
|
boost::put(*feature,name,val);
|
|
}
|
|
else if (oid==21) //int2
|
|
{
|
|
int val = int2net(buf);
|
|
boost::put(*feature,name,val);
|
|
}
|
|
else if (oid == 700) // float4
|
|
{
|
|
float val;
|
|
float4net(val,buf);
|
|
boost::put(*feature,name,val);
|
|
}
|
|
else if (oid == 701) // float8
|
|
{
|
|
double val;
|
|
float8net(val,buf);
|
|
boost::put(*feature,name,val);
|
|
}
|
|
else if (oid==25 || oid==1042 || oid==1043) // text or bpchar or varchar
|
|
{
|
|
std::string str(buf);
|
|
trim(str);
|
|
std::wstring wstr = tr_->transcode(str);
|
|
boost::put(*feature,name,wstr);
|
|
}
|
|
else
|
|
{
|
|
#ifdef MAPNIK_DEBUG
|
|
std::clog << "uknown OID = " << oid << " FIXME \n";
|
|
#endif
|
|
//boost::put(*feature,name,0);
|
|
}
|
|
}
|
|
++count_;
|
|
}
|
|
return feature;
|
|
}
|
|
else
|
|
{
|
|
rs_->close();
|
|
return feature_ptr();
|
|
}
|
|
}
|
|
|
|
|
|
postgis_featureset::~postgis_featureset()
|
|
{
|
|
rs_->close();
|
|
}
|