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.

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

Fix DRB Point Source Listing #2839

Merged
merged 4 commits into from May 22, 2018
Merged

Fix DRB Point Source Listing #2839

merged 4 commits into from May 22, 2018

Conversation

rajadain
Copy link
Member

Overview

For some edge cases, the query for whether it was "within" the DRB or not would fail. In order to ensure we capture all of them correctly, we now test against the simplified perimeter instead.

image

Green is White Clay Creek HUC-10. Red is the DRB boundary. Blue is a simplified, buffered DRB boundary.

In this PR, we switch from comparing the green against the red to comparing the green against the blue.

Connects #2812

Demo

image

Testing Instructions

  • Check out this branch and restart Celery

    $ vagrant ssh worker -c 'sudo service celeryd restart'
    
  • Analyze White Clay Creek HUC-10, or Upper Schuylkill HUC-10, or any other shape on the edge of the DRB. Go to the Point Sources tab. Turn on the related layer. Ensure the points on the map match those in the table.

  • Analyze some shape outside of the DRB. Ensure it works as before.

Previously we would compare a shape against a high-resolution
GeoJSON of the DRB. This would sometimes fail for shapes that
fell on the edges, causing minor coordinate variations to say
that those shapes were not in the DRB, when in fact they are.

By comparing against a simplified, buffered DRB shape (already
used elsewhere), we ensure that all true shapes are correctly
deemed eligible. Furthermore, since the shape is significantly
simpler, the comparison is much quicker, speedening up general
execution as well.

Refs #2812
Valid GeoJSON requires all Features to have a properties
key, which is always an object. It cannot be null.

This linting allows simpler importing of these files into
services such as http://geojson.io/
@rajadain rajadain added the NSF Funding Source: National Science Foundation label May 21, 2018
@rajadain rajadain requested a review from caseycesari May 21, 2018 18:24
Since the Java versions update often and need to be changed, we
switch to a more generic Java specification that should catch
all instances and not need to be updated as often.
Latest Kombu renamed async to asynchronous celery/kombu#839
breaking Celery, which has a PR to fix this celery/celery#4679
but the changes haven't been released yet celery/celery#4387
so we use this in the interim.
Copy link
Member

@caseycesari caseycesari left a comment

Choose a reason for hiding this comment

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

Working as described. Thanks for including the provisioning fixes.

@caseycesari caseycesari assigned rajadain and unassigned caseycesari May 22, 2018
@rajadain rajadain merged commit c0d8a4b into develop May 22, 2018
@rajadain rajadain deleted the tt/fix-point-source-mismatch branch May 22, 2018 14:00
@rajadain
Copy link
Member Author

Thanks for taking a look!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
NSF Funding Source: National Science Foundation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants