Commit 72ca2199 authored by ssides's avatar ssides
Browse files

GEOS 3.9 camtools

parent 04f2658b

isis/src/base/apps/caminfo/CamTools.cpp

+4 −4
Original line number Diff line number Diff line
@@ -317,9 +317,9 @@ namespace Isis { 
        poly.Create(cube, _sampleInc, _lineInc, 1, 1, 0, 0, band + 1,

            increasePrecision);

        geos::geom::MultiPolygon *multiP = poly.Polys();

        _polys.push_back(multiP->clone());

        _polys.push_back(multiP->clone().release());

        if(_combined == 0) {

          _combined = multiP->clone();

          _combined = multiP->clone().release();

        }

        else {

          //  Construct composite (union) polygon
@@ -336,8 +336,8 @@ namespace Isis { 
        // Read the footprint from the image labels

        ImagePolygon poly = cube.readFootprint();

        geos::geom::MultiPolygon *multiP = poly.Polys();

        _polys.push_back(multiP->clone());

        _combined = multiP->clone();

        _polys.push_back(multiP->clone().release());

        _combined = multiP->clone().release();

        _mapping = getProjGeometry(camera, multiP, g);

      }

isis/tests/FunctionalTestsFootprintinit.cpp

+6 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ TEST_F(DefaultCube, FunctionalTestFootprintinitDefault) { 
  ImagePolygon poly = testCube->readFootprint();



  ASSERT_EQ(49, poly.numVertices());

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope();

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope().release();



  std::vector<double> lons = {255.645358, 256.146267, 256.146267, 255.645358, 255.645358};

  std::vector<double> lats = {9.928502, 9.928502, 10.434859, 10.434859, 9.928502};
@@ -50,7 +50,7 @@ TEST_F(DefaultCube, FunctionalTestFootprintinitLincSinc) { 
  ImagePolygon poly = testCube->readFootprint();



  ASSERT_EQ(95, poly.numVertices());

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope();

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope().release();



  std::vector<double> lons = {255.645390, 256.146233, 256.146233, 255.645390, 255.645390};

  std::vector<double> lats = {9.928500, 9.928500, 10.434861, 10.434861, 9.928500};
@@ -72,7 +72,7 @@ TEST_F(DefaultCube, FunctionalTestFootprintinitVertices) { 
  ImagePolygon poly = testCube->readFootprint();



  ASSERT_EQ(43, poly.numVertices());

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope();

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope().release();



  std::vector<double> lons = {255.645374, 256.146251, 256.146251, 255.645374, 255.645374};

  std::vector<double> lats = {9.928456, 9.928456, 10.434903, 10.434903, 9.928456};
@@ -94,7 +94,7 @@ TEST_F(DefaultCube, FunctionalTestFootprintinitCamera) { 
  ImagePolygon poly = testCube->readFootprint();



  ASSERT_EQ(34, poly.numVertices());

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope();

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope().release();



  std::vector<double> lons = {255.923821, 256.215272, 256.215272, 255.923821, 255.923821};

  std::vector<double> lats = {9.924583, 9.924583, 10.329275, 10.329275, 9.924583};
@@ -116,7 +116,7 @@ TEST_F(DefaultCube, FunctionalTestFootprintinitTestXY) { 
  ImagePolygon poly = testCube->readFootprint();



  ASSERT_EQ(49, poly.numVertices());

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope();

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope().release();



  std::vector<double> lons = {255.645358, 256.146267, 256.146267, 255.645358, 255.645358};

  std::vector<double> lats = {9.928502, 9.928502, 10.434859, 10.434859, 9.928502};
@@ -144,7 +144,7 @@ TEST_F(DefaultCube, FunctionalTestFootprintinitPrecision) { 
  ImagePolygon poly = testCube->readFootprint();



  ASSERT_EQ(49, poly.numVertices());

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope();

  geos::geom::Geometry* boundary = poly.Polys()->getEnvelope().release();



  std::vector<double> lons = {255.645358, 256.146267, 256.146267, 255.645358, 255.645358};

  std::vector<double> lats = {9.928502, 9.928502, 10.434859, 10.434859, 9.928502};