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")
143 lines
4.4 KiB
C++
143 lines
4.4 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: connection_manager.hpp 17 2005-03-08 23:58:43Z pavlenko $
|
|
|
|
#ifndef CONNECTION_MANAGER_HPP
|
|
#define CONNECTION_MANAGER_HPP
|
|
|
|
#include <string>
|
|
#include <mapnik/pool.hpp>
|
|
#include <mapnik/utils.hpp>
|
|
#include "connection.hpp"
|
|
#include <boost/shared_ptr.hpp>
|
|
#include <boost/thread/mutex.hpp>
|
|
#include <boost/optional.hpp>
|
|
|
|
using mapnik::Pool;
|
|
using mapnik::singleton;
|
|
using mapnik::CreateStatic;
|
|
using std::string;
|
|
using boost::mutex;
|
|
|
|
template <typename T>
|
|
class ConnectionCreator
|
|
{
|
|
|
|
public:
|
|
ConnectionCreator(boost::optional<string> const& host,
|
|
boost::optional<string> const& port,
|
|
boost::optional<string> const& dbname,
|
|
boost::optional<string> const& user,
|
|
boost::optional<string> const& pass)
|
|
: host_(host),
|
|
port_(port),
|
|
dbname_(dbname),
|
|
user_(user),
|
|
pass_(pass) {}
|
|
|
|
T* operator()() const
|
|
{
|
|
return new T(connection_string());
|
|
}
|
|
|
|
inline std::string id() const
|
|
{
|
|
return connection_string();
|
|
}
|
|
|
|
inline std::string connection_string() const
|
|
{
|
|
std::string connect_str;
|
|
if (host_) connect_str += "host=" + *host_;
|
|
if (port_) connect_str += " port=" + *port_;
|
|
if (dbname_) connect_str += " dbname=" + *dbname_;
|
|
if (user_) connect_str += " user=" + *user_;
|
|
if (pass_) connect_str += " password=" + *pass_;
|
|
connect_str += " connect_timeout=4"; // todo: set by client (param)
|
|
return connect_str;
|
|
}
|
|
|
|
private:
|
|
boost::optional<string> host_;
|
|
boost::optional<string> port_;
|
|
boost::optional<string> dbname_;
|
|
boost::optional<string> user_;
|
|
boost::optional<string> pass_;
|
|
|
|
};
|
|
|
|
class ConnectionManager : public singleton <ConnectionManager,CreateStatic>
|
|
{
|
|
|
|
friend class CreateStatic<ConnectionManager>;
|
|
typedef Pool<Connection,ConnectionCreator> PoolType;
|
|
typedef std::map<std::string,boost::shared_ptr<PoolType> > ContType;
|
|
typedef boost::shared_ptr<Connection> HolderType;
|
|
ContType pools_;
|
|
|
|
public:
|
|
|
|
bool registerPool(const ConnectionCreator<Connection>& creator,unsigned initialSize,unsigned maxSize)
|
|
{
|
|
mutex::scoped_lock lock(mutex_);
|
|
if (pools_.find(creator.id())==pools_.end())
|
|
{
|
|
return pools_.insert(std::make_pair(creator.id(),
|
|
boost::shared_ptr<PoolType>(new PoolType(creator,initialSize,maxSize)))).second;
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
boost::shared_ptr<PoolType> getPool(std::string const& key)
|
|
{
|
|
mutex::scoped_lock lock(mutex_);
|
|
ContType::const_iterator itr=pools_.find(key);
|
|
if (itr!=pools_.end())
|
|
{
|
|
return itr->second;
|
|
}
|
|
static const boost::shared_ptr<PoolType> emptyPool;
|
|
return emptyPool;
|
|
}
|
|
|
|
HolderType get(std::string const& key)
|
|
{
|
|
mutex::scoped_lock lock(mutex_);
|
|
ContType::const_iterator itr=pools_.find(key);
|
|
if (itr!=pools_.end())
|
|
{
|
|
boost::shared_ptr<PoolType> pool=itr->second;
|
|
return pool->borrowObject();
|
|
}
|
|
return HolderType();
|
|
}
|
|
|
|
private:
|
|
ConnectionManager() {}
|
|
ConnectionManager(const ConnectionManager&);
|
|
ConnectionManager& operator=(const ConnectionManager);
|
|
};
|
|
|
|
#endif //CONNECTION_MANAGER_HPP
|