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

clang-format

Browse source
This commit is contained in:
Artem Pavlenko 2024-07-29 12:35:31 +01:00
parent 4f6a7a2571
commit a982e69525
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/projection.hpp
View file

@ -81,6 +81,7 @@ class MAPNIK_DECL projection
std::string description() const; std::string description() const;
void init_proj(); void init_proj();
std::optional<box2d<double>> area_of_use() const; std::optional<box2d<double>> area_of_use() const;
private: private:
void swap(projection& rhs); void swap(projection& rhs);

9
test/unit/projection/proj_transform.cpp
View file

@ -210,15 +210,14 @@ TEST_CASE("projection transform")
mapnik::projection prj_geog("epsg:4326"); mapnik::projection prj_geog("epsg:4326");
mapnik::projection prj_proj("epsg:3995"); mapnik::projection prj_proj("epsg:3995");
mapnik::proj_transform prj_trans_fwd(prj_proj, prj_geog); mapnik::proj_transform prj_trans_fwd(prj_proj, prj_geog);
mapnik::proj_transform prj_trans_rev(prj_geog, prj_proj); mapnik::proj_transform prj_trans_rev(prj_geog, prj_proj);
// bounds // bounds
const mapnik::box2d<double> bounds{-180.0,60.0,180.0,90.0}; const mapnik::box2d<double> bounds{-180.0, 60.0, 180.0, 90.0};
{ {
// projected bounds // projected bounds
mapnik::box2d<double> projected_bounds{-3299207.53,-3333134.03, 3299207.53, 3333134.03}; mapnik::box2d<double> projected_bounds{-3299207.53, -3333134.03, 3299207.53, 3333134.03};
CHECKED_IF(prj_trans_fwd.forward(projected_bounds, PROJ_ENVELOPE_POINTS)) CHECKED_IF(prj_trans_fwd.forward(projected_bounds, PROJ_ENVELOPE_POINTS))
{ {
CHECK(projected_bounds.minx() == Approx(bounds.minx())); CHECK(projected_bounds.minx() == Approx(bounds.minx()));
@ -230,7 +229,7 @@ TEST_CASE("projection transform")
{ {
// check the same logic works for .backward() // check the same logic works for .backward()
mapnik::box2d<double> projected_bounds{-3299207.53,-3333134.03, 3299207.53, 3333134.03}; mapnik::box2d<double> projected_bounds{-3299207.53, -3333134.03, 3299207.53, 3333134.03};
CHECKED_IF(prj_trans_rev.backward(projected_bounds, PROJ_ENVELOPE_POINTS)) CHECKED_IF(prj_trans_rev.backward(projected_bounds, PROJ_ENVELOPE_POINTS))
{ {
CHECK(projected_bounds.minx() == Approx(bounds.minx())); CHECK(projected_bounds.minx() == Approx(bounds.minx()));