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

[FEATURE][Geometry checker] Support checking multiple layers at once, add new checks #5410

Merged
merged 103 commits into from
Oct 23, 2017
Merged

[FEATURE][Geometry checker] Support checking multiple layers at once, add new checks #5410

merged 103 commits into from
Oct 23, 2017

Conversation

manisandro
Copy link
Member

Description

This is a fairly big update to the geometry checker, which besides restoring it's functionality (currently it's completely broken):

  • Adds support for checking multiple layers at once
  • Adds a series of new checks:
    • Linie Must Not Intersect With...
    • Point Must be properly inside polygons
    • Linie Must Not Intersect
    • Linie Must Not Have Dangles
    • Point Must Not Have Duplicates
    • Point Must Be Covered By Line
    • Linie must not intersect with layer
  • Moves the core components to qgis_analysis, the plugin now only contains the user interface
  • Adds tests for all checks

There might still be some rough edges here and there, so testing feedback is very welcome. Overall it should however already be pretty stable.

nyalldawson referenced this pull request Oct 20, 2017
@nyalldawson
Safer memory management in geos
947b0cc 
Also speed up avoid intersections by removing unnecessary geometry
cloning
@manisandro
[Geometry checker] Initial multi-layer support
31cc65d
@manisandro
[Geometry checker] Introduce QgsGeometryCheckerContext
2a92bfb
@manisandro
[Geometry checker] Make checks report affected are in selected crs
e7efde2
@manisandro
[Geometry checker] Ensure headers appear in project tree
46e3ef7
@manisandro
[Geometry checker] Store error values in map units, perform topology …
23affe4 
…checks in map CRS
@manisandro
[Geometry checker] Add multi-layer support to gap check
dd12b13
@manisandro
[Geometry checker] Initial multilayer support for overlap check
3d8ffcb
@manisandro
[Geometry checker] Initial multilayer support for duplicate check
55cf125
@manisandro
[Geometry checker] Initial multilayer support for contained check
821eb40
@manisandro
[Geometry checker] Introduce QgsGeometryCheckerUtils::LayerFeatures
b52b2c5
@manisandro
[Geometry checker] Adapt for API changes
1642eb1
@manisandro
[Geometry checker] Use map crs for geometry and errorLocation in Chec…
84184d4 
…kErrors, overall code cleanup
@manisandro
[Geometry checker] Add dangle check
7fb1c55
@manisandro
[Geometry checker] Add point must be covered by line check
ee47d42
@manisandro
[Geometry checker] Extend duplicate check to also handle points
b9966aa
@manisandro
[Geometry checker] Simplify code
b5208c0
@manisandro
[Geometry checker] Add line intersection check
3842f42
@manisandro
[Geometry checker] Add point in polygon check
e88f32a
@manisandro
[Geometry checker] Fix LayerFeature iterator
f0f66d7
@manisandro
[Geometry checker] Tweak logic for choosing which layers are selected…
c1b06ce 
… in the setup tab
@manisandro
[Geometry checker] Rename tab: Settings -> Setup
45862ed
@manisandro
[Geometry checker] Set appropriate initial size for checker dialog
5470b16
@manisandro
[Geometry checker] Ensure all UI items are consistently enabled/disab…
57c348b 
…led depending on type of layers to be checked
@manisandro
[Geometry checker] Fix angle check possibly reporting end nodes of lines
7a51866
@manisandro
[Geometry checker] Reduce icon size in setup layer list
29d057c
@manisandro
[Geometry checker] Fix updating and gathering of layers
81a4a52
@manisandro
[Geometry checker] Fix determining active layer geometry types
018467f
@manisandro
[Geometry checker] Imporove logic for picking the output directory
b80fa36
@manisandro
[Geometry checker] Add layer column to result table
5e6501f
@manisandro
[Geometry checker] Fix incorrect ring index in QgsGeometrySelfInterse…
5b2297f 
…ctionCheck::fixError
@manisandro
[Geometry checker] Fix crash in QgsGeometryCheckerResultTab::addError…
3b6a0e2 
… if layerId is empty
@manisandro
[Geometry checker] Add more fixError tests
876418c
@manisandro
[Geometry checker] Fix incorrect logic in QgsGeometryCheckError::hand…
cc9a2b3 
…leChanges
@manisandro
[Geometry checker] Remove debug print
8a56166
@manisandro
[Geometry checker] More change tracking tests
084660a
@manisandro
[Geometry checker] Fix features not correctly removed from QgsFeature…
efc00c3 
…Pool spatial index
@manisandro
Re-add QgsGeometryEngine::combine taking a list of QgsAbstractGeometries
fde740a
@manisandro
[Geometry checker] Use reduced tolerance when attempting to combine t…
f0116b4 
…wo geometries, and ensure that the output is a single-part geometry
@manisandro
[Geometry checker] Fix incorrect change parametrization in QgsGeometr…
15b5da8 
…yCheck::replaceFeatureGeometryPart
@manisandro
[Geometry checker] Don't recollect errors with empty recheck list
f507246
@manisandro
[Geometry checker] Don't make the layer-feature iterator return featu…
9218afd 
…res without valid geometry
@manisandro
[Geometry checker] Fix incomplete QgsGeometryOverlapCheckError::handl…
5de0c80 
…eChanges
@manisandro
[Geometry checker] Disable sorting in QgsGeometryCheckerFixSummaryDia…
50e1c7a 
…log::addError for better performance
@manisandro
[Geometry checker] Fix possible crash in QgsGeometryCheckerFixSummary…
e00f767 
…Dialog::addError
@manisandro
[Geometry checker] Only add to feature pool spatial indices features …
e089b3b 
…which are to be processed
@manisandro
[Geometry checker] Don't recheck any features if fixed error resulted…
8cefc65 
… in no changes
@manisandro
[Geometry checker] Try harder to match old errors to those found afte…
ecd951d 
…r a recheck
@manisandro
Add missing QgsVScrollArea documentation
2c36a51
@manisandro
Add QgsVScrollArea sip bindings
1f300cf
@manisandro
[Geometry checker] Exclude from sip bindings
972d14f
@manisandro
[Geometry checker] Qt < 5.9 compatibility fix
9a2393e
@nyalldawson
Copy link
Collaborator

There's a lot of code here to go through, so I haven't looked this over in depth, but I'm really happy to see the move to the analysis lib (hopefully in future we can use the checker from processing!) and the new unit tests.

Quick question: can you confirm that the added code to analysis has no gui dependencies? (Ie no qt widgets or qgis gui classes)

@manisandro
Copy link
Member Author

@nyalldawson Just spotted two unused includes which were indeed QtGui includes.. Should be good now.
If you don't mind I'd like to merge as is (as soon as travis is done) so that interested people can start testing, but I'm still open to resolving the combine situation if the QList<QgsAbstractGeometry> method is really deemed unacceptable.

@manisandro manisandro merged commit ea0e09b into qgis:master Oct 23, 2017
@manisandro manisandro deleted the geomchecker branch October 23, 2017 21:34
nyalldawson
nyalldawson reviewed Oct 24, 2017
View reviewed changes
src/gui/qgsvscrollarea.h
*
* \since QGIS 3.0
*/
class GUI_EXPORT QgsVScrollArea : public QScrollArea
Copy link
Collaborator

Choose a reason for hiding this comment

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

@manisandro I think this should inherit from QgsScrollArea

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah yes, done in bb21395, thanks.

@qgib qgib mentioned this pull request May 25, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nyalldawson nyalldawson nyalldawson left review comments

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@manisandro @nyalldawson