Commit f5acc904 authored by ssides's avatar ssides
Browse files

GEOS 3.9 unit tests

parent 01513dab

isis/src/base/objs/Chip/unitTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -140,10 +140,10 @@ int main() { 
  pts->add(geos::geom::Coordinate(28.0, 27.0));

  pts->add(geos::geom::Coordinate(25.0, 28.0));

  pts->add(geos::geom::Coordinate(23.0, 22.0));

  vector<geos::geom::Geometry *> polys;

  vector<geos::geom::Geometry *> *polys = new vector<geos::geom::Geometry *>;

  geos::geom::GeometryFactory::Ptr gf = geos::geom::GeometryFactory::create();

  polys.push_back(gf->createPolygon(gf->createLinearRing(pts), NULL));

  geos::geom::MultiPolygon *mPolygon = gf->createMultiPolygon(&polys);

  polys->push_back(gf->createPolygon(gf->createLinearRing(pts), NULL));

  geos::geom::MultiPolygon *mPolygon = gf->createMultiPolygon(polys);



  chip.SetClipPolygon(*mPolygon);

  chip.Load(junk, 45.0);

isis/src/base/objs/GridPolygonSeeder/unitTest.cpp

+7 −7
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ int main() { 
      try {

        // Call the seed member with a polygon

        geos::geom::CoordinateArraySequence *pts;

        vector<geos::geom::Geometry *> polys;

        auto *polys = new vector<geos::geom::Geometry *>;



        // Create the A polygon

        pts = new geos::geom::CoordinateArraySequence();
@@ -79,10 +79,10 @@ int main() { 
        pts->add(geos::geom::Coordinate(0.5, 0));

        pts->add(geos::geom::Coordinate(0, 0));



        polys.push_back(Isis::globalFactory->createPolygon(

        polys->push_back(Isis::globalFactory->createPolygon(

                          Isis::globalFactory->createLinearRing(pts), NULL));



        geos::geom::MultiPolygon *mp = Isis::globalFactory->createMultiPolygon(&polys);

        geos::geom::MultiPolygon *mp = Isis::globalFactory->createMultiPolygon(polys);



        cout << "Lon/Lat polygon = " << mp->toString() << endl;

        // Create the projection necessary for seeding
@@ -131,7 +131,7 @@ int main() { 
      try {

        // Call the seed member with a polygon

        geos::geom::CoordinateArraySequence *pts;

        vector<geos::geom::Geometry *> polys;

        auto *polys = new vector<geos::geom::Geometry *>;



        // Create the A polygon

        pts = new geos::geom::CoordinateArraySequence();
@@ -141,10 +141,10 @@ int main() { 
        pts->add(geos::geom::Coordinate(0.0125, 0));

        pts->add(geos::geom::Coordinate(0, 0));



        polys.push_back(Isis::globalFactory->createPolygon(

        polys->push_back(Isis::globalFactory->createPolygon(

                         Isis::globalFactory->createLinearRing(pts), NULL));



        geos::geom::MultiPolygon *mp = Isis::globalFactory->createMultiPolygon(&polys);

        geos::geom::MultiPolygon *mp = Isis::globalFactory->createMultiPolygon(polys);



        cout << "Lon/Lat polygon = " << mp->toString() << endl;

isis/src/base/objs/ImageOverlap/unitTest.cpp

+8 −8
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ int main() { 
    cout << pts->toString() << endl;



    // Create a multi polygon

    vector<geos::geom::Geometry *> polys;

    vector<const geos::geom::Geometry *> polys;

    polys.push_back(globalFactory->createPolygon(

                      globalFactory->createLinearRing(pts), NULL));

    geos::geom::MultiPolygon *mPolygon = globalFactory->createMultiPolygon(&polys);

    geos::geom::MultiPolygon *mPolygon = globalFactory->createMultiPolygon(polys);



    // Add more coordinates so we can make sure we did a deep copy when we

    // created the multipolygon
@@ -75,10 +75,10 @@ int main() { 
    pts3->add(geos::geom::Coordinate(0.123456789, 0.123456789));



    try {

      vector<geos::geom::Geometry *> polys3;

      vector<const geos::geom::Geometry *> polys3;

      polys3.push_back(globalFactory->createPolygon(

                         globalFactory->createLinearRing(pts3), NULL));

      geos::geom::MultiPolygon *mPolygon3 = globalFactory->createMultiPolygon(&polys3);

      geos::geom::MultiPolygon *mPolygon3 = globalFactory->createMultiPolygon(polys3);

      a.SetPolygon(*mPolygon3);

      delete mPolygon3;

    }
@@ -98,10 +98,10 @@ int main() { 
    pts4->add(geos::geom::Coordinate(10.123456789, 10.123456789));



    try {

      vector<geos::geom::Geometry *> polys4;

      vector<const geos::geom::Geometry *> polys4;

      polys4.push_back(globalFactory->createPolygon(

                         globalFactory->createLinearRing(pts4), NULL));

      geos::geom::MultiPolygon *mPolygon4 = globalFactory->createMultiPolygon(&polys4);

      geos::geom::MultiPolygon *mPolygon4 = globalFactory->createMultiPolygon(polys4);

      a.SetPolygon(mPolygon4);

      delete mPolygon4;

    }
@@ -126,11 +126,11 @@ int main() { 
    pts->add(geos::geom::Coordinate(0.123456789, 0.123456789));



    try {

      vector<geos::geom::Geometry *> polys;

      vector<const geos::geom::Geometry *> polys;

      polys.push_back(globalFactory->createPolygon(

                        globalFactory->createLinearRing(pts), NULL));



      geos::geom::MultiPolygon *mPolygon = globalFactory->createMultiPolygon(&polys);

      geos::geom::MultiPolygon *mPolygon = globalFactory->createMultiPolygon(polys);



      ImageOverlap a("idFour", *mPolygon);

      PrintImageOverlap(a);

isis/src/base/objs/ImageOverlapSet/unitTest.cpp

+7 −7
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int main() { 


  // Reusable variables

  geos::geom::CoordinateArraySequence *pts;

  vector<geos::geom::Geometry *> polys;

  vector<const geos::geom::Geometry *> polys;



  // Create the A polygon

  pts = new geos::geom::CoordinateArraySequence();
@@ -87,7 +87,7 @@ int main() { 
  polys.push_back(globalFactory->createPolygon(

                    globalFactory->createLinearRing(pts), NULL));



  boundaries.push_back(globalFactory->createMultiPolygon(&polys));

  boundaries.push_back(globalFactory->createMultiPolygon(polys));



  for(unsigned int i = 0; i < polys.size(); ++i) delete polys[i];

  polys.clear();
@@ -103,7 +103,7 @@ int main() { 


  polys.push_back(globalFactory->createPolygon(

                    globalFactory->createLinearRing(pts), NULL));

  boundaries.push_back(globalFactory->createMultiPolygon(&polys));

  boundaries.push_back(globalFactory->createMultiPolygon(polys));



  for(unsigned int i = 0; i < polys.size(); ++i) delete polys[i];

  polys.clear();
@@ -119,7 +119,7 @@ int main() { 


  polys.push_back(globalFactory->createPolygon(

                    globalFactory->createLinearRing(pts), NULL));

  boundaries.push_back(globalFactory->createMultiPolygon(&polys));

  boundaries.push_back(globalFactory->createMultiPolygon(polys));



  for(unsigned int i = 0; i < polys.size(); ++i) delete polys[i];

  polys.clear();
@@ -135,7 +135,7 @@ int main() { 


  polys.push_back(globalFactory->createPolygon(

                    globalFactory->createLinearRing(pts), NULL));

  boundaries.push_back(globalFactory->createMultiPolygon(&polys));

  boundaries.push_back(globalFactory->createMultiPolygon(polys));



  for(unsigned int i = 0; i < polys.size(); ++i) delete polys[i];

  polys.clear();
@@ -151,7 +151,7 @@ int main() { 


  polys.push_back(globalFactory->createPolygon(

                    globalFactory->createLinearRing(pts), NULL));

  boundaries.push_back(globalFactory->createMultiPolygon(&polys));

  boundaries.push_back(globalFactory->createMultiPolygon(polys));



  for(unsigned int i = 0; i < polys.size(); ++i) delete polys[i];

  polys.clear();
@@ -167,7 +167,7 @@ int main() { 


  polys.push_back(globalFactory->createPolygon(

                    globalFactory->createLinearRing(pts), NULL));

  boundaries.push_back(globalFactory->createMultiPolygon(&polys));

  boundaries.push_back(globalFactory->createMultiPolygon(polys));



  for(unsigned int i = 0; i < polys.size(); ++i) delete polys[i];

  polys.clear();

isis/src/base/objs/LimitPolygonSeeder/unitTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int main() { 
    try {

      // Call the seed member with a polygon

      geos::geom::CoordinateArraySequence *pts;

      vector<geos::geom::Geometry *> polys;

      vector<const geos::geom::Geometry *> polys;



      // Create the A polygon

      pts = new geos::geom::CoordinateArraySequence();
@@ -74,7 +74,7 @@ int main() { 
      polys.push_back(Isis::globalFactory->createPolygon(

                        Isis::globalFactory->createLinearRing(pts), NULL));



      geos::geom::MultiPolygon *mp = Isis::globalFactory->createMultiPolygon(&polys);

      geos::geom::MultiPolygon *mp = Isis::globalFactory->createMultiPolygon(polys);



      std::cout << "Lon/Lat polygon = " << mp->toString() << std::endl;

      // Create the projection necessary for seeding
@@ -123,7 +123,7 @@ int main() { 
    try {

      // Call the seed member with a polygon

      geos::geom::CoordinateArraySequence *pts;

      vector<geos::geom::Geometry *> polys;

      vector<const geos::geom::Geometry *> polys;



      // Create the A polygon

      pts = new geos::geom::CoordinateArraySequence();
@@ -136,7 +136,7 @@ int main() { 
      polys.push_back(Isis::globalFactory->createPolygon(

                        Isis::globalFactory->createLinearRing(pts), NULL));



      geos::geom::MultiPolygon *mp = Isis::globalFactory->createMultiPolygon(&polys);

      geos::geom::MultiPolygon *mp = Isis::globalFactory->createMultiPolygon(polys);



      cout << "Lon/Lat polygon = " << mp->toString() << endl;