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

add missed commits to complete the support for map 'base'

Browse source
This commit is contained in:
Dane Springmeyer 2011-05-25 23:51:40 +00:00
parent b7a0204bf2
commit 1d07c81316
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libxml2_loader.cpp
View file

@ -118,18 +118,18 @@ public:
load(doc, pt);
}
void load_string( const std::string & buffer, ptree & pt, std::string const & base_url )
void load_string( const std::string & buffer, ptree & pt, std::string const & base_path )
{
if (!base_url.empty())
if (!base_path.empty())
{
boost::filesystem::path path(base_url);
boost::filesystem::path path(base_path);
if ( ! boost::filesystem::exists( path ) ) {
throw config_error(string("Could not locate base_url '") +
base_url + "': file or directory does not exist");
throw config_error(string("Could not locate base_path '") +
base_path + "': file or directory does not exist");
}
}
xmlDocPtr doc = xmlCtxtReadMemory(ctx_, buffer.data(), buffer.length(), base_url.c_str(), encoding_, options_);
xmlDocPtr doc = xmlCtxtReadMemory(ctx_, buffer.data(), buffer.length(), base_path.c_str(), encoding_, options_);
load(doc, pt);
}
@ -227,10 +227,10 @@ void read_xml2( std::string const & filename, boost::property_tree::ptree & pt)
libxml2_loader loader;
loader.load( filename, pt );
}
void read_xml2_string( std::string const & str, boost::property_tree::ptree & pt, std::string const & base_url)
void read_xml2_string( std::string const & str, boost::property_tree::ptree & pt, std::string const & base_path)
{
libxml2_loader loader;
loader.load_string( str, pt, base_url );
loader.load_string( str, pt, base_path );
}
} // end of namespace mapnik

15
src/map.cpp
View file

@ -64,6 +64,7 @@ Map::Map()
height_(400),
srs_("+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs"),
buffer_size_(0),
base_path_(""),
aspectFixMode_(GROW_BBOX) {}
Map::Map(int width,int height, std::string const& srs)
@ -71,6 +72,7 @@ Map::Map(int width,int height, std::string const& srs)
height_(height),
srs_(srs),
buffer_size_(0),
base_path_(""),
aspectFixMode_(GROW_BBOX) {}
Map::Map(const Map& rhs)
@ -86,6 +88,7 @@ Map::Map(const Map& rhs)
aspectFixMode_(rhs.aspectFixMode_),
current_extent_(rhs.current_extent_),
maximum_extent_(rhs.maximum_extent_),
base_path_(rhs.base_path_),
extra_attr_(rhs.extra_attr_) {}
Map& Map::operator=(const Map& rhs)
@ -102,6 +105,7 @@ Map& Map::operator=(const Map& rhs)
layers_=rhs.layers_;
aspectFixMode_=rhs.aspectFixMode_;
maximum_extent_=rhs.maximum_extent_;
base_path_=rhs.base_path_;
extra_attr_=rhs.extra_attr_;
return *this;
}
@ -344,6 +348,16 @@ boost::optional<box2d<double> > const& Map::maximum_extent() const
return maximum_extent_;
}
std::string const& Map::base_path() const
{
return base_path_;
}
void Map::set_base_path(std::string const& base)
{
base_path_ = base;
}
void Map::zoom(double factor)
{
coord2d center = current_extent_.center();
@ -381,6 +395,7 @@ void Map::zoom_all()
proj_transform prj_trans(proj0,proj1);
box2d<double> layer_ext = itr->envelope();
// TODO - consider using more robust method: http://trac.mapnik.org/ticket/751
if (prj_trans.backward(layer_ext))
{
success = true;