Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[warp] fast track for same projection #9336

Merged
merged 9 commits into from
Mar 5, 2024
Merged

[warp] fast track for same projection #9336

merged 9 commits into from
Mar 5, 2024

Conversation

elpaso
Copy link
Collaborator

@elpaso elpaso commented Feb 27, 2024

Fixes a downstream issue: qgis/QGIS#56288

rouault
rouault reviewed Feb 27, 2024
View reviewed changes
alg/gdaltransformer.cpp Outdated Show resolved Hide resolved
@rouault
Copy link
Member

rouault commented Feb 29, 2024

@elpaso Test failure on msys2-mingw target:

 26:             # Test extent calculation
26:             res = gdal.SuggestedWarpOutput(ds, [])
26: >           assert res.ymin == pytest.approx(29.95)
26: E           assert 29.933772233983163 == 29.95 � 3.0e-05
26: E

@elpaso @rouault
skip on windows minimal
c3dfd05 
Co-authored-by: Even Rouault <even.rouault@spatialys.com>
jjimenezshaw
jjimenezshaw reviewed Mar 1, 2024
View reviewed changes
alg/gdaltransformer.cpp
}
}

if (psInfo && !psInfo->pSrcTransformer &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which case is covering this full if statement?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the purpose of this if is to skip the fast track in all cases when it is not appropriate which are:

  • custom transforms
  • forced square
  • extent transform
  • pixel resolution changes

basically I went through all failing tests and excluded all cases when the fast track wasn't appropriate

@elpaso elpaso force-pushed the bugfix-qgis-gh-56288-warp-fast-track-for-same-projection branch from 3942f54 to d0ca389 Compare March 5, 2024 15:16
@coveralls
Copy link
Collaborator

Coverage Status

coverage: 68.834% (+0.006%) from 68.828%
when pulling d0ca389 on elpaso:bugfix-qgis-gh-56288-warp-fast-track-for-same-projection
into d7075c8 on OSGeo:master.

@rouault rouault added this to the 3.9.0 milestone Mar 5, 2024
@rouault rouault merged commit c091ead into OSGeo:master Mar 5, 2024
32 checks passed
@jjimenezshaw
Copy link
Contributor

Thanks @elpaso !

rouault added a commit to rouault/gdal that referenced this pull request Apr 22, 2024
@rouault
GDALSuggestedWarpOutput2(): make changes of PR OSGeo#9336 honour SRC_…
4fea661 
…METHOD=NO_GEOTRANSFORM

Fixes failure on rasterio tests/test_warpedvrt.py::test_transformer_options__width_height
rouault added a commit to rouault/gdal that referenced this pull request Apr 22, 2024
@rouault
GDALSuggestedWarpOutput2(): make changes of PR OSGeo#9336 honour SRC_…
e41215e 
…METHOD=NO_GEOTRANSFORM

Fixes failure on rasterio tests/test_warpedvrt.py::test_transformer_options__width_height
rouault added a commit that referenced this pull request Apr 23, 2024
@rouault
Merge pull request #9724 from rouault/fix_rasterio_test_transformer_o…
b922016 
…ptions__width_height

GDALSuggestedWarpOutput2(): make changes of PR #9336 honour SRC_METHOD=NO_GEOTRANSFORM
rouault added a commit that referenced this pull request Apr 23, 2024
@rouault @github-actions
GDALSuggestedWarpOutput2(): make changes of PR #9336 honour SRC_METHO…
8fab19e 
…D=NO_GEOTRANSFORM

Fixes failure on rasterio tests/test_warpedvrt.py::test_transformer_options__width_height
AbelPau added a commit to AbelPau/gdal that referenced this pull request Apr 23, 2024
@AbelPau
Fixing an error in field values of type lists and "Lower" to "Lowest"…
53cfc70 
…. + Tests

commit 9ba5941
Merge: d7ffaff 82eecf3
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Tue Apr 23 13:26:17 2024 +0200

    Merge branch 'release/3.9' into Adding-tests-for-MiraMonVector-driver

commit d7ffaff
Merge: fe3be15 b922016
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Tue Apr 23 13:20:32 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Adding-tests-for-MiraMonVector-driver

commit b922016
Merge: da8eae1 e41215e
Author: Even Rouault <even.rouault@spatialys.com>
Date:   Tue Apr 23 12:14:24 2024 +0200

    Merge pull request OSGeo#9724 from rouault/fix_rasterio_test_transformer_options__width_height

    GDALSuggestedWarpOutput2(): make changes of PR OSGeo#9336 honour SRC_METHOD=NO_GEOTRANSFORM

commit fe3be15
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Tue Apr 23 11:35:17 2024 +0200

    Tests multipolygon and some 3d

commit e474b30
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Tue Apr 23 10:13:09 2024 +0200

    Testing multilines and multipoints

commit 3f86567
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Mon Apr 22 22:10:26 2024 +0200

    Fix Lower and list values + tests

    Fixing bad assignation of lists values

    Writing tests for Polygons

    test reading 3d with more than one height

    test reading 3d with more than one height

    test reading 3d with more than one height

commit da8eae1
Author: Even Rouault <even.rouault@spatialys.com>
Date:   Tue Apr 23 01:05:35 2024 +0200

     Miramon: avoid unsigned integer overflow (https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=68241)

commit 317929b
Author: Even Rouault <even.rouault@spatialys.com>
Date:   Tue Apr 23 00:52:17 2024 +0200

    Miramon: avoid harmless unsigned integer overflow (https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=68240)

commit fba559b
Author: Even Rouault <even.rouault@spatialys.com>
Date:   Mon Apr 22 23:50:26 2024 +0200

    CMake: add missing dependency to generate_gdal_version_h target when building {plugin}_core targets

commit 03873dc
Merge: c7b613d 4a84971
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Mon Apr 22 21:55:14 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Adding-tests-for-MiraMonVector-driver

commit e41215e
Author: Even Rouault <even.rouault@spatialys.com>
Date:   Mon Apr 22 19:23:44 2024 +0200

    GDALSuggestedWarpOutput2(): make changes of PR OSGeo#9336 honour SRC_METHOD=NO_GEOTRANSFORM

    Fixes failure on rasterio tests/test_warpedvrt.py::test_transformer_options__width_height

commit 4a84971
Author: Even Rouault <even.rouault@spatialys.com>
Date:   Mon Apr 22 16:42:23 2024 +0200

    CI: disabled running Python autotests on OSX Arm64 (works around OSGeo#9723)

commit 27b5611
Author: Even Rouault <even.rouault@spatialys.com>
Date:   Mon Apr 22 13:29:26 2024 +0200

    Update master to 3.10.0dev

commit c7b613d
Merge: eb7da79 086f596
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Sat Apr 20 22:56:52 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Adding-tests-for-MiraMonVector-driver

commit eb7da79
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Fri Apr 19 21:50:13 2024 +0200

    Correcting tests

    Cotrolling corrupted files

    Cotrolling corrupted files 2

commit 4e12664
Merge: 3a92eee b1737c0
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Fri Apr 19 21:36:53 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Adding-tests-for-MiraMonVector-driver

commit 3a92eee
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Fri Apr 19 15:56:39 2024 +0200

    Adding reading/writing tests for MiraMonVector driver

    Adding reading/writing tests for MiraMonVector driver

    * Testing diferent -lco Version parameters for points, arcs and polygons
    * Testing read and write multipolygons (also ogrsf test)
    * Testing diferent -lco DBFEncoding parameters
    * Testing diferent -lco MultiRecordIndex parameters

    Fix: Force to open files with MiraMon Vector

commit 3fc7482
Merge: 1b8c69d c2489e1
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Fri Apr 19 15:51:16 2024 +0200

    Merge remote-tracking branch 'upstream/master' into Adding-tests-for-MiraMonVector-driver

commit 1b8c69d
Merge: 11dc12d 177c473
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Fri Apr 19 07:34:01 2024 +0200

    Merge branch 'miramon_clean_history_extra_fixes' into Adding-tests-for-MiraMonVector-driver

commit 11dc12d
Merge: 78eb918 1ecd8e1
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Fri Apr 19 07:30:45 2024 +0200

    Merge branch 'master' into Adding-tests-for-MiraMonVector-driver

commit 177c473
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Fri Apr 19 03:49:35 2024 +0200

    Deleting unused IAmExternal

commit 414184a
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Fri Apr 19 03:44:09 2024 +0200

    Fixing the way a multipolygon is constructed from MiraMon multipolygon feature

commit 54a82fc
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Fri Apr 19 02:05:36 2024 +0200

    Fix the construction of a MiraMon multipolygon when coordinates are readed in reverse mode

commit 78eb918
Merge: 8bd235b 6f849e5
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Fri Apr 19 00:50:42 2024 +0200

    Merge branch 'miramon_clean_history_extra_fixes' into Adding-tests-for-MiraMonVector-driver

commit 8bd235b
Merge: d843d3d 0bf2055
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Thu Apr 18 22:48:56 2024 +0200

    Merge branch 'master' into Adding-tests-for-MiraMonVector-driver

commit 6f849e5
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Thu Apr 18 21:27:43 2024 +0200

    Fixing allocation

commit 44651b4
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Thu Apr 18 20:09:29 2024 +0200

    Fixing white values, data format and GInt64 instead of double

commit d843d3d
Author: Even Rouault <even.rouault@spatialys.com>
Date:   Thu Apr 18 15:22:52 2024 +0200

    Miramon: rename iMultiRecord open option to MultiRecordIndex

commit c574d49
Author: Even Rouault <even.rouault@spatialys.com>
Date:   Thu Apr 18 12:03:40 2024 +0200

    Update doc/source/drivers/vector/miramon.rst

commit 4b71cd2
Author: Even Rouault <even.rouault@spatialys.com>
Date:   Thu Apr 18 00:23:57 2024 +0200

    Apply suggestions from code review

    Co-authored-by: Nyall Dawson <nyall.dawson@gmail.com>

commit fad106a
Author: AbelPau <a.pau@creaf.uab.cat>
Date:   Wed Apr 17 17:32:20 2024 +0200

    Initial version of the OGR MiramonVector driver (read/write)
rouault added a commit that referenced this pull request Apr 23, 2024
@rouault
Merge pull request #9730 from OSGeo/backport-9724-to-release/3.9
be99d9f 
[Backport release/3.9] GDALSuggestedWarpOutput2(): make changes of PR #9336 honour SRC_METHOD=NO_GEOTRANSFORM
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rouault rouault rouault left review comments

@jjimenezshaw jjimenezshaw jjimenezshaw left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.9.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@elpaso @rouault @coveralls @jjimenezshaw