Merge pull request #1452 from pierotofy/copc

Planar Reconstruction

.github/workflows/publish-snap.yml

@@ -1,56 +1,56 @@
-name: Publish Snap
+# name: Publish Snap
 
-on:
-  push:
-    branches:
-    - master
-    tags:
-    - v**
+# on:
+#   push:
+#     branches:
+#     - master
+#     tags:
+#     - v**
 
-jobs:
-  build-and-release:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        architecture:
-        - amd64
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set Swap Space
-      uses: pierotofy/set-swap-space@master
-      with:
-        swap-size-gb: 12
-    - name: Build
-      id: build
-      uses: diddlesnaps/snapcraft-multiarch-action@v1
-      with:
-        architecture: ${{ matrix.architecture }}
-    - name: Review
-      uses: diddlesnaps/snapcraft-review-tools-action@v1
-      with:
-        snap: ${{ steps.build.outputs.snap }}
-        isClassic: 'false'
-    - name: Publish unstable builds to Edge
-      if: github.ref == 'refs/heads/master'
-      uses: snapcore/action-publish@v1
-      with:
-        store_login: ${{ secrets.STORE_LOGIN }}
-        snap: ${{ steps.build.outputs.snap }}
-        release: edge
-    - name: Publish tagged prerelease builds to Beta
-      # These are identified by having a hyphen in the tag name, e.g.: v1.0.0-beta1
-      if: startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-')
-      uses: snapcore/action-publish@v1
-      with:
-        store_login: ${{ secrets.STORE_LOGIN }}
-        snap: ${{ steps.build.outputs.snap }}
-        release: beta
-    - name: Publish tagged stable or release-candidate builds to Candidate
-      # These are identified by NOT having a hyphen in the tag name, OR having "-RC" or "-rc" in the tag name.
-      if: startsWith(github.ref, 'refs/tags/v1') && ( ( ! contains(github.ref, '-') ) || contains(github.ref, '-RC') || contains(github.ref, '-rc') )
-      uses: snapcore/action-publish@v1
-      with:
-        store_login: ${{ secrets.STORE_LOGIN }}
-        snap: ${{ steps.build.outputs.snap }}
-        release: candidate
+# jobs:
+#   build-and-release:
+#     runs-on: ubuntu-latest
+#     strategy:
+#       matrix:
+#         architecture:
+#         - amd64
+#     steps:
+#     - name: Checkout
+#       uses: actions/checkout@v2
+#     - name: Set Swap Space
+#       uses: pierotofy/set-swap-space@master
+#       with:
+#         swap-size-gb: 12
+#     - name: Build
+#       id: build
+#       uses: diddlesnaps/snapcraft-multiarch-action@v1
+#       with:
+#         architecture: ${{ matrix.architecture }}
+#     - name: Review
+#       uses: diddlesnaps/snapcraft-review-tools-action@v1
+#       with:
+#         snap: ${{ steps.build.outputs.snap }}
+#         isClassic: 'false'
+#     - name: Publish unstable builds to Edge
+#       if: github.ref == 'refs/heads/master'
+#       uses: snapcore/action-publish@v1
+#       with:
+#         store_login: ${{ secrets.STORE_LOGIN }}
+#         snap: ${{ steps.build.outputs.snap }}
+#         release: edge
+#     - name: Publish tagged prerelease builds to Beta
+#       # These are identified by having a hyphen in the tag name, e.g.: v1.0.0-beta1
+#       if: startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-')
+#       uses: snapcore/action-publish@v1
+#       with:
+#         store_login: ${{ secrets.STORE_LOGIN }}
+#         snap: ${{ steps.build.outputs.snap }}
+#         release: beta
+#     - name: Publish tagged stable or release-candidate builds to Candidate
+#       # These are identified by NOT having a hyphen in the tag name, OR having "-RC" or "-rc" in the tag name.
+#       if: startsWith(github.ref, 'refs/tags/v1') && ( ( ! contains(github.ref, '-') ) || contains(github.ref, '-RC') || contains(github.ref, '-rc') )
+#       uses: snapcore/action-publish@v1
+#       with:
+#         store_login: ${{ secrets.STORE_LOGIN }}
+#         snap: ${{ steps.build.outputs.snap }}
+#         release: candidate

.github/workflows/test-build-prs.yaml

@@ -24,29 +24,29 @@ jobs:
         platforms: linux/amd64
         push: false
   
-  snapcraft:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        architecture:
-        - amd64
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set Swap Space
-      uses: pierotofy/set-swap-space@master
-      with:
-        swap-size-gb: 12
-    - name: Build
-      id: build
-      uses: diddlesnaps/snapcraft-multiarch-action@v1
-      with:
-        architecture: ${{ matrix.architecture }}
-    - name: Review
-      uses: diddlesnaps/snapcraft-review-tools-action@v1
-      with:
-        snap: ${{ steps.build.outputs.snap }}
-        isClassic: 'false'
+  # snapcraft:
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     matrix:
+  #       architecture:
+  #       - amd64
+  #   steps:
+  #   - name: Checkout
+  #     uses: actions/checkout@v2
+  #   - name: Set Swap Space
+  #     uses: pierotofy/set-swap-space@master
+  #     with:
+  #       swap-size-gb: 12
+  #   - name: Build
+  #     id: build
+  #     uses: diddlesnaps/snapcraft-multiarch-action@v1
+  #     with:
+  #       architecture: ${{ matrix.architecture }}
+  #   - name: Review
+  #     uses: diddlesnaps/snapcraft-review-tools-action@v1
+  #     with:
+  #       snap: ${{ steps.build.outputs.snap }}
+  #       isClassic: 'false'
 
   windows:
     runs-on: windows-2019

SuperBuild/cmake/External-OpenSfM.cmake

@@ -19,7 +19,7 @@ ExternalProject_Add(${_proj_name}
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
   GIT_REPOSITORY    https://github.com/OpenDroneMap/OpenSfM/
-  GIT_TAG           280
+  GIT_TAG           283
   #--Update/Patch step----------
   UPDATE_COMMAND    git submodule update --init --recursive
   #--Configure step-------------

VERSION

@@ -1 +1 @@
-2.8.2
+2.8.3

opendm/config.py

@@ -232,8 +232,8 @@ def config(argv=None, parser=None):
                     metavar='<string>',
                     action=StoreValue,
                     default='incremental',
-                    choices=['incremental', 'triangulation'],
-                    help=('Choose the structure from motion algorithm. For aerial datasets, if camera GPS positions and angles are available, triangulation can generate better results. '
+                    choices=['incremental', 'triangulation', 'planar'],
+                    help=('Choose the structure from motion algorithm. For aerial datasets, if camera GPS positions and angles are available, triangulation can generate better results. For planar scenes captured at fixed altitude with nadir-only images, planar can be much faster. '
                         'Can be one of: %(choices)s. Default: '
                         '%(default)s'))