Merge pull request #116 from minorsecond/develop

Develop

Author: minorsecond

Jenkinsfile

@@ -55,7 +55,7 @@ pipeline {
             }
             post {
                 success {
-                    archiveArtifacts 'dist/gh.exe'
+                    archiveArtifacts 'dist/gh/**'
                 }
                 always {
                     junit 'results.xml'

gh-debug.spec

@@ -30,20 +30,22 @@ a = Analysis(['gh.py'],
              runtime_hooks=[],
              excludes=[],
              win_no_prefer_redirects=False,
-             win_private_assemblies=True,
+             win_private_assemblies=False,
              cipher=block_cipher)
 pyz = PYZ(a.pure, a.zipped_data,
              cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,
+          exclude_binaries=True,
           name='gh',
           debug=True,
           strip=False,
           upx=False,
-          upx_exclude=[],
-          runtime_tmpdir=None,
-          console=True,
-          icon='assets\\map.ico')
+          console=True , icon='assets\\map.ico')
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=False,
+               name='gh')

gh.py

@@ -40,6 +40,8 @@ def __init__(self):
         self.shapefileViewGo.clicked.connect(self.display_shapefile)
 
         self.catalogTiffBrowseButton.clicked.connect(self.browse_for_raster)
+        self.catalogTiffBOutputrowseButton.clicked.\
+            connect(self.browse_catalog_output)
         self.catalogTiffProcess.clicked.connect(self.get_raster_bounds)
 
         self.dmsToDD.setChecked(True)
@@ -103,6 +105,16 @@ def browse_for_raster(self):
                                                               "Directory")
         self.geoTiffDir1.setText(open_dir)
 
+    def browse_catalog_output(self):
+        """
+        Browse for shapefile catalog output
+        :return:
+        """
+
+        open_dir = QtWidgets.QFileDialog.\
+            getExistingDirectory(self, "Select output directory")
+        self.TiffCatalogOutputEdit.setText(open_dir)
+
     def error_popup_show(self, title, message, info):
         """
         Display an error message when an exception occurs.
@@ -225,12 +237,11 @@ def get_raster_bounds(self):
         :return: tuple of bounding coordinates
         """
 
-        raster_measurements = measurements.RasterMeasurements()
-
         path = self.geoTiffDir1.text()
+        output_path = self.TiffCatalogOutputEdit.text()
 
-        raster_count, raster_dictionary = raster_measurements.\
-            CalculateRasterBounds(path)
+        raster_count, raster_dictionary = measurements.\
+            create_catalog(path, output_path)
 
         output_text = "Finished processing {0} rasters.\n\n".\
             format(raster_count)

gisHelperGui.ui

@@ -47,7 +47,7 @@
      <bool>false</bool>
     </property>
     <property name="currentIndex">
-     <number>0</number>
+     <number>1</number>
     </property>
     <widget class="QWidget" name="gisCalc">
      <attribute name="title">
@@ -650,7 +650,7 @@
        <string>Output Directory: </string>
       </property>
      </widget>
-     <widget class="QPushButton" name="catalogTiffBrowseButton_2">
+     <widget class="QPushButton" name="catalogTiffBOutputrowseButton">
       <property name="geometry">
        <rect>
         <x>652</x>
@@ -738,7 +738,7 @@
        </font>
       </property>
      </widget>
-     <widget class="QLineEdit" name="lineEdit_5">
+     <widget class="QLineEdit" name="TiffCatalogOutputEdit">
       <property name="geometry">
        <rect>
         <x>140</x>

gui.py

@@ -5,7 +5,7 @@
 # Created by: PyQt5 UI code generator 5.12.3
 #
 # WARNING! All changes made in this file will be lost!
-# flake8:  noqa
+
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
@@ -245,12 +245,12 @@ def setupUi(self, MainWindow):
         font.setFamily("Helvetica")
         self.tiffCatalogOutputLabel.setFont(font)
         self.tiffCatalogOutputLabel.setObjectName("tiffCatalogOutputLabel")
-        self.catalogTiffBrowseButton_2 = QtWidgets.QPushButton(self.catalogTiff)
-        self.catalogTiffBrowseButton_2.setGeometry(QtCore.QRect(652, 72, 113, 32))
+        self.catalogTiffBOutputrowseButton = QtWidgets.QPushButton(self.catalogTiff)
+        self.catalogTiffBOutputrowseButton.setGeometry(QtCore.QRect(652, 72, 113, 32))
         font = QtGui.QFont()
         font.setFamily("Helvetica")
-        self.catalogTiffBrowseButton_2.setFont(font)
-        self.catalogTiffBrowseButton_2.setObjectName("catalogTiffBrowseButton_2")
+        self.catalogTiffBOutputrowseButton.setFont(font)
+        self.catalogTiffBOutputrowseButton.setObjectName("catalogTiffBOutputrowseButton")
         self.catalogTiffOutputWindow = QtWidgets.QTextEdit(self.catalogTiff)
         self.catalogTiffOutputWindow.setGeometry(QtCore.QRect(10, 192, 755, 325))
         font = QtGui.QFont()
@@ -278,12 +278,12 @@ def setupUi(self, MainWindow):
         font.setFamily("Helvetica")
         self.geoTiffDir1.setFont(font)
         self.geoTiffDir1.setObjectName("geoTiffDir1")
-        self.lineEdit_5 = QtWidgets.QLineEdit(self.catalogTiff)
-        self.lineEdit_5.setGeometry(QtCore.QRect(140, 76, 481, 21))
+        self.TiffCatalogOutputEdit = QtWidgets.QLineEdit(self.catalogTiff)
+        self.TiffCatalogOutputEdit.setGeometry(QtCore.QRect(140, 76, 481, 21))
         font = QtGui.QFont()
         font.setFamily("Helvetica")
-        self.lineEdit_5.setFont(font)
-        self.lineEdit_5.setObjectName("lineEdit_5")
+        self.TiffCatalogOutputEdit.setFont(font)
+        self.TiffCatalogOutputEdit.setObjectName("TiffCatalogOutputEdit")
         self.catalogTiffProcess = QtWidgets.QPushButton(self.catalogTiff)
         self.catalogTiffProcess.setGeometry(QtCore.QRect(652, 118, 113, 32))
         font = QtGui.QFont()
@@ -382,7 +382,7 @@ def setupUi(self, MainWindow):
         MainWindow.setStatusBar(self.statusbar)
 
         self.retranslateUi(MainWindow)
-        self.tabContainer.setCurrentIndex(0)
+        self.tabContainer.setCurrentIndex(1)
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
 
     def retranslateUi(self, MainWindow):
@@ -414,7 +414,7 @@ def retranslateUi(self, MainWindow):
         self.label_2.setText(_translate("MainWindow", "Geotiff Directory: "))
         self.catalogTiffBrowseButton.setText(_translate("MainWindow", "Browse"))
         self.tiffCatalogOutputLabel.setText(_translate("MainWindow", "Output Directory: "))
-        self.catalogTiffBrowseButton_2.setText(_translate("MainWindow", "Browse"))
+        self.catalogTiffBOutputrowseButton.setText(_translate("MainWindow", "Browse"))
         self.checkBox.setText(_translate("MainWindow", "Fan out by resolution"))
         self.catalogTiffProcess.setText(_translate("MainWindow", "Process"))
         self.tabContainer.setTabText(self.tabContainer.indexOf(self.catalogTiff), _translate("MainWindow", "Catalog Tiffs"))

raster/measurements.py

@@ -1,49 +1,94 @@
-from os.path import join
+from os.path import join, splitext
 from os import walk
 import gdal
 import rasterio as rio
+from shapely.geometry import Point, Polygon, mapping
+import fiona
 
 # These are needed for pyinstaller
 from rasterio import _shim, control, crs, sample, vrt, _features  # noqa
 
 
-class RasterMeasurements:
+def calculate_raster_bounds(rasters):
     """
-    Contains methods for measuring raster bounds, pixel size, etc.
+    Gets bounding box of raster image using GDAL bindings
+    :param rasters: list of raster paths
+    :return: tuple of bounding coordinates
     """
 
-    def CalculateRasterBounds(self, path):
-        """
-        Gets bounding box of raster image using GDAL bindings
-        :param path: path to raster
-        :return: tuple of bounding coordinates
-        """
+    raster_dictionary = {}
+    raster_count = 0
+
+    for raster in rasters:
+        raster_count += 1
+        image = gdal.Open(raster)  # Open the file using gdal
+        ulx, xres, xskew, uly, yskew, yres = image.GetGeoTransform()
+        lrx = ulx + (image.RasterXSize * xres)
+        lry = uly + (image.RasterYSize * yres)
+
+        ulx = round(ulx, 3)
+        uly = round(uly, 3)
+        lrx = round(lrx, 3)
+        lry = round(lry, 3)
+
+        bounds = [ulx, uly, lrx, lry]
+        raster_dictionary[raster] = bounds
+
+    return raster_count, raster_dictionary
+
+
+def create_catalog(path, output_dir):
+    rasters = []
+    polygons = []
+    output_path = join(output_dir, 'tif_catalog.shp')
 
-        rasters = []
-        raster_dictionary = {}
-        raster_count = 0
+    for dirpath, dirnames, filenames in walk(path):
+        for file in filenames:
+            if splitext(file)[1].lower() == '.tif':
+                rasters.append(join(dirpath, file))
 
-        for dirpath, dirnames, filenames in walk(path):
-            for file in filenames:
-                if file.endswith('.tif'):
-                    rasters.append(join(dirpath, file))
+    count, rasters = calculate_raster_bounds(rasters)
 
-        for raster in rasters:
-            raster_count += 1
-            image = gdal.Open(raster)  # Open the file using gdal
-            ulx, xres, xskew, uly, yskew, yres = image.GetGeoTransform()
-            lrx = ulx + (image.RasterXSize * xres)
-            lry = uly + (image.RasterYSize * yres)
+    print("Creating polygons")
+    # Create the polygons
+    for path, bounds in rasters.items():
+        ulx = bounds[0]
+        uly = bounds[1]
+        lrx = bounds[2]
+        lry = bounds[3]
 
-            ulx = round(ulx, 3)
-            uly = round(uly, 3)
-            lrx = round(lrx, 3)
-            lry = round(lry, 3)
+        p1 = Point(ulx, lry)
+        p2 = Point(ulx, uly)
+        p3 = Point(lrx, uly)
+        p4 = Point(lrx, lry)
 
-            bounds = [ulx, uly, lrx, lry]
-            raster_dictionary[raster] = bounds
+        pointList = [p1, p2, p3, p4]
 
-        return raster_count, raster_dictionary
+        polygons.append(Polygon([[p.x, p.y] for p in pointList]))
+
+    # Write to shp
+    schema = {
+        'geometry': 'Polygon',
+        'properties': {'id': 'int'}
+    }
+
+    id = 0
+    with fiona.open(output_path, 'w', 'ESRI Shapefile', schema) as c:
+        for polygon in polygons:
+            c.write({
+                'geometry': mapping(polygon),
+                'properties': {'id': id}
+            })
+
+            id += 1
+
+    return count, rasters
+
+
+class RasterMeasurements:
+    """
+    Contains methods for measuring raster bounds, pixel size, etc.
+    """
 
     def getPixelValue(self, raster, in_x, in_y):
         """
@@ -54,7 +99,7 @@ def getPixelValue(self, raster, in_x, in_y):
         pixel_val = None
 
         # Remove this - don't want to run this thing twice
-        raster_count, raster_dictionary = self.CalculateRasterBounds(raster)
+        raster_count, raster_dictionary = calculate_raster_bounds(raster)
 
         for raster_path, bounds in raster_dictionary.items():
             with rio.open(raster_path) as raster_input:

tests/test_calculations.py

@@ -20,7 +20,6 @@ def test_dms_to_dd():
     assert Convert.dms_to_dd("36 7 28.612") == 36.12461444
     assert Convert.dms_to_dd("99.5") is None
 
-
 def test_origin_calculation():
     """
     Test origin coordinate calculation.
@@ -35,9 +34,8 @@ def test_raster_bounds():
     :return:
     """
 
-    path = '.\\tests\\test_data\\'
-    raster_measurements = measurements.RasterMeasurements()
-    results = raster_measurements.CalculateRasterBounds(path)
+    path = ['.\\tests\\test_data\\raster.tif']
+    results = measurements.calculate_raster_bounds(path)
 
     assert results == (1, {'.\\tests\\test_data\\raster.tif': [-99.632,
                                                                31.564,
@@ -47,7 +45,7 @@ def test_raster_bounds():
 
 
 def test_get_pixel_value():
-    path = 'tests\\test_data\\'
+    path = ['.\\tests\\test_data\\raster.tif']
     raster_measurements = measurements.RasterMeasurements()
     pixel_value = raster_measurements.getPixelValue(raster=path,
                                                     in_x=-99.631408,