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

Enable client side filtering for WQP catalog #3029

Merged
merged 2 commits into from Nov 21, 2018
Merged

Conversation

mmcfarland
Copy link
Contributor

@mmcfarland mmcfarland commented Nov 16, 2018

Overview

Abstracts the implementation for free text search on the client for the
CUAHSI catalog and allows WQP to also filter locally.

Connects #2918
Connects #3012

Demo

WQP

screenshot from 2018-11-16 17 20 52
screenshot from 2018-11-16 17 20 42
screenshot from 2018-11-16 17 20 28

CUAHSI

screenshot from 2018-11-16 17 23 55
screenshot from 2018-11-16 17 23 45
screenshot from 2018-11-16 17 23 34

Testing Instructions

  • For an area, use the text filter for both cuahsi and WQP catalogs. Ensure that the results change based on text known to exist and not exist.

Abstracts the implementation for free text search on the client for the
CUAHSI catalog and allows WQP to also filter locally.
@rajadain rajadain added NSF Funding Source: National Science Foundation Monitor labels Nov 20, 2018
@rajadain
Copy link
Member

Taking a look now!

Copy link
Member

@rajadain rajadain left a comment

Choose a reason for hiding this comment

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

This works great! I like that CUAHSI is still searched for in the background as soon as the Monitor tab is opened, but WQP is only searched when its tab is focused.

Consider adding this to also complete #3012:

diff --git a/src/mmw/apps/bigcz/clients/usgswqp/search.py b/src/mmw/apps/bigcz/clients/usgswqp/search.py
index 767f27ce..ddad22b8 100644
--- a/src/mmw/apps/bigcz/clients/usgswqp/search.py
+++ b/src/mmw/apps/bigcz/clients/usgswqp/search.py
@@ -74,7 +74,7 @@ def parse_record(record):
         service_code=record['MonitoringLocationIdentifier'],
         service_url='https://www.waterqualitydata.us/data/Result/search?siteid={}&mimeType=csv&sorted=no&zip=yes'.format(record['MonitoringLocationIdentifier']),  # NOQA
         service_title=None,
-        service_citation='We thank the water quality portal.',
+        service_citation='National Water Quality Monitoring Council, [YEAR]. Water Quality Portal. Accessed [DATE ACCESSED]. https://www.waterqualitydata.us/',  # NOQA
         begin_date=None,
         end_date=None,
         monitoring_type=record['MonitoringLocationTypeName'],

@rajadain rajadain assigned mmcfarland and unassigned rajadain Nov 20, 2018
More comprehensive text for display for WQP result items.
@mmcfarland
Copy link
Contributor Author

Thanks, I wanted to do that card next but was unsure about the context. I added
3c6a0f3 with the patch.

screenshot from 2018-11-20 16 51 03

@rajadain
Copy link
Member

Great! I'm merging this now since Matt's on vacation until next week.

@rajadain rajadain merged commit 4d54bdf into develop Nov 21, 2018
@rajadain rajadain deleted the mjm/wqp-freetext branch November 21, 2018 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Monitor NSF Funding Source: National Science Foundation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants