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

Merge branch 'master' of github.com:mapnik/mapnik into map-request

Browse source
This commit is contained in:
Dane Springmeyer 2013-02-25 19:33:54 -05:00
commit 864fdc5234
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/mapnik/map.hpp
View file

@ -112,14 +112,14 @@ public:
* *
* @param rhs Map to copy from. * @param rhs Map to copy from.
*/ */
Map(const Map& rhs); Map(Map const& rhs);
/*! \brief Assignment operator /*! \brief Assignment operator
* *
* TODO: to be documented * TODO: to be documented
* *
*/ */
Map& operator=(const Map& rhs); Map& operator=(Map const& rhs);
/*! \brief Get all styles /*! \brief Get all styles
* @return Const reference to styles * @return Const reference to styles
@ -201,13 +201,13 @@ public:
/*! \brief Add a layer to the map. /*! \brief Add a layer to the map.
* @param l The layer to add. * @param l The layer to add.
*/ */
void addLayer(const layer& l); void addLayer(layer const& l);
/*! \brief Get a layer. /*! \brief Get a layer.
* @param index layer number. * @param index layer number.
* @return Constant layer. * @return Constant layer.
*/ */
const layer& getLayer(size_t index) const; layer const& getLayer(size_t index) const;
/*! \brief Get a layer. /*! \brief Get a layer.
* @param index layer number. * @param index layer number.
@ -267,7 +267,7 @@ public:
/*! \brief Set the map background color. /*! \brief Set the map background color.
* @param c Background color. * @param c Background color.
*/ */
void set_background(const color& c); void set_background(color const& c);
/*! \brief Get the map background color /*! \brief Get the map background color
* @return Background color as boost::optional * @return Background color as boost::optional
@ -327,7 +327,7 @@ public:
* Aspect is handled automatic if not fitting to width/height. * Aspect is handled automatic if not fitting to width/height.
* @param box The bounding box where to zoom. * @param box The bounding box where to zoom.
*/ */
void zoom_to_box(const box2d<double>& box); void zoom_to_box(box2d<double> const& box);
/*! \brief Zoom the map to show all data. /*! \brief Zoom the map to show all data.
*/ */
@ -340,7 +340,7 @@ public:
/*! \brief Get current bounding box. /*! \brief Get current bounding box.
* @return The current bounding box. * @return The current bounding box.
*/ */
const box2d<double>& get_current_extent() const; box2d<double> const& get_current_extent() const;
/*! \brief Get current buffered bounding box. /*! \brief Get current buffered bounding box.
* @return The current buffered bounding box. * @return The current buffered bounding box.

18
src/map.cpp
View file

@ -75,7 +75,7 @@ Map::Map(int width,int height, std::string const& srs)
aspectFixMode_(GROW_BBOX), aspectFixMode_(GROW_BBOX),
base_path_("") {} base_path_("") {}
Map::Map(const Map& rhs) Map::Map(Map const& rhs)
: width_(rhs.width_), : width_(rhs.width_),
height_(rhs.height_), height_(rhs.height_),
srs_(rhs.srs_), srs_(rhs.srs_),
@ -93,7 +93,7 @@ Map::Map(const Map& rhs)
Map::~Map() {} Map::~Map() {}
Map& Map::operator=(const Map& rhs) Map& Map::operator=(Map const& rhs)
{ {
if (this==&rhs) return *this; if (this==&rhs) return *this;
width_=rhs.width_; width_=rhs.width_;
@ -132,12 +132,12 @@ Map::style_iterator Map::end_styles()
return styles_.end(); return styles_.end();
} }
Map::const_style_iterator Map::begin_styles() const Map::const_style_iterator Map::begin_styles() const
{ {
return styles_.begin(); return styles_.begin();
} }
Map::const_style_iterator Map::end_styles() const Map::const_style_iterator Map::end_styles() const
{ {
return styles_.end(); return styles_.end();
} }
@ -194,7 +194,7 @@ size_t Map::layer_count() const
return layers_.size(); return layers_.size();
} }
void Map::addLayer(const layer& l) void Map::addLayer(layer const& l)
{ {
layers_.push_back(l); layers_.push_back(l);
} }
@ -210,7 +210,7 @@ void Map::remove_all()
styles_.clear(); styles_.clear();
} }
const layer& Map::getLayer(size_t index) const layer const& Map::getLayer(size_t index) const
{ {
return layers_[index]; return layers_[index];
} }
@ -302,7 +302,7 @@ boost::optional<color> const& Map::background() const
return background_; return background_;
} }
void Map::set_background(const color& c) void Map::set_background(color const& c)
{ {
background_ = c; background_ = c;
} }
@ -426,7 +426,7 @@ void Map::zoom_all()
} }
} }
void Map::zoom_to_box(const box2d<double> &box) void Map::zoom_to_box(box2d<double> const& box)
{ {
current_extent_=box; current_extent_=box;
fixAspectRatio(); fixAspectRatio();
@ -488,7 +488,7 @@ void Map::fixAspectRatio()
} }
} }
const box2d<double>& Map::get_current_extent() const box2d<double> const& Map::get_current_extent() const
{ {
return current_extent_; return current_extent_;
} }