-
Notifications
You must be signed in to change notification settings - Fork 165
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.
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
Add ImplHelper::ValidOp Module to Provide Uniform Validity Checks #271
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d25d2a4
Add ImplHelper::ValidOp module to provide a uniform interface for val…
keithdoggett a5208bd
Minor fixes to ValidOp, move Validity testing instance variables to c…
keithdoggett 0f0a7b3
fix psych related tests
BuonOmo 53aa155
Split ValidOp into ValidOp and ValidOpHelpers
keithdoggett 81fce56
Use module_function instead of extend self
keithdoggett d084d57
Implement #crosses? and #intersects? between spherical line strings a…
keithdoggett 0d1c8e7
Appease Rubocop
keithdoggett File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| module RGeo | ||
| module Cartesian | ||
| module ValidOp | ||
| include ImplHelper::ValidOp | ||
|
|
||
| def validity_helper | ||
| ValidOpHelpers | ||
| end | ||
| end | ||
|
|
||
| module ValidOpHelpers | ||
| include ImplHelper::ValidOpHelpers | ||
|
|
||
| module_function(*ImplHelper::ValidOpHelpers.singleton_methods) # rubocop:disable Style/AccessModifierDeclarations | ||
|
|
||
| module_function | ||
|
|
||
| # Checks that there are no invalid intersections between the components | ||
| # of a polygon. | ||
| # | ||
| # @param [RGeo::Feature::Polygon] poly | ||
| # | ||
| # @return [String] invalid_reason | ||
| def check_consistent_area(poly) | ||
| # Get set of unique coords | ||
| pts = poly.exterior_ring.coordinates.to_set | ||
| poly.interior_rings.each do |ring| | ||
| pts += ring.coordinates | ||
| end | ||
| num_points = pts.size | ||
|
|
||
| # if additional nodes were added, there must be an intersection | ||
| # through a boundary. | ||
| if poly.send(:graph).incident_edges.size > num_points | ||
| return ImplHelper::TopologyErrors::SELF_INTERSECTION | ||
| end | ||
|
|
||
| rings = [poly.exterior_ring] + poly.interior_rings | ||
| return ImplHelper::TopologyErrors::DUPLICATE_RINGS if rings.uniq.size != rings.size | ||
|
|
||
| nil | ||
| end | ||
|
|
||
| # Checks that the interior of a polygon is connected. | ||
| # | ||
| # Process to do this is to walk around an interior cycle of the | ||
| # exterior shell in the polygon's geometry graph. It will keep track | ||
| # of all the nodes it visited and if that set is a superset of the | ||
| # coordinates in the exterior_ring, the interior is connected, otherwise | ||
| # it is split somewhere. | ||
| # | ||
| # @param [RGeo::Feature::Polygon] poly | ||
| # | ||
| # @return [String] invalid_reason | ||
| def check_connected_interiors(poly) | ||
| exterior_coords = poly.exterior_ring.coordinates.to_set | ||
|
|
||
| visited = Set.new | ||
| poly.send(:graph).geom_edges.first.exterior_edge.and_connected do |hedge| | ||
| visited << hedge.origin.coordinates | ||
| end | ||
|
|
||
| return ImplHelper::TopologyErrors::DISCONNECTED_INTERIOR unless exterior_coords.subset?(visited) | ||
|
|
||
| nil | ||
| end | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not 100% sure I get your point there ^^
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same simplicity check (self-intersection) can be performed by creating the
GeometryGraphof theLineStringand doing the described comparison. But doing the check withgraphwill be slower since it has to perform an intersection check and then link all of the nodes whereas the current implementation only does an intersection check.And since
graphis not used elsewhere in anyLineStringmethod I figured the additional overhead is not necessary, but I could change it if we think it's better to do so.