Unverified Commit 14b52f7a authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

Updating Geos to 3.7 (#3617) 

* Centos has no which

* month/day/year now also hashed

* Added GDAL and ported ISIS to Geos 3.6

port to geos 3.6

ported chip

updated env

env

ev

env

env

* removed uneeded contructor

env

environment

environment

environment

build

env

Asda

env

removed gdal

* unpinned opencv

force remove anaconda channel

printing conda channels

afkasdfg

asdfkjas;d

updated env

updated ev

3.7

pinned bullet

added defaults again

hopefully this works

sdlkfjlasdkj

sjdfhalsdjhf

* updated for centos

* updated centos env
parent 1121ca40

build.groovy

+6 −3
Original line number Diff line number Diff line
@@ -85,14 +85,17 @@ node("${env.OS.toLowerCase()}") { 
              # conda config --set channel_alias http://dmz-jenkins.wr.usgs.gov

              conda config --set always_yes True

              conda config --set ssl_verify false 

              conda create -n isis python=3

              conda update -n base -c defaults conda

          """

           

          

          if (env.OS.toLowerCase() == "centos") {

              sh 'conda env update -n isis -f environment_gcc4.yml --prune'

              sh 'conda env create -n isis -f environment_gcc4.yml'

          } else {

            sh "conda env update -n isis -f environment.yml --prune"

            sh """

                conda config --show channels

                conda env create -n isis -f environment.yml

            """

          }

       } 

    }

environment.yml

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ dependencies: 
  - boost=1.68.0

  - armadillo

  - blas

  - bullet

  - bullet=2.86.1=0

  - bz2file

  - bzip2

  - cmake >=3.15
@@ -17,7 +17,7 @@ dependencies: 
  - doxygen

  - eigen

  - embree

  - geos=3.5.1

  - geos>=3.7,<3.8

  - geotiff

  - gmm

  - gmp

environment_gcc4.yml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ dependencies: 
  - doxygen

  - eigen

  - embree

  - geos=3.5.1

  - geos>=3.7,>3.8

  - geotiff

  - gmm

  - gmp

isis/src/base/apps/footprintmerge/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ void IsisMain() { 


  //  Create union poly

  geos::geom::GeometryCollection *polyCollection =

    Isis::globalFactory.createGeometryCollection(allPolys);

    Isis::globalFactory->createGeometryCollection(allPolys);

  geos::geom::Geometry *unionPoly = polyCollection->buffer(0);

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

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ namespace Isis { 
            interp.Interpolate(CubeSample(), CubeLine(), port.DoubleBuffer());

        }

        else {

          geos::geom::Point *pnt = globalFactory.createPoint(

          geos::geom::Point *pnt = globalFactory->createPoint(

                                     geos::geom::Coordinate(CubeSample(), CubeLine()));

          if (pnt->within(m_clipPolygon)) {

            port.SetPosition(CubeSample(), CubeLine(), band);