archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2026-02-01 17:36:36 +00:00
Code Issues Projects Releases Wiki Activity

improve up front error checking of shapefile existence with boost, and allow shapefile plugin to accept filename with or without '.shp' extension - closes #199 and #174

Browse Source
This commit is contained in:
Dane Springmeyer 2009-03-30 23:51:58 +00:00
parent 5d976513b8
commit a9f353de05
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/input/shape/SConscript
View File

@ -42,6 +42,8 @@ if env['PLATFORM'] == 'Darwin':
libraries.append('mapnik')
libraries.append('icuuc')
libraries.append('icudata')
libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append('boost_filesystem%s' % env['BOOST_APPEND'])
shape_inputdriver = env.SharedLibrary('shape', SHLIBSUFFIX='.input', source=shape_src, SHLIBPREFIX='', LIBS = libraries)

17
plugins/input/shape/shape.cpp
View File

@ -24,6 +24,11 @@
#include <fstream>
#include <stdexcept>
#include <mapnik/geom_util.hpp>
// boost
#include <boost/algorithm/string.hpp>
#include <boost/filesystem/operations.hpp>
#include "shape_featureset.hpp"
#include "shape_index_featureset.hpp"
#include "shape.hpp"
@ -45,11 +50,19 @@ shape_datasource::shape_datasource(const parameters &params)
indexed_(false),
desc_(*params.get<std::string>("type"), *params.get<std::string>("encoding","utf-8"))
{
boost::optional<std::string> file = params.get<std::string>("file");
if (!file) throw datasource_exception("missing <file> parameter");
boost::optional<std::string> base = params.get<std::string>("base");
if (base)
shape_name_ = *base + "/" + *params_.get<std::string>("file","");
shape_name_ = *base + "/" + *file;
else
shape_name_ = *params_.get<std::string>("file","");
shape_name_ = *file;
boost::algorithm::ireplace_last(shape_name_,".shp","");
if (!boost::filesystem::exists(shape_name_ + ".shp")) throw datasource_exception(shape_name_ + " does not exist");
try
{
shape_io shape(shape_name_);