Merge pull request #936 from pierotofy/projfix

proj4 fixes, numpy fixes, and others

Dockerfile

@@ -21,7 +21,7 @@ liblas-bin python-matplotlib libatlas-base-dev swig2.0 python-wheel libboost-log
 RUN apt-get remove libdc1394-22-dev
 RUN pip install --upgrade pip
 RUN pip install setuptools
-RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/gipit/gippy/archive/1.0.0.zip loky shapely numpy pyproj psutil repoze.lru && pip install -U scipy --ignore-installed
+RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/gipit/gippy/archive/1.0.0.zip loky shapely numpy==1.15.4 pyproj psutil repoze.lru && pip install -U scipy --ignore-installed
 
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages"
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"

configure.sh

@@ -96,7 +96,7 @@ install() {
                          libboost-log-dev
 
     echo "Installing split-merge Dependencies"
-    pip install -U scipy shapely numpy pyproj
+    pip install -U scipy shapely numpy==1.15.4 pyproj
 
     pip install -U https://github.com/gipit/gippy/archive/1.0.0.zip psutil
 

core2.Dockerfile

@@ -19,7 +19,7 @@ liblas-bin python-matplotlib libatlas-base-dev swig2.0 python-wheel libboost-log
 RUN apt-get remove libdc1394-22-dev
 RUN pip install --upgrade pip
 RUN pip install setuptools
-RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/gipit/gippy/archive/1.0.0.zip loky shapely numpy pyproj psutil repoze.lru && pip install -U scipy --ignore-installed
+RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings https://github.com/gipit/gippy/archive/1.0.0.zip loky shapely numpy==1.15.4 pyproj psutil repoze.lru && pip install -U scipy --ignore-installed
 
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages"
 ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"

opendm/types.py

@@ -160,10 +160,10 @@ class ODM_Reconstruction(object):
             try:
                 if ref[0] == 'WGS84' and ref[1] == 'UTM':  # match_wgs_utm:
                     datum = ref[0]
-                    utm_pole = ref[2][len(ref[2]) - 1]
+                    utm_pole = (ref[2][len(ref[2]) - 1]).upper()
                     utm_zone = int(ref[2][:len(ref[2]) - 1])
 
-                    return Proj(proj="utm", zone=utm_zone, datum=datum, no_defs=True)
+                    return Proj(proj="utm", zone=utm_zone, south=utm_pole == 'S', datum=datum, no_defs=True)
                 elif '+proj' in line:
                     return Proj(line.strip('\''))
                 elif 'epsg' in line.lower():
@@ -202,10 +202,7 @@ class ODM_GeoRef(object):
 
     def __init__(self, projection):
         self.projection = projection
-        self.datum = 'WGS84'
         self.epsg = None
-        self.utm_zone = 0
-        self.utm_pole = 'N'
         self.utm_east_offset = 0
         self.utm_north_offset = 0
         self.transform = []

scripts/odm_georeferencing.py

@@ -103,7 +103,7 @@ class ODMGeoreferencingCell(ecto.Cell):
                 if transformPointCloud:
                     kwargs['pc_params'] = '-inputPointCloudFile {input_pc_file} -outputPointCloudFile {output_pc_file}'.format(**kwargs)
 
-                    if geo_ref.projection.srs:
+                    if geo_ref.projection and geo_ref.projection.srs:
                         kwargs['pc_params'] += ' -outputPointCloudSrs %s' % pipes.quote(geo_ref.projection.srs)
                     else:
                         log.ODM_WARNING('NO SRS: The output point cloud will not have a SRS.')