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

fix merge artifacts

Browse source
This commit is contained in:
Artem Pavlenko 2021-03-11 15:04:53 +00:00
parent 342bf2947b
commit ec880947e0
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -207,14 +207,10 @@ SECTION("Test proj antimeridian bbox")
SECTION("proj_transform of coordinate arrays with stride > 1") SECTION("proj_transform of coordinate arrays with stride > 1")
{ {
<<<<<<< HEAD
mapnik::projection const proj_4326("epsg:4326"); mapnik::projection const proj_4326("epsg:4326");
mapnik::projection const proj_3857("epsg:3857"); mapnik::projection const proj_3857("epsg:3857");
mapnik::projection const proj_2193("epsg:2193"); mapnik::projection const proj_2193("epsg:2193");
=======
mapnik::projection const proj_4326("+init=epsg:4326");
mapnik::projection const proj_3857("+init=epsg:3857");
>>>>>>> master
SECTION("lonlat <-> Web Mercator") SECTION("lonlat <-> Web Mercator")
{ {
@ -249,12 +245,9 @@ SECTION("proj_transform of coordinate arrays with stride > 1")
#ifdef MAPNIK_USE_PROJ4 #ifdef MAPNIK_USE_PROJ4
SECTION("lonlat <-> New Zealand Transverse Mercator 2000") SECTION("lonlat <-> New Zealand Transverse Mercator 2000")
{ {
<<<<<<< HEAD
// cs2cs -Ef %.10f epsg:4326 +to epsg:2193 <<END
=======
mapnik::projection const proj_2193("+init=epsg:2193"); mapnik::projection const proj_2193("+init=epsg:2193");
// cs2cs -Ef %.10f +init=epsg:4326 +to +init=epsg:2193 <<END // cs2cs -Ef %.10f epsg:4326 +to epsg:2193 <<END
>>>>>>> master
// 170.142139 -43.595056 // 170.142139 -43.595056
// 175.566667 -39.283333 // 175.566667 -39.283333
// END // END