From 0453656856310f16ea7749855e0af36c5352d1a1 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 20 Sep 2017 17:39:17 -0400 Subject: [PATCH 001/172] Add API Auth ADR - ADR on how the client app should authenticate its anonymous requests --- doc/arch/adr-005-api-client-app-auth.md | 127 ++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 doc/arch/adr-005-api-client-app-auth.md diff --git a/doc/arch/adr-005-api-client-app-auth.md b/doc/arch/adr-005-api-client-app-auth.md new file mode 100644 index 000000000..837d9613e --- /dev/null +++ b/doc/arch/adr-005-api-client-app-auth.md @@ -0,0 +1,127 @@ +# Geoprocessing API: Only Allow Anonymous Requests From The Client App + +## Context + +We're creating a [proper, publicly documented API](https://github.com/WikiWatershed/model-my-watershed/blob/develop/src/mmw/apps/geoprocessing_api/views.py) around our analyze and +RWD endpoints: the [Geoprocessing API.](https://github.com/WikiWatershed/model-my-watershed/blob/develop/doc/arch/adr-004-geoprocessing-api.md) The analyze and RWD endpoints have +always had allow-any access; we'd now like to secure them via token authentication +so that we can better track individual users, prevent users from sending off too many +requests, revoke the access of problematic users, and some day maybe add a +paid tier of use. + +Enforcing token authentication on these previously open endpoints causes +a problem for our client app; the client app consumes the same API, and +want to continue to allow unauthenticated users access to these endpoints +via the app. We need a way to identify the client app as a special case +from which the app should allow unrestricted requests. + +Because everything we send to and from the client is exposed to the app user, +any mechanism we give the client app to identify itself will be fairly +easy to uncover and then fake by anyone trying to get un-checked access to the +API. With this in mind our solution should prioritize not be overly complicated/difficult +for us when we know there's no truly secure solution (barring doing all our rendering +server-side). + +Some possibilities are: + +1. Give each environment of the client app its own API token + - Keeps a single system for API authentication; easy to reason about; + as a bonus will allow us to cycle the client app's token if someone + decides to start using it + +1. Set a special, is-client-app flag that the API would check to determine if authentication was necessary + - To set the flag we'd have to know the request was from the client app in + the first place. Preliminary checks for doing this via `http_referer` + were unsuccessful, which would leave doing this via custom header (or some + other part of the request). Setting a `X-IsClientApp` custom header might + be overly naive or hacky, and could result in a lot of conditional logic + +1. Do (1) and also enforce the `HTTP_REFERER` header be from an expected domain. +[Google Maps ](https://developers.google.com/maps/documentation/javascript/get-api-key#key-restrictions) +does this. Even though such headers are easily spoofed by a client outside of a browser, +they're fairly effective for browser-based apps and for naive use from a non-browser client + +## Decision + +**Give the client app its own API token** + +Setting up the client app with its own API token will result a cleaner +architecture for the API. All users use a token, no exceptions. In addition to +the simpler mental model the API token method provides, we'll also gain an added +level of token enforcement; if some API user tries to programmatically use the client +app's token instead of their own, we'll be able to easily cycle the client app's token +to de-incentivize them. + +One easy way to cycle the token: +``` +./manage.py drf_create_token -r +``` + +We can always implement (3) as an enhancement later on. + +##### When should the client app send its token + +For all Geoprocessing API requests, whether there's a logged-in user's token available +to use or not, ie., we will continue to use a user's credentials when needed for the +application endpoints. + + +##### How the client app should get the token + +If we hard-code the token on the frontend (or anywhere), we'll have to deploy any time we need +to cycle the token. We should instead pass the token to the client app via `clientSettings`. + +##### How the server should get the token + +To get the token to put in the client's settings, the server can look up the +token from the `authtoken_token` table via the client app's `user_id`. +The `user_id` should remain secret so that there's no programmatic way get +the token outside of swiping it off the client app. + +## Consequences + +#### Backdoor to the API +As discussed in [Context](#Context), allowing the client app to make requests without a user creates a +backdoor into the API. This is acceptable because up until now we've allowed unrestricted API access +(we just haven't advertised the API as something you could use.) There's also no sensitive data available +via the API. While it's not ideal that someone could use the client app token to make unlimited, +resource-intensive requests unchecked the decision will at least allow us to cycle the token whenever +there's an issue. + +#### More Complex Throttling + +We want to throttle users of the API, and if the client app is just another, regular user +of the API with a token it would get throttled the same. All guest MMW users in the world +would share a cumalitive number of requests per minute. + +To fix this we'll need to treat the client app's token as a special case for throttling: + +if token is client app: + +don't throttle or cache number of requests per IP +(like [AnonRateThrottle](http://www.django-rest-framework.org/api-guide/throttling/#anonratethrottle)). +There may be difficulties with this related to which IP DRF uses; +it may use that of our load balancer instead of the client's. This also may +cause issues for our classroom users if set too low. + +else: + +cache number of requests per token (like [UserRateThrottle](http://www.django-rest-framework.org/api-guide/throttling/#userratethrottle)) + +#### Dev Setup + +The `user_id` the app server uses to get the client's token should be fairly +constant for the life of staging and production. Each developer's machine, +however, will have different database instances and, therefore, different +client app `user_id`'s. + +We could: +1. Use some special email or name like `clientapp09212017` for the app server to look up the `user_id` to get the token. This would add a level +of indirection, but would allow production, staging and our local machines +to share a migration that creates the user, and share code to look up the id. +There's precedence for this setup at Azavea in Raster Foundry's airflow user. + +1. Store the `user_id` itself as an environment variable. A migration could +create the user and write its id to an envfile. We would have to include the envfile in our `.gitignore`, and be careful not to tamper with it. + + From 421c1129a03b06884491bc14617c0802ae1b9ecc Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 22 Sep 2017 13:45:54 -0400 Subject: [PATCH 002/172] Upgrade Celery --- .../ansible/roles/model-my-watershed.celery/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml b/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml index 4e9c8919a..7bd8d06c5 100644 --- a/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml +++ b/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml @@ -1,3 +1,3 @@ --- -celery_version: 3.1.18 +celery_version: 4.1.0 djcelery_version: 3.1.16 From bf7e9d0590ff418c68f9ca03361c68916256abf7 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 22 Sep 2017 17:10:18 -0400 Subject: [PATCH 003/172] Remove unsupported --autoreload command This was experimental and is no longer supported. Furthermore, I doubt it ever worked at all. --- scripts/debugcelery.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/debugcelery.sh b/scripts/debugcelery.sh index 7c9bbab3a..5a32d1c0e 100755 --- a/scripts/debugcelery.sh +++ b/scripts/debugcelery.sh @@ -6,6 +6,6 @@ set -e STOP_SERVICE="(sudo service celeryd stop || /bin/true)" CHANGE_DIR="cd /opt/app/" -RUN_CELERY="envdir /etc/mmw.d/env celery -A 'mmw.celery:app' worker --autoreload -l debug -n debug@%n" +RUN_CELERY="envdir /etc/mmw.d/env celery -A 'mmw.celery:app' worker -l debug -n debug@%n" vagrant ssh worker -c "$STOP_SERVICE && $CHANGE_DIR && $RUN_CELERY" From 7e1b02e98b24a18edfc3f4698410e370f62d236b Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 22 Sep 2017 18:05:00 -0400 Subject: [PATCH 004/172] Upgrade Celery configuration * Remove old djcelery in favor of new django_celery_results * Remove unsupported celery.task.http * Prefix all Celery settings with CELERY_ and declare that prefix in the config_from_object call * Remove chord_unlock rate limiting hack --- .../defaults/main.yml | 1 - .../model-my-watershed.celery/tasks/main.yml | 1 - src/mmw/apps/modeling/tests.py | 8 +- src/mmw/mmw/celery.py | 78 +------------------ src/mmw/mmw/settings/base.py | 14 ++-- src/mmw/requirements/base.txt | 1 + 6 files changed, 14 insertions(+), 89 deletions(-) diff --git a/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml b/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml index 7bd8d06c5..7d8dddc3c 100644 --- a/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml +++ b/deployment/ansible/roles/model-my-watershed.celery/defaults/main.yml @@ -1,3 +1,2 @@ --- celery_version: 4.1.0 -djcelery_version: 3.1.16 diff --git a/deployment/ansible/roles/model-my-watershed.celery/tasks/main.yml b/deployment/ansible/roles/model-my-watershed.celery/tasks/main.yml index 82a6c4ea6..26213b088 100644 --- a/deployment/ansible/roles/model-my-watershed.celery/tasks/main.yml +++ b/deployment/ansible/roles/model-my-watershed.celery/tasks/main.yml @@ -3,4 +3,3 @@ pip: name="{{ item.name }}" version={{ item.version }} state=present with_items: - { name: "celery[redis]", version: "{{ celery_version }}" } - - { name: "django-celery", version: "{{ djcelery_version }}" } diff --git a/src/mmw/apps/modeling/tests.py b/src/mmw/apps/modeling/tests.py index af0a286a0..f43f468fb 100644 --- a/src/mmw/apps/modeling/tests.py +++ b/src/mmw/apps/modeling/tests.py @@ -202,7 +202,7 @@ def setUp(self): status='started') self.job.save() - @override_settings(CELERY_ALWAYS_EAGER=True) + @override_settings(CELERY_TASK_ALWAYS_EAGER=True) def test_tr55_job_runs_in_chain(self): # For the purposes of this test, there are no modifications self.model_input['modification_pieces'] = [] @@ -228,7 +228,7 @@ def test_tr55_job_runs_in_chain(self): 'complete', 'Job found but incomplete.') - @override_settings(CELERY_ALWAYS_EAGER=True) + @override_settings(CELERY_TASK_ALWAYS_EAGER=True) def test_tr55_job_error_in_chain(self): model_input = { 'inputs': [], @@ -401,7 +401,7 @@ def test_tr55_chain_doesnt_generate_aoi_census_if_it_exists_and_no_mods(self): else False for t in needed_tasks]), 'missing necessary job in chain') - @override_settings(CELERY_ALWAYS_EAGER=True) + @override_settings(CELERY_TASK_ALWAYS_EAGER=True) def test_tr55_chain_generates_modification_censuses_if_they_are_old(self): """If they modification censuses exist in the model input, but the hash stored with the censuses does not match the hash passed in @@ -455,7 +455,7 @@ def test_tr55_chain_generates_modification_censuses_if_they_are_old(self): else False for t in needed_tasks]), 'missing necessary job in chain') - @override_settings(CELERY_ALWAYS_EAGER=True) + @override_settings(CELERY_TASK_ALWAYS_EAGER=True) def test_tr55_chain_generates_both_censuses_if_they_are_missing(self): """If neither the AoI censuses or the modification censuses exist, they are both generated. diff --git a/src/mmw/mmw/celery.py b/src/mmw/mmw/celery.py index 3a94ea79a..8bf22279e 100644 --- a/src/mmw/mmw/celery.py +++ b/src/mmw/mmw/celery.py @@ -2,87 +2,13 @@ import os import rollbar -import logging from celery import Celery -from celery._state import connect_on_app_finalize from celery.signals import task_failure from django.conf import settings -@connect_on_app_finalize -def add_unlock_chord_task_shim(app): - """ - Override native unlock_chord to support configurable max_retries. - Original code taken from https://goo.gl/3mX0ie - - This task is used by result backends without native chord support. - It joins chords by creating a task chain polling the header for completion. - """ - from celery.canvas import maybe_signature - from celery.exceptions import ChordError - from celery.result import allow_join_result, result_from_tuple - - logger = logging.getLogger(__name__) - - MAX_RETRIES = settings.CELERY_CHORD_UNLOCK_MAX_RETRIES - - @app.task(name='celery.chord_unlock', shared=False, default_retry_delay=1, - ignore_result=True, lazy=False, bind=True, - max_retries=MAX_RETRIES) - def unlock_chord(self, group_id, callback, interval=None, - max_retries=MAX_RETRIES, result=None, - Result=app.AsyncResult, GroupResult=app.GroupResult, - result_from_tuple=result_from_tuple, **kwargs): - if interval is None: - interval = self.default_retry_delay - - # check if the task group is ready, and if so apply the callback. - callback = maybe_signature(callback, app) - deps = GroupResult( - group_id, - [result_from_tuple(r, app=app) for r in result], - app=app, - ) - j = deps.join_native if deps.supports_native_join else deps.join - - try: - ready = deps.ready() - except Exception as exc: - raise self.retry( - exc=exc, countdown=interval, max_retries=max_retries) - else: - if not ready: - raise self.retry(countdown=interval, max_retries=max_retries) - - callback = maybe_signature(callback, app=app) - try: - with allow_join_result(): - ret = j(timeout=3.0, propagate=True) - except Exception as exc: - try: - culprit = next(deps._failed_join_report()) - reason = 'Dependency {0.id} raised {1!r}'.format( - culprit, exc, - ) - except StopIteration: - reason = repr(exc) - logger.error('Chord %r raised: %r', group_id, exc, exc_info=1) - app.backend.chord_error_from_stack(callback, - ChordError(reason)) - else: - try: - callback.delay(ret) - except Exception as exc: - logger.error('Chord %r raised: %r', group_id, exc, exc_info=1) - app.backend.chord_error_from_stack( - callback, - exc=ChordError('Callback error: {0!r}'.format(exc)), - ) - return unlock_chord - - # set the default Django settings module for the 'celery' program. os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mmw.settings.production') @@ -91,8 +17,8 @@ def unlock_chord(self, group_id, callback, interval=None, # Using a string here means the worker will not have to # pickle the object when using Windows. -app.config_from_object('django.conf:settings') -app.autodiscover_tasks(lambda: settings.INSTALLED_APPS) +app.config_from_object('django.conf:settings', namespace='CELERY') +app.autodiscover_tasks() rollbar_settings = getattr(settings, 'ROLLBAR', {}) if rollbar_settings: diff --git a/src/mmw/mmw/settings/base.py b/src/mmw/mmw/settings/base.py index 75a962bcf..5ae3fddbe 100644 --- a/src/mmw/mmw/settings/base.py +++ b/src/mmw/mmw/settings/base.py @@ -115,22 +115,21 @@ def get_env_setting(setting): # CELERY CONFIGURATION -BROKER_URL = 'redis://{0}:{1}/2'.format( +CELERY_BROKER_URL = 'redis://{0}:{1}/2'.format( environ.get('MMW_CACHE_HOST', 'localhost'), environ.get('MMW_CACHE_PORT', 6379)) -CELERY_IMPORTS = ('celery.task.http', - # Submodule task is not always autodiscovered - 'apps.modeling.mapshed.tasks', - ) +CELERY_IMPORTS = ( + # Submodule task is not always autodiscovered + 'apps.modeling.mapshed.tasks', +) CELERY_ACCEPT_CONTENT = ['json'] CELERY_TASK_SERIALIZER = 'json' CELERY_RESULT_SERIALIZER = 'json' -CELERY_RESULT_BACKEND = 'djcelery.backends.cache:CacheBackend' +CELERY_RESULT_BACKEND = 'django-cache' STATSD_CELERY_SIGNALS = True CELERY_CREATE_MISSING_QUEUES = True CELERY_CHORD_PROPAGATES = True -CELERY_CHORD_UNLOCK_MAX_RETRIES = 60 CELERY_DEFAULT_QUEUE = STACK_COLOR CELERY_DEFAULT_ROUTING_KEY = "task.%s" % STACK_COLOR # END CELERY CONFIGURATION @@ -294,6 +293,7 @@ def get_env_setting(setting): 'rest_framework_swagger', 'rest_framework.authtoken', 'registration', + 'django_celery_results', ) # THIRD-PARTY CONFIGURATION diff --git a/src/mmw/requirements/base.txt b/src/mmw/requirements/base.txt index 8508c5a92..8839ad100 100644 --- a/src/mmw/requirements/base.txt +++ b/src/mmw/requirements/base.txt @@ -18,3 +18,4 @@ rollbar==0.13.8 retry==0.9.1 python-dateutil==2.6.0 suds==0.4 +django_celery_results==1.0.1 From 24468c9370af504e2d495c454ef2aad51e2b832b Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 22 Sep 2017 18:22:44 -0400 Subject: [PATCH 005/172] Don't apply error handlers on chains with groups Previously we could attach an error handler to any Celery chain and have it catch an error in any task of the chain. This did not work with groups, which were ignored, so we had to apply the error handler manually to every task in the group. With the latest version of Celery, the groups are no longer ignored. Instead, we get a runtime error saying that chains with groups cannot have error handlers attached to them. Thus, we remove the error handlers on chains that have groups in them. Since all the group tasks have individual error handler tasks already, and the other tasks are simple data transformations in Python, this should not affect the output. --- src/mmw/apps/geoprocessing_api/views.py | 10 +++++++--- src/mmw/apps/modeling/views.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/mmw/apps/geoprocessing_api/views.py b/src/mmw/apps/geoprocessing_api/views.py index cc5fa7be5..31d7b7775 100644 --- a/src/mmw/apps/geoprocessing_api/views.py +++ b/src/mmw/apps/geoprocessing_api/views.py @@ -936,7 +936,7 @@ def start_analyze_climate(request, format=None): group(geotasks), tasks.combine_climate.s(), tasks.collect_climate.s(), - ], area_of_interest, user) + ], area_of_interest, user, link_error=False) def _initiate_rwd_job_chain(location, snapping, data_source, @@ -948,7 +948,7 @@ def _initiate_rwd_job_chain(location, snapping, data_source, .apply_async(link_error=errback) -def start_celery_job(task_list, job_input, user=None): +def start_celery_job(task_list, job_input, user=None, link_error=True): """ Given a list of Celery tasks and it's input, starts a Celery async job with those tasks, adds save_job_result and save_job_error handlers, and returns @@ -957,6 +957,7 @@ def start_celery_job(task_list, job_input, user=None): :param task_list: A list of Celery tasks to execute. Is made into a chain :param job_input: Input to the first task, used in recording started jobs :param user: The user requesting the job. Optional. + :param link_error: Whether or not to apply error handler to entire chain :return: A Response contianing the job id, marked as 'started' """ created = now() @@ -968,7 +969,10 @@ def start_celery_job(task_list, job_input, user=None): error = save_job_error.s(job.id) task_list.append(success) - task_chain = chain(task_list).apply_async(link_error=error) + if link_error: + task_chain = chain(task_list).apply_async(link_error=error) + else: + task_chain = chain(task_list).apply_async() job.uuid = task_chain.id job.save() diff --git a/src/mmw/apps/modeling/views.py b/src/mmw/apps/modeling/views.py index 823a01aad..88d5f3a3c 100644 --- a/src/mmw/apps/modeling/views.py +++ b/src/mmw/apps/modeling/views.py @@ -234,7 +234,7 @@ def _initiate_mapshed_job_chain(mapshed_input, job_id): collect_data.s(area_of_interest).set(link_error=errback) | save_job_result.s(job_id, mapshed_input)) - return chain(job_chain).apply_async(link_error=errback) + return chain(job_chain).apply_async() @decorators.api_view(['POST']) From 7737d61c9afacd8915490b85a04bac6a260836e4 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 26 Sep 2017 11:04:28 -0400 Subject: [PATCH 006/172] Remove extraneous buffer tasks for chained chords The previous version of Celery had a bug which did not allow a chord to be the antepenultimate task in a chain. To get around this, we added extraneous tasks as buffer to get it to work correctly. The latest version of Celery no longer has this bug, so these tasks are collapsed into their successors. This will reduce Celery overhead as we run fewer tasks. See https://github.com/celery/celery/issues/3191 --- src/mmw/apps/geoprocessing_api/tasks.py | 28 ++++++++----------------- src/mmw/apps/geoprocessing_api/views.py | 1 - src/mmw/apps/modeling/mapshed/tasks.py | 17 +++------------ src/mmw/apps/modeling/views.py | 2 -- 4 files changed, 12 insertions(+), 36 deletions(-) diff --git a/src/mmw/apps/geoprocessing_api/tasks.py b/src/mmw/apps/geoprocessing_api/tasks.py index 653984a51..00fc57fad 100644 --- a/src/mmw/apps/geoprocessing_api/tasks.py +++ b/src/mmw/apps/geoprocessing_api/tasks.py @@ -175,38 +175,28 @@ def analyze_climate(result, category, month): @shared_task -def combine_climate(results): +def collect_climate(results): """ Given an array of dictionaries resulting from multiple analyze_climate calls, combines them so that the 'ppt' values are grouped together and 'tmean' together. Each group is a dictionary where the keys are strings of the month '1', '2', ..., '12', and the values the average in the area of interest. + + Then, transforms these dictionaries into a final result of the format used + for all other Analyze operations. The 'categories' contain twelve objects, + one for each month, with a 'month' field containing the name of the month, + and 'ppt' and 'tmean' fields with corresponding values. The 'index' can be + used for sorting purposes on the client side. """ ppt = {k[5:]: v for r in results for k, v in r.items() if 'ppt' in k} tmean = {k[7:]: v for r in results for k, v in r.items() if 'tmean' in k} - return { - 'ppt': ppt, - 'tmean': tmean, - } - - -@shared_task -def collect_climate(results): - """ - Given the two dictionaries from combine_climate, transforms them into a - final result of the format used for all other Analyze operations. The - 'categories' contain twelve objects, one for each month, with a 'month' - field containing the name of the month, and 'ppt' and 'tmean' fields with - corresponding values. The 'index' can be used for sorting purposes on the - client side. - """ categories = [{ 'monthidx': i, 'month': month_name[i], - 'ppt': results['ppt'][str(i)] * CM_PER_MM, - 'tmean': results['tmean'][str(i)], + 'ppt': ppt[str(i)] * CM_PER_MM, + 'tmean': tmean[str(i)], } for i in xrange(1, 13)] return { diff --git a/src/mmw/apps/geoprocessing_api/views.py b/src/mmw/apps/geoprocessing_api/views.py index 31d7b7775..c93ce1b31 100644 --- a/src/mmw/apps/geoprocessing_api/views.py +++ b/src/mmw/apps/geoprocessing_api/views.py @@ -934,7 +934,6 @@ def start_analyze_climate(request, format=None): return start_celery_job([ group(geotasks), - tasks.combine_climate.s(), tasks.collect_climate.s(), ], area_of_interest, user, link_error=False) diff --git a/src/mmw/apps/modeling/mapshed/tasks.py b/src/mmw/apps/modeling/mapshed/tasks.py index 8061e8250..de59a1b1e 100644 --- a/src/mmw/apps/modeling/mapshed/tasks.py +++ b/src/mmw/apps/modeling/mapshed/tasks.py @@ -45,7 +45,9 @@ @shared_task -def collect_data(geop_result, geojson): +def collect_data(geop_results, geojson): + geop_result = {k: v for r in geop_results for k, v in r.items()} + geom = GEOSGeometry(geojson, srid=4326) area = geom.transform(5070, clone=True).area # Square Meters @@ -491,19 +493,6 @@ def geoprocessing_chains(aoi, wkaoi, errback): ] -@shared_task -def combine(geop_results): - """ - Flattens the incoming results dictionaries into one - which has all the keys of the components. - - This could be a part of collect_data, but we need - a buffer in a chord as a workaround to - https://github.com/celery/celery/issues/3191 - """ - return {k: v for r in geop_results for k, v in r.items()} - - def get_lu_index(nlcd): # Convert NLCD code into MapShed Land Use Index if nlcd == 81: diff --git a/src/mmw/apps/modeling/views.py b/src/mmw/apps/modeling/views.py index 88d5f3a3c..7797d997a 100644 --- a/src/mmw/apps/modeling/views.py +++ b/src/mmw/apps/modeling/views.py @@ -31,7 +31,6 @@ from apps.core.decorators import log_request from apps.modeling import tasks, geoprocessing from apps.modeling.mapshed.tasks import (geoprocessing_chains, - combine, collect_data, ) from apps.modeling.models import Project, Scenario @@ -230,7 +229,6 @@ def _initiate_mapshed_job_chain(mapshed_input, job_id): job_chain = ( group(geoprocessing_chains(area_of_interest, wkaoi, errback)) | - combine.s() | collect_data.s(area_of_interest).set(link_error=errback) | save_job_result.s(job_id, mapshed_input)) From 8adcbc3599fe01374698b0771d0d18562b99adf5 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 26 Sep 2017 12:11:06 -0400 Subject: [PATCH 007/172] Switch to new errback format Previously, a Celery error callback was only given the UUID of the failing job. To retrieve additional information about it, we had to query the app with it. To get the app reference, the task had to be bound to the app. With new Celery, there is an issue with using bound tasks for error handling. See https://github.com/celery/celery/issues/3723 Fortunately, in the new error callback format in Celery 4, the handler is given a request, exception, and traceback as arguments. This obviates the need for an app reference, since these were the values we were fetching from it. Now we use them directly. --- src/mmw/apps/core/tasks.py | 15 +++++++-------- src/mmw/apps/modeling/geoprocessing.py | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/mmw/apps/core/tasks.py b/src/mmw/apps/core/tasks.py index ed3b958ea..09c90e916 100644 --- a/src/mmw/apps/core/tasks.py +++ b/src/mmw/apps/core/tasks.py @@ -14,8 +14,8 @@ logger = logging.getLogger(__name__) -@shared_task(bind=True) -def save_job_error(self, uuid, job_id): +@shared_task +def save_job_error(request, exc, traceback, job_id): """ A handler task attached to the Celery chain. Any exception thrown along the chain will trigger this task, which logs the failure to the Job row so that @@ -24,15 +24,14 @@ def save_job_error(self, uuid, job_id): To see failing task in Flower, follow instructions here: https://github.com/WikiWatershed/model-my-watershed/pull/551#issuecomment-119333146 """ - result = self.app.AsyncResult(uuid) error_message = 'Task {0} run from job {1} raised exception: {2}\n{3}' - logger.error(error_message.format(str(uuid), str(job_id), - str(result.result), - str(result.traceback))) + logger.error(error_message.format(str(request.id), str(job_id), + str(exc), + str(traceback))) try: job = Job.objects.get(id=job_id) - job.error = result.result - job.traceback = result.traceback + job.error = exc + job.traceback = traceback job.delivered_at = now() job.status = 'failed' job.save() diff --git a/src/mmw/apps/modeling/geoprocessing.py b/src/mmw/apps/modeling/geoprocessing.py index 159dde16a..9307e4b98 100644 --- a/src/mmw/apps/modeling/geoprocessing.py +++ b/src/mmw/apps/modeling/geoprocessing.py @@ -77,7 +77,7 @@ def run(self, opname, input_data, wkaoi=None, cache_key=''): raise r except Exception as x: return { - 'error': x.message + 'error': str(x) } From b7f8f2c0fa343f5f778557c4f5252cc26623582c Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 26 Sep 2017 12:19:28 -0400 Subject: [PATCH 008/172] Simplify error message if geoprocessing down In case the geoprocessing service is unreachable, we now show this simplified message, instead of exposing inner details to the user. Without this, the error message would be something like: [analyze_nlcd] HTTPConnectionPool(host='localhost', port=8090): Max retries exceeded with url: /run (Caused by NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection refused',)) --- src/mmw/apps/modeling/geoprocessing.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mmw/apps/modeling/geoprocessing.py b/src/mmw/apps/modeling/geoprocessing.py index 9307e4b98..4bb62969f 100644 --- a/src/mmw/apps/modeling/geoprocessing.py +++ b/src/mmw/apps/modeling/geoprocessing.py @@ -75,6 +75,10 @@ def run(self, opname, input_data, wkaoi=None, cache_key=''): return result except Retry as r: raise r + except ConnectionError: + return { + 'error': 'Could not reach the geoprocessing service' + } except Exception as x: return { 'error': str(x) From 08e748a372ad34c93620013b592411bf6fc33f4d Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 26 Sep 2017 12:34:46 -0400 Subject: [PATCH 009/172] Reduce geoprocessing max retries Previously, since Spark JobServer would take a long time and much resources to accomplish, sometimes to the point of not accepting new requests, we had to retry a large number of times in hopes of making it in eventually. Since the new geoprocessing service is quite fast, and is built on Akka which more readily accepts new requests even when running processing on background threads, we don't need to retry as much. By reducing excessive retries, we make sure to not clog up the Celery worker capacity. --- src/mmw/apps/modeling/geoprocessing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mmw/apps/modeling/geoprocessing.py b/src/mmw/apps/modeling/geoprocessing.py index 4bb62969f..a82d28b24 100644 --- a/src/mmw/apps/modeling/geoprocessing.py +++ b/src/mmw/apps/modeling/geoprocessing.py @@ -19,7 +19,7 @@ from django.conf import settings -@shared_task(bind=True, default_retry_delay=1, max_retries=42) +@shared_task(bind=True, default_retry_delay=1, max_retries=6) def run(self, opname, input_data, wkaoi=None, cache_key=''): """ Run a geoprocessing operation. From 89277d6e7282d0b2985bf5782b35cf92efcb85b0 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Mon, 25 Sep 2017 17:03:35 -0400 Subject: [PATCH 010/172] Add RWD simplify param to geoprocessing API - document RWD simplify param in Swagger docs - parse RWD simplify param in RWD endpoint - adjust sample RWD response to 5 trailing digits - change example Swagger input point to one which generates a smaller unsimplified shape --- src/mmw/apps/geoprocessing_api/tasks.py | 17 ++++++++++++-- src/mmw/apps/geoprocessing_api/views.py | 31 +++++++++++++++---------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/mmw/apps/geoprocessing_api/tasks.py b/src/mmw/apps/geoprocessing_api/tasks.py index 653984a51..c9f5e69c7 100644 --- a/src/mmw/apps/geoprocessing_api/tasks.py +++ b/src/mmw/apps/geoprocessing_api/tasks.py @@ -5,6 +5,7 @@ import os import logging +import urllib from ast import literal_eval as make_tuple from calendar import month_name @@ -35,7 +36,7 @@ @shared_task -def start_rwd_job(location, snapping, data_source): +def start_rwd_job(location, snapping, simplify, data_source): """ Calls the Rapid Watershed Delineation endpoint that is running in the Docker container, and returns @@ -47,9 +48,21 @@ def start_rwd_job(location, snapping, data_source): rwd_url = 'http://%s:%s/%s/%f/%f' % (RWD_HOST, RWD_PORT, end_point, lat, lng) + params = {} + # The Webserver defaults to enable snapping, uses 1 (true) 0 (false) if not snapping: - rwd_url += '?snapping=0' + params['snapping'] = 0 + + # RWD also defaults to simplify the shape according to a tolerance. + # Passing it `?simplify=0` returns the unsimplified result. + if simplify is not False: + params['simplify'] = simplify + + query_string = urllib.urlencode(params) + + if query_string: + rwd_url += ('?%s' % query_string) logger.debug('rwd request: %s' % rwd_url) diff --git a/src/mmw/apps/geoprocessing_api/views.py b/src/mmw/apps/geoprocessing_api/views.py index cc5fa7be5..b3661c5d5 100644 --- a/src/mmw/apps/geoprocessing_api/views.py +++ b/src/mmw/apps/geoprocessing_api/views.py @@ -57,11 +57,17 @@ def start_rwd(request, format=None): `snappingOn` (`boolean`): Snap to the nearest stream? Default is false + `simplify` (`number`): Simplify tolerance for delineated watershed shape in + response. Use `0` to receive an unsimplified shape. When this + parameter is not supplied, `simplify` defaults to `0.0001` for + "drb" and is a function of the shape's area for "nhd". + **Example** { - "location": [39.97185812402583,-75.16742706298828], + "location": [39.67185812402583,-75.76742706298828], "snappingOn": true, + "simplify": 0, "dataSource":"nhd" } @@ -86,12 +92,12 @@ def start_rwd(request, format=None): "coordinates": [ [ [ - -75.24776006176894, - 39.98166667527191 + -75.24776, + 39.98166 ], [ - -75.24711191361516, - 39.98166667527191 + -75.24711, + 39.98166 ] ], ... ] @@ -119,8 +125,8 @@ def start_rwd(request, format=None): "geometry": { "type": "Point", "coordinates": [ - -75.24938043215342, - 39.97875000854888 + -75.24938, + 39.97875 ] }, "type": "Feature", @@ -165,12 +171,13 @@ def start_rwd(request, format=None): location = request.data['location'] data_source = request.data.get('dataSource', 'drb') snapping = request.data.get('snappingOn', False) + simplify = request.data.get('simplify', False) job = Job.objects.create(created_at=created, result='', error='', traceback='', user=user, status='started') - task_list = _initiate_rwd_job_chain(location, snapping, data_source, - job.id) + task_list = _initiate_rwd_job_chain(location, snapping, simplify, + data_source, job.id) job.uuid = task_list.id job.save() @@ -939,12 +946,12 @@ def start_analyze_climate(request, format=None): ], area_of_interest, user) -def _initiate_rwd_job_chain(location, snapping, data_source, +def _initiate_rwd_job_chain(location, snapping, simplify, data_source, job_id, testing=False): errback = save_job_error.s(job_id) - return chain(tasks.start_rwd_job.s(location, snapping, data_source), - save_job_result.s(job_id, location)) \ + return chain(tasks.start_rwd_job.s(location, snapping, simplify, + data_source), save_job_result.s(job_id, location)) \ .apply_async(link_error=errback) From d158b61a705332ed7ffcc62e9aaa4796542496c6 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 27 Sep 2017 10:01:18 -0400 Subject: [PATCH 011/172] Add MMW_CLIENT_APP_USER_PASSWORD Env Variable * We're adding a django user for the client app so that the client app can have its own geoprocessing API token * Add the client app's account's password as an environment variable - Add to ansible mmw default role - Add to cloud formation set up - Add to sample deployment configuration file - Add to Django App settings Refs #2270 --- deployment/ansible/group_vars/all | 2 ++ .../roles/model-my-watershed.base/defaults/main.yml | 1 + deployment/cfn/application.py | 12 +++++++++++- deployment/default.yml.example | 1 + src/mmw/mmw/settings/base.py | 4 ++++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all index b53f6a419..9a695f007 100644 --- a/deployment/ansible/group_vars/all +++ b/deployment/ansible/group_vars/all @@ -14,6 +14,8 @@ stack_color: "Black" itsi_client_id: "model-my-watershed" +client_app_user_password: "mmw" + postgresql_username: mmw postgresql_password: mmw postgresql_database: mmw diff --git a/deployment/ansible/roles/model-my-watershed.base/defaults/main.yml b/deployment/ansible/roles/model-my-watershed.base/defaults/main.yml index c6f16c167..673fd063b 100644 --- a/deployment/ansible/roles/model-my-watershed.base/defaults/main.yml +++ b/deployment/ansible/roles/model-my-watershed.base/defaults/main.yml @@ -17,6 +17,7 @@ envdir_config: MMW_ITSI_CLIENT_ID: "{{ itsi_client_id }}" MMW_ITSI_SECRET_KEY: "{{ itsi_secret_key }}" MMW_ITSI_BASE_URL: "{{ itsi_base_url }}" + MMW_CLIENT_APP_USER_PASSWORD: "{{ client_app_user_password }}" MMW_STACK_COLOR: "{{ stack_color }}" MMW_TILECACHE_BUCKET: "{{ tilecache_bucket_name }}" MMW_STACK_TYPE: "{{ stack_type }}" diff --git a/deployment/cfn/application.py b/deployment/cfn/application.py index 2d14258f8..db8b37f68 100644 --- a/deployment/cfn/application.py +++ b/deployment/cfn/application.py @@ -70,6 +70,7 @@ class Application(StackNode): 'ITSISecretKey': ['global:ITSISecretKey'], 'RollbarServerSideAccessToken': ['global:RollbarServerSideAccessToken'], + 'ClientAppUserPassword': ['global:ClientAppUserPassword'], } DEFAULTS = { @@ -240,6 +241,11 @@ def set_up_stack(self): Description='Secret key for ITSI portal integration' ), 'ITSISecretKey') + self.client_app_user_password = self.add_parameter(Parameter( + 'ClientAppUserPassword', Type='String', NoEcho=True, + Description='Password for the client apps django account', + ), 'ClientAppUserPassword') + app_server_lb_security_group, \ app_server_security_group = self.create_security_groups() app_server_lb, \ @@ -582,7 +588,11 @@ def get_cloud_config(self, tile_distribution_endpoint): ' - path: /etc/mmw.d/env/MMW_ITSI_SECRET_KEY\n', ' permissions: 0750\n', ' owner: root:mmw\n', - ' content: ', Ref(self.itsi_secret_key)] + ' content: ', Ref(self.itsi_secret_key), '\n', + ' - path: /etc/mmw.d/env/MMW_CLIENT_APP_USER_PASSWORD\n', + ' permissions: 0750\n', + ' owner: root:mmw\n', + ' content: ', Ref(self.client_app_user_password)] def create_cloud_watch_resources(self, app_server_lb): self.add_resource(cw.Alarm( diff --git a/deployment/default.yml.example b/deployment/default.yml.example index 6afa9fa4e..9e58c873b 100644 --- a/deployment/default.yml.example +++ b/deployment/default.yml.example @@ -64,3 +64,4 @@ WorkerAutoScalingScheduleEndRecurrence: '0 1 * * *' ITSIBaseURL: '' ITSISecretKey: '' RollbarServerSideAccessToken: '' +ClientAppUserPassword: '' diff --git a/src/mmw/mmw/settings/base.py b/src/mmw/mmw/settings/base.py index 5ae3fddbe..e84e2f7fe 100644 --- a/src/mmw/mmw/settings/base.py +++ b/src/mmw/mmw/settings/base.py @@ -585,6 +585,10 @@ def get_env_setting(setting): TILER_HOST = environ.get('MMW_TILER_HOST', 'localhost') # END TILER CONFIGURATION +# UI ("CLIENT APP") USER CONFIGURATION +CLIENT_APP_USER_PASSWORD = environ.get('MMW_CLIENT_APP_USER_PASSWORD', 'mmw') +# END UI ("CLIENT APP") USER CONFIGURATION + # UI CONFIGURATION DRAW_TOOLS = [ From f309bd9e2f3c99fa8e55dca9c89528c229ac4344 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 27 Sep 2017 10:50:42 -0400 Subject: [PATCH 012/172] Add migration to add client app user * Create a user for the client app so that it can get a token to send geoprocessing API requests --- .../user/migrations/0003_client_app_user.py | 30 +++++++++++++++++++ src/mmw/mmw/settings/base.py | 1 + 2 files changed, 31 insertions(+) create mode 100644 src/mmw/apps/user/migrations/0003_client_app_user.py diff --git a/src/mmw/apps/user/migrations/0003_client_app_user.py b/src/mmw/apps/user/migrations/0003_client_app_user.py new file mode 100644 index 000000000..37555888d --- /dev/null +++ b/src/mmw/apps/user/migrations/0003_client_app_user.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations +from django.conf import settings +from django.contrib.auth.models import User + +def add_client_app_user(apps, schema_editor): + web_app_user = User.objects.create_user( + username=settings.CLIENT_APP_USERNAME, + password=settings.CLIENT_APP_USER_PASSWORD) + web_app_user.save() + + +def remove_client_app_user(apps, schema_editor): + User.objects.filter(username=settings.CLIENT_APP_USERNAME).delete() + + +class Migration(migrations.Migration): + + dependencies = [ + ('authtoken', '0001_initial'), + ('user', '0001_initial'), + ('user', '0002_auth_tokens') + ] + + operations = [ + migrations.RunPython(add_client_app_user, + remove_client_app_user) + ] diff --git a/src/mmw/mmw/settings/base.py b/src/mmw/mmw/settings/base.py index e84e2f7fe..000ade3ae 100644 --- a/src/mmw/mmw/settings/base.py +++ b/src/mmw/mmw/settings/base.py @@ -586,6 +586,7 @@ def get_env_setting(setting): # END TILER CONFIGURATION # UI ("CLIENT APP") USER CONFIGURATION +CLIENT_APP_USERNAME = 'mmw|client_app_user' CLIENT_APP_USER_PASSWORD = environ.get('MMW_CLIENT_APP_USER_PASSWORD', 'mmw') # END UI ("CLIENT APP") USER CONFIGURATION From d530911cfaf42fd1cc210613fff4b998ed0b204a Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 27 Sep 2017 11:41:58 -0400 Subject: [PATCH 013/172] Add Client App Geoprocessing API Token To Client Settings * Pass along the client app dummy user's auth token to the clientSettings so the client can use it for its geoprocessing API requests * For now, simply looks up the client app dummy user via username -- there's already an index on the username field, so should be performant enough --- src/mmw/apps/home/views.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/mmw/apps/home/views.py b/src/mmw/apps/home/views.py index 0fb6355fd..dc39e0599 100644 --- a/src/mmw/apps/home/views.py +++ b/src/mmw/apps/home/views.py @@ -12,6 +12,9 @@ from django.template import RequestContext from django.template.context_processors import csrf from django.conf import settings +from django.contrib.auth.models import User + +from rest_framework.authtoken.models import Token from apps.modeling.models import Project, Scenario @@ -115,6 +118,16 @@ def set_url(layer): layer.update({'url': get_layer_url(layer)}) +def get_api_token(): + try: + client_app_user = User.objects.get( + username=settings.CLIENT_APP_USERNAME) + token = Token.objects.get(user=client_app_user) + return token.key + except User.DoesNotExist, Token.DoesNotExist: + return None + + def get_client_settings(request): # BiG-CZ mode applies when either request host contains predefined host, or # ?bigcz query parameter is present. This covers staging sites, etc. @@ -143,6 +156,7 @@ def get_client_settings(request): 'data_catalog_page_size': settings.BIGCZ_CLIENT_PAGE_SIZE, 'itsi_enabled': not bigcz, 'title': title, + 'api_token': get_api_token(), }), 'google_maps_api_key': settings.GOOGLE_MAPS_API_KEY, 'title': title, From 8bb0a421ee6ed3c4afdc9ea0809d8ebfc4f60c81 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 27 Sep 2017 14:58:15 -0400 Subject: [PATCH 014/172] Send Authorization Header With Geoprocessing API Requests * Add token attribute to the TaskModel and use it for Authorization headers where applicable (currently for all geoprocessing api requests) --- src/mmw/js/src/analyze/models.js | 3 ++- src/mmw/js/src/core/models.js | 13 +++++++++++-- src/mmw/js/src/draw/models.js | 4 +++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/mmw/js/src/analyze/models.js b/src/mmw/js/src/analyze/models.js index dd47f24fd..58db6c104 100644 --- a/src/mmw/js/src/analyze/models.js +++ b/src/mmw/js/src/analyze/models.js @@ -28,7 +28,8 @@ var AnalyzeTaskModel = coreModels.TaskModel.extend({ area_of_interest: null, wkaoi: null, taskName: 'analyze', - taskType: 'api' + taskType: 'api', + token: settings.get('api_token') }, coreModels.TaskModel.prototype.defaults ), diff --git a/src/mmw/js/src/core/models.js b/src/mmw/js/src/core/models.js index e9291ca5b..7d1be7a5c 100644 --- a/src/mmw/js/src/core/models.js +++ b/src/mmw/js/src/core/models.js @@ -474,6 +474,14 @@ var TaskModel = Backbone.Model.extend({ } }, + headers: function() { + var token = this.get('token'); + if (token) { + return { 'Authorization': 'Token ' + token }; + } + return null; + }, + // Cancels any currently running jobs. The promise returned // by previous calls to pollForResults will be rejected. reset: function() { @@ -505,7 +513,8 @@ var TaskModel = Backbone.Model.extend({ url: self.url(taskHelper.queryParams), method: 'POST', data: taskHelper.postData, - contentType: taskHelper.contentType + contentType: taskHelper.contentType, + headers: self.headers() }), pollingDefer = $.Deferred(); @@ -554,7 +563,7 @@ var TaskModel = Backbone.Model.extend({ return; } - self.fetch() + self.fetch({ headers: self.headers() }) .done(function(response) { console.log('Polling ' + self.url()); if (response.status === 'started') { diff --git a/src/mmw/js/src/draw/models.js b/src/mmw/js/src/draw/models.js index 61007f05d..5b8181111 100644 --- a/src/mmw/js/src/draw/models.js +++ b/src/mmw/js/src/draw/models.js @@ -2,6 +2,7 @@ var Backbone = require('../../shim/backbone'), _ = require('jquery'), + settings = require('../core/settings'), coreModels = require('../core/models'); var ToolbarModel = Backbone.Model.extend({ @@ -53,7 +54,8 @@ var ToolbarModel = Backbone.Model.extend({ var RwdTaskModel = coreModels.TaskModel.extend({ defaults: _.extend( { taskName: 'rwd', - taskType: 'api' + taskType: 'api', + token: settings.get('api_token') }, coreModels.TaskModel.prototype.defaults ) }); From 6b3c523b6949438aa1066a9d9122b3f14218f7c2 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 27 Sep 2017 15:10:19 -0400 Subject: [PATCH 015/172] Require Token Authentication On Geoprocessing API Endpoints Not that the client app sends a proper auth token, we can secure the geoprocessing API as an token-auth-ed only service * Geop API only endpoints (analyze + RWD): require IsAuthenticated permissions and only allow token authentication * The Model + Geop API endpoint (GET /jobs): As before, AllowAny, but only give response if authenticated user matches job's user (if it exists). Get the user either from the Token or Session, when present --- src/mmw/apps/core/permissions.py | 24 ------------------------ src/mmw/apps/geoprocessing_api/views.py | 16 ++++++++-------- src/mmw/apps/modeling/views.py | 3 +-- 3 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 src/mmw/apps/core/permissions.py diff --git a/src/mmw/apps/core/permissions.py b/src/mmw/apps/core/permissions.py deleted file mode 100644 index f232ae2ae..000000000 --- a/src/mmw/apps/core/permissions.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import print_function -from __future__ import unicode_literals - -from rest_framework.permissions import BasePermission -from rest_framework.authentication import TokenAuthentication - - -class IsTokenAuthenticatedOrNotSwagger(BasePermission): - """ - TODO This is just to test the token authentication - Only anonymous requests from the client app should - be allowed: - https://github.com/WikiWatershed/model-my-watershed/issues/2270 - Currently all anonymous requests are allowed, unless you're using - swagger - """ - - def has_permission(self, request, view): - from_swagger = 'api/docs' in request.META['HTTP_REFERER'] \ - if 'HTTP_REFERER' in request.META else False - token_authenticated = type(request.successful_authenticator) \ - is TokenAuthentication - return not from_swagger or token_authenticated diff --git a/src/mmw/apps/geoprocessing_api/views.py b/src/mmw/apps/geoprocessing_api/views.py index c93ce1b31..289cd6354 100644 --- a/src/mmw/apps/geoprocessing_api/views.py +++ b/src/mmw/apps/geoprocessing_api/views.py @@ -7,6 +7,7 @@ from rest_framework.response import Response from rest_framework import decorators from rest_framework.authentication import TokenAuthentication +from rest_framework.permissions import IsAuthenticated from django.utils.timezone import now from django.core.urlresolvers import reverse @@ -15,7 +16,6 @@ from apps.core.models import Job from apps.core.tasks import (save_job_error, save_job_result) -from apps.core.permissions import IsTokenAuthenticatedOrNotSwagger from apps.core.decorators import log_request from apps.modeling import geoprocessing from apps.modeling.views import load_area_of_interest @@ -24,7 +24,7 @@ @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) -@decorators.permission_classes((IsTokenAuthenticatedOrNotSwagger, )) +@decorators.permission_classes((IsAuthenticated, )) @log_request def start_rwd(request, format=None): """ @@ -186,7 +186,7 @@ def start_rwd(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) -@decorators.permission_classes((IsTokenAuthenticatedOrNotSwagger, )) +@decorators.permission_classes((IsAuthenticated, )) @log_request def start_analyze_land(request, format=None): """ @@ -381,7 +381,7 @@ def start_analyze_land(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) -@decorators.permission_classes((IsTokenAuthenticatedOrNotSwagger, )) +@decorators.permission_classes((IsAuthenticated, )) @log_request def start_analyze_soil(request, format=None): """ @@ -508,7 +508,7 @@ def start_analyze_soil(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) -@decorators.permission_classes((IsTokenAuthenticatedOrNotSwagger, )) +@decorators.permission_classes((IsAuthenticated, )) @log_request def start_analyze_animals(request, format=None): """ @@ -619,7 +619,7 @@ def start_analyze_animals(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) -@decorators.permission_classes((IsTokenAuthenticatedOrNotSwagger, )) +@decorators.permission_classes((IsAuthenticated, )) @log_request def start_analyze_pointsource(request, format=None): """ @@ -709,7 +709,7 @@ def start_analyze_pointsource(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) -@decorators.permission_classes((IsTokenAuthenticatedOrNotSwagger, )) +@decorators.permission_classes((IsAuthenticated, )) @log_request def start_analyze_catchment_water_quality(request, format=None): """ @@ -828,7 +828,7 @@ def start_analyze_catchment_water_quality(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) -@decorators.permission_classes((IsTokenAuthenticatedOrNotSwagger, )) +@decorators.permission_classes((IsAuthenticated, )) @log_request def start_analyze_climate(request, format=None): """ diff --git a/src/mmw/apps/modeling/views.py b/src/mmw/apps/modeling/views.py index 7797d997a..5016faf9f 100644 --- a/src/mmw/apps/modeling/views.py +++ b/src/mmw/apps/modeling/views.py @@ -27,7 +27,6 @@ from apps.core.models import Job from apps.core.tasks import save_job_error, save_job_result -from apps.core.permissions import IsTokenAuthenticatedOrNotSwagger from apps.core.decorators import log_request from apps.modeling import tasks, geoprocessing from apps.modeling.mapshed.tasks import (geoprocessing_chains, @@ -486,7 +485,7 @@ def drb_point_sources(request): @decorators.api_view(['GET']) @decorators.authentication_classes((TokenAuthentication, SessionAuthentication, )) -@decorators.permission_classes((IsTokenAuthenticatedOrNotSwagger, )) +@decorators.permission_classes((AllowAny, )) @log_request def get_job(request, job_uuid, format=None): """ From c0cff05bd04ca51077009598477fe5f183b15bee Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Fri, 6 Oct 2017 10:27:11 -0400 Subject: [PATCH 016/172] Rename api/rwd -> api/watershed - rename api/rwd route -> api/watershed --- src/mmw/apps/geoprocessing_api/urls.py | 2 +- src/mmw/js/src/draw/models.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mmw/apps/geoprocessing_api/urls.py b/src/mmw/apps/geoprocessing_api/urls.py index 72b3dc049..872a67edd 100644 --- a/src/mmw/apps/geoprocessing_api/urls.py +++ b/src/mmw/apps/geoprocessing_api/urls.py @@ -30,5 +30,5 @@ url(r'analyze/climate/$', views.start_analyze_climate, name='start_analyze_climate'), url(r'jobs/' + uuid_regex, get_job, name='get_job'), - url(r'rwd/$', views.start_rwd, name='start_rwd'), + url(r'watershed/$', views.start_rwd, name='start_rwd'), ) diff --git a/src/mmw/js/src/draw/models.js b/src/mmw/js/src/draw/models.js index 5b8181111..5d712b737 100644 --- a/src/mmw/js/src/draw/models.js +++ b/src/mmw/js/src/draw/models.js @@ -53,7 +53,7 @@ var ToolbarModel = Backbone.Model.extend({ // Used for running Rapid Watershed Delineation tasks. var RwdTaskModel = coreModels.TaskModel.extend({ defaults: _.extend( { - taskName: 'rwd', + taskName: 'watershed', taskType: 'api', token: settings.get('api_token') }, coreModels.TaskModel.prototype.defaults From 462d348f2948f6c52d6b227bb3a91da764019039 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Thu, 28 Sep 2017 14:42:20 -0400 Subject: [PATCH 017/172] BiG-CZ: Register Clicks Inside Cinergi Bounding Boxes * Previously we didn't fill the Cinergi boxes, so clicks only registered on their borders * Transparently fill the boxes so we can capture all intersecting clicks --- src/mmw/js/src/core/views.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/core/views.js b/src/mmw/js/src/core/views.js index a4636944c..25bf32848 100644 --- a/src/mmw/js/src/core/views.js +++ b/src/mmw/js/src/core/views.js @@ -25,7 +25,8 @@ var dataCatalogPolygonStyle = { color: 'steelblue', weight: 2, opacity: 1, - fill: false + fill: true, + fillOpacity: 0, }; var dataCatalogPointStyle = _.assign({}, dataCatalogPolygonStyle, { From 8526b6e320c4b79618f0002bd43f24b03cdc34f9 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Thu, 28 Sep 2017 14:45:41 -0400 Subject: [PATCH 018/172] BiG-CZ: Register Clicks For All Intersected Layers * Previously only the topmost catalog feature would fire a click event * We want to show all intersected layers per click, move the popup binding into an on click handler on the whole FeatureGroup * Clicks that only intersect a single feature show popups the same as before * Clicks that intersect multiple features, just log them to the console for now --- src/mmw/js/src/core/views.js | 81 +++++++++++++++++++++++++++++------- 1 file changed, 66 insertions(+), 15 deletions(-) diff --git a/src/mmw/js/src/core/views.js b/src/mmw/js/src/core/views.js index 25bf32848..9d0d33b99 100644 --- a/src/mmw/js/src/core/views.js +++ b/src/mmw/js/src/core/views.js @@ -737,7 +737,9 @@ var MapView = Marionette.ItemView.extend({ onEachFeature: function(feature, layer) { layer.on('mouseover', function() { // Only highlight the layer if detail mode is not active - if (self._dataCatalogDetailLayer.getLayers().length === 0) { + // and the layer bounds are within the viewport + if (self._dataCatalogDetailLayer.getLayers().length === 0 && + self._leafletMap.getBounds().contains(layer.getBounds())) { layer.setStyle(dataCatalogActiveStyle); result.set('active', true); } @@ -748,7 +750,7 @@ var MapView = Marionette.ItemView.extend({ if (geom.type === 'Point') { // Preserve highlight of marker if popup is open. // It will get restyled when the popup is closed. - if (!layer._popup._isOpen) { + if (!layer._popup || !layer._popup._isOpen) { layer.setStyle(dataCatalogPointStyle); result.set('active', false); } @@ -812,21 +814,70 @@ var MapView = Marionette.ItemView.extend({ }, bindDataCatalogPopovers: function(PopoverView, catalogId, resultModels) { - this._dataCatalogResultsLayer.eachLayer(function(layer) { - var result = resultModels.findWhere({ id: layer.options.id }); - layer.on('popupopen', function() { - layer.setStyle(dataCatalogActiveStyle); - result.set('active', true); - }); - layer.on('popupclose', function() { - layer.setStyle(dataCatalogPointStyle); - result.set('active', false); - }); - layer.bindPopup(new PopoverView({ + var handleClick = function(e) { + var clickPoint = e.layerPoint, + clickLatLng = e.latlng, + + intersectsClickBounds = function(layer) { + var shape = layer.getLayers()[0]; + + if (shape instanceof L.Polygon) { + return shape.getBounds().contains(clickLatLng); + } + + if (shape instanceof L.Circle) { + return shape._point.distanceTo(clickPoint) <= shape._radius; + } + + return false; + }, + + // Get a list of results intersecting the clicked point + intersectingFeatures = _.reduce( + e.target._layers, + function(intersectingFeatures, layer) { + if (intersectsClickBounds(layer)) { + intersectingFeatures.push(layer); + } + return intersectingFeatures; + }, []); + + // If nothing intersected the clicked point, finish + if (intersectingFeatures.length === 0) { + return; + } + + // If only a single feature intersected the clicked point + // show its detail popup, put active styling on the feature + if (intersectingFeatures.length === 1) { + var layer = intersectingFeatures[0], + result = resultModels.findWhere({ id: layer.options.id }); + + layer.bindPopup(new PopoverView({ model: result, catalog: catalogId - }).render().el, { className: 'data-catalog-popover' }); - }); + }).render().el, { className: 'data-catalog-popover'}); + + layer.openPopup(); + layer.setStyle(dataCatalogActiveStyle); + result.set('active', true); + + layer.on('popupclose', function() { + layer.setStyle(dataCatalogPointStyle); + result.set('active', false); + }); + + return; + } + + console.log("Click intersects multiple features", intersectingFeatures); + }; + + // Remove all existing event listeners that might be from the other catalogs + this._dataCatalogResultsLayer.removeEventListener(); + + // Listen for clicks on the currently active layer + this._dataCatalogResultsLayer.on('click', handleClick); }, renderSelectedGeocoderArea: function() { From b398ac38b54b82407c897a6aa0050a5ee8f7d354 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Fri, 29 Sep 2017 11:04:15 -0400 Subject: [PATCH 019/172] BiG-CZ: Render List Popup View On Multiple Features Click * Create a new popup view that first shows a list view of all click-intersected results. If a list item is clicked, shows the selected result's detail view --- src/mmw/js/src/core/views.js | 103 ++++++++++-------- src/mmw/js/src/data_catalog/models.js | 9 +- .../templates/resultMapPopoverController.html | 1 + ...pover.html => resultMapPopoverDetail.html} | 0 .../templates/resultMapPopoverList.html | 1 + .../templates/resultMapPopoverListItem.html | 33 ++++++ src/mmw/js/src/data_catalog/views.js | 78 ++++++++++++- src/mmw/sass/base/_map.scss | 17 ++- src/mmw/sass/pages/_data-catalog.scss | 51 ++++++++- 9 files changed, 240 insertions(+), 53 deletions(-) create mode 100644 src/mmw/js/src/data_catalog/templates/resultMapPopoverController.html rename src/mmw/js/src/data_catalog/templates/{resultMapPopover.html => resultMapPopoverDetail.html} (100%) create mode 100644 src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html create mode 100644 src/mmw/js/src/data_catalog/templates/resultMapPopoverListItem.html diff --git a/src/mmw/js/src/core/views.js b/src/mmw/js/src/core/views.js index 9d0d33b99..e23ee7b4f 100644 --- a/src/mmw/js/src/core/views.js +++ b/src/mmw/js/src/core/views.js @@ -4,6 +4,7 @@ var L = require('leaflet'), $ = require('jquery'), _ = require('underscore'), router = require('../router.js').router, + Backbone = require('../../shim/backbone'), Marionette = require('../../shim/backbone.marionette'), TransitionRegion = require('../../shim/marionette.transition-region'), coreUtils = require('./utils'), @@ -813,64 +814,74 @@ var MapView = Marionette.ItemView.extend({ } }, - bindDataCatalogPopovers: function(PopoverView, catalogId, resultModels) { - var handleClick = function(e) { - var clickPoint = e.layerPoint, - clickLatLng = e.latlng, + bindDataCatalogPopovers: function(SinglePopoverView, ListPopoverView, + catalogId, resultModels) { + var self = this, + handleClick = function(e) { + var clickPoint = e.layerPoint, + clickLatLng = e.latlng, - intersectsClickBounds = function(layer) { - var shape = layer.getLayers()[0]; + intersectsClickBounds = function(layer) { + var shape = layer.getLayers()[0]; - if (shape instanceof L.Polygon) { - return shape.getBounds().contains(clickLatLng); - } + if (shape instanceof L.Polygon) { + return shape.getBounds().contains(clickLatLng); + } - if (shape instanceof L.Circle) { - return shape._point.distanceTo(clickPoint) <= shape._radius; - } + if (shape instanceof L.Circle) { + return shape._point.distanceTo(clickPoint) <= shape._radius; + } - return false; - }, + return false; + }, - // Get a list of results intersecting the clicked point - intersectingFeatures = _.reduce( - e.target._layers, - function(intersectingFeatures, layer) { - if (intersectsClickBounds(layer)) { - intersectingFeatures.push(layer); - } - return intersectingFeatures; - }, []); + // Get a list of results intersecting the clicked point + intersectingFeatures = _.filter(e.target._layers, + intersectsClickBounds); - // If nothing intersected the clicked point, finish - if (intersectingFeatures.length === 0) { - return; - } + // If nothing intersected the clicked point, finish + if (intersectingFeatures.length === 0) { + return; + } - // If only a single feature intersected the clicked point - // show its detail popup, put active styling on the feature - if (intersectingFeatures.length === 1) { - var layer = intersectingFeatures[0], - result = resultModels.findWhere({ id: layer.options.id }); + // If only a single feature intersected the clicked point + // show its detail popup, put active styling on the feature + if (intersectingFeatures.length === 1) { + var layer = intersectingFeatures[0], + result = resultModels.findWhere({ id: layer.options.id }); - layer.bindPopup(new PopoverView({ - model: result, - catalog: catalogId - }).render().el, { className: 'data-catalog-popover'}); + layer.bindPopup(new SinglePopoverView({ + model: result, + catalog: catalogId + }).render().el, { className: 'data-catalog-popover'}); - layer.openPopup(); - layer.setStyle(dataCatalogActiveStyle); - result.set('active', true); + layer.openPopup(); + layer.setStyle(dataCatalogActiveStyle); + result.set('active', true); - layer.on('popupclose', function() { - layer.setStyle(dataCatalogPointStyle); - result.set('active', false); - }); + layer.once('popupclose', function() { + layer.setStyle(dataCatalogPointStyle); + result.set('active', false); + }); - return; - } + return; + } - console.log("Click intersects multiple features", intersectingFeatures); + // For multiple intersecting features, show the list popup + var id = function(layer) { return layer.options.id; }, + intersectingFeatureIds = _.map(intersectingFeatures, id), + resultIntersects = function(result) { + return _.includes(intersectingFeatureIds, result.get('id')); + }, + intersectingResults = resultModels.filter(resultIntersects); + + self._leafletMap.openPopup( + new ListPopoverView({ + collection: new Backbone.Collection(intersectingResults), + catalog: catalogId + }).render().el, + clickLatLng, + { className: 'data-catalog-popover-list' }); }; // Remove all existing event listeners that might be from the other catalogs diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index d940899d9..2b23b36d2 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -390,6 +390,12 @@ var SearchForm = Backbone.Model.extend({ } }); +var PopoverControllerModel = Backbone.Model.extend({ + defaults: { + activeResult: null // Result + } +}); + module.exports = { GriddedServicesFilter: GriddedServicesFilter, DateFilter: DateFilter, @@ -398,5 +404,6 @@ module.exports = { Catalogs: Catalogs, Result: Result, Results: Results, - SearchForm: SearchForm + SearchForm: SearchForm, + PopoverControllerModel: PopoverControllerModel, }; diff --git a/src/mmw/js/src/data_catalog/templates/resultMapPopoverController.html b/src/mmw/js/src/data_catalog/templates/resultMapPopoverController.html new file mode 100644 index 000000000..d66b5568a --- /dev/null +++ b/src/mmw/js/src/data_catalog/templates/resultMapPopoverController.html @@ -0,0 +1 @@ +
diff --git a/src/mmw/js/src/data_catalog/templates/resultMapPopover.html b/src/mmw/js/src/data_catalog/templates/resultMapPopoverDetail.html similarity index 100% rename from src/mmw/js/src/data_catalog/templates/resultMapPopover.html rename to src/mmw/js/src/data_catalog/templates/resultMapPopoverDetail.html diff --git a/src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html b/src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html new file mode 100644 index 000000000..f75119a6d --- /dev/null +++ b/src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html @@ -0,0 +1 @@ +
    diff --git a/src/mmw/js/src/data_catalog/templates/resultMapPopoverListItem.html b/src/mmw/js/src/data_catalog/templates/resultMapPopoverListItem.html new file mode 100644 index 000000000..f7f903735 --- /dev/null +++ b/src/mmw/js/src/data_catalog/templates/resultMapPopoverListItem.html @@ -0,0 +1,33 @@ +
  • + +
    • diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index abf7713d8..6ef7a27fa 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -6,6 +6,7 @@ var $ = require('jquery'), App = require('../app'), analyzeViews = require('../analyze/views.js'), settings = require('../core/settings'), + models = require('./models'), errorTmpl = require('./templates/error.html'), dateFilterTmpl = require('./templates/dateFilter.html'), checkboxFilterTmpl = require('./templates/checkboxFilter.html'), @@ -22,7 +23,10 @@ var $ = require('jquery'), resultDetailsHydroshareTmpl = require('./templates/resultDetailsHydroshare.html'), resultDetailsCuahsiTmpl = require('./templates/resultDetailsCuahsi.html'), resultsWindowTmpl = require('./templates/resultsWindow.html'), - resultMapPopoverTmpl = require('./templates/resultMapPopover.html'); + resultMapPopoverDetailTmpl = require('./templates/resultMapPopoverDetail.html'), + resultMapPopoverListTmpl = require('./templates/resultMapPopoverList.html'), + resultMapPopoverListItemTmpl = require('./templates/resultMapPopoverListItem.html'), + resultMapPopoverControllerTmpl = require('./templates/resultMapPopoverController.html'); var ENTER_KEYCODE = 13, PAGE_SIZE = settings.get('data_catalog_page_size'), @@ -171,7 +175,8 @@ var DataCatalogWindow = Marionette.LayoutView.extend({ if (catalog) { App.map.set('dataCatalogResults', catalog.get('results')); - App.getMapView().bindDataCatalogPopovers(ResultMapPopoverView, + App.getMapView().bindDataCatalogPopovers( + ResultMapPopoverDetailView, ResultMapPopoverControllerView, catalog.id, catalog.get('results')); } } @@ -471,8 +476,8 @@ var ResultDetailsView = Marionette.ItemView.extend({ } }); -var ResultMapPopoverView = Marionette.LayoutView.extend({ - template: resultMapPopoverTmpl, +var ResultMapPopoverDetailView = Marionette.LayoutView.extend({ + template: resultMapPopoverDetailTmpl, regions: { 'resultRegion': '.data-catalog-popover-result-region' @@ -501,6 +506,71 @@ var ResultMapPopoverView = Marionette.LayoutView.extend({ } }); +var ResultMapPopoverListItemView = Marionette.ItemView.extend({ + template: resultMapPopoverListItemTmpl, + + ui: { + selectButton: '.data-catalog-popover-list-item-btn' + }, + + events: { + 'click @ui.selectButton': 'selectItem' + }, + + templateHelpers: function() { + return { + catalog: this.options.catalog + }; + }, + + selectItem: function() { + this.options.popoverModel.set('activeResult', this.model); + } +}); + +var ResultMapPopoverListView = Marionette.CompositeView.extend({ + template: resultMapPopoverListTmpl, + childView: ResultMapPopoverListItemView, + childViewContainer: '.data-catalog-popover-result-list', + childViewOptions: function() { + return { + popoverModel: this.options.popoverModel, + catalog: this.options.catalog + }; + } +}); + +var ResultMapPopoverControllerView = Marionette.LayoutView.extend({ + // model: PopoverControllerModel + template: resultMapPopoverControllerTmpl, + + regions: { + container: '.data-catalog-popover-container' + }, + + initialize: function() { + this.model = new models.PopoverControllerModel(); + this.model.on('change:activeResult', this.render); + }, + + onRender: function() { + var activeResult = this.model.get('activeResult'); + if (activeResult) { + this.container.show(new ResultMapPopoverDetailView({ + model: activeResult, + catalog: this.options.catalog + })); + } else { + this.container.show(new ResultMapPopoverListView({ + collection: this.collection, + popoverModel: this.model, + catalog: this.options.catalog + })); + } + } + +}); + var PagerView = Marionette.ItemView.extend({ template: pagerTmpl, diff --git a/src/mmw/sass/base/_map.scss b/src/mmw/sass/base/_map.scss index 692a641d3..5e0fb9e88 100644 --- a/src/mmw/sass/base/_map.scss +++ b/src/mmw/sass/base/_map.scss @@ -275,10 +275,25 @@ div.leaflet-popup.data-catalog-popover.leaflet-zoom-animated -div.leaflet-popup-content-wrapper { +div.leaflet-popup-content-wrapper, +div.leaflet-popup.data-catalog-popover-list.leaflet-zoom-animated + div.leaflet-popup-content-wrapper { border-radius: 0px; +} + + +div.leaflet-popup.data-catalog-popover.leaflet-zoom-animated +div.leaflet-popup-content-wrapper { div.leaflet-popup-content { margin-left: 10px; margin-bottom: 10px; } } + +div.leaflet-popup.data-catalog-popover-list.leaflet-zoom-animated +div.leaflet-popup-content-wrapper { + width: 250px; + div.leaflet-popup-content { + margin: 0; + } +} diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index 327de1576..202b984b9 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -169,7 +169,16 @@ } .data-catalog-window, -.data-catalog-resource-popover { +.data-catalog-resource-popover, +.data-catalog-popover-list-item { + .btn-secondary { + height: auto; + } + + h3 { + margin-bottom: 7px; + } + .resource-description { color: $ui-grey; font-size: $font-size-h5; @@ -228,6 +237,46 @@ } } +.data-catalog-popover-container +.data-catalog-resource-popover { + padding: 10px; +} + +.data-catalog-popover-result-list { + padding: 0px; +} + +.data-catalog-popover-list-item { + display: block; + .data-catalog-popover-list-item-btn { + border: none; + border-bottom: 1px solid $ui-light; + padding: 6px; + background: none; + text-align: left; + width: 100%; + + &:hover { + background: #f3f3f3; + } + } + + .data-catalog-popover-list-item-btn + .list-item-title { + color: $brand-primary; + height: 17px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + } + + .data-catalog-popover-list-item-btn + .data-catalog-popover-list-item-date { + color: $ui-grey; + font-size: $font-size-h5; + } +} + .data-catalog-filter-window { padding: 1rem; padding-top: 2rem; From e141c73511798a8f22e93754f1e04905903c9e43 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Fri, 29 Sep 2017 15:02:29 -0400 Subject: [PATCH 020/172] BiG-CZ: Add number of results to popover list view --- .../data_catalog/templates/resultMapPopoverList.html | 4 ++++ src/mmw/js/src/data_catalog/views.js | 6 ++++++ src/mmw/sass/pages/_data-catalog.scss | 11 +++++++++++ 3 files changed, 21 insertions(+) diff --git a/src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html b/src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html index f75119a6d..656a8610c 100644 --- a/src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html +++ b/src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html @@ -1 +1,5 @@ +
    + {{ numResults }} results found at
    + this location +
      diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 6ef7a27fa..7389e0ff9 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -537,6 +537,12 @@ var ResultMapPopoverListView = Marionette.CompositeView.extend({ popoverModel: this.options.popoverModel, catalog: this.options.catalog }; + }, + + templateHelpers: function() { + return { + numResults: this.collection.length + }; } }); diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index 202b984b9..de7c54727 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -246,6 +246,17 @@ padding: 0px; } +.data-catalog-popover-num-results { + color: $ui-secondary; + // Important because leaflet popup title + // tries to add a margin-bottom + margin-bottom: 0 !important; + font-weight: 800; + padding: 6px; + padding-top: 0; + border-bottom: 1px solid $ui-light; +} + .data-catalog-popover-list-item { display: block; .data-catalog-popover-list-item-btn { From 0139cd215960d17af3cc9bf336e5ec30aa4f6177 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Fri, 29 Sep 2017 15:29:41 -0400 Subject: [PATCH 021/172] BiG-CZ: Add back button from details popover to list popover --- .../templates/resultMapPopoverController.html | 6 ++++++ src/mmw/js/src/data_catalog/views.js | 13 ++++++++++++- src/mmw/sass/pages/_data-catalog.scss | 8 ++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/data_catalog/templates/resultMapPopoverController.html b/src/mmw/js/src/data_catalog/templates/resultMapPopoverController.html index d66b5568a..4a1aa898a 100644 --- a/src/mmw/js/src/data_catalog/templates/resultMapPopoverController.html +++ b/src/mmw/js/src/data_catalog/templates/resultMapPopoverController.html @@ -1 +1,7 @@ +{% if activeResult %} + +{% endif %} +
      diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 7389e0ff9..6e294beef 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -554,6 +554,14 @@ var ResultMapPopoverControllerView = Marionette.LayoutView.extend({ container: '.data-catalog-popover-container' }, + ui: { + back: '.data-catalog-popover-back-btn' + }, + + events: { + 'click @ui.back': 'backToList' + }, + initialize: function() { this.model = new models.PopoverControllerModel(); this.model.on('change:activeResult', this.render); @@ -573,8 +581,11 @@ var ResultMapPopoverControllerView = Marionette.LayoutView.extend({ catalog: this.options.catalog })); } - } + }, + backToList: function() { + this.model.set('activeResult', null); + } }); var PagerView = Marionette.ItemView.extend({ diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index de7c54727..a4fff2efd 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -239,7 +239,15 @@ .data-catalog-popover-container .data-catalog-resource-popover { + padding: 0 10px 10px 10px; +} + +.data-catalog-popover-back-btn { + color: $brand-primary; + border: none; + background: none; padding: 10px; + font-size: $font-size-h5; } .data-catalog-popover-result-list { From 88f8caf6c0fc5fa678674e7912dad941c9a4da52 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Fri, 29 Sep 2017 15:40:07 -0400 Subject: [PATCH 022/172] BiG-CZ: Close popovers when switching catalog/detail view * The list popups are directly on the map, not tied to any particular layer. Close them manually when the catalog is switched or we enter a detail view --- src/mmw/js/src/core/views.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/core/views.js b/src/mmw/js/src/core/views.js index e23ee7b4f..2ecca263b 100644 --- a/src/mmw/js/src/core/views.js +++ b/src/mmw/js/src/core/views.js @@ -776,6 +776,9 @@ var MapView = Marionette.ItemView.extend({ this._dataCatalogResultsLayer.addLayer(layer); } }, this); + + // Close any popup that might be on the map + this._leafletMap.closePopup(); }, renderDataCatalogActiveResult: function() { @@ -790,6 +793,9 @@ var MapView = Marionette.ItemView.extend({ this._renderDataCatalogResult(result, this._dataCatalogDetailLayer, 'bigcz-detail-map', dataCatalogDetailStyle); + + // Close any popup that might be on the map + this._leafletMap.closePopup(); }, _renderDataCatalogResult: function(result, featureGroup, className, style) { @@ -884,8 +890,9 @@ var MapView = Marionette.ItemView.extend({ { className: 'data-catalog-popover-list' }); }; - // Remove all existing event listeners that might be from the other catalogs + // Remove all existing event listeners/popups that might be from the other catalogs this._dataCatalogResultsLayer.removeEventListener(); + this._leafletMap.closePopup(); // Listen for clicks on the currently active layer this._dataCatalogResultsLayer.on('click', handleClick); From 7e49722c882796f3eb89720cb654db57196b1182 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Fri, 29 Sep 2017 17:25:31 -0400 Subject: [PATCH 023/172] BiG-CZ: Paginate Popover List View * Use Backbone Pageable Collection to paginate popover list view when results > 3 items --- src/mmw/js/src/core/models.js | 6 +++++ src/mmw/js/src/core/views.js | 5 ++-- .../templates/resultMapPopoverList.html | 22 ++++++++++++++++ src/mmw/js/src/data_catalog/views.js | 26 ++++++++++++++++++- src/mmw/sass/pages/_data-catalog.scss | 19 +++++++++++++- 5 files changed, 74 insertions(+), 4 deletions(-) diff --git a/src/mmw/js/src/core/models.js b/src/mmw/js/src/core/models.js index 7d1be7a5c..5102ef833 100644 --- a/src/mmw/js/src/core/models.js +++ b/src/mmw/js/src/core/models.js @@ -635,6 +635,11 @@ var CatchmentWaterQualityCensusCollection = Backbone.PageableCollection.extend({ state: { pageSize: 6, firstPage: 1 } }); +var DataCatalogPopoverResultCollection = Backbone.PageableCollection.extend({ + mode: 'client', + state: { pageSize: 3, firstPage: 1, currentPage: 1 } +}); + var GeoModel = Backbone.Model.extend({ M_IN_KM: 1000000, @@ -705,6 +710,7 @@ module.exports = { ClimateCensusCollection: ClimateCensusCollection, PointSourceCensusCollection: PointSourceCensusCollection, CatchmentWaterQualityCensusCollection: CatchmentWaterQualityCensusCollection, + DataCatalogPopoverResultCollection: DataCatalogPopoverResultCollection, GeoModel: GeoModel, AreaOfInterestModel: AreaOfInterestModel, AppStateModel: AppStateModel diff --git a/src/mmw/js/src/core/views.js b/src/mmw/js/src/core/views.js index 2ecca263b..465f95388 100644 --- a/src/mmw/js/src/core/views.js +++ b/src/mmw/js/src/core/views.js @@ -4,10 +4,10 @@ var L = require('leaflet'), $ = require('jquery'), _ = require('underscore'), router = require('../router.js').router, - Backbone = require('../../shim/backbone'), Marionette = require('../../shim/backbone.marionette'), TransitionRegion = require('../../shim/marionette.transition-region'), coreUtils = require('./utils'), + models = require('./models'), drawUtils = require('../draw/utils'), modificationConfigUtils = require('../modeling/modificationConfigUtils'), headerTmpl = require('./templates/header.html'), @@ -883,7 +883,8 @@ var MapView = Marionette.ItemView.extend({ self._leafletMap.openPopup( new ListPopoverView({ - collection: new Backbone.Collection(intersectingResults), + collection: + new models.DataCatalogPopoverResultCollection(intersectingResults), catalog: catalogId }).render().el, clickLatLng, diff --git a/src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html b/src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html index 656a8610c..beafcf2e7 100644 --- a/src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html +++ b/src/mmw/js/src/data_catalog/templates/resultMapPopoverList.html @@ -3,3 +3,25 @@
      this location
        + +{% if hasPrevPage or hasNextPage %} + +
        + + + Page {{ pageNum }} of {{ numPages }} + + +
        + +{% endif %} diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 6e294beef..d148745d1 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -539,10 +539,34 @@ var ResultMapPopoverListView = Marionette.CompositeView.extend({ }; }, + ui: { + prevPage: '[data-action="prev-page"]', + nextPage: '[data-action="next-page"]' + }, + + events: { + 'click @ui.prevPage': 'prevPage', + 'click @ui.nextPage': 'nextPage' + }, + templateHelpers: function() { return { - numResults: this.collection.length + numResults: this.collection.fullCollection.length, + pageNum: this.collection.state.currentPage, + numPages: this.collection.state.totalPages, + hasNextPage: this.collection.hasNextPage(), + hasPrevPage: this.collection.hasPreviousPage() }; + }, + + prevPage: function() { + this.collection.getPreviousPage(); + this.render(); + }, + + nextPage: function() { + this.collection.getNextPage(); + this.render(); } }); diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index a4fff2efd..16d990ddc 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -254,11 +254,28 @@ padding: 0px; } +.data-catalog-popover-pagination { + text-align: center; +} + +.data-catalog-popover-pagination +.data-catalog-popover-pagination-btn { + border: none; + background: none; + &:disabled { + color: $ui-light; + } +} + +.data-catalog-popover-pagination-btn, .data-catalog-popover-num-results { - color: $ui-secondary; // Important because leaflet popup title // tries to add a margin-bottom margin-bottom: 0 !important; +} + +.data-catalog-popover-num-results { + color: $ui-secondary; font-weight: 800; padding: 6px; padding-top: 0; From 7583d7d2dbb68256a5e47b293df827f7e576f629 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Tue, 3 Oct 2017 14:52:37 -0400 Subject: [PATCH 024/172] BiG-CZ: Link Popup Active+Highlight States With Sidebar And Map * Highlight the sidebar list item and map element when hovering a popup list * This involved changing the way we add the "ring" highlight to the map when the shape is outside the viewport bounds for CINERGI - Before we were using jquery to add a "highlight" class to the map container. This caused additional mouseenter and mouseleave events to fire on the popup list element. The cursor and highlighting would flicker - Switch to adding a whole DOM element to show the "highlight" ring. This does not cause additional mouse events to fire. --- src/mmw/js/src/core/views.js | 8 +++++-- src/mmw/js/src/data_catalog/views.js | 16 +++++++++++++- src/mmw/sass/base/_map.scss | 33 ++++++++++++++-------------- 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/src/mmw/js/src/core/views.js b/src/mmw/js/src/core/views.js index 465f95388..e311cbbbf 100644 --- a/src/mmw/js/src/core/views.js +++ b/src/mmw/js/src/core/views.js @@ -800,7 +800,7 @@ var MapView = Marionette.ItemView.extend({ _renderDataCatalogResult: function(result, featureGroup, className, style) { featureGroup.clearLayers(); - this.$el.removeClass(className); + $("div.map-highlight").remove(); // If nothing is selected, exit early if (!result) { return; } @@ -811,7 +811,11 @@ var MapView = Marionette.ItemView.extend({ if (geom) { if ((geom.type === 'MultiPolygon' || geom.type === 'Polygon') && drawUtils.shapeBoundingBox(geom).contains(mapBounds)) { - this.$el.addClass(className); + + $(".map-container") + .append('
        '); } else { var layer = this.createDataCatalogShape(result); layer.setStyle(style); diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index d148745d1..28ebba4d9 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -514,7 +514,9 @@ var ResultMapPopoverListItemView = Marionette.ItemView.extend({ }, events: { - 'click @ui.selectButton': 'selectItem' + 'click @ui.selectButton': 'selectItem', + 'mouseover': 'highlightResult', + 'mouseout': 'unHighlightResult' }, templateHelpers: function() { @@ -525,6 +527,16 @@ var ResultMapPopoverListItemView = Marionette.ItemView.extend({ selectItem: function() { this.options.popoverModel.set('activeResult', this.model); + }, + + highlightResult: function() { + App.map.set('dataCatalogActiveResult', this.model); + this.model.set('active', true); + }, + + unHighlightResult: function() { + App.map.set('dataCatalogActiveResult', null); + this.model.set('active', false); } }); @@ -599,6 +611,8 @@ var ResultMapPopoverControllerView = Marionette.LayoutView.extend({ catalog: this.options.catalog })); } else { + App.map.set('dataCatalogActiveResult', null); + this.model.set('active', false); this.container.show(new ResultMapPopoverListView({ collection: this.collection, popoverModel: this.model, diff --git a/src/mmw/sass/base/_map.scss b/src/mmw/sass/base/_map.scss index 5e0fb9e88..57b7e24ce 100644 --- a/src/mmw/sass/base/_map.scss +++ b/src/mmw/sass/base/_map.scss @@ -40,22 +40,6 @@ right: 0; left: 0; height: 100%; - - &.bigcz-highlight-map:after { - content: ""; - border: 3px solid gold; - width: 100%; - height: 100%; - position: absolute; - } - - &.bigcz-detail-map:after { - content: ""; - border: 3px solid steelblue; - width: 100%; - height: 100%; - position: absolute; - } } #overlay-subclass-vector .disabled, #overlay-subclass-raster .disabled { @@ -297,3 +281,20 @@ div.leaflet-popup-content-wrapper { margin: 0; } } + +.map-highlight.bigcz-highlight-map, +.map-highlight.bigcz-detail-map { + pointer-events: none; + width: 100%; + height: 100%; + position: absolute; + z-index: 100; +} + +.map-highlight.bigcz-highlight-map { + border: 3px solid gold; +} + +.map-highlight.bigcz-detail-map { + border: 3px solid steelblue; +} From 9bb0e532f96d2b677e323279b3d3a9af732a472e Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Thu, 5 Oct 2017 13:42:27 -0400 Subject: [PATCH 025/172] BiG-CZ: On list popup close, clear active styling --- src/mmw/js/src/core/views.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mmw/js/src/core/views.js b/src/mmw/js/src/core/views.js index e311cbbbf..f7146d7b1 100644 --- a/src/mmw/js/src/core/views.js +++ b/src/mmw/js/src/core/views.js @@ -893,6 +893,13 @@ var MapView = Marionette.ItemView.extend({ }).render().el, clickLatLng, { className: 'data-catalog-popover-list' }); + + self._leafletMap.once('popupclose', function() { + self.model.set('dataCatalogActiveResult', null); + _.forEach(intersectingResults, function(result) { + result.set('active', false); + }); + }); }; // Remove all existing event listeners/popups that might be from the other catalogs From bb0a409e22247f92afefc10f751725fcef50d918 Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Thu, 5 Oct 2017 14:54:42 -0400 Subject: [PATCH 026/172] Adjust PostgreSQL versions to fix package installs The PostgreSQL 10 release has caused a number of changes to the official APT repositories we depend on. Many of the core packages begin with 10.x. Also, Psycopg2 2.6.x had a bug where it was expecting PostgreSQL version numbers in the 9.x range. --- deployment/ansible/group_vars/all | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all index 9a695f007..5f70c5d41 100644 --- a/deployment/ansible/group_vars/all +++ b/deployment/ansible/group_vars/all @@ -23,8 +23,8 @@ postgresql_database: mmw postgresql_version: "9.4" postgresql_package_version: "9.4.*.pgdg14.04+1" postgresql_support_repository_channel: "main" -postgresql_support_libpq_version: "9.6.*.pgdg14.04+1" -postgresql_support_psycopg2_version: "2.6" +postgresql_support_libpq_version: "10.0-*.pgdg14.04+1" +postgresql_support_psycopg2_version: "2.7" postgis_version: "2.1" postgis_package_version: "2.1.*.pgdg14.04+1" From decd019543be277b0396fde52fd9b217e6232fac Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Fri, 6 Oct 2017 12:23:34 -0400 Subject: [PATCH 027/172] Upgrade RWD to 1.2.3 - upgrade RWD to 1.2.3 to incorporate rounding watershed latlngs to 6 trailing decimal places --- .../ansible/roles/model-my-watershed.rwd/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml b/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml index 90199a7ed..de979dfbe 100644 --- a/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml +++ b/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml @@ -2,7 +2,7 @@ rwd_data_path: "/opt/rwd-data" rwd_host: "localhost" rwd_port: 5000 -rwd_docker_image: "quay.io/wikiwatershed/rwd:1.2.2" +rwd_docker_image: "quay.io/wikiwatershed/rwd:1.2.3" app_config: RWD_HOST: "{{ rwd_host }}" From b9055f4186175d1c6dee321975197fcc85481ba9 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 10:53:42 -0400 Subject: [PATCH 028/172] Upgrade pip and add Ulmo Ulmo (https://github.com/ulmo-dev/ulmo/) is a data access library designed to fetch information from various hydrology and climatology sources. It works on the WaterML standard, which is a protocol built on top of SOAP. We will use it to fetch detailed values for sensor data from CUAHSI. Also upgrade pip which speeds up our Python dependency installation step significantly. --- deployment/ansible/roles.yml | 2 +- src/mmw/requirements/base.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml index 4cd4b9f0a..7e061e4e5 100644 --- a/deployment/ansible/roles.yml +++ b/deployment/ansible/roles.yml @@ -1,7 +1,7 @@ - src: azavea.ntp version: 0.1.1 - src: azavea.pip - version: 0.1.1 + version: 1.0.0 - src: azavea.nodejs version: 0.3.0 - src: azavea.git diff --git a/src/mmw/requirements/base.txt b/src/mmw/requirements/base.txt index 8839ad100..4d8a84f6a 100644 --- a/src/mmw/requirements/base.txt +++ b/src/mmw/requirements/base.txt @@ -19,3 +19,4 @@ retry==0.9.1 python-dateutil==2.6.0 suds==0.4 django_celery_results==1.0.1 +ulmo==0.8.4 From b3cb9fb1f4905b90b38b6a20148e39e4a6b05d06 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 11:07:05 -0400 Subject: [PATCH 029/172] Return more details for Variables Previously, a CUAHSI search would have a `concept_keywords` array of strings, corresponding to each variable. Now that we want to fetch more detailed values, we switch to having an array of `variables`, each of which in addition to `id`, `name` (that tends to be longer, more like a description than name), and `concept_keyword`, has a `site` and `wsdl` which will be used to fetch values for that variable in a given timespan. This array is sorted by `concept_keyword`, which will also be used as a display label in the UI. --- src/mmw/apps/bigcz/clients/cuahsi/models.py | 7 ++++--- src/mmw/apps/bigcz/clients/cuahsi/search.py | 11 +++++++++-- src/mmw/apps/bigcz/clients/cuahsi/serializers.py | 11 ++++++++++- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/cuahsi/models.py b/src/mmw/apps/bigcz/clients/cuahsi/models.py index 8a5c757db..7e304c00e 100644 --- a/src/mmw/apps/bigcz/clients/cuahsi/models.py +++ b/src/mmw/apps/bigcz/clients/cuahsi/models.py @@ -9,15 +9,16 @@ class CuahsiResource(Resource): def __init__(self, id, description, author, links, title, created_at, updated_at, geom, details_url, sample_mediums, - concept_keywords, service_org, service_code, service_url, - service_title, service_citation, begin_date, end_date): + variables, service_org, service_code, service_url, + service_title, service_citation, + begin_date, end_date): super(CuahsiResource, self).__init__(id, description, author, links, title, created_at, updated_at, geom) self.details_url = details_url self.sample_mediums = sample_mediums - self.concept_keywords = concept_keywords + self.variables = variables self.service_org = service_org self.service_code = service_code self.service_url = service_url diff --git a/src/mmw/apps/bigcz/clients/cuahsi/search.py b/src/mmw/apps/bigcz/clients/cuahsi/search.py index fbc4fee50..3e0f05b93 100644 --- a/src/mmw/apps/bigcz/clients/cuahsi/search.py +++ b/src/mmw/apps/bigcz/clients/cuahsi/search.py @@ -6,7 +6,7 @@ from datetime import date from urllib2 import URLError from socket import timeout -from operator import attrgetter +from operator import attrgetter, itemgetter from suds.client import Client from suds.sudsobject import asdict @@ -126,7 +126,7 @@ def parse_record(record, service): geom=geom, details_url=details_url, sample_mediums=record['sample_mediums'], - concept_keywords=record['concept_keywords'], + variables=record['variables'], service_org=service['organization'], service_code=record['serv_code'], service_url=service['ServiceDescriptionURL'], @@ -189,6 +189,13 @@ def group_series_by_location(series): for r in group]), 'end_date': max([parse_date(r['endDate']) for r in group]), + 'variables': sorted([{ + 'id': r['VarCode'], + 'name': r['VarName'], + 'concept_keyword': r['conceptKeyword'], + 'site': r['location'], + 'wsdl': r['ServURL'], + } for r in group], key=itemgetter('concept_keyword')) }) return records diff --git a/src/mmw/apps/bigcz/clients/cuahsi/serializers.py b/src/mmw/apps/bigcz/clients/cuahsi/serializers.py index 549a971a0..2d30c1893 100644 --- a/src/mmw/apps/bigcz/clients/cuahsi/serializers.py +++ b/src/mmw/apps/bigcz/clients/cuahsi/serializers.py @@ -6,15 +6,24 @@ from rest_framework.serializers import (CharField, DateTimeField, ListField, + Serializer, ) from apps.bigcz.serializers import ResourceSerializer +class CuahsiVariableSetSerializer(Serializer): + id = CharField() + name = CharField() + concept_keyword = CharField() + site = CharField() + wsdl = CharField() + + class CuahsiResourceSerializer(ResourceSerializer): details_url = CharField() sample_mediums = ListField(child=CharField()) - concept_keywords = ListField(child=CharField()) + variables = ListField(child=CuahsiVariableSetSerializer()) service_org = CharField() service_code = CharField() service_url = CharField() From 2c2d41f700cedc9b650decc804d6e4371ceb760f Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 11:41:40 -0400 Subject: [PATCH 030/172] Add `details` and `values` endpoints For fetching CUAHSI variable values, we add two endpoints: `details` expects a `wsdl` and `site` parameter, and uses it to fetch the WaterML siteinfo object for the given site from the given wsdl url. This siteinfo object contains details for the variables in the site, including units, and the time ranges for which each variable has values. This information is important, because if we query for `values` with a time outside this range, the endpoint crashes. `values` expects a `wsdl`, `site`, `variable`, `from_date` and `to_date`, and uses it to fetch the values of that variable at that site in the given time range, and returns the WaterML value object. The expected use is one call to `details` for a site, to fetch units and time ranges for each variable, and then a call to `values` for each variable in the site, fetching its values for the given time range. --- Notes: 1. The WaterML objects themselves are complex and elaborate, with many nested keys and arrays. Fortunately, we don't need to write our own serializers for them, because that is all taken care of within Ulmo. Furthermore, because of WaterML being an underlying standard, we can reasonably expect the data to follow a certain shape, and exercise this assumption all the way on the client side, without having to verify it on the server. 2. Ulmo uses suds under the hood to make SOAP requests, and by default uses the suds cache, which is distinct from the redis cache used elsewhere in the app (for Geoprocessing, etc). I have not looked into changing this default behavior, leaving it to a future investigation should the need arise. --- src/mmw/apps/bigcz/clients/__init__.py | 2 + src/mmw/apps/bigcz/clients/cuahsi/__init__.py | 1 + src/mmw/apps/bigcz/clients/cuahsi/details.py | 55 +++++++++++++ src/mmw/apps/bigcz/urls.py | 2 + src/mmw/apps/bigcz/views.py | 79 ++++++++++++++++++- 5 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 src/mmw/apps/bigcz/clients/cuahsi/details.py diff --git a/src/mmw/apps/bigcz/clients/__init__.py b/src/mmw/apps/bigcz/clients/__init__.py index 5b97a5cdb..a8db2e15f 100644 --- a/src/mmw/apps/bigcz/clients/__init__.py +++ b/src/mmw/apps/bigcz/clients/__init__.py @@ -22,6 +22,8 @@ 'model': cuahsi.model, 'serializer': cuahsi.serializer, 'search': cuahsi.search, + 'details': cuahsi.details, + 'values': cuahsi.values, 'is_pageable': False, }, } diff --git a/src/mmw/apps/bigcz/clients/cuahsi/__init__.py b/src/mmw/apps/bigcz/clients/cuahsi/__init__.py index 57f81b9fb..2dae317d7 100644 --- a/src/mmw/apps/bigcz/clients/cuahsi/__init__.py +++ b/src/mmw/apps/bigcz/clients/cuahsi/__init__.py @@ -8,6 +8,7 @@ # Import catalog name and search function, so it can be exported from here from apps.bigcz.clients.cuahsi.search import CATALOG_NAME, search # NOQA +from apps.bigcz.clients.cuahsi.details import details, values # NOQA model = CuahsiResource serializer = CuahsiResourceSerializer diff --git a/src/mmw/apps/bigcz/clients/cuahsi/details.py b/src/mmw/apps/bigcz/clients/cuahsi/details.py new file mode 100644 index 000000000..fdcbd7aaf --- /dev/null +++ b/src/mmw/apps/bigcz/clients/cuahsi/details.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division + +from datetime import date, timedelta + +from rest_framework.exceptions import ValidationError + +from ulmo.cuahsi import wof + +DATE_FORMAT = '%m/%d/%Y' + + +def details(wsdl, site): + if not wsdl: + raise ValidationError({ + 'error': 'Required argument: wsdl'}) + + if not site: + raise ValidationError({ + 'error': 'Required argument: site'}) + + if not wsdl.upper().endswith('?WSDL'): + wsdl += '?WSDL' + + return wof.get_site_info(wsdl, site) + + +def values(wsdl, site, variable, from_date=None, to_date=None): + if not wsdl: + raise ValidationError({ + 'error': 'Required argument: wsdl'}) + + if not site: + raise ValidationError({ + 'error': 'Required argument: site'}) + + if not variable: + raise ValidationError({ + 'error': 'Required argument: variable'}) + + if not to_date: + # Set to default value of today + to_date = date.today().strftime(DATE_FORMAT) + + if not from_date: + # Set to default value of one week ago + from_date = (date.today() - + timedelta(days=7)).strftime(DATE_FORMAT) + + if not wsdl.upper().endswith('?WSDL'): + wsdl += '?WSDL' + + return wof.get_values(wsdl, site, variable, from_date, to_date) diff --git a/src/mmw/apps/bigcz/urls.py b/src/mmw/apps/bigcz/urls.py index db43e0c10..43becf18a 100644 --- a/src/mmw/apps/bigcz/urls.py +++ b/src/mmw/apps/bigcz/urls.py @@ -10,4 +10,6 @@ urlpatterns = patterns( '', url(r'^search$', views.search, name='bigcz_search'), + url(r'^details$', views.details, name='bigcz_details'), + url(r'^values$', views.values, name='bigcz_values'), ) diff --git a/src/mmw/apps/bigcz/views.py b/src/mmw/apps/bigcz/views.py index 5004f9623..3fa0fbbed 100644 --- a/src/mmw/apps/bigcz/views.py +++ b/src/mmw/apps/bigcz/views.py @@ -8,7 +8,7 @@ from django.contrib.gis.geos import GEOSGeometry from django.conf import settings from rest_framework import decorators -from rest_framework.exceptions import ValidationError, ParseError +from rest_framework.exceptions import ValidationError, ParseError, NotFound from rest_framework.permissions import AllowAny from rest_framework.response import Response @@ -87,7 +87,84 @@ def _do_search(request): raise ParseError(ex.message) +def _get_details(request): + params = request.query_params + catalog = params.get('catalog') + + if not catalog: + raise ValidationError({ + 'error': 'Required argument: catalog'}) + + if catalog not in CATALOGS: + raise ValidationError({ + 'error': 'Catalog must be one of: {}' + .format(', '.join(CATALOGS.keys()))}) + + details = CATALOGS[catalog]['details'] + + if not details: + raise NotFound({ + 'error': 'No details endpoint for {}' + .format(catalog)}) + + details_kwargs = { + 'wsdl': params.get('wsdl'), + 'site': params.get('site'), + } + + try: + return details(**details_kwargs) + except ValueError as ex: + raise ParseError(ex.message) + + +def _get_values(request): + params = request.query_params + catalog = params.get('catalog') + + if not catalog: + raise ValidationError({ + 'error': 'Required argument: catalog'}) + + if catalog not in CATALOGS: + raise ValidationError({ + 'error': 'Catalog must be one of: {}' + .format(', '.join(CATALOGS.keys()))}) + + values = CATALOGS[catalog]['values'] + + if not values: + raise NotFound({ + 'error': 'No values endpoint for {}' + .format(catalog)}) + + values_kwargs = { + 'wsdl': params.get('wsdl'), + 'site': params.get('site'), + 'variable': params.get('variable'), + 'from_date': params.get('from_date'), + 'to_date': params.get('to_date'), + } + + try: + return values(**values_kwargs) + except ValueError as ex: + raise ParseError(ex.message) + + @decorators.api_view(['POST']) @decorators.permission_classes((AllowAny,)) def search(request): return Response(_do_search(request)) + + +@decorators.api_view(['GET']) +@decorators.permission_classes((AllowAny,)) +def details(request): + return Response(_get_details(request)) + + +@decorators.api_view(['GET']) +@decorators.permission_classes((AllowAny,)) +def values(request): + return Response(_get_values(request)) From e049d8debf8e68b8e62eeb65a9e83f6c2d192472 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 16:28:53 -0400 Subject: [PATCH 031/172] Include geometry for HydroShare results Previously the HydroShare API did not send any geometries in its responses. Now, the "coverages" key is an array of (at least) two types of values: period and box, for time and geography respectively. We translate the box coverage into a geometry if it is included. It behaves identically to CINERGI in the UI, with respect to multiple overlapping popups and polygons that exceed the map bounds. --- .../apps/bigcz/clients/hydroshare/search.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/mmw/apps/bigcz/clients/hydroshare/search.py b/src/mmw/apps/bigcz/clients/hydroshare/search.py index f5952aca3..cf66b584f 100644 --- a/src/mmw/apps/bigcz/clients/hydroshare/search.py +++ b/src/mmw/apps/bigcz/clients/hydroshare/search.py @@ -8,6 +8,7 @@ from rest_framework.exceptions import ValidationError from django.conf import settings +from django.contrib.gis.geos import Polygon from apps.bigcz.models import Resource, ResourceLink, ResourceList from apps.bigcz.utils import RequestTimedOutError @@ -21,6 +22,21 @@ def parse_date(value): return dateutil.parser.parse(value) +def parse_geom(coverages): + if coverages: + box = [c['value'] for c in coverages if c['type'] == 'box'][0] + if box: + return Polygon(( + (float(box['westlimit']), float(box['northlimit'])), + (float(box['eastlimit']), float(box['northlimit'])), + (float(box['eastlimit']), float(box['southlimit'])), + (float(box['westlimit']), float(box['southlimit'])), + (float(box['westlimit']), float(box['northlimit'])), + )) + + return None + + def parse_record(item): return Resource( id=item['resource_id'], @@ -32,7 +48,7 @@ def parse_record(item): ], created_at=parse_date(item['date_created']), updated_at=parse_date(item['date_last_updated']), - geom=None) + geom=parse_geom(item['coverages'])) def prepare_bbox(box): From 2b60667c1ec79f956cd347805024695aac7fefe7 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 10 Oct 2017 15:15:54 -0400 Subject: [PATCH 032/172] Reduce precipitation significant digits to 1 It is unlikely that the underlying data is accurate to 1/10 of a millimeter. --- src/mmw/js/src/analyze/templates/climateTable.html | 2 +- src/mmw/js/src/analyze/templates/climateTableRow.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mmw/js/src/analyze/templates/climateTable.html b/src/mmw/js/src/analyze/templates/climateTable.html index 3da4d7654..9f8b6da83 100644 --- a/src/mmw/js/src/analyze/templates/climateTable.html +++ b/src/mmw/js/src/analyze/templates/climateTable.html @@ -16,7 +16,7 @@ Annual - {{ totalPpt|round(2)|toLocaleString(2) }} + {{ totalPpt|round(1)|toLocaleString(1) }} {{ avgTmean|round(1)|toLocaleString(1) }} diff --git a/src/mmw/js/src/analyze/templates/climateTableRow.html b/src/mmw/js/src/analyze/templates/climateTableRow.html index e87bd0f10..e4761f299 100644 --- a/src/mmw/js/src/analyze/templates/climateTableRow.html +++ b/src/mmw/js/src/analyze/templates/climateTableRow.html @@ -1,4 +1,4 @@ {{ monthidx }} {{ month }} -{{ ppt|round(2)|toLocaleString(2) }} +{{ ppt|round(1)|toLocaleString(1) }} {{ tmean|round(1)|toLocaleString(1) }} From 131a2c7f5fe66227d90cd21f9423b37384e18c55 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 10 Oct 2017 15:17:20 -0400 Subject: [PATCH 033/172] Reduce significant digits in Climate charts Add a yTickFormat option field, defaulting to previously hard-coded 2 decimal places, but allowing the caller to override with a format. For the climate charts, we set to 1 decimal place. --- src/mmw/js/src/analyze/views.js | 1 + src/mmw/js/src/core/chart.js | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mmw/js/src/analyze/views.js b/src/mmw/js/src/analyze/views.js index 091054f9b..812eb2415 100644 --- a/src/mmw/js/src/analyze/views.js +++ b/src/mmw/js/src/analyze/views.js @@ -1228,6 +1228,7 @@ var ClimateChartView = ChartView.extend({ return monthNames[x]; }, xTickValues: lodash.range(12), + yTickFormat: '0.01f', }; $(chartEl).empty(); diff --git a/src/mmw/js/src/core/chart.js b/src/mmw/js/src/core/chart.js index 93b8adad4..d45205889 100644 --- a/src/mmw/js/src/core/chart.js +++ b/src/mmw/js/src/core/chart.js @@ -283,7 +283,8 @@ function renderLineChart(chartEl, data, options) { options = options || {}; _.defaults(options, { - margin: {top: 20, right: 30, bottom: 40, left: 60} + margin: {top: 20, right: 30, bottom: 40, left: 60}, + yTickFormat: '.02f', }); nv.addGraph(function() { @@ -298,7 +299,7 @@ function renderLineChart(chartEl, data, options) { chart.yAxis .axisLabel(options.yAxisLabel) - .tickFormat(d3.format('.02f')); + .tickFormat(d3.format(options.yTickFormat)); chart.tooltip.valueFormatter(function(d) { return chart.yAxis.tickFormat()(d) + ' ' + options.yAxisUnit; From 2c1946e35f3996f87ab91d0e874e6057d075b246 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Tue, 10 Oct 2017 13:10:45 -0400 Subject: [PATCH 034/172] Pass /account browser url to app * We'll be adding a new page: the Account Page * Allow the /account url to feed through to the web app, so that it can handle it accordingly --- src/mmw/apps/home/urls.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mmw/apps/home/urls.py b/src/mmw/apps/home/urls.py index 592b0a0f4..11f1b2f57 100644 --- a/src/mmw/apps/home/urls.py +++ b/src/mmw/apps/home/urls.py @@ -11,6 +11,7 @@ '', url(r'^$', home_page, name='home_page'), url(r'^draw/?$', home_page, name='home_page'), + url(r'^account/?$', home_page, name='account'), url(r'^projects/$', projects, name='projects'), url(r'^project/$', project, name='project'), url(r'^project/new/', project, name='project'), From 260fd3f38a4b091594206ec8e0d8ff750087c2e1 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Tue, 10 Oct 2017 14:36:33 -0400 Subject: [PATCH 035/172] Replace stock DRF obtain_auth_token view with custom get_auth_token * New endpoint: /api/token * Add a view to get a user's auth token either via: - session auth (we'll use this view to display/regenerate the token in the web app) - a json body with the username and password. Created a custom Authentication DRF class to mimic the way the stock `obtain_auth_token` endpoint behaved. This will allow programmatic-only users to get their tokens without having to go to the webapp * Display authtoken view in swagger UI --- src/mmw/apps/geoprocessing_api/permissions.py | 26 ++++++ src/mmw/apps/geoprocessing_api/tests.py | 83 ++++++++++++++++++- src/mmw/apps/geoprocessing_api/urls.py | 3 +- src/mmw/apps/geoprocessing_api/views.py | 39 ++++++++- src/mmw/mmw/settings/base.py | 1 - 5 files changed, 147 insertions(+), 5 deletions(-) create mode 100644 src/mmw/apps/geoprocessing_api/permissions.py diff --git a/src/mmw/apps/geoprocessing_api/permissions.py b/src/mmw/apps/geoprocessing_api/permissions.py new file mode 100644 index 000000000..aafbd768a --- /dev/null +++ b/src/mmw/apps/geoprocessing_api/permissions.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +from __future__ import print_function +from __future__ import unicode_literals + +from rest_framework import authentication +from rest_framework.authtoken.serializers import AuthTokenSerializer + + +class AuthTokenSerializerAuthentication(authentication.BaseAuthentication): + def authenticate(self, request): + + # if the user has made no attempt to add + # credentials via the request body, + # pass through so other authentication + # can be tried + username = request.data.get('username', None) + password = request.data.get('password', None) + if not username and not password: + return None + + serializer = AuthTokenSerializer(data=request.data, + context={'request': request}) + serializer.is_valid(raise_exception=True) + user = serializer.validated_data['user'] + + return(user, None) diff --git a/src/mmw/apps/geoprocessing_api/tests.py b/src/mmw/apps/geoprocessing_api/tests.py index 63557c788..8eef67868 100644 --- a/src/mmw/apps/geoprocessing_api/tests.py +++ b/src/mmw/apps/geoprocessing_api/tests.py @@ -3,11 +3,92 @@ from __future__ import unicode_literals from __future__ import division -from django.test import TestCase +import json + +from django.test import (Client, + TestCase, + LiveServerTestCase) +from django.contrib.auth.models import User + +from rest_framework.authtoken.models import Token from apps.geoprocessing_api import tasks +class ExerciseManageApiToken(LiveServerTestCase): + TOKEN_URL = 'http://localhost:8081/api/token/' + + def setUp(self): + User.objects.create_user(username='bob', email='bob@azavea.com', + password='bob') + + User.objects.create_user(username='nono', email='nono@azavea.com', + password='nono') + + def get_logged_in_session(self, username, password): + c = Client() + c.login(username=username, + password=password) + return c + + def get_api_token(self, username='', password='', + session=None): + if not session: + session = Client() + + payload = None + if username or password: + payload = {'username': username, + 'password': password} + + return session.post(self.TOKEN_URL, + data=payload) + + def test_get_api_token_no_credentials_returns_400(self): + response = self.get_api_token() + self.assertEqual(response.status_code, 403, + 'Incorrect server response. Expected 403 found %s %s' + % (response.status_code, response.content)) + + def test_get_api_token_bad_body_credentials_returns_400(self): + response = self.get_api_token('bad', 'bad') + self.assertEqual(response.status_code, 400, + 'Incorrect server response. Expected 400 found %s %s' + % (response.status_code, response.content)) + + def test_get_api_token_good_body_credentials_returns_200(self): + response = self.get_api_token('bob', 'bob') + self.assertEqual(response.status_code, 200, + 'Incorrect server response. Expected 200 found %s %s' + % (response.status_code, response.content)) + + def test_get_api_token_good_session_credentials_returns_200(self): + s = self.get_logged_in_session('bob', 'bob') + response = self.get_api_token(session=s) + self.assertEqual(response.status_code, 200, + 'Incorrect server response. Expected 200 found %s %s' + % (response.status_code, response.content)) + + def test_get_api_token_uses_body_credentials_over_session(self): + bob_user = User.objects.get(username='bob') + bob_token = Token.objects.get(user=bob_user) + + s = self.get_logged_in_session('nono', 'nono') + response = self.get_api_token('bob', 'bob', s) + + self.assertEqual(response.status_code, 200, + 'Incorrect server response. Expected 200 found %s %s' + % (response.status_code, response.content)) + + response_token = json.loads(response.content)['token'] + + self.assertEqual(str(response_token), str(bob_token), + """ Incorrect server response. + Expected to get token for user + given in request body %s, but got %s + """ % (bob_token, response_token)) + + class ExerciseAnalyze(TestCase): def test_survey_land(self): self.maxDiff = None diff --git a/src/mmw/apps/geoprocessing_api/urls.py b/src/mmw/apps/geoprocessing_api/urls.py index 872a67edd..7b322ff7e 100644 --- a/src/mmw/apps/geoprocessing_api/urls.py +++ b/src/mmw/apps/geoprocessing_api/urls.py @@ -4,7 +4,6 @@ from __future__ import division from django.conf.urls import include, patterns, url -import rest_framework.authtoken.views from apps.modeling.views import get_job from apps.modeling.urls import uuid_regex @@ -14,7 +13,7 @@ urlpatterns = patterns( '', url(r'^docs/', include('rest_framework_swagger.urls')), - url(r'^api-token-auth/', rest_framework.authtoken.views.obtain_auth_token, + url(r'^token/', views.get_auth_token, name="authtoken"), url(r'analyze/land/$', views.start_analyze_land, name='start_analyze_land'), diff --git a/src/mmw/apps/geoprocessing_api/views.py b/src/mmw/apps/geoprocessing_api/views.py index 04d74671c..b7c7e557c 100644 --- a/src/mmw/apps/geoprocessing_api/views.py +++ b/src/mmw/apps/geoprocessing_api/views.py @@ -6,8 +6,10 @@ from rest_framework.response import Response from rest_framework import decorators -from rest_framework.authentication import TokenAuthentication +from rest_framework.authentication import (TokenAuthentication, + SessionAuthentication) from rest_framework.permissions import IsAuthenticated +from rest_framework.authtoken.models import Token from django.utils.timezone import now from django.core.urlresolvers import reverse @@ -20,6 +22,41 @@ from apps.modeling import geoprocessing from apps.modeling.views import load_area_of_interest from apps.geoprocessing_api import tasks +from apps.geoprocessing_api.permissions import AuthTokenSerializerAuthentication # noqa + + +@decorators.api_view(['POST']) +@decorators.authentication_classes((AuthTokenSerializerAuthentication, + SessionAuthentication, )) +@decorators.permission_classes((IsAuthenticated, )) +def get_auth_token(request, format=None): + """ + Get your API key + + + ## Request Body + + { + "username": "your_username", + "password": "your_password" + } + + ## Sample Response + + { + "token": "ea467ed7f67c53cfdd313198647a1d187b4d3ab9", + "created_at": "2017-09-11T14:50:54.738Z" + } + --- + omit_serializer: true + consumes: + - application/json + produces: + - application/json + """ + token, created = Token.objects.get_or_create(user=request.user) + return Response({'token': token.key, + 'created_at': token.created}) @decorators.api_view(['POST']) diff --git a/src/mmw/mmw/settings/base.py b/src/mmw/mmw/settings/base.py index 000ade3ae..ef92f04b7 100644 --- a/src/mmw/mmw/settings/base.py +++ b/src/mmw/mmw/settings/base.py @@ -308,7 +308,6 @@ def get_env_setting(setting): } SWAGGER_SETTINGS = { - 'exclude_url_names': ['authtoken'], 'exclude_namespaces': ['bigcz', 'mmw', 'user'], From f2101bf93c899d18a93a4702d43d2330cfd31fd7 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 13:14:54 -0400 Subject: [PATCH 036/172] Adapt search results to API updates Previously concept_keywords was a simple array, which could be joined in the template. Now we get a variables array of objects, each of which have a concept_keyword field. We pluck the values in templateHelpers and use the final string in the template. --- .../src/data_catalog/templates/searchResultCuahsi.html | 2 +- src/mmw/js/src/data_catalog/views.js | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/data_catalog/templates/searchResultCuahsi.html b/src/mmw/js/src/data_catalog/templates/searchResultCuahsi.html index 7dd66856a..41a088fd1 100644 --- a/src/mmw/js/src/data_catalog/templates/searchResultCuahsi.html +++ b/src/mmw/js/src/data_catalog/templates/searchResultCuahsi.html @@ -9,7 +9,7 @@

        - {{ concept_keywords|join("; ") }} + {{ concept_keywords }}
        diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 28ebba4d9..a65a13cff 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -396,6 +396,16 @@ var StaticResultView = Marionette.ItemView.extend({ return CATALOG_RESULT_TEMPLATE[this.options.catalog]; }, + templateHelpers: function() { + if (this.options.catalog === 'cuahsi') { + return { + 'concept_keywords': this.model.get('variables') + .pluck('concept_keyword') + .join('; '), + }; + } + }, + modelEvents: { 'change:active': 'render' }, From 1b92e1182baf0ab1afea62718897653810747eba Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 14:17:40 -0400 Subject: [PATCH 037/172] Robustify toTimeAgo filter Prefer using standard library over hackneyed solution --- src/mmw/js/src/core/filters.js | 26 ++----------------- .../templates/resultDetailsCuahsi.html | 2 +- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/mmw/js/src/core/filters.js b/src/mmw/js/src/core/filters.js index 2158a9d5d..780c32fd8 100644 --- a/src/mmw/js/src/core/filters.js +++ b/src/mmw/js/src/core/filters.js @@ -3,6 +3,7 @@ var nunjucks = require('nunjucks'); var utils = require('./utils'); var _ = require('lodash'); +var moment = require('moment'); nunjucks.env = new nunjucks.Environment(); @@ -61,30 +62,7 @@ nunjucks.env.addFilter('toDateWithoutTime', function(date) { }); nunjucks.env.addFilter('toTimeAgo', function(date) { - var diff = Date.now() - (new Date(date)).getTime(), - secs = diff / 1000, - mins = secs / 60, - hrs = mins / 60, - days = hrs / 24, - wks = days / 7, - mths = days / 30, - yrs = days / 365; - - if (yrs > 1) { - return Math.floor(yrs) + " years ago"; - } else if (mths > 1) { - return Math.floor(mths) + " months ago"; - } else if (wks > 1) { - return Math.floor(wks) + " weeks ago"; - } else if (days > 1) { - return Math.floor(days) + " days ago"; - } else if (hrs > 1) { - return Math.floor(hrs) + " hours ago"; - } else if (mins > 1) { - return Math.floor(mins) + " minutes ago"; - } else { - return Math.floor(secs) + " seconds ago"; - } + return moment(date).fromNow(); }); nunjucks.env.addFilter('split', function(str, splitChar, indexToReturn) { diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html index baa09da4f..fff26f9ab 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html @@ -47,7 +47,7 @@

        - Last collected value {{ end_date|toTimeAgo }}: + Last value collected {{ end_date|toTimeAgo }}:

        From 0a1067eb07104751f4de864847329098438c0497 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 11:49:02 -0400 Subject: [PATCH 038/172] Abstract out DATE_FORMAT for reuse --- src/mmw/js/src/data_catalog/models.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 2b23b36d2..2f7b8dada 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -10,6 +10,8 @@ var REQUEST_TIMED_OUT_CODE = 408; var DESCRIPTION_MAX_LENGTH = 100; var PAGE_SIZE = settings.get('data_catalog_page_size'); +var DATE_FORMAT = 'MM/DD/YYYY'; + var FilterModel = Backbone.Model.extend({ defaults: { @@ -76,22 +78,21 @@ var DateFilter = FilterModel.extend({ validate: function() { // Only need to validate if there are two dates. Ensure that // before is earlier than after - var dateFormat = "MM/DD/YYYY", - toDate = this.get('toDate'), + var toDate = this.get('toDate'), fromDate = this.get('fromDate'), isValid = true; - if (toDate && !moment(toDate, dateFormat).isValid()) { + if (toDate && !moment(toDate, DATE_FORMAT).isValid()) { isValid = false; } - if (fromDate && !moment(fromDate, dateFormat).isValid()) { + if (fromDate && !moment(fromDate, DATE_FORMAT).isValid()) { isValid = false; } if (toDate && fromDate){ - isValid = moment(fromDate, dateFormat) - .isBefore(moment(toDate, dateFormat)); + isValid = moment(fromDate, DATE_FORMAT) + .isBefore(moment(toDate, DATE_FORMAT)); } this.set('isValid', isValid); From 107129dc1f07521b3bc453d529a09a9a54d5e0a8 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 12:07:43 -0400 Subject: [PATCH 039/172] Clear lingering popovers The .popover('hide') command only works if the corresponding tag is still in the DOM. If it has been unloaded, but the popup still remains, .popover('hide') does not close it. To close such lingering popovers, we add the explicit command to remove all matching divs. --- src/mmw/js/src/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mmw/js/src/app.js b/src/mmw/js/src/app.js index d3c20da76..7b0d36a33 100644 --- a/src/mmw/js/src/app.js +++ b/src/mmw/js/src/app.js @@ -68,6 +68,7 @@ var App = new Marionette.Application({ // Enabling hiding popovers from within them window.closePopover = function() { $('[data-toggle="popover"]').popover('hide'); + $('.popover').remove(); }; }, From 6e9131424411ba2d35f59f734c2e08d340b6f0de Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 13:00:48 -0400 Subject: [PATCH 040/172] Add CuahsiVariable model and collection CuahsiVariable model and collection represent each variable for a given result. They are initially populated by the /search/ (id, name, concept_keyword, wsdl, site) and /details/ (units, begin_date, end_date) endpoints, but also have additional fields (most_recent_value, values, error) for fetching values. CuahsiVariable support searching, given a time range. The range is validated and capped to the begin and end dates on the model. If none is specified, we go with the most recent week or the entire range, whichever is shorter. When the results return, if there are any values, we populate the most_recent_value field with the last reported value. This field will be used in the table UI. The error field is set if fetching fails, or if the returned set has 0 values. --- src/mmw/js/src/data_catalog/models.js | 91 +++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 2f7b8dada..6005f3fe0 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -397,6 +397,95 @@ var PopoverControllerModel = Backbone.Model.extend({ } }); +var CuahsiVariable = Backbone.Model.extend({ + url: '/bigcz/values', + + defaults: { + id: '', + name: '', + units: '', + concept_keyword: '', + speciation: '', + sample_medium: '', + wsdl: '', + site: '', + values: null, // CuahsiValues Collection + most_recent_value: null, + begin_date: '', + end_date: '', + error: null, + }, + + search: function(from, to) { + var self = this, + begin_date = moment(this.get('begin_date')), + end_date = moment(this.get('end_date')), + params = { + catalog: 'cuahsi', + wsdl: this.get('wsdl'), + site: this.get('site'), + variable: this.get('id'), + }; + + // If neither from date nor to date is specified, set time interval + // to be either from begin date to end date, or 1 week up to end date, + // whichever is shorter. + if (!from || moment(from).isBefore(begin_date)) { + if (end_date.diff(begin_date, 'weeks', true) > 1) { + params.from_date = end_date.subtract(7, 'days'); + } else { + params.from_date = begin_date; + } + } else { + params.from_date = moment(from); + } + + if (!to || moment(to).isAfter(end_date)) { + params.to_date = end_date; + } else { + params.to_date = moment(to); + } + + params.from_date = params.from_date.format(DATE_FORMAT); + params.to_date = params.to_date.format(DATE_FORMAT); + + this.set('error', null); + + return this.fetch({ + data: params, + processData: true, + }) + .fail(function(error) { + self.set('error', 'Error ' + error.status + ' during fetch'); + }); + }, + + parse: function(response) { + var mrv = null; + + if (response.values && response.values.length > 0) { + var values = this.get('values'); + + values.reset(response.values); + mrv = response.values[response.values.length - 1].value; + + delete response.values; + } else { + this.set('error', 'No values returned from API'); + } + + return { + name: response.variable.name, + units: response.variable.units.abbreviation, + most_recent_value: mrv, + }; + } +}); + +var CuahsiVariables = Backbone.Collection.extend({ + model: CuahsiVariable, +}); + module.exports = { GriddedServicesFilter: GriddedServicesFilter, DateFilter: DateFilter, @@ -407,4 +496,6 @@ module.exports = { Results: Results, SearchForm: SearchForm, PopoverControllerModel: PopoverControllerModel, + CuahsiVariable: CuahsiVariable, + CuahsiVariables: CuahsiVariables, }; From 870abc69126b64324c395cfb8122050d57a42d63 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 13:02:00 -0400 Subject: [PATCH 041/172] Add CuahsiValue model and collection CuahsiValue model corresponds to a value object in WaterML. It represents a single value in a series for a variable for a site. --- src/mmw/js/src/data_catalog/models.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 6005f3fe0..a265ffc19 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -397,6 +397,22 @@ var PopoverControllerModel = Backbone.Model.extend({ } }); +var CuahsiValue = Backbone.Model.extend({ + defaults: { + source_id: '', + source_code: '', + quality_control_level_code: '', + value: null, + datetime: '', + date_time_utc: '', + time_offset: '', + } +}); + +var CuahsiValues = Backbone.Collection.extend({ + model: CuahsiValue, +}); + var CuahsiVariable = Backbone.Model.extend({ url: '/bigcz/values', @@ -416,6 +432,10 @@ var CuahsiVariable = Backbone.Model.extend({ error: null, }, + initialize: function() { + this.set('values', new CuahsiValues()); + }, + search: function(from, to) { var self = this, begin_date = moment(this.get('begin_date')), @@ -496,6 +516,8 @@ module.exports = { Results: Results, SearchForm: SearchForm, PopoverControllerModel: PopoverControllerModel, + CuahsiValue: CuahsiValue, + CuahsiValues: CuahsiValues, CuahsiVariable: CuahsiVariable, CuahsiVariables: CuahsiVariables, }; From cc888135f354b938565044762035f82fb7e690dc Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 13:11:30 -0400 Subject: [PATCH 042/172] Fetch CUAHSI Values for Result For a given CUAHSI Result, we add a `fetchCuahsiValues` function that first fetches the /details/ for the result, then fetches /values/ for each variable in the result. If either fetch fails, we set an `error` field to true. A `fetching` field is added to track when the fetch completes. When a CUAHSI Result page is loaded, each result has some fields of every variable filled out: id, name, concept_keyword, wsdl, and site. Before we can fetch the variable values, we need begin_date and end_date, thus we call /details/ to fill those values. Once that succeeds, the actual values can be fetched. `units` are populated both by /details/ and /values/. In most cases they agree, but in some cases they differ. The response from /values/ always overrides /details/, and is considered more accurate. --- src/mmw/js/src/data_catalog/models.js | 104 +++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 3 deletions(-) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index a265ffc19..92ad033a3 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -11,6 +11,7 @@ var DESCRIPTION_MAX_LENGTH = 100; var PAGE_SIZE = settings.get('data_catalog_page_size'); var DATE_FORMAT = 'MM/DD/YYYY'; +var WATERML_VARIABLE_TIME_INTERVAL = '{http://www.cuahsi.org/water_ml/1.1/}variable_time_interval'; var FilterModel = Backbone.Model.extend({ @@ -315,7 +316,105 @@ var Result = Backbone.Model.extend({ created_at: '', updated_at: '', active: false, - show_detail: false // Show this result as the detail view? + show_detail: false, // Show this result as the detail view? + variables: null, // CuahsiVariables Collection + fetching: false, + error: false, + }, + + initialize: function(attrs) { + // For CUAHSI + if (attrs.variables) { + this.set('variables', new CuahsiVariables(attrs.variables)); + } + }, + + parse: function(response) { + // For CUAHSI + if (response.variables) { + var variables = this.get('variables'); + if (variables instanceof CuahsiVariables) { + variables.reset(response.variables); + delete response.variables; + } + } + + return response; + }, + + fetchCuahsiValues: function(opts) { + if (this.fetchPromise && !this.get('error')) { + return this.fetchPromise; + } + + opts = _.defaults(opts || {}, { + onEachSearchDone: _.noop, + onEachSearchFail: _.noop, + from_date: null, + to_date: null, + }); + + var self = this, + variables = self.get('variables'), + runSearches = function() { + return variables.map(function(v) { + return v.search(opts.from_date, opts.to_date) + .done(opts.onEachSearchDone) + .fail(opts.onEachSearchFail); + }); + }, + setSuccess = function() { + self.set('error', false); + }, + setError = function() { + self.set('error', true); + }, + startFetch = function() { + self.set('fetching', true); + }, + endFetch = function() { + self.set('fetching', false); + }; + + startFetch(); + this.fetchPromise = $.get('/bigcz/details', { + catalog: 'cuahsi', + wsdl: variables.first().get('wsdl'), + site: self.get('id'), + }) + .then(function(response) { + variables.forEach(function(v) { + var info = response.series[v.get('id')] || null, + interval = info && info[WATERML_VARIABLE_TIME_INTERVAL]; + + if (info) { + v.set({ + 'units': info.variable.units.abbreviation, + 'speciation': info.variable.speciation, + 'sample_medium': info.variable.sample_medium, + }); + + if (interval) { + v.set({ + 'begin_date': new Date(interval.begin_date_time), + 'end_date': new Date(interval.end_date_time), + }); + } + } + }); + }, function() { + // Handle error in /details/ + setError(); + endFetch(); + }) + .then(function() { + return $.when.apply($, runSearches()) + .done(setSuccess) + .fail(setError) // Handle error in /values/ + .always(endFetch); + }); + + return this.fetchPromise; }, getSummary: function() { @@ -488,14 +587,13 @@ var CuahsiVariable = Backbone.Model.extend({ values.reset(response.values); mrv = response.values[response.values.length - 1].value; - - delete response.values; } else { this.set('error', 'No values returned from API'); } return { name: response.variable.name, + sample_medium: response.variable.sample_medium, units: response.variable.units.abbreviation, most_recent_value: mrv, }; From 09fe45ca2118f0e6871b15dc95d8cd618de56c04 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Tue, 10 Oct 2017 14:58:19 -0400 Subject: [PATCH 043/172] Add "regenerate" flag to /api/token endpoint * Allow the passing of the flag "regenerate" in the request body of /api/token to signal that the current token should be deleted, and a new one returned * Flag is part of the body because endpoint was already made a "POST" endpoint to mimic the DRF "obtain_auth_token" view setup --- src/mmw/apps/geoprocessing_api/tests.py | 49 +++++++++++++++++++++++-- src/mmw/apps/geoprocessing_api/views.py | 19 ++++++++++ 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/src/mmw/apps/geoprocessing_api/tests.py b/src/mmw/apps/geoprocessing_api/tests.py index 8eef67868..588a7fcfd 100644 --- a/src/mmw/apps/geoprocessing_api/tests.py +++ b/src/mmw/apps/geoprocessing_api/tests.py @@ -32,14 +32,16 @@ def get_logged_in_session(self, username, password): return c def get_api_token(self, username='', password='', - session=None): + session=None, regenerate=False): if not session: session = Client() - payload = None + payload = {} if username or password: - payload = {'username': username, - 'password': password} + payload.update({'username': username, + 'password': password}) + if regenerate: + payload.update({'regenerate': True}) return session.post(self.TOKEN_URL, data=payload) @@ -88,6 +90,45 @@ def test_get_api_token_uses_body_credentials_over_session(self): given in request body %s, but got %s """ % (bob_token, response_token)) + def test_get_api_token_doesnt_regenerate_token(self): + bob_user = User.objects.get(username='bob') + bob_token_before = Token.objects.get(user=bob_user) + + response = self.get_api_token('bob', 'bob') + + response_token = json.loads(response.content)['token'] + + self.assertEqual(str(response_token), str(bob_token_before), + """ Expected request token to be the same + as token before the request was made + (%s), but got %s + """ % (bob_token_before, response_token)) + + bob_token_after = Token.objects.get(user=bob_user) + self.assertEqual(bob_token_before, bob_token_after, + """ Expected token to be the same + as it was before the request was made + (%s), but got %s + """ % (bob_token_before, bob_token_after)) + + def test_get_api_token_can_regenerate_token(self): + bob_user = User.objects.get(username='bob') + old_bob_token = Token.objects.get(user=bob_user) + + response = self.get_api_token('bob', 'bob', regenerate=True) + + response_token = json.loads(response.content)['token'] + new_bob_token = Token.objects.get(user=bob_user) + + self.assertEqual(str(response_token), str(new_bob_token), + """ Expected regenerated response token to + be the same as stored token (%s), but got %s + """ % (new_bob_token, response_token)) + + self.assertTrue(old_bob_token is not new_bob_token, + """ Expected new token to be created + but token is the same""") + class ExerciseAnalyze(TestCase): def test_survey_land(self): diff --git a/src/mmw/apps/geoprocessing_api/views.py b/src/mmw/apps/geoprocessing_api/views.py index b7c7e557c..262ae6b74 100644 --- a/src/mmw/apps/geoprocessing_api/views.py +++ b/src/mmw/apps/geoprocessing_api/views.py @@ -36,6 +36,20 @@ def get_auth_token(request, format=None): ## Request Body + **Required** + + `username` (`string`): Your username + + `password` (`string`): Your password + + + **Optional** + + `regenerate` (`boolean`): Regenerate your API token? + Default is `false`. + + **Example** + { "username": "your_username", "password": "your_password" @@ -54,6 +68,11 @@ def get_auth_token(request, format=None): produces: - application/json """ + + should_regenerate = request.data.get('regenerate', False) + if should_regenerate: + Token.objects.filter(user=request.user).delete() + token, created = Token.objects.get_or_create(user=request.user) return Response({'token': token.key, 'created_at': token.created}) From 801b46d8b818c405c0ed6b6655458eded27b7a7f Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 11 Oct 2017 14:24:43 -0400 Subject: [PATCH 044/172] Fix django user no-csrf-token test None of the user login tests were using a csrftoken (we assumed it was coming back from a `requests` request, but it wasn't). It appears the token wasn't ever being enforced, which led to us commenting out a test for the endpoint failing when the token wasn't there. * Remove ineffective fetch for csrf token * Modify attempt_login_without_token to use the Django test helper Client, which exposes an `enforce_csrf_checks` flag --- src/mmw/apps/user/tests.py | 40 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/src/mmw/apps/user/tests.py b/src/mmw/apps/user/tests.py index 11d42acc4..0844cb3d7 100644 --- a/src/mmw/apps/user/tests.py +++ b/src/mmw/apps/user/tests.py @@ -6,7 +6,8 @@ import requests from django.test import LiveServerTestCase -from django.test import TestCase +from django.test import (TestCase, + Client) from django.contrib.auth.models import User from apps.user.views import trim_to_valid_length @@ -19,36 +20,18 @@ def setUp(self): User.objects.create_user(username='bob', email='bob@azavea.com', password='bob') - def get_token(self): - try: - init_response = requests.get(self.HOMEPAGE_URL) - except requests.RequestException: - init_response = {} - - try: - csrf = init_response.cookies['csrftoken'] - except KeyError: - csrf = None - - return csrf - def attempt_login(self, username, password): - csrf = self.get_token() try: - headers = {'HTTP_X_CSRFTOKEN': csrf} payload = {'username': username, 'password': password} - response = requests.post(self.LOGIN_URL, params=payload, - headers=headers) + response = requests.post(self.LOGIN_URL, params=payload) except requests.RequestException: response = {} return response def attempt_login_without_token(self, username, password): - try: - payload = {'username': username, 'password': password} - response = requests.post(self.LOGIN_URL, params=payload) - except requests.RequestException: - response = {} + c = Client(enforce_csrf_checks=True) + payload = {'username': username, 'password': password} + response = c.post(self.LOGIN_URL, params=payload) return response def test_no_username_returns_400(self): @@ -87,12 +70,11 @@ def test_good_credentials_returns_200(self): 'Incorrect server response. Expected 200 found %s' % response.status_code) - # TODO: commented out because it fails and we don't know why yet. - # def test_no_token_good_credentials_returns_400(self): - # response = self.attempt_login_without_token('bob', 'bob') - # self.assertEqual(response.status_code, 400, - # 'Incorrect server response. Expected 400 found %s' - # % response.status_code) + def test_no_token_good_credentials_returns_400(self): + response = self.attempt_login_without_token('bob', 'bob') + self.assertEqual(response.status_code, 400, + 'Incorrect server response. Expected 400 found %s' + % response.status_code) def test_no_token_bad_credentials_returns_400(self): response = self.attempt_login_without_token('badbob', 'badpass') From 01872ecb89067b4207df82a3d7192d33b85b43b1 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 9 Oct 2017 13:23:37 -0400 Subject: [PATCH 045/172] Render CUAHSI Variables and Values in table * Extract the variable table into its own set of views * Add spinner and error prompts for when fetching / failing * Add switcher between table and chart views (charts not implemented here, upcoming in #2333) * Initialize BootstrapTable on load, and then handle Backbone events on each model with a custom update function that will update the matching row in the BootstrapTable. Also use a custom formatter for rendering the first column of the table. --- src/mmw/js/src/data_catalog/models.js | 1 + .../templates/resultDetailsCuahsi.html | 29 +-- .../templates/resultDetailsCuahsiChart.html | 0 .../templates/resultDetailsCuahsiTable.html | 9 + ...esultDetailsCuahsiTableRowVariableCol.html | 19 ++ src/mmw/js/src/data_catalog/views.js | 193 ++++++++++++++++-- src/mmw/sass/pages/_data-catalog.scss | 25 +++ src/mmw/sass/utils/_quick-classes.scss | 4 + 8 files changed, 247 insertions(+), 33 deletions(-) create mode 100644 src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html create mode 100644 src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTable.html create mode 100644 src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTableRowVariableCol.html diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 92ad033a3..366b765e6 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -320,6 +320,7 @@ var Result = Backbone.Model.extend({ variables: null, // CuahsiVariables Collection fetching: false, error: false, + mode: 'table', }, initialize: function(attrs) { diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html index fff26f9ab..35f7c8e05 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html @@ -45,28 +45,19 @@

         Web Services

        + +
        + +
        +
        + + +

        - Last value collected {{ end_date|toTimeAgo }}: + Last value collected {{ last_date|toTimeAgo }}:

        -

        - - - - - - - - - {% for ck in concept_keywords %} - - - - - - {% endfor %} - -
        VariableValueUnits
        {{ ck }}
        +

        Citation: {{ service_citation }}

        diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html new file mode 100644 index 000000000..e69de29bb diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTable.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTable.html new file mode 100644 index 000000000..8387e54dd --- /dev/null +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTable.html @@ -0,0 +1,9 @@ + + + Variable + Value + Units + + + + diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTableRowVariableCol.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTableRowVariableCol.html new file mode 100644 index 000000000..feefb8425 --- /dev/null +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTableRowVariableCol.html @@ -0,0 +1,19 @@ +{{ concept_keyword }} +{% if name %} + Speciation: {{ speciation }}

        + {% endif %} +

        Medium: {{ sample_medium }}

        "> + +         +{% endif %} +{% if error %} + + + +{% endif %} diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index a65a13cff..b3a5ad6d0 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -22,6 +22,9 @@ var $ = require('jquery'), resultDetailsCinergiTmpl = require('./templates/resultDetailsCinergi.html'), resultDetailsHydroshareTmpl = require('./templates/resultDetailsHydroshare.html'), resultDetailsCuahsiTmpl = require('./templates/resultDetailsCuahsi.html'), + resultDetailsCuahsiChartTmpl = require('./templates/resultDetailsCuahsiChart.html'), + resultDetailsCuahsiTableTmpl = require('./templates/resultDetailsCuahsiTable.html'), + resultDetailsCuahsiTableRowVariableColTmpl = require('./templates/resultDetailsCuahsiTableRowVariableCol.html'), resultsWindowTmpl = require('./templates/resultsWindow.html'), resultMapPopoverDetailTmpl = require('./templates/resultMapPopoverDetail.html'), resultMapPopoverListTmpl = require('./templates/resultMapPopoverList.html'), @@ -34,11 +37,6 @@ var ENTER_KEYCODE = 13, cinergi: searchResultTmpl, hydroshare: searchResultTmpl, cuahsi: searchResultCuahsiTmpl, - }, - CATALOG_RESULT_DETAILS_TEMPLATE = { - cinergi: resultDetailsCinergiTmpl, - hydroshare: resultDetailsHydroshareTmpl, - cuahsi: resultDetailsCuahsiTmpl, }; var HeaderView = Marionette.LayoutView.extend({ @@ -134,6 +132,7 @@ var DataCatalogWindow = Marionette.LayoutView.extend({ onDetailResultChange: function() { var activeCatalog = this.collection.getActiveCatalog(), + ResultDetailsView = CATALOG_RESULT_DETAILS_VIEW[activeCatalog.id], detailResult = activeCatalog.get('detail_result'); if (!detailResult) { @@ -447,11 +446,7 @@ var ResultsView = Marionette.CollectionView.extend({ } }); -var ResultDetailsView = Marionette.ItemView.extend({ - getTemplate: function() { - return CATALOG_RESULT_DETAILS_TEMPLATE[this.catalog]; - }, - +var ResultDetailsBaseView = Marionette.LayoutView.extend({ ui: { closeDetails: '.close' }, @@ -469,23 +464,193 @@ var ResultDetailsView = Marionette.ItemView.extend({ placement: 'right', trigger: 'click', }); - this.$('[data-toggle="table"]').bootstrapTable(); }, + closeDetails: function() { + this.model.collection.closeDetail(); + } +}); + +var ResultDetailsCinergiView = ResultDetailsBaseView.extend({ + template: resultDetailsCinergiTmpl, +}); + +var ResultDetailsHydroshareView = ResultDetailsBaseView.extend({ + template: resultDetailsHydroshareTmpl, +}); + +var ResultDetailsCuahsiView = ResultDetailsBaseView.extend({ + template: resultDetailsCuahsiTmpl, + templateHelpers: function() { var id = this.model.get('id'), - location = id.substring(id.indexOf(':') + 1); + location = id.substring(id.indexOf(':') + 1), + fetching = this.model.get('fetching'), + error = this.model.get('error'), + last_date = this.model.get('end_date'); + + if (!fetching && !error) { + var variables = this.model.get('variables'), + last_dates = variables.map(function(v) { + var values = v.get('values'); + + if (values.length > 0) { + return new Date(values.last().get('datetime')); + } else { + return new Date('07/04/1776'); + } + }); + + last_dates.push(new Date(last_date)); + last_date = Math.max.apply(null, last_dates); + } return { location: location, + last_date: last_date, }; }, - closeDetails: function() { - this.model.collection.closeDetail(); + regions: { + valuesRegion: '#cuahsi-values-region', + }, + + ui: _.defaults({ + chartButton: '#cuahsi-button-chart', + tableButton: '#cuahsi-button-table', + }, ResultDetailsBaseView.prototype.ui), + + events: _.defaults({ + 'click @ui.chartButton': 'setChartMode', + 'click @ui.tableButton': 'setTableMode', + }, ResultDetailsBaseView.prototype.events), + + modelEvents: { + 'change:fetching': 'render', + 'change:mode': 'showValuesRegion', + }, + + initialize: function() { + this.model.fetchCuahsiValues(); + }, + + onRender: function() { + this.showValuesRegion(); + }, + + onDomRefresh: function() { + window.closePopover(); + this.$('[data-toggle="popover"]').popover({ + placement: 'right', + trigger: 'click', + }); + }, + + showValuesRegion: function() { + if (!this.valuesRegion) { + // Don't attempt to display values if this view + // has been unloaded. + return; + } + + var mode = this.model.get('mode'), + variables = this.model.get('variables'), + view = mode === 'table' ? + new CuahsiTableView({ collection: variables }) : + new CuahsiChartView({ collection: variables }); + + this.valuesRegion.show(view); + }, + + setChartMode: function() { + this.model.set('mode', 'chart'); + this.ui.chartButton.addClass('active'); + this.ui.tableButton.removeClass('active'); + }, + + setTableMode: function() { + this.model.set('mode', 'table'); + this.ui.tableButton.addClass('active'); + this.ui.chartButton.removeClass('active'); } }); +var CATALOG_RESULT_DETAILS_VIEW = { + cinergi: ResultDetailsCinergiView, + hydroshare: ResultDetailsHydroshareView, + cuahsi: ResultDetailsCuahsiView, +}; + +var CuahsiTableView = Marionette.ItemView.extend({ + tagName: 'table', + className: 'table custom-hover', + attributes: { + 'data-toggle': 'table', + }, + template: resultDetailsCuahsiTableTmpl, + + initialize: function() { + var self = this; + + this.variableColumnTmpl = resultDetailsCuahsiTableRowVariableColTmpl; + + this.collection.forEach(function(v, index) { + self.listenTo(v, 'change', _.partial(self.onVariableUpdate, index)); + }); + }, + + onAttach: function() { + var data = this.collection.toJSON(), + variableColumnFormatter = _.bind(this.variableColumnFormatter, this), + enablePopovers = _.bind(this.enablePopovers, this); + + this.$el.bootstrapTable({ + data: data, + columns: [ + { + field: 'concept_keyword', + formatter: variableColumnFormatter, + }, + { + field: 'most_recent_value', + }, + { + field: 'units', + } + ], + onPostBody: enablePopovers, + }); + + enablePopovers(); + }, + + enablePopovers: function() { + this.$('.variable-popover').popover({ + placement: 'right', + trigger: 'focus', + }); + }, + + variableColumnFormatter: function(value, row, index) { + return this.variableColumnTmpl.render( + this.collection.at(index).toJSON() + ); + }, + + onVariableUpdate: function(index) { + var row = this.collection.at(index).toJSON(); + + this.$el.bootstrapTable('updateRow', { + index: index, + row: row, + }); + } +}); + +var CuahsiChartView = Marionette.ItemView.extend({ + template: resultDetailsCuahsiChartTmpl, +}); + var ResultMapPopoverDetailView = Marionette.LayoutView.extend({ template: resultMapPopoverDetailTmpl, diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index 16d990ddc..568d3b00a 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -30,6 +30,17 @@ margin: 5px 0 0 0; } + .spinner:after { + top: 44px; + right: 7px; + } + + .error { + position: absolute; + top: 33px; + right: 10px; + } + .result-detail-header { h2 { display: inline-block; @@ -41,6 +52,20 @@ display: block; } } + + .cuahsi-buttons { + button { + padding: 1px 4px; + margin-top: -4px; + background-color: transparent; + border: 0; + + &.active { + color: $paper; + background-color: $black-54; + } + } + } } } diff --git a/src/mmw/sass/utils/_quick-classes.scss b/src/mmw/sass/utils/_quick-classes.scss index 4764c7458..abdd232c2 100644 --- a/src/mmw/sass/utils/_quick-classes.scss +++ b/src/mmw/sass/utils/_quick-classes.scss @@ -57,3 +57,7 @@ .pad-lg{ padding: 3rem; } + +.ui-danger { + color: $ui-danger; +} From 5a593c708bf67740fc87c8234447d28bf92f8b10 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 26 Sep 2017 10:22:13 -0400 Subject: [PATCH 046/172] Merge pull request #2269 from WikiWatershed/jdf/detail-style Restyle data detail view --- .../templates/resultDetailsCuahsi.html | 66 +++++++++++-------- src/mmw/sass/pages/_data-catalog.scss | 32 ++++++++- 2 files changed, 70 insertions(+), 28 deletions(-) diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html index 35f7c8e05..3dd7a2bb1 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html @@ -6,33 +6,43 @@

        Site: {{ location }} {{ title }}

        -

        - Source: {{ service_org }} {{ service_title }} - - - -

        + + + + + + {% if author %} + + + + + {% endif %} + + {% if begin_date == end_date %} + + + {% else %} + + + {% endif %} + + + + + +
        Source{{ service_org }}
        {{ service_title }} + + + +
        Author + {{ author }} +
        Data collected on{{ begin_date|toDateWithoutTime }}Data collected between{{ begin_date|toDateWithoutTime }} – {{ end_date|toDateWithoutTime }}
        Medium + {{ sample_mediums|join(", ") }} +

        - {% if author %} -

        - {{ author }} -

        - {% endif %} - {% if begin_date == end_date %} -

        - Data collected on: {{ begin_date|toDateWithoutTime }} -

        - {% else %} -

        - Data collected between: {{ begin_date|toDateWithoutTime }} - {{ end_date|toDateWithoutTime }} -

        - {% endif %} -

        - Medium: {{ sample_mediums|join(", ") }} -

        {% if details_url %}

        +

        Source Data

        @@ -60,5 +71,6 @@

        -

        Citation: {{ service_citation }}

        +

        Citation

        +

        {{ service_citation }}

        diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index 568d3b00a..139346af8 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -44,13 +44,17 @@ .result-detail-header { h2 { display: inline-block; - margin: 4px 0; + margin: 10px 0 4px; max-width: 95%; } a.zoom { display: block; } + + .close { + opacity: 0.6; + } } .cuahsi-buttons { @@ -421,3 +425,29 @@ margin-top: 8px; } } + +.result-details-region { + p, + .btn { + font-size: $font-size-h5; + } +} + +.table-data-detail { + font-size: $font-size-h5; + margin: 14px 0 6px; + + td, + th { + vertical-align: top; + padding-bottom: 10px; + } + + td { + color: #777; + } + + th { + padding-right: 20px; + } +} From 43339345e7be606db4b49fe0ef6502f33f08c8fd Mon Sep 17 00:00:00 2001 From: Jeff Frankl Date: Tue, 26 Sep 2017 16:09:15 -0400 Subject: [PATCH 047/172] Merge pull request #2297 from WikiWatershed/jdf/detail-style Style WDC detail view --- .../src/data_catalog/templates/resultDetailsCinergi.html | 7 +++---- .../src/data_catalog/templates/resultDetailsCuahsi.html | 8 ++++++-- .../data_catalog/templates/resultDetailsHydroshare.html | 7 +++---- src/mmw/sass/pages/_data-catalog.scss | 9 ++++++++- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html index ac96714b8..0e7e8a41c 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html @@ -1,12 +1,11 @@
        +

        {{ title }}

        - -         Zoom to extent
        {% if author %} diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html index 3dd7a2bb1..9d984ec1c 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html @@ -1,7 +1,7 @@

        Site: {{ location }} {{ title }} @@ -41,6 +41,10 @@

        {{ sample_mediums|join(", ") }} + + Catalog + Water Data Center +

        @@ -66,7 +70,7 @@

        Source Data

        - Last value collected {{ last_date|toTimeAgo }}: + Last value collected {{ last_date|toTimeAgo }}

        diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html b/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html index aacadd961..c9c811f42 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html @@ -1,12 +1,11 @@
        +

        {{ title }}

        - - Zoom to extent
        {% if author %} diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index 139346af8..2a5ec02d1 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -53,7 +53,14 @@ } .close { - opacity: 0.6; + float: none; + display: block; + opacity: 1; + color: #389b9b; + text-shadow: none; + font-size: 13px; + font-weight: 400; + padding: 6px 0 2px; } } From af7305f15000b68d56d8d93c2a3c7193ef1cca60 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Thu, 12 Oct 2017 11:48:58 -0400 Subject: [PATCH 048/172] Better handle empty CUAHSI results --- src/mmw/apps/bigcz/clients/cuahsi/search.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mmw/apps/bigcz/clients/cuahsi/search.py b/src/mmw/apps/bigcz/clients/cuahsi/search.py index 3e0f05b93..9625ab70a 100644 --- a/src/mmw/apps/bigcz/clients/cuahsi/search.py +++ b/src/mmw/apps/bigcz/clients/cuahsi/search.py @@ -257,6 +257,10 @@ def get_series_catalog_in_box(box, from_date, to_date, networkIDs): try: return result['SeriesRecord'] except KeyError: + # Empty object can mean "No results" + if not result: + return [] + # Missing key may indicate a server-side error raise ValueError(result) except TypeError: From b07d9570c29df166b4e7add03512838e5b1831f1 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Thu, 12 Oct 2017 11:53:09 -0400 Subject: [PATCH 049/172] Style updates To account for new header and back button on the left --- src/mmw/sass/pages/_data-catalog.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index 2a5ec02d1..8c8ad64c7 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -31,13 +31,13 @@ } .spinner:after { - top: 44px; + top: 22px; right: 7px; } .error { position: absolute; - top: 33px; + top: 11px; right: 10px; } From d9f676e5f2dbfce014845b609ca535a904a05521 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Tue, 10 Oct 2017 13:13:56 -0400 Subject: [PATCH 050/172] Add Account Page Skeleton * Add new browser route /account and wire it to the new `account/AccountController` * AccountController will behave similarly to the "Projects" page - Render its view, AccountContainerView, in the "footer" region of the app - It's styled to be on top the other page elements - Hide LayerPicker and Geocoder regions * Add two placeholder sub-pages to AccountContainerView: Profile, Account - There will be a third sub-page -- Preferences, so keep it easy to add new sub-pages - Placeholder templates display sub-page header * Add link to "My Account" in header's user dropdown --- src/mmw/js/src/account/controllers.js | 33 +++++++++ src/mmw/js/src/account/models.js | 18 +++++ src/mmw/js/src/account/templates/account.html | 1 + .../js/src/account/templates/container.html | 20 ++++++ src/mmw/js/src/account/templates/profile.html | 1 + src/mmw/js/src/account/views.js | 71 +++++++++++++++++++ src/mmw/js/src/core/templates/header.html | 1 + src/mmw/js/src/core/utils.js | 2 + src/mmw/js/src/routes.js | 2 + src/mmw/sass/main.scss | 1 + src/mmw/sass/pages/_account.scss | 43 +++++++++++ 11 files changed, 193 insertions(+) create mode 100644 src/mmw/js/src/account/controllers.js create mode 100644 src/mmw/js/src/account/models.js create mode 100644 src/mmw/js/src/account/templates/account.html create mode 100644 src/mmw/js/src/account/templates/container.html create mode 100644 src/mmw/js/src/account/templates/profile.html create mode 100644 src/mmw/js/src/account/views.js create mode 100644 src/mmw/sass/pages/_account.scss diff --git a/src/mmw/js/src/account/controllers.js b/src/mmw/js/src/account/controllers.js new file mode 100644 index 000000000..1973362d2 --- /dev/null +++ b/src/mmw/js/src/account/controllers.js @@ -0,0 +1,33 @@ +"use strict"; + +var App = require('../app'), + views = require('./views'), + models = require('./models'), + coreUtils= require('../core/utils'); + +var AccountController = { + accountPrepare: function() { + App.rootView.geocodeSearchRegion.empty(); + }, + + account: function() { + App.rootView.footerRegion.show( + new views.AccountContainerView({ + model: new models.AccountContainerModel() + }) + ); + + App.rootView.layerPickerRegion.empty(); + + App.state.set('active_page', coreUtils.accountPageTitle); + }, + + accountCleanUp: function() { + App.rootView.footerRegion.empty(); + App.showLayerPicker(); + } +}; + +module.exports = { + AccountController: AccountController +}; diff --git a/src/mmw/js/src/account/models.js b/src/mmw/js/src/account/models.js new file mode 100644 index 000000000..0a88c96f7 --- /dev/null +++ b/src/mmw/js/src/account/models.js @@ -0,0 +1,18 @@ +"use strict"; + +var Backbone = require('../../shim/backbone'); + +var ACCOUNT = 'account'; +var PROFILE = 'profile'; + +var AccountContainerModel = Backbone.Model.extend({ + defaults: { + active_page: PROFILE + } +}); + +module.exports = { + ACCOUNT: ACCOUNT, + PROFILE: PROFILE, + AccountContainerModel: AccountContainerModel +}; diff --git a/src/mmw/js/src/account/templates/account.html b/src/mmw/js/src/account/templates/account.html new file mode 100644 index 000000000..aa341db86 --- /dev/null +++ b/src/mmw/js/src/account/templates/account.html @@ -0,0 +1 @@ +

        Account

        diff --git a/src/mmw/js/src/account/templates/container.html b/src/mmw/js/src/account/templates/container.html new file mode 100644 index 000000000..6fc640316 --- /dev/null +++ b/src/mmw/js/src/account/templates/container.html @@ -0,0 +1,20 @@ +
        +
        + + +
        + +
        + diff --git a/src/mmw/js/src/account/templates/profile.html b/src/mmw/js/src/account/templates/profile.html new file mode 100644 index 000000000..3f4631a3a --- /dev/null +++ b/src/mmw/js/src/account/templates/profile.html @@ -0,0 +1 @@ +

        Profile

        diff --git a/src/mmw/js/src/account/views.js b/src/mmw/js/src/account/views.js new file mode 100644 index 000000000..63b9182aa --- /dev/null +++ b/src/mmw/js/src/account/views.js @@ -0,0 +1,71 @@ +"use strict"; + +var Marionette = require('../../shim/backbone.marionette'), + models = require('./models'), + containerTmpl = require('./templates/container.html'), + profileTmpl = require('./templates/profile.html'), + accountTmpl = require('./templates/account.html'); + +var ProfileView = Marionette.ItemView.extend({ + template: profileTmpl +}); + +var AccountView = Marionette.ItemView.extend({ + template: accountTmpl +}); + +var AccountContainerView = Marionette.LayoutView.extend({ + // model AccountContainerModel + + template: containerTmpl, + + ui: { + profile: '[data-action="viewprofile"]', + account: '[data-action="viewaccount"]' + }, + + events: { + 'click @ui.profile': 'viewProfile', + 'click @ui.account': 'viewAccount' + }, + + modelEvents: { + 'change:active_page': 'render' + }, + + regions: { + infoContainer: '.account-page-container' + }, + + showActivePage: function() { + var activePage = this.model.get('active_page'); + + switch(activePage) { + case models.PROFILE: + this.infoContainer.show(new ProfileView()); + break; + case models.ACCOUNT: + this.infoContainer.show(new AccountView()); + break; + default: + console.error("Account page, ", activePage, + ", is not supported."); + } + }, + + onRender: function() { + this.showActivePage(); + }, + + viewProfile: function() { + this.model.set('active_page', models.PROFILE); + }, + + viewAccount: function() { + this.model.set('active_page', models.ACCOUNT); + } +}); + +module.exports = { + AccountContainerView: AccountContainerView +}; diff --git a/src/mmw/js/src/core/templates/header.html b/src/mmw/js/src/core/templates/header.html index 8a796c4cd..38e77d0c9 100644 --- a/src/mmw/js/src/core/templates/header.html +++ b/src/mmw/js/src/core/templates/header.html @@ -20,6 +20,7 @@ {% if not itsi_embed %}
      • My Projects
        • {% endif %} +
      • My Account
      • Logout
        • diff --git a/src/mmw/js/src/core/utils.js b/src/mmw/js/src/core/utils.js index 3ced9e395..84a56d6e5 100644 --- a/src/mmw/js/src/core/utils.js +++ b/src/mmw/js/src/core/utils.js @@ -33,6 +33,8 @@ var utils = { projectsPageTitle: 'Projects', + accountPageTitle: 'Account', + filterNoData: function(data) { if (data && !isNaN(data) && isFinite(data)) { return data.toFixed(3); diff --git a/src/mmw/js/src/routes.js b/src/mmw/js/src/routes.js index 9ee14a5d8..6ed6ea7a2 100644 --- a/src/mmw/js/src/routes.js +++ b/src/mmw/js/src/routes.js @@ -4,6 +4,7 @@ var router = require('./router').router, settings = require('./core/settings'), DrawController = require('./draw/controllers').DrawController, AnalyzeController = require('./analyze/controllers').AnalyzeController, + AccountController = require('./account/controllers').AccountController, DataCatalogController = require('./data_catalog/controllers').DataCatalogController, ModelingController = require('./modeling/controllers').ModelingController, CompareController = require('./compare/controllers').CompareController, @@ -14,6 +15,7 @@ var router = require('./router').router, router.addRoute(/^/, DrawController, 'splash'); router.addRoute(/^draw/, DrawController, 'draw'); router.addRoute(/^analyze/, AnalyzeController, 'analyze'); +router.addRoute(/^account/, AccountController, 'account'); router.addRoute('project/new/:modelPackage(/)', ModelingController, 'makeNewProject'); router.addRoute('project(/:projectId)(/scenario/:scenarioId)(/)', ModelingController, 'project'); router.addRoute('project/:projectId/clone(/)', ModelingController, 'projectClone'); diff --git a/src/mmw/sass/main.scss b/src/mmw/sass/main.scss index 3d7e9fe15..c975ed9e1 100644 --- a/src/mmw/sass/main.scss +++ b/src/mmw/sass/main.scss @@ -77,6 +77,7 @@ "pages/model", "pages/compare", "pages/projects", + "pages/account", "pages/water-balance", "pages/registration", "pages/data-catalog"; diff --git a/src/mmw/sass/pages/_account.scss b/src/mmw/sass/pages/_account.scss new file mode 100644 index 000000000..f79c94daa --- /dev/null +++ b/src/mmw/sass/pages/_account.scss @@ -0,0 +1,43 @@ +#account-container { + padding: 2em; + display: flex; + flex-direction: row; + position: absolute; + top: 44px; + left: 0; + right: 0; + bottom: 0; + z-index: 100; + background-color: #eceff1; + transition: 0.3s ease left, 0.3s ease right; + + > .page-toggle-column { + width: 100px; + } + + > .account-page-column { + flex-grow: 1; + } +} + +#account-container .page-toggle-button { + background: none; + border: none; + display: block; + font-size: $font-size-h4; + font-weight: lighter; + + &.active { + font-weight: bolder; + color: $brand-primary; + } +} + +#account-container .account-page-container { + background: $paper; + padding: 2rem; + box-sizing: content-box; + box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.5); + margin-left: 8em; + max-width: 700px; +} From cec61103e99f47f83c69558d5af92bf6fce7aa45 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 11 Oct 2017 17:42:32 -0400 Subject: [PATCH 051/172] Show guest user login modal if they try to access account page * If a not-logged in user goes to the account page view the browser route, show them the login modal. Display their account page on success --- src/mmw/js/src/account/controllers.js | 37 ++++++++++++++++++++------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/src/mmw/js/src/account/controllers.js b/src/mmw/js/src/account/controllers.js index 1973362d2..8e3044e27 100644 --- a/src/mmw/js/src/account/controllers.js +++ b/src/mmw/js/src/account/controllers.js @@ -3,6 +3,7 @@ var App = require('../app'), views = require('./views'), models = require('./models'), + router = require('../router').router, coreUtils= require('../core/utils'); var AccountController = { @@ -11,15 +12,7 @@ var AccountController = { }, account: function() { - App.rootView.footerRegion.show( - new views.AccountContainerView({ - model: new models.AccountContainerModel() - }) - ); - - App.rootView.layerPickerRegion.empty(); - - App.state.set('active_page', coreUtils.accountPageTitle); + showLoginOrAccountView(); }, accountCleanUp: function() { @@ -28,6 +21,32 @@ var AccountController = { } }; +function showAccountView() { + App.rootView.footerRegion.show( + new views.AccountContainerView({ + model: new models.AccountContainerModel() + }) + ); + App.rootView.layerPickerRegion.empty(); + + App.state.set('active_page', coreUtils.accountPageTitle); +} + +function showLoginOrAccountView() { + App.user.fetch().always(function() { + if (App.user.get('guest')) { + var loginSuccess = function() { + router.navigate("/account", { trigger: true }); + }; + App.showLoginModal(loginSuccess); + // Until the user has logged in, show the main page + router.navigate("/", { trigger: true }); + } else { + showAccountView(); + } + }); +} + module.exports = { AccountController: AccountController }; From a99045d17da30475770bc4895f96fc07e4cb3324 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Mon, 16 Oct 2017 15:24:30 -0400 Subject: [PATCH 052/172] Destroy filterView on clicking back button - destroy the filterView on clicking the back button from the data catalog page to ensure it will re-create properly --- src/mmw/js/src/data_catalog/views.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index b3a5ad6d0..871bbe566 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -198,6 +198,10 @@ var FormView = Marionette.ItemView.extend({ 'click @ui.filterToggle': 'onFilterToggle', }, + onBeforeDestroy: function() { + App.rootView.secondarySidebarRegion.empty(); + }, + initialize: function() { var updateFilterSidebar = _.bind(function() { if (App.rootView.secondarySidebarRegion.hasView()) { From 6f9f1487274df6a6b15698c80998a1e8af7ac386 Mon Sep 17 00:00:00 2001 From: jfrankl Date: Tue, 17 Oct 2017 10:33:10 -0400 Subject: [PATCH 053/172] Update observation colors --- src/mmw/js/src/core/vizerLayers.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/mmw/js/src/core/vizerLayers.js b/src/mmw/js/src/core/vizerLayers.js index ed4690aeb..974f651a8 100644 --- a/src/mmw/js/src/core/vizerLayers.js +++ b/src/mmw/js/src/core/vizerLayers.js @@ -16,11 +16,11 @@ var $ = require('jquery'), // These are likely temporary until we develop custom icons for each type var platformIcons = { - 'River Guage': '#F44336', - 'Weather Station': '#4CAF50', - 'Fixed Shore Platform': '#2196F3', - 'Soil Pit': '#FFEB3B', - 'Well': '#795548' + 'River Guage': '#10A579', + 'Weather Station': '#F2B703', + 'Fixed Shore Platform': '#7FB95A', + 'Soil Pit': '#CF1D90', + 'Well': '#A5A998' }, error_msg = 'Unable to load Observation data'; @@ -57,7 +57,8 @@ function VizerLayers() { return L.circleMarker([asset.lat, asset.lon], { attributes: asset, fillColor: color, - fillOpacity: 1.0 + fillOpacity: 0.6, + color: color }); }); From 6d25d22e4160f991f595bdd651969accd97e0a7f Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Mon, 16 Oct 2017 17:57:01 -0400 Subject: [PATCH 054/172] Clear details geom on leaving DataCatalogWindow - reset details geom in dataCatalogCleanup method --- src/mmw/js/src/data_catalog/controllers.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mmw/js/src/data_catalog/controllers.js b/src/mmw/js/src/data_catalog/controllers.js index 13f83f234..d26b41a8e 100644 --- a/src/mmw/js/src/data_catalog/controllers.js +++ b/src/mmw/js/src/data_catalog/controllers.js @@ -64,6 +64,7 @@ var DataCatalogController = { App.map.set({ dataCatalogResults: null, dataCatalogActiveResult: null, + dataCatalogDetailResult: null, }); App.rootView.sidebarRegion.currentView.collection.forEach( function(catalogModel) { From 027dfcb3332cced599783e95ce929979800da9c4 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 17 Oct 2017 15:55:48 -0400 Subject: [PATCH 055/172] Fetch one month of data instead of one week It's not terribly slow, we can wait for the results. --- src/mmw/js/src/data_catalog/models.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 366b765e6..252c0674c 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -551,8 +551,8 @@ var CuahsiVariable = Backbone.Model.extend({ // to be either from begin date to end date, or 1 week up to end date, // whichever is shorter. if (!from || moment(from).isBefore(begin_date)) { - if (end_date.diff(begin_date, 'weeks', true) > 1) { - params.from_date = end_date.subtract(7, 'days'); + if (end_date.diff(begin_date, 'months', true) > 1) { + params.from_date = moment(end_date).subtract(1, 'months'); } else { params.from_date = begin_date; } From e4093c898471726af2d1213bd05670dfce255c14 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Tue, 10 Oct 2017 15:41:30 -0400 Subject: [PATCH 056/172] Display user's api token in account page * Add ApiTokenModel to handle fetching and regenerating the token - two of its attributes are currently undisplay/unused: fetching, error * Add token info to account template * Regenerate token on "regenerate api key" button click * Initialize ApiTokenModel in AccountContainerView's initialize() - The api key will be fairly constant. Instead of having to fetch it every time the user switches the sub-page of the account container view, initialize its model when the container view is created - If the token is eventually needed elsewhere, we will want to move its model to the App object --- src/mmw/js/src/account/models.js | 60 ++++++++++++++++++- src/mmw/js/src/account/templates/account.html | 16 ++++- src/mmw/js/src/account/templates/profile.html | 2 +- src/mmw/js/src/account/views.js | 27 ++++++++- src/mmw/sass/pages/_account.scss | 17 ++++++ 5 files changed, 117 insertions(+), 5 deletions(-) diff --git a/src/mmw/js/src/account/models.js b/src/mmw/js/src/account/models.js index 0a88c96f7..01bfeab9f 100644 --- a/src/mmw/js/src/account/models.js +++ b/src/mmw/js/src/account/models.js @@ -1,6 +1,7 @@ "use strict"; -var Backbone = require('../../shim/backbone'); +var _ = require('lodash'), + Backbone = require('../../shim/backbone'); var ACCOUNT = 'account'; var PROFILE = 'profile'; @@ -11,8 +12,65 @@ var AccountContainerModel = Backbone.Model.extend({ } }); +var ApiTokenModel = Backbone.Model.extend({ + url: '/api/token/', + + defaults: { + api_key: '', + created_at: '', // Datetime of api key generation + fetching: false, // Is fetching api key? + error: '' + }, + + initialize: function() { + this.fetchToken(); + }, + + fetchToken: function(regenerate) { + this.set({fetching: true, + error: ''}); + + var data = {}; + + if (regenerate) { + data['regenerate'] = true; + } + + var request = { + data: JSON.stringify(data), + type: 'POST', + dataType: 'json', + contentType: 'application/json' + }, + + failFetch = _.bind(function(error) { + this.set('error', error); + }, this), + + finishFetch = _.bind(function() { + this.set('fetching', false); + }, this); + + return this.fetch(request) + .fail(failFetch) + .always(finishFetch); + }, + + regenerateToken: function() { + this.fetchToken(true); + }, + + parse: function(response) { + return { + api_key: response.token, + created_at: response.created_at + }; + } +}); + module.exports = { ACCOUNT: ACCOUNT, PROFILE: PROFILE, + ApiTokenModel: ApiTokenModel, AccountContainerModel: AccountContainerModel }; diff --git a/src/mmw/js/src/account/templates/account.html b/src/mmw/js/src/account/templates/account.html index aa341db86..316a6148f 100644 --- a/src/mmw/js/src/account/templates/account.html +++ b/src/mmw/js/src/account/templates/account.html @@ -1 +1,15 @@ -

        Account

        +

        Account

        + + +

        You can use your API Key to make up to 2 requests per minute

        + diff --git a/src/mmw/js/src/account/templates/profile.html b/src/mmw/js/src/account/templates/profile.html index 3f4631a3a..dbfc29ce8 100644 --- a/src/mmw/js/src/account/templates/profile.html +++ b/src/mmw/js/src/account/templates/profile.html @@ -1 +1 @@ -

        Profile

        +

        Profile

        diff --git a/src/mmw/js/src/account/views.js b/src/mmw/js/src/account/views.js index 63b9182aa..9417ea0af 100644 --- a/src/mmw/js/src/account/views.js +++ b/src/mmw/js/src/account/views.js @@ -11,7 +11,24 @@ var ProfileView = Marionette.ItemView.extend({ }); var AccountView = Marionette.ItemView.extend({ - template: accountTmpl + // model ApiTokenModel + template: accountTmpl, + + ui: { + regenerateKey: '[data-action="regeneratekey"]' + }, + + events: { + 'click @ui.regenerateKey': 'regenerateApiKey' + }, + + modelEvents: { + 'change': 'render' + }, + + regenerateApiKey: function() { + this.model.regenerateToken(); + } }); var AccountContainerView = Marionette.LayoutView.extend({ @@ -37,6 +54,10 @@ var AccountContainerView = Marionette.LayoutView.extend({ infoContainer: '.account-page-container' }, + initialize: function() { + this.tokenModel = new models.ApiTokenModel(); + }, + showActivePage: function() { var activePage = this.model.get('active_page'); @@ -45,7 +66,9 @@ var AccountContainerView = Marionette.LayoutView.extend({ this.infoContainer.show(new ProfileView()); break; case models.ACCOUNT: - this.infoContainer.show(new AccountView()); + this.infoContainer.show(new AccountView({ + model: this.tokenModel + })); break; default: console.error("Account page, ", activePage, diff --git a/src/mmw/sass/pages/_account.scss b/src/mmw/sass/pages/_account.scss index f79c94daa..2a105b753 100644 --- a/src/mmw/sass/pages/_account.scss +++ b/src/mmw/sass/pages/_account.scss @@ -40,4 +40,21 @@ box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.5); margin-left: 8em; max-width: 700px; + + h2 { + margin-bottom: 2rem; + } +} + +.account-api-key-section { + border: 1px solid $ui-medium-light; + padding: 1rem; + display: inline-block; + margin: 1rem 0; + + > .detail { + color: $ui-grey; + font-weight: 400; + margin: 1rem 0; + } } From f1b87dd8f596519d6a55842cfa241ec29d035451 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Thu, 12 Oct 2017 11:43:30 -0400 Subject: [PATCH 057/172] Format Account Page API Token Created At * Use `moment.js` to display the token's created at datetime like: "Oct 12, 2017, 3:42 PM" --- src/mmw/js/src/account/templates/account.html | 2 +- src/mmw/js/src/account/views.js | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/account/templates/account.html b/src/mmw/js/src/account/templates/account.html index 316a6148f..6b4670362 100644 --- a/src/mmw/js/src/account/templates/account.html +++ b/src/mmw/js/src/account/templates/account.html @@ -7,7 +7,7 @@ {{ api_key }}

        - Created at {{ created_at }} + Created at {{ created_at_formatted }}

        Created at {{ created_at_formatted }} diff --git a/src/mmw/js/src/account/views.js b/src/mmw/js/src/account/views.js index f066fbfac..de8a97a36 100644 --- a/src/mmw/js/src/account/views.js +++ b/src/mmw/js/src/account/views.js @@ -1,6 +1,7 @@ "use strict"; -var Marionette = require('../../shim/backbone.marionette'), +var Clipboard = require('clipboard'), + Marionette = require('../../shim/backbone.marionette'), moment = require('moment'), models = require('./models'), containerTmpl = require('./templates/container.html'), @@ -16,7 +17,8 @@ var AccountView = Marionette.ItemView.extend({ template: accountTmpl, ui: { - regenerateKey: '[data-action="regeneratekey"]' + regenerateKey: '[data-action="regeneratekey"]', + copyKey: '[data-action="copykey"]' }, events: { @@ -27,6 +29,10 @@ var AccountView = Marionette.ItemView.extend({ 'change': 'render' }, + onRender: function() { + new Clipboard(this.ui.copyKey[0]); + }, + templateHelpers: function() { var dateFormat = 'MMM D, YYYY, h:mm A', formattedCreatedAt = moment(this.model.get('created_at')) diff --git a/src/mmw/sass/pages/_account.scss b/src/mmw/sass/pages/_account.scss index 2a105b753..b317caa6c 100644 --- a/src/mmw/sass/pages/_account.scss +++ b/src/mmw/sass/pages/_account.scss @@ -58,3 +58,24 @@ margin: 1rem 0; } } + +.account-api-key-section > .api-key-row { + display: flex; + flex: 1 1 auto; + + .copiable-input, .btn-copy { + border: 1px solid $ui-medium-light; + } + + .copiable-input { + padding-left: 0.5rem; + width: 345px; + border-radius: 2px 0 0 2px; + border-right: none; + } + + .btn-copy { + background: $ui-light; + border-radius: 0 2px 2px 0; + } +} From 7b107a188f9e3f25c18c0911a7434395039aa133 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Thu, 12 Oct 2017 13:05:04 -0400 Subject: [PATCH 059/172] Add loading and error states to account page's API key section * show a loading spinner over the copy button if the api key is fetching * show an error message if the api key failed to fetch/regenerate. * disable copy button if state is fetching --- src/mmw/js/src/account/models.js | 6 ++++-- src/mmw/js/src/account/templates/account.html | 10 ++++++++++ src/mmw/sass/pages/_account.scss | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/mmw/js/src/account/models.js b/src/mmw/js/src/account/models.js index 01bfeab9f..966206f13 100644 --- a/src/mmw/js/src/account/models.js +++ b/src/mmw/js/src/account/models.js @@ -43,8 +43,10 @@ var ApiTokenModel = Backbone.Model.extend({ contentType: 'application/json' }, - failFetch = _.bind(function(error) { - this.set('error', error); + failFetch = _.bind(function() { + var messageVerb = regenerate ? 'regenerate' : 'get'; + this.set('error', + 'Unable to ' + messageVerb + ' API Key'); }, this), finishFetch = _.bind(function() { diff --git a/src/mmw/js/src/account/templates/account.html b/src/mmw/js/src/account/templates/account.html index 3ba0de050..c788b6fdb 100644 --- a/src/mmw/js/src/account/templates/account.html +++ b/src/mmw/js/src/account/templates/account.html @@ -2,6 +2,11 @@

        Account

        You can use your API Key to make up to 2 requests per minute

        +{% if error %} +

        + {{error}} +

        +{% endif %} + + +
        + +
        diff --git a/src/mmw/js/src/account/views.js b/src/mmw/js/src/account/views.js index f345fed7e..e9e19b984 100644 --- a/src/mmw/js/src/account/views.js +++ b/src/mmw/js/src/account/views.js @@ -3,6 +3,8 @@ var Clipboard = require('clipboard'), Marionette = require('../../shim/backbone.marionette'), moment = require('moment'), + userViews = require('../user/views'), + userModels = require('../user/models'), modalViews = require('../core/modals/views'), modalModels = require('../core/modals/models'), models = require('./models'), @@ -20,11 +22,13 @@ var AccountView = Marionette.ItemView.extend({ ui: { regenerateKey: '[data-action="regeneratekey"]', - copyKey: '[data-action="copykey"]' + copyKey: '[data-action="copykey"]', + resetPassword: '[data-action="resetpassword"]' }, events: { - 'click @ui.regenerateKey': 'regenerateApiKey' + 'click @ui.regenerateKey': 'regenerateApiKey', + 'click @ui.resetPassword': 'resetPassword' }, modelEvents: { @@ -64,6 +68,15 @@ var AccountView = Marionette.ItemView.extend({ modal.on('confirmation', function() { self.model.regenerateToken(); }); + }, + + resetPassword: function() { + var resetPasswordModal = + new userViews.ChangePasswordModalView({ + model: new userModels.ChangePasswordFormModel() + }); + + resetPasswordModal.render(); } }); diff --git a/src/mmw/js/src/user/models.js b/src/mmw/js/src/user/models.js index 8e0e70b18..13870abc8 100644 --- a/src/mmw/js/src/user/models.js +++ b/src/mmw/js/src/user/models.js @@ -218,6 +218,49 @@ var ResendFormModel = ModalBaseModel.extend({ } }); +var ChangePasswordFormModel = ModalBaseModel.extend({ + defaults: { + old_password: null, + new_password1: null, + new_password2: null + }, + + url: '/user/change-password', + + validate: function(attrs) { + var errors = []; + + if (!attrs.old_password) { + errors.push('Please enter your password'); + } + + if (!attrs.new_password1) { + errors.push('Please enter a password'); + } + + if (!attrs.new_password2) { + errors.push('Please repeat the password'); + } + + if (attrs.new_password1 !== attrs.new_password2) { + errors.push('Passwords do not match'); + } + + if (errors.length) { + this.set({ + 'client_errors': errors, + 'server_errors': null + }); + return errors; + } else { + this.set({ + 'client_errors': null, + 'server_errors': null + }); + } + } +}); + var ItsiSignUpFormModel = ModalBaseModel.extend({ defaults: { username: null, @@ -264,5 +307,6 @@ module.exports = { SignUpFormModel: SignUpFormModel, ResendFormModel: ResendFormModel, ForgotFormModel: ForgotFormModel, + ChangePasswordFormModel: ChangePasswordFormModel, ItsiSignUpFormModel: ItsiSignUpFormModel }; diff --git a/src/mmw/js/src/user/templates/changePasswordModal.html b/src/mmw/js/src/user/templates/changePasswordModal.html new file mode 100644 index 000000000..4f4bd79ec --- /dev/null +++ b/src/mmw/js/src/user/templates/changePasswordModal.html @@ -0,0 +1,21 @@ +{% extends './baseModal.html' %} + +{% block form %} + {% if success %} + Thanks! Your password has been updated. + {% else %} + {{ field(old_password, 'old_password', 'Current Password', 'password') }} + {{ field(new_password1, 'new_password1', 'New Password', 'password') }} + {{ field(new_password2, 'new_password2', 'Repeat New Password', 'password') }} + {% endif %} +{% endblock %} + +{% block footer %} + {% if success %} + + {% else %} + + {% endif %} +{% endblock %} diff --git a/src/mmw/js/src/user/views.js b/src/mmw/js/src/user/views.js index 48cef0ca8..85815b07f 100644 --- a/src/mmw/js/src/user/views.js +++ b/src/mmw/js/src/user/views.js @@ -12,6 +12,8 @@ var _ = require('underscore'), signUpModalTmpl = require('./templates/signUpModal.html'), resendModalTmpl = require('./templates/resendModal.html'), forgotModalTmpl = require('./templates/forgotModal.html'), + changePasswordModalTmpl = + require('./templates/changePasswordModal.html'), itsiSignUpModalTmpl = require('./templates/itsiSignUpModal.html'); var ENTER_KEYCODE = 13; @@ -385,10 +387,37 @@ var ItsiSignUpModalView = ModalBaseView.extend({ } }); +var ChangePasswordModalView = ModalBaseView.extend({ + template: changePasswordModalTmpl, + + ui: _.defaults({ + 'oldPassword': '#old_password', + 'password1': '#new_password1', + 'password2': '#new_password2' + }, ModalBaseView.prototype.ui), + + onModalShown: function() { + this.ui.oldPassword.focus(); + }, + + onValidationError: function() { + this.ui.oldPassword.focus(); + }, + + setFields: function() { + this.model.set({ + old_password: $(this.ui.oldPassword.selector).val(), + new_password1: $(this.ui.password1.selector).val(), + new_password2: $(this.ui.password2.selector).val(), + }, { silent: true }); + } +}); + module.exports = { LoginModalView: LoginModalView, SignUpModalView: SignUpModalView, ResendModalView: ResendModalView, ForgotModalView: ForgotModalView, + ChangePasswordModalView: ChangePasswordModalView, ItsiSignUpModalView: ItsiSignUpModalView }; diff --git a/src/mmw/sass/pages/_account.scss b/src/mmw/sass/pages/_account.scss index ba014522a..c48e1161a 100644 --- a/src/mmw/sass/pages/_account.scss +++ b/src/mmw/sass/pages/_account.scss @@ -57,7 +57,7 @@ border: 1px solid $ui-medium-light; padding: 1rem; display: inline-block; - margin: 1rem 0; + margin: 1rem 0 3rem 0; > .detail { color: $ui-grey; From 9d791f7977c1b01b459c8a6b418c35ea2e4141a4 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Tue, 17 Oct 2017 16:29:59 -0400 Subject: [PATCH 064/172] Add "Copy to clipboard" and "Copied!" Tooltips Copy Key Btn * On hover, show "copy to clipboard" tooltip * on successful click, show "Copied!" --- src/mmw/js/src/account/templates/account.html | 3 +++ src/mmw/js/src/account/views.js | 22 ++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/account/templates/account.html b/src/mmw/js/src/account/templates/account.html index 3329601d1..23c391724 100644 --- a/src/mmw/js/src/account/templates/account.html +++ b/src/mmw/js/src/account/templates/account.html @@ -19,6 +19,9 @@ +
        + +
        diff --git a/src/mmw/js/src/compare/views.js b/src/mmw/js/src/compare/views.js index 2a2a7be98..ff4e93c07 100644 --- a/src/mmw/js/src/compare/views.js +++ b/src/mmw/js/src/compare/views.js @@ -2,9 +2,11 @@ var _ = require('lodash'), $ = require('jquery'), + moment = require('moment'), Marionette = require('../../shim/backbone.marionette'), App = require('../app'), coreModels = require('../core/models'), + coreUtils = require('../core/utils'), coreViews = require('../core/views'), chart = require('../core/chart.js'), modalViews = require('../core/modals/views'), @@ -217,17 +219,27 @@ var InputsView = Marionette.LayoutView.extend({ ui: { chartButton: '#compare-input-button-chart', tableButton: '#compare-input-button-table', + downloadButton: '#compare-input-button-download' }, events: { 'click @ui.chartButton': 'setChartView', 'click @ui.tableButton': 'setTableView', + 'click @ui.downloadButton': 'downloadCSV' }, regions: { precipitationRegion: '.compare-precipitation', }, + modelEvents: { + 'change:polling': 'toggleDownloadButtonActive' + }, + + toggleDownloadButtonActive: function() { + this.ui.downloadButton.prop('disabled', this.model.get('polling')); + }, + onShow: function() { var addOrReplaceInput = _.bind(this.model.addOrReplaceInput, this.model), controlModel = this.model.get('scenarios') @@ -255,6 +267,92 @@ var InputsView = Marionette.LayoutView.extend({ this.ui.tableButton.addClass('active'); this.model.set({ mode: models.constants.TABLE }); }, + + downloadCSV: function() { + var aoi = App.currentProject.get('area_of_interest'), + aoiVolumeModel = new tr55Models.AoiVolumeModel({ areaOfInterest: aoi }), + csvHeadings = [['scenario_name', 'precipitation_cm', 'runoff_cm', + 'evapotranspiration_cm', 'infiltration_cm', 'tss_load_cm', 'tss_runoff_cm', + 'tss_loading_rate_kgha', 'tn_load_cm', 'tn_runoff_cm', 'tn_loading_rate_kgha', + 'tp_load_cm', 'tp_runoff_cm', 'tp_loading_rate_kgha']], + precipitation = this.model.get('scenarios') + .findWhere({ active: true }) + .get('inputs') + .findWhere({ name: 'precipitation' }) + .get('value'), + csvData = this.model.get('scenarios') + .map(function(scenario) { + var result = scenario + .get('results') + .findWhere({ name: 'runoff' }) + .get('result'), + isPreColumbian = scenario.get('is_pre_columbian') || false, + isCurrentConditions = scenario.get('is_current_conditions'), + runoff, + quality, + tss, + tn, + tp; + + if (isPreColumbian) { + runoff = result.runoff.pc_unmodified; + quality = result.quality.pc_unmodified; + } else if (isCurrentConditions) { + runoff = result.runoff.unmodified; + quality = result.quality.unmodified; + } else { + runoff = result.runoff.modified; + quality = result.quality.modified; + } + + tss = quality[0]; + tn = quality[1]; + tp = quality[2]; + + return [ + scenario.get('name'), + coreUtils.convertToMetric(precipitation, 'in').toFixed(2), + runoff.runoff, + runoff.et, + runoff.inf, + tss.load, + tss.runoff, + aoiVolumeModel.getLoadingRate(tss.load), + tn.load, + tn.runoff, + aoiVolumeModel.getLoadingRate(tn.load), + tp.load, + tp.runoff, + aoiVolumeModel.getLoadingRate(tp.load), + ]; + }), + csv = csvHeadings + .concat(csvData) + .map(function (data) { + return data.join(', '); + }) + .join('\n'), + projectName = this.model.get('projectName'), + timeStamp = moment().format('MMDDYYYYHHmmss'), + fileName = projectName.replace(/[^a-z0-9+]+/gi, '_') + '_' + + timeStamp + '.csv', + blob = new Blob([csv], { type: 'application/octet-stream' }); + + if (window.navigator && window.navigator.msSaveOrOpenBlob) { + window.navigator.msSaveOrOpenBlob(blob, fileName); + } else { + var url = window.URL.createObjectURL(blob), + tmpLink = document.createElement('a'); + + tmpLink.download = fileName; + tmpLink.href = url; + tmpLink.type = 'attachment/csv;charset=utf-8'; + tmpLink.target = '_blank'; + document.body.appendChild(tmpLink); + tmpLink.click(); + document.body.removeChild(tmpLink); + } + } }); var CompareModificationsPopoverView = Marionette.ItemView.extend({ @@ -932,6 +1030,7 @@ function getCompareScenarios(isTr55) { function showCompare() { var model_package = App.currentProject.get('model_package'), + projectName = App.currentProject.get('name'), isTr55 = model_package === modelingModels.TR55_PACKAGE, scenarios = getCompareScenarios(isTr55), tabs = isTr55 ? getTr55Tabs(scenarios) : getGwlfeTabs(scenarios), @@ -941,6 +1040,7 @@ function showCompare() { controls: controls, tabs: tabs, scenarios: scenarios, + projectName: projectName, }); if (isTr55) { From 0aeee9c8b174394927b75fe0cf1c7544df9a58a6 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Thu, 12 Oct 2017 17:07:20 -0400 Subject: [PATCH 066/172] Create climate & precipitation legends - create & configure continuous legend for climate tabs using linear gradients - add label ticks & values --- src/mmw/js/src/core/layerPicker.js | 24 +++++- src/mmw/js/src/core/models.js | 8 ++ .../layerPickerColorRampLegendTmpl.html | 27 +++++++ .../src/core/templates/layerPickerLayer.html | 2 +- src/mmw/mmw/settings/layer_settings.py | 10 ++- src/mmw/sass/components/_layerpicker.scss | 77 ++++++++++++++++++- 6 files changed, 140 insertions(+), 8 deletions(-) create mode 100644 src/mmw/js/src/core/templates/layerPickerColorRampLegendTmpl.html diff --git a/src/mmw/js/src/core/layerPicker.js b/src/mmw/js/src/core/layerPicker.js index a22d11a52..cb7038021 100644 --- a/src/mmw/js/src/core/layerPicker.js +++ b/src/mmw/js/src/core/layerPicker.js @@ -10,6 +10,7 @@ var $ = require('jquery'), layerPickerGroupTmpl = require('./templates/layerPickerGroup.html'), layerPickerLayerTmpl = require('./templates/layerPickerLayer.html'), layerPickerLegendTmpl = require('./templates/layerPickerLegend.html'), + layerPickerColorRampLegendTmpl = require('./templates/layerPickerColorRampLegendTmpl.html'), layerPickerNavTmpl = require('./templates/layerPickerNav.html'), opacityControlTmpl = require('./templates/opacityControl.html'), timeSliderTmpl = require('./templates/timeSliderControl.html'); @@ -112,6 +113,18 @@ var LayerPickerLegendView = Marionette.ItemView.extend({ } }); +var LayerPickerColorRampLegendView = Marionette.ItemView.extend({ + template: layerPickerColorRampLegendTmpl, + + templateHelpers: function() { + return { + colorRampId: this.model.get('colorRampId'), + legendUnitsLabel: this.model.get('legendUnitsLabel'), + legendUnitBreaks: this.model.get('legendUnitBreaks'), + }; + } +}); + /* The individual layers in each layer group */ var LayerPickerLayerView = Marionette.ItemView.extend({ template: layerPickerLayerTmpl, @@ -133,21 +146,24 @@ var LayerPickerLayerView = Marionette.ItemView.extend({ layerDisplay: this.model.get('display'), layerClass: this.model.get('active') ? 'layerpicker-title active' : 'layerpicker-title', isDisabled: this.model.get('disabled'), + useColorRamp: this.model.get('useColorRamp') }; }, onRender: function() { + var legendTooltipContent = this.model.get('useColorRamp') ? + new LayerPickerColorRampLegendView({ model: this.model }) : + new LayerPickerLegendView({ model: this.model }); + this.ui.layerHelpIcon.popover({ trigger: 'focus', viewport: { 'selector': '.map-container', 'padding': 10 }, - content: new LayerPickerLegendView({ - model: this.model, - }).render().el + content: legendTooltipContent.render().el }); - }, + } }); /* The list of layers in a layer group */ diff --git a/src/mmw/js/src/core/models.js b/src/mmw/js/src/core/models.js index 5102ef833..6f4f1cc33 100644 --- a/src/mmw/js/src/core/models.js +++ b/src/mmw/js/src/core/models.js @@ -144,6 +144,10 @@ var LayerModel = Backbone.Model.extend({ legendMapping: null, cssClassPrefix: null, active: false, + useColorRamp: false, + colorRampId: null, + legendUnitsLabel: null, + legendUnitBreaks: null, }, buildLayer: function(layerSettings, layerType, initialActive) { @@ -202,6 +206,10 @@ var LayerModel = Backbone.Model.extend({ legendMapping: layerSettings.legend_mapping, cssClassPrefix: layerSettings.css_class_prefix, active: layerSettings.display === initialActive ? true : false, + useColorRamp: layerSettings.use_color_ramp || false, + colorRampId: layerSettings.color_ramp_id || null, + legendUnitsLabel: layerSettings.legend_units_label || null, + legendUnitBreaks: layerSettings.legend_unit_breaks || null, }); } }); diff --git a/src/mmw/js/src/core/templates/layerPickerColorRampLegendTmpl.html b/src/mmw/js/src/core/templates/layerPickerColorRampLegendTmpl.html new file mode 100644 index 000000000..efab0fab4 --- /dev/null +++ b/src/mmw/js/src/core/templates/layerPickerColorRampLegendTmpl.html @@ -0,0 +1,27 @@ +
        +
        +
        +
        +
        + {% for break in legendUnitBreaks %} +
        + {% endfor %} +
        +
        + {% for break in legendUnitBreaks %} + {% if loop.last %} +
        + {{break}} +
        + {% else %} +
        + {{break}} +
        + {% endif %} + {% endfor %} +
        +
        +
        + {{legendUnitsLabel}} +
        +
        diff --git a/src/mmw/js/src/core/templates/layerPickerLayer.html b/src/mmw/js/src/core/templates/layerPickerLayer.html index 5b718746c..cb8090cde 100644 --- a/src/mmw/js/src/core/templates/layerPickerLayer.html +++ b/src/mmw/js/src/core/templates/layerPickerLayer.html @@ -5,7 +5,7 @@ > {{ layerDisplay }} - {% if not isDisabled and legendMapping %} + {% if not isDisabled and (legendMapping or useColorRamp) %} .popover-content { border: #fff 1px solid; } @@ -19,7 +23,7 @@ left: 265px; bottom: 23px; width: 150px; - padding: 10px; + padding: 8px; background-color: #fff; box-shadow: 0 0 6px $black-74; font-size: 13px; @@ -205,3 +209,74 @@ span.time-slider-end { font-size: 13px; padding: 0 0 8px 6px; } + +#temperature-legend { + height: 20px; + width: 300px; + margin-left: 2px; + margin-right: 2px; + background: linear-gradient(90deg, rgba(46, 0, 103, 1) 0%, rgba(141, 20, 255, 1) 16.666667%, rgba(165, 15, 245, 1) 20.0%, rgba(189, 10, 235, 1) 23.333333%, rgba(213, 5, 225, 1) 26.666667%, rgba(238, 0, 215, 1) 30.0%, rgba(178, 8, 225, 1) 33.333333%, rgba(119, 16, 235, 1) 36.666667%, rgba(59, 25, 245, 1) 40.0%, rgba(0, 34, 255, 1) 43.333333%, rgba(0, 77, 199, 1) 46.666667%, rgba(0, 121, 143, 1) 50.0%, rgba(0, 164, 86, 1) 53.333333%, rgba(0, 208, 31, 1) 56.666667%, rgba(59, 211, 23, 1) 60.0%, rgba(117, 214, 15, 1) 63.333333%, rgba(176, 217, 7, 1) 66.666667%, rgba(236, 221, 0, 1) 70.0%, rgba(240, 165, 0, 1) 73.333333%, rgba(245, 110, 2, 1) 76.666667%, rgba(250, 55, 2, 1) 80.0%, rgba(255, 0, 4, 1) 83.333333%, rgba(87, 0, 16, 1) 100%); +} + +#precipitation-legend { + height: 20px; + width: 300px; + margin-left: 3px; + margin-right: 2px; + background: linear-gradient(90deg, rgba(230, 111, 0, 1) 0%, rgba(246, 155, 56, 1) 8%, rgba(62, 178, 189, 1) 16%, rgba(97, 212, 231, 1) 24%, rgba(3, 116, 116, 1) 32%, rgba(0, 49, 96, 1) 100%) +} + +.climate-legend-tooltip { + height: 65px; +} + +.climate-legend-unit-breaks-labels { + font-size: 0.8em; + position: absolute; + left: 0px; +} + +.climate-legend-label-ticks { + display: table; + width: 100%; + table-layout: fixed; +} + +.climate-legend-label-tick { + white-space: nowrap; + overflow: hidden; + text-align: center; + text-overflow: ellipsis; + display: table-cell; +} + +.climate-legend-label-tick::after { + display: block; + text-align: center; + content: '|'; +} + +.climate-legend-label-values { + display: table; + width: 100%; + table-layout: fixed; +} + +.climate-legend-label-value { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + margin: 0 auto; + display: table-cell; + text-align: center; +} + +.climate-legend-label-value.max { + padding-right: 10px; +} + +.climate-legend-units-label { + font-weight: bold; + text-align: center; + padding-top: 30px; +} From 50637b8138b9b92c62038a18d6db74ed2d03f3e5 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 17 Oct 2017 16:20:49 -0400 Subject: [PATCH 067/172] Rearchitect WDC Detail View for refreshes The main WDC Detail view is a Marionette.LayoutView. Previously, it featured a number of inline elements that needed to be updated on model changes, such as the fetching spinner, the error icon, and the most recent result date. These were siblings to other Marionette.ItemViews, like the Table View and the Chart View. Unfortunately, when LayoutViews are rendered, all their child views are detached, destroyed, recreated, and reattached. This leads to unnecessary revision of the Table View which is updated separately, and can cause scroll jumps in some cases because the entire view is re-rendering. To get around this, we follow the recommended Marionette pattern of never re-rendering the LayoutView. The static parts of the LayoutView remain there, which are only rendered once when the detail view is loaded. We split the rest into two additional views: a Status which has the error and fetching icons, and a Switcher which has the most recent result date, and the table / chart switcher buttons. All the child ItemViews listen to the same model fields on their own and update accordingly. --- .../templates/resultDetailsCuahsi.html | 17 +-- .../templates/resultDetailsCuahsiStatus.html | 4 + .../resultDetailsCuahsiSwitcher.html | 7 + src/mmw/js/src/data_catalog/views.js | 132 +++++++++++------- 4 files changed, 97 insertions(+), 63 deletions(-) create mode 100644 src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiStatus.html create mode 100644 src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiSwitcher.html diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html index 9d984ec1c..b48bef52a 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html @@ -59,21 +59,12 @@

         Web Services

        - -
        - -
        +

        Source Data

        -
        - - -
        -

        - Last value collected {{ last_date|toTimeAgo }} -

        -
        - +
        +
        +

        Citation

        {{ service_citation }}

        diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiStatus.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiStatus.html new file mode 100644 index 000000000..b4111dec7 --- /dev/null +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiStatus.html @@ -0,0 +1,4 @@ + +
        + +
        diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiSwitcher.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiSwitcher.html new file mode 100644 index 000000000..9e21b3292 --- /dev/null +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiSwitcher.html @@ -0,0 +1,7 @@ +
        + + +
        +

        + Last value collected {{ last_date|toTimeAgo }} +

        diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index b3a5ad6d0..1cdcf3643 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -22,6 +22,8 @@ var $ = require('jquery'), resultDetailsCinergiTmpl = require('./templates/resultDetailsCinergi.html'), resultDetailsHydroshareTmpl = require('./templates/resultDetailsHydroshare.html'), resultDetailsCuahsiTmpl = require('./templates/resultDetailsCuahsi.html'), + resultDetailsCuahsiStatusTmpl = require('./templates/resultDetailsCuahsiStatus.html'), + resultDetailsCuahsiSwitcherTmpl = require('./templates/resultDetailsCuahsiSwitcher.html'), resultDetailsCuahsiChartTmpl = require('./templates/resultDetailsCuahsiChart.html'), resultDetailsCuahsiTableTmpl = require('./templates/resultDetailsCuahsiTable.html'), resultDetailsCuahsiTableRowVariableColTmpl = require('./templates/resultDetailsCuahsiTableRowVariableCol.html'), @@ -484,58 +486,40 @@ var ResultDetailsCuahsiView = ResultDetailsBaseView.extend({ templateHelpers: function() { var id = this.model.get('id'), - location = id.substring(id.indexOf(':') + 1), - fetching = this.model.get('fetching'), - error = this.model.get('error'), - last_date = this.model.get('end_date'); - - if (!fetching && !error) { - var variables = this.model.get('variables'), - last_dates = variables.map(function(v) { - var values = v.get('values'); - - if (values.length > 0) { - return new Date(values.last().get('datetime')); - } else { - return new Date('07/04/1776'); - } - }); - - last_dates.push(new Date(last_date)); - last_date = Math.max.apply(null, last_dates); - } + location = id.substring(id.indexOf(':') + 1); return { location: location, - last_date: last_date, }; }, - regions: { - valuesRegion: '#cuahsi-values-region', - }, - ui: _.defaults({ - chartButton: '#cuahsi-button-chart', - tableButton: '#cuahsi-button-table', + chartRegion: '#cuahsi-chart-region', + tableRegion: '#cuahsi-table-region', }, ResultDetailsBaseView.prototype.ui), - events: _.defaults({ - 'click @ui.chartButton': 'setChartMode', - 'click @ui.tableButton': 'setTableMode', - }, ResultDetailsBaseView.prototype.events), + regions: { + statusRegion: '#cuahsi-status-region', + switcherRegion: '#cuahsi-switcher-region', + chartRegion: '#cuahsi-chart-region', + tableRegion: '#cuahsi-table-region', + }, modelEvents: { - 'change:fetching': 'render', - 'change:mode': 'showValuesRegion', + 'change:mode': 'showChartOrTable', }, initialize: function() { + this.model.set('mode', 'table'); this.model.fetchCuahsiValues(); }, - onRender: function() { - this.showValuesRegion(); + onShow: function() { + var variables = this.model.get('variables'); + + this.statusRegion.show(new CuahsiStatusView({ model: this.model })); + this.switcherRegion.show(new CuahsiSwitcherView({ model: this.model })); + this.tableRegion.show(new CuahsiTableView({ collection: variables })); }, onDomRefresh: function() { @@ -546,32 +530,80 @@ var ResultDetailsCuahsiView = ResultDetailsBaseView.extend({ }); }, - showValuesRegion: function() { - if (!this.valuesRegion) { - // Don't attempt to display values if this view - // has been unloaded. - return; + showChartOrTable: function() { + if (this.model.get('mode') === 'table') { + this.ui.chartRegion.addClass('hidden'); + this.ui.tableRegion.removeClass('hidden'); + } else { + this.ui.chartRegion.removeClass('hidden'); + this.ui.tableRegion.addClass('hidden'); + + if (!this.chartRegion.hasView()) { + this.chartRegion.show(new CuahsiChartView({ + collection: this.model.get('variables'), + })); + } } + } +}); - var mode = this.model.get('mode'), - variables = this.model.get('variables'), - view = mode === 'table' ? - new CuahsiTableView({ collection: variables }) : - new CuahsiChartView({ collection: variables }); +var CuahsiStatusView = Marionette.ItemView.extend({ + template: resultDetailsCuahsiStatusTmpl, - this.valuesRegion.show(view); + modelEvents: { + 'change:fetching change:error': 'render', + }, +}); + +var CuahsiSwitcherView = Marionette.ItemView.extend({ + template: resultDetailsCuahsiSwitcherTmpl, + + ui: { + chartButton: '#cuahsi-button-chart', + tableButton: '#cuahsi-button-table', + }, + + events: { + 'click @ui.chartButton': 'setChartMode', + 'click @ui.tableButton': 'setTableMode', + }, + + modelEvents: { + 'change:fetching change:mode': 'render', + }, + + templateHelpers: function() { + var fetching = this.model.get('fetching'), + error = this.model.get('error'), + last_date = this.model.get('end_date'); + + if (!fetching && !error) { + var variables = this.model.get('variables'), + last_dates = variables.map(function(v) { + var values = v.get('values'); + + if (values.length > 0) { + return new Date(values.last().get('datetime')); + } else { + return new Date('07/04/1776'); + } + }); + + last_dates.push(new Date(last_date)); + last_date = Math.max.apply(null, last_dates); + } + + return { + last_date: last_date, + }; }, setChartMode: function() { this.model.set('mode', 'chart'); - this.ui.chartButton.addClass('active'); - this.ui.tableButton.removeClass('active'); }, setTableMode: function() { this.model.set('mode', 'table'); - this.ui.tableButton.addClass('active'); - this.ui.chartButton.removeClass('active'); } }); From f08ab89082fb84b5ba51614cdaba954bd9d81c7d Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 17 Oct 2017 16:32:15 -0400 Subject: [PATCH 068/172] Add Chart --- src/mmw/js/src/data_catalog/models.js | 9 ++ .../templates/resultDetailsCuahsiChart.html | 8 ++ src/mmw/js/src/data_catalog/views.js | 117 ++++++++++++++++++ src/mmw/sass/pages/_data-catalog.scss | 8 ++ 4 files changed, 142 insertions(+) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 252c0674c..f5b4d5df7 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -598,6 +598,15 @@ var CuahsiVariable = Backbone.Model.extend({ units: response.variable.units.abbreviation, most_recent_value: mrv, }; + }, + + getChartData: function() { + return this.get('values').map(function(v) { + return [ + moment(v.get('datetime')).valueOf(), + parseFloat(v.get('value')) + ]; + }); } }); diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html index e69de29bb..31e0a2580 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html @@ -0,0 +1,8 @@ + +
        diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 1cdcf3643..344c7be6c 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -2,7 +2,9 @@ var $ = require('jquery'), _ = require('lodash'), + Backbone = require('../../shim/backbone'), Marionette = require('../../shim/backbone.marionette'), + HighstockChart = require('../../shim/highstock'), App = require('../app'), analyzeViews = require('../analyze/views.js'), settings = require('../core/settings'), @@ -681,6 +683,121 @@ var CuahsiTableView = Marionette.ItemView.extend({ var CuahsiChartView = Marionette.ItemView.extend({ template: resultDetailsCuahsiChartTmpl, + + ui: { + 'chartDiv': '#cuahsi-variable-chart', + 'select': 'select', + }, + + events: { + 'change @ui.select': 'selectVariable', + }, + + modelEvents: { + 'change:selected': 'renderChart', + }, + + templateHelpers: function() { + var variables = this.collection.map(function(v) { + return { + id: v.get('id'), + concept_keyword: v.get('concept_keyword'), + }; + }); + + return { + variables: variables, + }; + }, + + initialize: function(attrs) { + var selected = this.collection.first().get('id'); + + this.model = new Backbone.Model(); + this.model.set({ + selected: selected, + result: attrs.result, + }); + }, + + selectVariable: function() { + var selected = this.ui.select.val(); + + this.model.set('selected', selected); + }, + + onShow: function() { + this.renderChart(); + }, + + initializeChart: function(variable) { + var chart = new HighstockChart({ + chart: { + renderTo: 'cuahsi-variable-chart', + }, + + rangeSelector: { + selected: 1, + buttons: [ + { type: 'week', count: 1, text: '1w' }, + { type: 'week', count: 2, text: '2w' }, + { type: 'month', count: 1, text: '1m' }, + ], + }, + + xAxis: { + ordinal: false, + }, + + yAxis: { + title: { + text: variable.get('units'), + } + }, + + // TODO Check why this isn't working + lang: { + thousandsSep: ',' + }, + + title : { + text : null + }, + + series : [{ + name : variable.get('concept_keyword'), + data : variable.getChartData(), + color: '#389b9b', + tooltip: { + valueSuffix: ' ' + variable.get('units'), + valueDecimals: 2, + }, + }] + }); + + return chart; + }, + + renderChart: function() { + var id = this.model.get('selected'), + variable = this.collection.findWhere({ id: id }); + + if (!this.chart) { + this.chart = this.initializeChart(variable); + } else { + this.chart.yAxis[0].setTitle({ + text: variable.get('units'), + }); + + this.chart.series[0].update({ + name: variable.get('concept_keyword'), + data: variable.getChartData(), + tooltip: { + valueSuffix: ' ' + variable.get('units'), + }, + }); + } + } }); var ResultMapPopoverDetailView = Marionette.LayoutView.extend({ diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index 8c8ad64c7..a57716817 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -77,6 +77,14 @@ } } } + + #cuahsi-chart-region { + margin-top: 20px; + + .cuahsi-variable-select { + margin-bottom: 10px; + } + } } } From c3a8081c6c55776877f6886120a312ef164d7cd4 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 18 Oct 2017 17:16:21 -0400 Subject: [PATCH 069/172] Fix Predominantly Forested Compare Table Values Identical issue fixed by #2355 -- we were always using the `modified` results. Create two helper functions `getTR55RunoffResult` and `getTR55QualityResult` to handle digging into the proper value within a scenario's tr-55 result. Use them in the compare charts and tables --- src/mmw/js/src/compare/models.js | 40 +++++++------------------------- src/mmw/js/src/core/utils.js | 23 +++++++++++++++++- 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/src/mmw/js/src/compare/models.js b/src/mmw/js/src/compare/models.js index 8e22188e4..2850f6ddb 100644 --- a/src/mmw/js/src/compare/models.js +++ b/src/mmw/js/src/compare/models.js @@ -43,16 +43,6 @@ var ChartRowsCollection = Backbone.Collection.extend({ this.scenarios.forEach(function(scenario) { scenario.get('results').on('change', update); }); - }, - - getScenarioResults: function(typeKey) { - return this.scenarios.map(function(scenario) { - var resultKey = coreUtils.getTR55ResultKey(scenario), - result = scenario.get('results') - .findWhere({ name: typeKey }) - .get('result'); - return result[typeKey][resultKey]; - }); } }); @@ -62,7 +52,7 @@ var Tr55RunoffCharts = ChartRowsCollection.extend({ .get('inputs') .findWhere({ name: 'precipitation' }), precipitation = coreUtils.convertToMetric(precipitationInput.get('value'), 'in'), - results = this.getScenarioResults('runoff'); + results = this.scenarios.map(coreUtils.getTR55RunoffResult, coreUtils); this.forEach(function(chart) { var key = chart.get('key'), @@ -87,7 +77,7 @@ var Tr55RunoffCharts = ChartRowsCollection.extend({ var Tr55QualityCharts = ChartRowsCollection.extend({ update: function() { var aoivm = this.aoiVolumeModel, - results = this.getScenarioResults('quality'); + results = this.scenarios.map(coreUtils.getTR55WaterQualityResult, coreUtils); this.forEach(function(chart) { var name = chart.get('name'), @@ -135,19 +125,10 @@ var TableRowsCollection = Backbone.Collection.extend({ var Tr55RunoffTable = TableRowsCollection.extend({ update: function() { - var results = this.scenarios.map(function(scenario) { - return scenario.get('results') - .findWhere({ name: 'runoff' }) - .get('result'); - }), - get = function(key) { - return function(result) { - return result.runoff.modified[key]; - }; - }, - runoff = _.map(results, get('runoff')), - et = _.map(results, get('et' )), - inf = _.map(results, get('inf' )), + var results = this.scenarios.map(coreUtils.getTR55RunoffResult, coreUtils), + runoff = _.map(results, 'runoff'), + et = _.map(results, 'et' ), + inf = _.map(results, 'inf' ), rows = [ { name: "Runoff" , unit: "cm", values: runoff }, { name: "Evapotranspiration", unit: "cm", values: et }, @@ -161,15 +142,10 @@ var Tr55RunoffTable = TableRowsCollection.extend({ var Tr55QualityTable = TableRowsCollection.extend({ update: function() { var aoivm = this.aoiVolumeModel, - results = this.scenarios.map(function(scenario) { - return scenario.get('results') - .findWhere({ name: 'quality' }) - .get('result'); - }), + results = this.scenarios.map(coreUtils.getTR55WaterQualityResult, coreUtils), get = function(key) { return function(result) { - var measures = result.quality.modified, - load = _.find(measures, { measure: key }).load; + var load = _.find(result, { measure: key }).load; return aoivm.getLoadingRate(load); }; diff --git a/src/mmw/js/src/core/utils.js b/src/mmw/js/src/core/utils.js index 84a56d6e5..481982e3c 100644 --- a/src/mmw/js/src/core/utils.js +++ b/src/mmw/js/src/core/utils.js @@ -407,7 +407,7 @@ var utils = { // } // Use the scenario attributes to figure out which subresult should be // accessed. - getTR55ResultKey: function(scenario) { + _getTR55ResultKey: function(scenario) { if (scenario.get('is_current_conditions')) { return 'unmodified'; } else if (scenario.get('is_pre_columbian')) { @@ -416,6 +416,27 @@ var utils = { return 'modified'; }, + /** Access a scenario's result for a given type + * @param {ScenarioModel} scenario + * @param {string} typeKey: the type of result you want + * back; 'runoff', 'quality' + **/ + _getTR55ScenarioResult: function(scenario, typeKey) { + var resultKey = this._getTR55ResultKey(scenario), + result = scenario.get('results') + .findWhere({ name: typeKey}) + .get('result'); + return result[typeKey][resultKey]; + }, + + getTR55WaterQualityResult: function(scenario) { + return this._getTR55ScenarioResult(scenario, 'quality'); + }, + + getTR55RunoffResult: function(scenario) { + return this._getTR55ScenarioResult(scenario, 'runoff'); + }, + // Reverse sorting of a Backbone Collection. // Taken from http://stackoverflow.com/a/12220415/2053314 reverseSortBy: function(sortByFunction) { From a1892ad7f865b4b42d55a194fb3076bb14201ceb Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 18 Oct 2017 17:21:19 -0400 Subject: [PATCH 070/172] Clean up TR-55 Views * Remove mention of `compareMode`. We no longer reuse charts from `tr55/quality` or `tr55/runoff` in the compare view. * Use helper functions to access tr-55 results --- .../tr55/quality/templates/result.html | 14 +-- src/mmw/js/src/modeling/tr55/quality/views.js | 109 +++--------------- .../tr55/runoff/templates/result.html | 14 +-- src/mmw/js/src/modeling/tr55/runoff/views.js | 63 +++------- src/mmw/js/src/modeling/views.js | 3 +- 5 files changed, 46 insertions(+), 157 deletions(-) diff --git a/src/mmw/js/src/modeling/tr55/quality/templates/result.html b/src/mmw/js/src/modeling/tr55/quality/templates/result.html index 78a76079e..83c90cd06 100644 --- a/src/mmw/js/src/modeling/tr55/quality/templates/result.html +++ b/src/mmw/js/src/modeling/tr55/quality/templates/result.html @@ -1,11 +1,9 @@ -{% if showModelDescription %} -
        - Total loads delivered in a 24-hour hypothetical storm event -
        -

        - Simulated by EPA's STEP-L model algorithms -

        -{% endif %} +
        + Total loads delivered in a 24-hour hypothetical storm event +
        +

        + Simulated by EPA's STEP-L model algorithms +

        diff --git a/src/mmw/js/src/modeling/tr55/quality/views.js b/src/mmw/js/src/modeling/tr55/quality/views.js index df2e2c1f3..089724bf4 100644 --- a/src/mmw/js/src/modeling/tr55/quality/views.js +++ b/src/mmw/js/src/modeling/tr55/quality/views.js @@ -1,7 +1,6 @@ "use strict"; var $ = require('jquery'), - _ = require('underscore'), Backbone = require('../../../../shim/backbone'), Marionette = require('../../../../shim/backbone.marionette'), AoiVolumeModel = require('../models').AoiVolumeModel, @@ -21,12 +20,6 @@ var ResultView = Marionette.LayoutView.extend({ template: resultTmpl, - templateHelpers: function() { - return { - showModelDescription: !this.compareMode - }; - }, - attributes: { role: 'tabpanel' }, @@ -50,7 +43,6 @@ var ResultView = Marionette.LayoutView.extend({ }, initialize: function(options) { - this.compareMode = options.compareMode; this.scenario = options.scenario; this.aoiVolumeModel = new AoiVolumeModel({ @@ -62,29 +54,21 @@ var ResultView = Marionette.LayoutView.extend({ this.tableRegion.reset(); this.chartRegion.reset(); if (this.model.get('result')) { - if (this.compareMode) { - this.chartRegion.show(new CompareChartView({ - model: this.model, - aoiVolumeModel: this.aoiVolumeModel, - scenario: this.scenario, - })); - } else { - var dataCollection = new Backbone.Collection( - this.model.get('result').quality['modified'].filter( - utils.filterOutOxygenDemand + var dataCollection = new Backbone.Collection( + this.model.get('result').quality['modified'].filter( + utils.filterOutOxygenDemand )); - this.tableRegion.show(new TableView({ - aoiVolumeModel: this.aoiVolumeModel, - collection: dataCollection - })); - - this.chartRegion.show(new ChartView({ - aoiVolumeModel: this.aoiVolumeModel, - model: this.model, - collection: dataCollection - })); - } + this.tableRegion.show(new TableView({ + aoiVolumeModel: this.aoiVolumeModel, + collection: dataCollection + })); + + this.chartRegion.show(new ChartView({ + aoiVolumeModel: this.aoiVolumeModel, + model: this.model, + collection: dataCollection + })); } }, @@ -132,13 +116,10 @@ var TableView = Marionette.CompositeView.extend({ }); var ChartView = Marionette.ItemView.extend({ + // model ResultModel template: barChartTmpl, className: 'chart-container quality-chart-container', - initialize: function(options) { - this.compareMode = options.compareMode; - }, - onAttach: function() { this.addChart(); }, @@ -162,68 +143,6 @@ var ChartView = Marionette.ItemView.extend({ } }); -var CompareChartView = Marionette.ItemView.extend({ - template: barChartTmpl, - - className: 'chart-container quality-chart-container', - - modelEvents: { - 'change': 'addChart' - }, - - initialize: function(options) { - this.scenario = options.scenario; - }, - - onAttach: function() { - this.addChart(); - }, - - addChart: function() { - function getData(result, seriesDisplayNames) { - return _.map(seriesDisplayNames, function(seriesDisplayName, seriesInd) { - var load = result[seriesInd].load; - return { - key: seriesDisplayName, - values: [ - { - x: '', - y: aoiVolumeModel.getLoadingRate(load), - } - ] - }; - }); - } - - var chartEl = this.$el.find('.bar-chart').get(0), - result = this.model.get('result').quality, - aoiVolumeModel = this.options.aoiVolumeModel, - seriesDisplayNames = ['Suspended Solids', - 'Nitrogen', - 'Phosphorus'], - data, - chartOptions; - - $(chartEl).empty(); - if (result) { - var resultKey = utils.getTR55ResultKey(this.scenario); - - data = getData(result[resultKey].filter(utils.filterOutOxygenDemand), seriesDisplayNames); - chartOptions = { - seriesColors: ['#4aeab3', '#4ebaea', '#329b9c'], - yAxisLabel: 'Loading Rate (kg/ha)', - yAxisUnit: 'kg/ha', - margin: {top: 20, right: 0, bottom: 40, left: 60}, - reverseLegend: this.compareMode, - disableToggle: true, - abbreviateTicks: true - }; - - chart.renderVerticalBarChart(chartEl, data, chartOptions); - } - } -}); - module.exports = { ResultView: ResultView }; diff --git a/src/mmw/js/src/modeling/tr55/runoff/templates/result.html b/src/mmw/js/src/modeling/tr55/runoff/templates/result.html index b6856e13d..83feb8ff5 100644 --- a/src/mmw/js/src/modeling/tr55/runoff/templates/result.html +++ b/src/mmw/js/src/modeling/tr55/runoff/templates/result.html @@ -1,11 +1,9 @@ -{% if showModelDescription %} -
        - 24-hour hypothetical storm event -
        -

        - Simulated by SLAMM and TR-55 model algorithms -

        -{% endif %} +
        + 24-hour hypothetical storm event +
        +

        + Simulated by SLAMM and TR-55 model algorithms +

        diff --git a/src/mmw/js/src/modeling/tr55/runoff/views.js b/src/mmw/js/src/modeling/tr55/runoff/views.js index b1b99b758..4a1b728a6 100644 --- a/src/mmw/js/src/modeling/tr55/runoff/views.js +++ b/src/mmw/js/src/modeling/tr55/runoff/views.js @@ -17,12 +17,6 @@ var ResultView = Marionette.LayoutView.extend({ template: resultTmpl, - templateHelpers: function() { - return { - showModelDescription: !this.compareMode - }; - }, - regions: { tableRegion: '.runoff-table-region', chartRegion: '.runoff-chart-region' @@ -42,7 +36,6 @@ var ResultView = Marionette.LayoutView.extend({ }, initialize: function(options) { - this.compareMode = options.compareMode; this.scenario = options.scenario; this.aoi = options.areaOfInterest; }, @@ -56,17 +49,13 @@ var ResultView = Marionette.LayoutView.extend({ areaOfInterest: this.aoi }); - if (!this.compareMode) { - this.tableRegion.show(new TableView({ - model: this.model, - aoiVolumeModel: aoiVolumeModel - })); - } + this.tableRegion.show(new TableView({ + model: this.scenario, + aoiVolumeModel: aoiVolumeModel + })); this.chartRegion.show(new ChartView({ - model: this.model, - scenario: this.scenario, - compareMode: this.compareMode + model: this.scenario, })); } }, @@ -81,30 +70,25 @@ var ResultView = Marionette.LayoutView.extend({ }); var ChartView = Marionette.ItemView.extend({ + // model ScenarioModel template: barChartTmpl, className: 'chart-container runoff-chart-container', - initialize: function(options) { - this.scenario = options.scenario; - this.compareMode = options.compareMode; - }, - onAttach: function() { this.addChart(); }, addChart: function() { function getData(result, seriesNames, seriesDisplayNames, - labelNames, labelDisplayNames) { + labelDisplayNames) { return _.map(seriesNames, function(seriesName, seriesInd) { var seriesDisplayName = seriesDisplayNames[seriesInd]; return { key: seriesDisplayName, - values: _.map(labelNames, function(labelName, labelInd) { - var labelDisplayName = labelDisplayNames[labelInd]; + values: _.map(labelDisplayNames, function(labelDisplayName) { return { x: labelDisplayName, - y: result[labelName][seriesName] + y: result[seriesName] }; }) }; @@ -112,10 +96,9 @@ var ChartView = Marionette.ItemView.extend({ } var chartEl = this.$el.find('.bar-chart').get(0), - result = this.model.get('result').runoff, + result = utils.getTR55RunoffResult(this.model), seriesNames = ['inf', 'runoff', 'et'], seriesDisplayNames = ['Infiltration', 'Runoff', 'Evapotranspiration'], - labelNames, labelDisplayNames, data, chartOptions; @@ -123,28 +106,21 @@ var ChartView = Marionette.ItemView.extend({ $(chartEl).empty(); if (result) { - var resultKey = utils.getTR55ResultKey(this.scenario); - labelNames = [resultKey]; - if (this.compareMode) { - labelDisplayNames = ['']; - this.$el.addClass('current-conditions'); - } else if (this.scenario.get('is_current_conditions')) { + if (this.model.get('is_current_conditions')) { labelDisplayNames = ['Current Conditions']; } else { labelDisplayNames = ['Modified']; } data = getData(result, seriesNames, seriesDisplayNames, - labelNames, labelDisplayNames); + labelDisplayNames); chartOptions = { seriesColors: ['#F8AA00', '#CF4300', '#C2D33C'], yAxisLabel: 'Level (cm)', yAxisUnit: 'cm', reverseLegend: true, disableToggle: true, - margin: this.compareMode ? - {top: 20, right: 0, bottom: 40, left: 60} : - {top: 0, right: 0, bottom: 40, left: 150} + margin: {top: 0, right: 0, bottom: 40, left: 150} }; chart.renderVerticalBarChart(chartEl, data, chartOptions); @@ -159,6 +135,7 @@ var TableRowView = Marionette.ItemView.extend({ }); var TableView = Marionette.CompositeView.extend({ + // model ScenarioModel childView: TableRowView, childViewContainer: 'tbody', template: tableTmpl, @@ -171,8 +148,7 @@ var TableView = Marionette.CompositeView.extend({ initialize: function() { this.aoiVolumeModel = this.options.aoiVolumeModel; - this.tr55Results = this.model.get('result').runoff; - + this.runoffResults = utils.getTR55RunoffResult(this.model); this.collection = this.formatData(); }, @@ -185,17 +161,16 @@ var TableView = Marionette.CompositeView.extend({ // Runoff Partition | Depth | Volume var collection = new Backbone.Collection(); - collection.add(this.makeRowsForScenario('modified')); + collection.add(this.makeRowsForScenario()); return collection; }, - makeRowsForScenario: function(runoffKey) { - var self = this, - runoffPartition = this.tr55Results[runoffKey]; + makeRowsForScenario: function() { + var self = this; return _.map(this.runoffTypes, function(runoffType) { - return _.extend(self.getRunoffTypeValue(runoffPartition, runoffType)); + return _.extend(self.getRunoffTypeValue(self.runoffResults, runoffType)); }); }, diff --git a/src/mmw/js/src/modeling/views.js b/src/mmw/js/src/modeling/views.js index a89aee632..c952169c9 100644 --- a/src/mmw/js/src/modeling/views.js +++ b/src/mmw/js/src/modeling/views.js @@ -664,8 +664,7 @@ var ScenarioModelToolbarView = Marionette.CompositeView.extend({ 'change:active': 'render' }, - initialize: function(options) { - this.compareMode = options.compareMode; + initialize: function() { var modificationsColl = this.model.get('modifications'); this.listenTo(modificationsColl, 'add remove reset', this.render); }, From 414b1da13e9c78e5c99ea43d28b94b3436998fd6 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Wed, 18 Oct 2017 18:35:39 -0400 Subject: [PATCH 071/172] Validate RWD API input - validate RWD API input & return informative validation error messages on encountering invalid inputs --- src/mmw/apps/geoprocessing_api/views.py | 37 ++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/mmw/apps/geoprocessing_api/views.py b/src/mmw/apps/geoprocessing_api/views.py index 262ae6b74..3c7525157 100644 --- a/src/mmw/apps/geoprocessing_api/views.py +++ b/src/mmw/apps/geoprocessing_api/views.py @@ -2,6 +2,8 @@ from __future__ import print_function from __future__ import unicode_literals +from numbers import Number + from celery import chain, group from rest_framework.response import Response @@ -10,6 +12,7 @@ SessionAuthentication) from rest_framework.permissions import IsAuthenticated from rest_framework.authtoken.models import Token +from rest_framework.exceptions import ValidationError from django.utils.timezone import now from django.core.urlresolvers import reverse @@ -224,11 +227,43 @@ def start_rwd(request, format=None): """ user = request.user if request.user.is_authenticated() else None created = now() - location = request.data['location'] + location = request.data.get('location') + + def validate_location(loc): + if loc is None or type(loc) is not list or len(loc) is not 2: + return False + else: + [lat, lng] = loc + return (isinstance(lat, Number) and isinstance(lng, Number) and + type(lat) is not bool and type(lng) is not bool) + + if not validate_location(location): + error = ('Invalid required `location` parameter value ' + '`{}`. Must be a `[lat, lng] where `lat` and `lng` are ' + 'numeric.'.format(location)) + raise ValidationError(error) + data_source = request.data.get('dataSource', 'drb') + + if data_source not in ['drb', 'nhd']: + error = ('Invalid optional `dataSource` parameter value ' + '`{}`. Must be `drb` or `nhd`.'.format(data_source)) + raise ValidationError(error) + snapping = request.data.get('snappingOn', False) + + if type(snapping) is not bool: + error = ('Invalid optional `snappingOn` parameter value ' + '`{}`. Must be `true` or `false`.'.format(snapping)) + raise ValidationError(error) + simplify = request.data.get('simplify', False) + if not isinstance(simplify, Number) and simplify is not False: + error = ('Invalid optional `simplify` parameter value: ' + '`{}`. Must be a number.'.format(simplify)) + raise ValidationError(error) + job = Job.objects.create(created_at=created, result='', error='', traceback='', user=user, status='started') From efd00aa6c75ac37fd45f7020ffe7aa2522c763a9 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Thu, 19 Oct 2017 17:21:12 -0400 Subject: [PATCH 072/172] Display Variable Data Type in table, chart Most variables have Data Type of either Unknown or Instantaneous. Some have Data Types of Minimum, Mean, Median, or Maximum, for the same variable. In order to distinguish them in the UI, we now show them in the table and the chart dropdown. --- src/mmw/js/src/data_catalog/models.js | 3 +++ .../src/data_catalog/templates/resultDetailsCuahsiChart.html | 3 +++ .../templates/resultDetailsCuahsiTableRowVariableCol.html | 3 +++ src/mmw/js/src/data_catalog/views.js | 1 + 4 files changed, 10 insertions(+) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 98b5c03ce..e084e21a7 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -393,6 +393,7 @@ var Result = Backbone.Model.extend({ v.set({ 'units': info.variable.units.abbreviation, 'speciation': info.variable.speciation, + 'data_type': info.variable.data_type, 'sample_medium': info.variable.sample_medium, }); @@ -522,6 +523,7 @@ var CuahsiVariable = Backbone.Model.extend({ name: '', units: '', concept_keyword: '', + data_type: '', speciation: '', sample_medium: '', wsdl: '', @@ -595,6 +597,7 @@ var CuahsiVariable = Backbone.Model.extend({ return { name: response.variable.name, + data_type: response.variable.data_type, sample_medium: response.variable.sample_medium, units: response.variable.units.abbreviation, most_recent_value: mrv, diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html index 31e0a2580..2851552cb 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html @@ -2,6 +2,9 @@ {% for v in variables %} {% endfor %} diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTableRowVariableCol.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTableRowVariableCol.html index feefb8425..269163c31 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTableRowVariableCol.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiTableRowVariableCol.html @@ -1,4 +1,7 @@ {{ concept_keyword }} +{% if data_type and data_type != 'Unknown' and data_type != 'Instantaneous' %} + ({{ data_type }}) +{% endif %} {% if name %} Date: Thu, 19 Oct 2017 17:22:12 -0400 Subject: [PATCH 073/172] Show units in chart dropdown In some cases there are multiple instances of the same variable with different units, which was previously impossible to differentiate in the Chart UI. By adding the units to the drop down we allow the users to more easily pick the one they want. --- .../src/data_catalog/templates/resultDetailsCuahsiChart.html | 3 +++ src/mmw/js/src/data_catalog/views.js | 1 + 2 files changed, 4 insertions(+) diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html index 2851552cb..459ea1fac 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsiChart.html @@ -5,6 +5,9 @@ {% if v.data_type and v.data_type != 'Unknown' and v.data_type != 'Instantaneous' %} ({{ v.data_type }}) {% endif %} + {% if v.units %} + ({{ v.units }}) + {% endif %} {% endfor %} diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 2e923bfe8..04da37884 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -709,6 +709,7 @@ var CuahsiChartView = Marionette.ItemView.extend({ id: v.get('id'), concept_keyword: v.get('concept_keyword'), data_type: v.get('data_type'), + units: v.get('units'), }; }); From 39529361f94ada46e1408e1bae5f6d0c0e80f041 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Thu, 19 Oct 2017 17:23:24 -0400 Subject: [PATCH 074/172] Show distinct variables in search result For the list view, instead of repeating the same variable a number of times (without knowing the various data types for them), we show them once each, only revealing their multi- plicity in the detail view. --- src/mmw/js/src/core/utils.js | 5 +++++ src/mmw/js/src/data_catalog/views.js | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/mmw/js/src/core/utils.js b/src/mmw/js/src/core/utils.js index 481982e3c..fe6309ddb 100644 --- a/src/mmw/js/src/core/utils.js +++ b/src/mmw/js/src/core/utils.js @@ -508,6 +508,11 @@ var utils = { wkaoi.includes('__') && !lodash.startsWith(wkaoi, '__') && !lodash.endsWith(wkaoi, '__'); + }, + + // Array.filter(distinct) to get distinct values + distinct: function(value, index, self) { + return self.indexOf(value) === index; } }; diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 04da37884..83f133f83 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -8,6 +8,7 @@ var $ = require('jquery'), App = require('../app'), analyzeViews = require('../analyze/views.js'), settings = require('../core/settings'), + utils = require('../core/utils'), models = require('./models'), errorTmpl = require('./templates/error.html'), dateFilterTmpl = require('./templates/dateFilter.html'), @@ -410,6 +411,7 @@ var StaticResultView = Marionette.ItemView.extend({ return { 'concept_keywords': this.model.get('variables') .pluck('concept_keyword') + .filter(utils.distinct) .join('; '), }; } From 408f81a60672f6575ae0c0daa7b5d3619b165481 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Wed, 18 Oct 2017 17:23:39 -0400 Subject: [PATCH 075/172] Add filter.isDefault function In most cases, filters will have default falsy values, i.e. they will not be turned on. However, in some cases, such as WDC's "Exclude Gridded" filter, they will be turned on by default. In order to see if the filter's current value is different from its default value, we add an unimplemented `.isDefault` function to the FilterModel, with the expectation that it will be implemented by all child models. It is implemented in the DateFilter as an _.isEmpty check on both dates, and in SearchOption as a comparison with the default active value. It is also implemented in the FilterCollection to check if all the filters in the collection satisfy their own isDefault. --- src/mmw/js/src/data_catalog/models.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 98b5c03ce..835d76213 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -43,6 +43,12 @@ var FilterModel = Backbone.Model.extend({ window.console.error("Use of unimplemented function", "FilterModel.isActive"); return false; + }, + + isDefault: function() { + window.console.error("Use of unimplemented function", + "FilterModel.isDefault"); + return false; } }); @@ -53,6 +59,10 @@ var SearchOption = FilterModel.extend({ isActive: function() { return this.get('active'); + }, + + isDefault: function() { + return this.get('active') === this.defaults.active; } }); @@ -77,6 +87,11 @@ var DateFilter = FilterModel.extend({ return this.get('fromDate') || this.get('toDate'); }, + isDefault: function() { + return _.isEmpty(this.get('fromDate')) && + _.isEmpty(this.get('toDate')); + }, + validate: function() { // Only need to validate if there are two dates. Ensure that // before is earlier than after @@ -110,6 +125,12 @@ var FilterCollection = Backbone.Collection.extend({ return this.filter(isActive).length; }, + + isDefault: function() { + var isDefault = function(filter) { return filter.isDefault(); }; + + return this.every(isDefault); + } }); var Catalog = Backbone.Model.extend({ From 1a8ee3002058aaf3481da992c4036d9231c110ad Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Wed, 18 Oct 2017 17:36:03 -0400 Subject: [PATCH 076/172] Hide Reset button if all filters are default The Reset button is now hidden by default, and only shown when there is one or more non-default active filters. Setting height to 44px ensures there is no movement as the button is hidden and shown. --- .../data_catalog/templates/filterSidebar.html | 2 +- src/mmw/js/src/data_catalog/views.js | 20 +++++++++++++++++++ src/mmw/sass/pages/_data-catalog.scss | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/data_catalog/templates/filterSidebar.html b/src/mmw/js/src/data_catalog/templates/filterSidebar.html index fd4733c3f..8a719459a 100644 --- a/src/mmw/js/src/data_catalog/templates/filterSidebar.html +++ b/src/mmw/js/src/data_catalog/templates/filterSidebar.html @@ -2,7 +2,7 @@

        Filters

        diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index afb46bbd8..0ff5d9a26 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -1088,6 +1088,26 @@ var FilterSidebar = Marionette.CompositeView.extend({ return null; }, + initialize: function() { + var self = this; + + this.collection.forEach(function(model) { + self.listenTo(model, 'change', self.toggleReset); + }); + }, + + onRender: function() { + this.toggleReset(); + }, + + toggleReset: function() { + if (this.collection.isDefault()) { + this.ui.reset.addClass('hidden'); + } else { + this.ui.reset.removeClass('hidden'); + } + }, + clearFilters: function() { this.collection.forEach(function(model) { model.reset(); }); } diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index a2e57ab7b..2fda7ccea 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -374,6 +374,7 @@ .data-catalog-filter-window > .data-catalog-filters-header { display: flex; flex-direction: row; + height: 44px; padding-bottom: 6px; > .filter-title { line-height: $height-md; From 1232cded06adb3eab18c8efb19292168aea8304b Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Wed, 18 Oct 2017 17:49:33 -0400 Subject: [PATCH 077/172] Only search once on Reset In case of multiple applied filters, resetting them all would trigger multiple searches, which would complete asynchronously and contaminate the results. By debouncing the search handler, we give each filter a chance to reset before triggering a search. The 100ms delay is almost imperceptible to users, but allows enough time to cycle through all active filters, resetting them. --- src/mmw/js/src/data_catalog/models.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 835d76213..7bc64a5e6 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -153,7 +153,19 @@ var Catalog = Backbone.Model.extend({ }, initialize: function() { - var self = this; + var self = this, + // Debounce search in case of multiple filters + // changing in rapid succession + debouncedSearch = _.debounce(function() { + if (self.isSearchValid()) { + if (self.get('active')) { + self.startSearch(1); + } else { + self.set('stale', true); + } + } + }, 100); + this.get('results').on('change:show_detail', function() { self.set('detail_result', self.get('results').getDetail()); }); @@ -162,15 +174,7 @@ var Catalog = Backbone.Model.extend({ if (this.get('filters') === null) { this.set({ filters: new FilterCollection() }); } - this.get('filters').on('change', function() { - if (self.isSearchValid()) { - if (self.get('active')) { - self.startSearch(1); - } else { - self.set('stale', true); - } - } - }); + this.get('filters').on('change', debouncedSearch); }, searchIfNeeded: function(query, geom) { From baf06e9ed3f930c095b86601c1672bf4686db5f2 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Wed, 18 Oct 2017 17:56:54 -0400 Subject: [PATCH 078/172] Remove click mines These blow up on Firefox --- src/mmw/js/src/data_catalog/templates/dateFilter.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mmw/js/src/data_catalog/templates/dateFilter.html b/src/mmw/js/src/data_catalog/templates/dateFilter.html index 2e1689084..04ccd1ccc 100644 --- a/src/mmw/js/src/data_catalog/templates/dateFilter.html +++ b/src/mmw/js/src/data_catalog/templates/dateFilter.html @@ -7,7 +7,7 @@ value="{{fromDate}}" /> {% if fromDate %} -         + {% endif %} @@ -20,7 +20,7 @@ value="{{toDate}}" /> {% if toDate %} - + {% endif %} From 7929f65238ee55c6c97d2c3b8c8c5c42db54d083 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Thu, 19 Oct 2017 20:07:14 -0400 Subject: [PATCH 079/172] Handle points, boxes for HydroShare results Previously we were only retrieving the first box of the various results in HydroShare. Now, we are retrieving points, as well as multiple boxes and points if there. The results are unioned into one result, just as done for CINERGI, before sending to the client. --- .../apps/bigcz/clients/hydroshare/search.py | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/hydroshare/search.py b/src/mmw/apps/bigcz/clients/hydroshare/search.py index f4e0dd589..8068997cb 100644 --- a/src/mmw/apps/bigcz/clients/hydroshare/search.py +++ b/src/mmw/apps/bigcz/clients/hydroshare/search.py @@ -8,7 +8,7 @@ from rest_framework.exceptions import ValidationError from django.conf import settings -from django.contrib.gis.geos import Polygon +from django.contrib.gis.geos import Point, Polygon from apps.bigcz.models import Resource, ResourceLink, ResourceList from apps.bigcz.utils import RequestTimedOutError @@ -22,17 +22,35 @@ def parse_date(value): return dateutil.parser.parse(value) +def parse_box(box): + return Polygon(( + (float(box['westlimit']), float(box['northlimit'])), + (float(box['eastlimit']), float(box['northlimit'])), + (float(box['eastlimit']), float(box['southlimit'])), + (float(box['westlimit']), float(box['southlimit'])), + (float(box['westlimit']), float(box['northlimit'])), + )) + + +def parse_point(point): + return Point(float(point['east']), float(point['north'])) + + def parse_geom(coverages): + geoms = [] if coverages: - box = [c['value'] for c in coverages if c['type'] == 'box'][0] - if box: - return Polygon(( - (float(box['westlimit']), float(box['northlimit'])), - (float(box['eastlimit']), float(box['northlimit'])), - (float(box['eastlimit']), float(box['southlimit'])), - (float(box['westlimit']), float(box['southlimit'])), - (float(box['westlimit']), float(box['northlimit'])), - )) + geoms.extend([parse_box(c['value']) + for c in coverages + if c['type'] == 'box']) + geoms.extend([parse_point(c['value']) + for c in coverages + if c['type'] == 'point']) + if geoms: + geom = geoms[0] + for g in geoms[1:]: + geom |= g + + return geom return None From 6f9f22adbe983bf0aeac38208cd9445b511bb063 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 20 Oct 2017 11:47:57 -0400 Subject: [PATCH 080/172] Add begin_date, end_date to HydroShare Search Results These fields are populated from the coverages[type=period] field in the API results. When they are not present, we return None. Custom model and serializer were added to accommodate these fields. They are named the same as Cuahsi's, so if in the future we consolidate them into the parent Resource class the public API will not change. --- .../apps/bigcz/clients/hydroshare/__init__.py | 7 +++---- .../apps/bigcz/clients/hydroshare/models.py | 17 +++++++++++++++ .../apps/bigcz/clients/hydroshare/search.py | 21 ++++++++++++++++--- .../bigcz/clients/hydroshare/serializers.py | 13 ++++++++++++ 4 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 src/mmw/apps/bigcz/clients/hydroshare/models.py create mode 100644 src/mmw/apps/bigcz/clients/hydroshare/serializers.py diff --git a/src/mmw/apps/bigcz/clients/hydroshare/__init__.py b/src/mmw/apps/bigcz/clients/hydroshare/__init__.py index 324083e83..8e6d8123f 100644 --- a/src/mmw/apps/bigcz/clients/hydroshare/__init__.py +++ b/src/mmw/apps/bigcz/clients/hydroshare/__init__.py @@ -3,11 +3,10 @@ from __future__ import unicode_literals from __future__ import division -from apps.bigcz.models import Resource -from apps.bigcz.serializers import ResourceSerializer +from apps.bigcz.clients.hydroshare import models, serializers # Import catalog name and search function, so it can be exported from here from apps.bigcz.clients.hydroshare.search import CATALOG_NAME, search # NOQA -model = Resource -serializer = ResourceSerializer +model = models.HydroshareResource +serializer = serializers.HydroshareResourceSerializer diff --git a/src/mmw/apps/bigcz/clients/hydroshare/models.py b/src/mmw/apps/bigcz/clients/hydroshare/models.py new file mode 100644 index 000000000..189691e55 --- /dev/null +++ b/src/mmw/apps/bigcz/clients/hydroshare/models.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division + +from apps.bigcz.models import Resource + + +class HydroshareResource(Resource): + def __init__(self, id, description, author, links, title, + created_at, updated_at, geom, begin_date, end_date): + super(HydroshareResource, self).__init__(id, description, author, + links, title, created_at, + updated_at, geom) + + self.begin_date = begin_date + self.end_date = end_date diff --git a/src/mmw/apps/bigcz/clients/hydroshare/search.py b/src/mmw/apps/bigcz/clients/hydroshare/search.py index 8068997cb..16be80006 100644 --- a/src/mmw/apps/bigcz/clients/hydroshare/search.py +++ b/src/mmw/apps/bigcz/clients/hydroshare/search.py @@ -10,9 +10,11 @@ from django.conf import settings from django.contrib.gis.geos import Point, Polygon -from apps.bigcz.models import Resource, ResourceLink, ResourceList +from apps.bigcz.models import ResourceLink, ResourceList from apps.bigcz.utils import RequestTimedOutError +from apps.bigcz.clients.hydroshare.models import HydroshareResource + CATALOG_NAME = 'hydroshare' CATALOG_URL = 'https://www.hydroshare.org/hsapi/resource/' @@ -55,8 +57,19 @@ def parse_geom(coverages): return None +def parse_coverage_period(coverages): + if coverages: + period = [c['value'] for c in coverages if c['type'] == 'period'] + if period and period[0]: + return period[0]['start'], period[0]['end'] + + return None, None + + def parse_record(item): - return Resource( + start, end = parse_coverage_period(item['coverages']) + + return HydroshareResource( id=item['resource_id'], title=item['resource_title'], description=None, @@ -66,7 +79,9 @@ def parse_record(item): ], created_at=parse_date(item['date_created']), updated_at=parse_date(item['date_last_updated']), - geom=parse_geom(item['coverages'])) + geom=parse_geom(item['coverages']), + begin_date=parse_date(start) if start else None, + end_date=parse_date(end) if end else None) def prepare_bbox(box): diff --git a/src/mmw/apps/bigcz/clients/hydroshare/serializers.py b/src/mmw/apps/bigcz/clients/hydroshare/serializers.py new file mode 100644 index 000000000..0869a68c2 --- /dev/null +++ b/src/mmw/apps/bigcz/clients/hydroshare/serializers.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division + +from rest_framework.serializers import DateTimeField + +from apps.bigcz.serializers import ResourceSerializer + + +class HydroshareResourceSerializer(ResourceSerializer): + begin_date = DateTimeField() + end_date = DateTimeField() From a21db5709cef74f3ff6f949d15762318d2550886 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 20 Oct 2017 11:50:39 -0400 Subject: [PATCH 081/172] Sort results by end_date, descending If end_date is missing, push those results to the bottom. --- .../apps/bigcz/clients/hydroshare/search.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/hydroshare/search.py b/src/mmw/apps/bigcz/clients/hydroshare/search.py index 16be80006..f4fe9723d 100644 --- a/src/mmw/apps/bigcz/clients/hydroshare/search.py +++ b/src/mmw/apps/bigcz/clients/hydroshare/search.py @@ -5,6 +5,7 @@ import requests import dateutil.parser +from datetime import datetime from rest_framework.exceptions import ValidationError from django.conf import settings @@ -19,6 +20,8 @@ CATALOG_NAME = 'hydroshare' CATALOG_URL = 'https://www.hydroshare.org/hsapi/resource/' +DATE_MIN = datetime(1776, 7, 4, 0, 0) + def parse_date(value): return dateutil.parser.parse(value) @@ -97,6 +100,14 @@ def prepare_date(value): return value.strftime('%Y-%m-%d') +def nullable_attrgetter(key, default): + """To allow sorting on nullable field with default value""" + def getter(item): + return getattr(item, key) or default + + return getter + + def search(**kwargs): query = kwargs.get('query') to_date = kwargs.get('to_date') @@ -142,11 +153,14 @@ def search(**kwargs): if 'results' not in data: raise ValueError(data) - results = data['results'] + records = [parse_record(item) for item in data['results']] + results = sorted(records, + key=nullable_attrgetter('end_date', DATE_MIN), + reverse=True) count = data['count'] return ResourceList( api_url=response.url, catalog=CATALOG_NAME, count=count, - results=[parse_record(item) for item in results]) + results=results) From 05e0bc066d8a989e6cb651ad1268d2862bc4856d Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 20 Oct 2017 11:51:02 -0400 Subject: [PATCH 082/172] Exclude results with no geometry --- src/mmw/apps/bigcz/clients/hydroshare/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mmw/apps/bigcz/clients/hydroshare/search.py b/src/mmw/apps/bigcz/clients/hydroshare/search.py index f4fe9723d..70a5be3ec 100644 --- a/src/mmw/apps/bigcz/clients/hydroshare/search.py +++ b/src/mmw/apps/bigcz/clients/hydroshare/search.py @@ -154,7 +154,7 @@ def search(**kwargs): raise ValueError(data) records = [parse_record(item) for item in data['results']] - results = sorted(records, + results = sorted([r for r in records if r.geom], key=nullable_attrgetter('end_date', DATE_MIN), reverse=True) count = data['count'] From fac9ab2ef60103055db1eb192b6f49576f361988 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 20 Oct 2017 11:55:16 -0400 Subject: [PATCH 083/172] Update HydroShare Search Result List View * Use a custom view for HydroShare Search Result listings * Move Date below Author * Show date range if available, "Unknown Time Period" if not --- src/mmw/js/src/data_catalog/models.js | 2 ++ .../templates/searchResultHydroshare.html | 18 ++++++++++++++++++ src/mmw/js/src/data_catalog/views.js | 3 ++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/mmw/js/src/data_catalog/templates/searchResultHydroshare.html diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index f20cb24d3..e34d3a4ad 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -341,6 +341,8 @@ var Result = Backbone.Model.extend({ links: null, // Array created_at: '', updated_at: '', + begin_date: '', + end_date: '', active: false, show_detail: false, // Show this result as the detail view? variables: null, // CuahsiVariables Collection diff --git a/src/mmw/js/src/data_catalog/templates/searchResultHydroshare.html b/src/mmw/js/src/data_catalog/templates/searchResultHydroshare.html new file mode 100644 index 000000000..d647daa03 --- /dev/null +++ b/src/mmw/js/src/data_catalog/templates/searchResultHydroshare.html @@ -0,0 +1,18 @@ +
        +

        + {{ title }} +

        + {% if author %} +
        + {{ author }} +
        + {% endif %} +
        + + {% if begin_date %} + {{ begin_date|toDateWithoutTime }} – {{ end_date|toDateWithoutTime }} + {% else %} + Unknown Time Period + {% endif %} +
        +
        diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 22f2f70f9..d3a5a84b9 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -17,6 +17,7 @@ var $ = require('jquery'), formTmpl = require('./templates/form.html'), pagerTmpl = require('./templates/pager.html'), searchResultTmpl = require('./templates/searchResult.html'), + searchResultHydroshareTmpl = require('./templates/searchResultHydroshare.html'), searchResultCuahsiTmpl = require('./templates/searchResultCuahsi.html'), tabContentTmpl = require('./templates/tabContent.html'), tabPanelTmpl = require('./templates/tabPanel.html'), @@ -40,7 +41,7 @@ var ENTER_KEYCODE = 13, PAGE_SIZE = settings.get('data_catalog_page_size'), CATALOG_RESULT_TEMPLATE = { cinergi: searchResultTmpl, - hydroshare: searchResultTmpl, + hydroshare: searchResultHydroshareTmpl, cuahsi: searchResultCuahsiTmpl, }; From 5b75d3e10fcd943da1c92a29325aadf38f805d7c Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 20 Oct 2017 13:33:52 -0400 Subject: [PATCH 084/172] Exclude Private Resources by default Add a filter similar to WDC for bringing them back in if needed. --- src/mmw/apps/bigcz/clients/hydroshare/search.py | 7 ++++++- src/mmw/js/src/data_catalog/controllers.js | 5 ++++- src/mmw/js/src/data_catalog/models.js | 10 ++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/hydroshare/search.py b/src/mmw/apps/bigcz/clients/hydroshare/search.py index 70a5be3ec..908d50233 100644 --- a/src/mmw/apps/bigcz/clients/hydroshare/search.py +++ b/src/mmw/apps/bigcz/clients/hydroshare/search.py @@ -114,6 +114,7 @@ def search(**kwargs): from_date = kwargs.get('from_date') bbox = kwargs.get('bbox') page = kwargs.get('page') + exclude_private = 'exclude_private' in kwargs.get('options') if not query: raise ValidationError({ @@ -153,7 +154,11 @@ def search(**kwargs): if 'results' not in data: raise ValueError(data) - records = [parse_record(item) for item in data['results']] + items = data['results'] + if exclude_private: + items = [item for item in items if item['public']] + + records = [parse_record(item) for item in items] results = sorted([r for r in records if r.geom], key=nullable_attrgetter('end_date', DATE_MIN), reverse=True) diff --git a/src/mmw/js/src/data_catalog/controllers.js b/src/mmw/js/src/data_catalog/controllers.js index d26b41a8e..f24df368e 100644 --- a/src/mmw/js/src/data_catalog/controllers.js +++ b/src/mmw/js/src/data_catalog/controllers.js @@ -36,7 +36,10 @@ var DataCatalogController = { id: 'hydroshare', name: 'HydroShare', results: new models.Results(null, { catalog: 'hydroshare' }), - filters: new models.FilterCollection([dateFilter]) + filters: new models.FilterCollection([ + dateFilter, + new models.PrivateResourcesFilter(), + ]), }), new models.Catalog({ id: 'cuahsi', diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index e34d3a4ad..3342098d3 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -75,6 +75,15 @@ var GriddedServicesFilter = SearchOption.extend({ }, SearchOption.prototype.defaults) }); +var PrivateResourcesFilter = SearchOption.extend({ + defaults: _.defaults({ + id: 'exclude_private', + type: 'checkbox', + label: 'Exclude Private Resources', + active: true, + }, SearchOption.prototype.defaults) +}); + var DateFilter = FilterModel.extend({ defaults: _.defaults({ id: 'date', @@ -647,6 +656,7 @@ var CuahsiVariables = Backbone.Collection.extend({ module.exports = { GriddedServicesFilter: GriddedServicesFilter, + PrivateResourcesFilter: PrivateResourcesFilter, DateFilter: DateFilter, FilterCollection: FilterCollection, Catalog: Catalog, From 96ac4d0b139f9a08c3d5150103a739498d94e0e3 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 20 Oct 2017 14:25:41 -0400 Subject: [PATCH 085/172] Cache HydroShare API calls for fast filter switch Previously we would make a new request for each HydroShare API call. With the addition of the "Exclude Private Resources" filter, which would add a few items to an existing set of results, making the user wait for a whole new request is frustrating. To alleviate this, we cache the API results for 30 minutes. This makes filter switching very performant. The 30 minute period is arbitrarily chosen. It may be fine tuned in the future. The CUAHSI cache key has been updated to reflect the catalog. --- src/mmw/apps/bigcz/clients/cuahsi/search.py | 4 +-- .../apps/bigcz/clients/hydroshare/search.py | 31 +++++++++++++------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/cuahsi/search.py b/src/mmw/apps/bigcz/clients/cuahsi/search.py index d12c61c7c..53102d73d 100644 --- a/src/mmw/apps/bigcz/clients/cuahsi/search.py +++ b/src/mmw/apps/bigcz/clients/cuahsi/search.py @@ -202,8 +202,8 @@ def group_series_by_location(series): def make_request(request, expiry, **kwargs): - key = 'bigcz_{}_{}'.format(request.method.name, - hash(frozenset(kwargs.items()))) + key = 'bigcz_cuahsi_{}_{}'.format(request.method.name, + hash(frozenset(kwargs.items()))) cached = cache.get(key) if cached: return cached diff --git a/src/mmw/apps/bigcz/clients/hydroshare/search.py b/src/mmw/apps/bigcz/clients/hydroshare/search.py index 908d50233..b579681de 100644 --- a/src/mmw/apps/bigcz/clients/hydroshare/search.py +++ b/src/mmw/apps/bigcz/clients/hydroshare/search.py @@ -3,11 +3,12 @@ from __future__ import unicode_literals from __future__ import division -import requests +from requests import Request, Session, Timeout import dateutil.parser from datetime import datetime from rest_framework.exceptions import ValidationError +from django.core.cache import cache from django.conf import settings from django.contrib.gis.geos import Point, Polygon @@ -142,14 +143,24 @@ def search(**kwargs): 'page': page }) - try: - response = requests.get(CATALOG_URL, - timeout=settings.BIGCZ_CLIENT_TIMEOUT, - params=params) - except requests.Timeout: - raise RequestTimedOutError() - - data = response.json() + session = Session() + request = session.prepare_request(Request('GET', + CATALOG_URL, + params=params)) + + key = 'bigcz_hydroshare_{}'.format(hash(frozenset(params.items()))) + cached = cache.get(key) + if cached: + data = cached + + else: + try: + response = session.send(request, + timeout=settings.BIGCZ_CLIENT_TIMEOUT) + data = response.json() + cache.set(key, data, timeout=1800) # Cache for half hour + except Timeout: + raise RequestTimedOutError() if 'results' not in data: raise ValueError(data) @@ -165,7 +176,7 @@ def search(**kwargs): count = data['count'] return ResourceList( - api_url=response.url, + api_url=request.url, catalog=CATALOG_NAME, count=count, results=results) From 3821b99efba54ebba9abe108847fcd2a7605838f Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 20 Oct 2017 17:19:41 -0400 Subject: [PATCH 086/172] Update date filter for coverage period Previously the date filter be passed to the HydroShare REST API, which uses it on the created_at field. Now, since the created_at field is no longer shown in the UI, and users care more for the coverage period, we make the dates apply to those fields instead. --- .../apps/bigcz/clients/hydroshare/search.py | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/hydroshare/search.py b/src/mmw/apps/bigcz/clients/hydroshare/search.py index b579681de..2a61d34dc 100644 --- a/src/mmw/apps/bigcz/clients/hydroshare/search.py +++ b/src/mmw/apps/bigcz/clients/hydroshare/search.py @@ -125,14 +125,6 @@ def search(**kwargs): 'full_text_search': query, } - if to_date: - params.update({ - 'to_date': prepare_date(to_date) - }) - if from_date: - params.update({ - 'from_date': prepare_date(from_date) - }) if bbox: params.update(prepare_bbox(bbox)) params.update({ @@ -170,7 +162,18 @@ def search(**kwargs): items = [item for item in items if item['public']] records = [parse_record(item) for item in items] - results = sorted([r for r in records if r.geom], + # Include only those with geometries + records = [r for r in records if r.geom] + + if from_date: + records = [r for r in records + if r.end_date and r.end_date >= from_date] + + if to_date: + records = [r for r in records + if r.begin_date and r.begin_date <= to_date] + + results = sorted(records, key=nullable_attrgetter('end_date', DATE_MIN), reverse=True) count = data['count'] From 524b87216341042013cd5147e35c6b555c8bc848 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 23 Oct 2017 10:12:06 -0400 Subject: [PATCH 087/172] Throttle Geoprocessing API Requests * Add a custom throttle base class to only throttle true users of the API and not the client app * Throttle users at a burst, per minute rate and a sustained, per day rate. Settings are from the [climate-api](https://github.com/azavea/climate-change-api/blob/34a17fa753dd2b1f4d1b20d6b960b347d80733dd/django/climate_change_api/climate_change_api/settings.py#L342) though we may need to fine-tune them at a later date * Add the throttling to all start-job geoprocessing api endpoints --- src/mmw/apps/geoprocessing_api/throttling.py | 27 ++++++++++++++++++++ src/mmw/apps/geoprocessing_api/views.py | 9 +++++++ src/mmw/mmw/settings/base.py | 6 ++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/mmw/apps/geoprocessing_api/throttling.py diff --git a/src/mmw/apps/geoprocessing_api/throttling.py b/src/mmw/apps/geoprocessing_api/throttling.py new file mode 100644 index 000000000..e8015cb5b --- /dev/null +++ b/src/mmw/apps/geoprocessing_api/throttling.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +from __future__ import print_function +from __future__ import unicode_literals + +from django.conf import settings + +from rest_framework.throttling import UserRateThrottle + + +class GeoprocessingApiUserRateThrottle(UserRateThrottle): + """ Only throttle "real" users of the API, not the client app""" + def allow_request(self, request, view): + if request.user and \ + request.user.username == settings.CLIENT_APP_USERNAME: + # If the user is the client app, pass through and + # don't attempt any throttling + return True + + return UserRateThrottle.allow_request(self, request, view) + + +class BurstRateThrottle(GeoprocessingApiUserRateThrottle): + scope = 'burst' + + +class SustainedRateThrottle(GeoprocessingApiUserRateThrottle): + scope = 'sustained' diff --git a/src/mmw/apps/geoprocessing_api/views.py b/src/mmw/apps/geoprocessing_api/views.py index 3c7525157..f0dda7db3 100644 --- a/src/mmw/apps/geoprocessing_api/views.py +++ b/src/mmw/apps/geoprocessing_api/views.py @@ -26,6 +26,8 @@ from apps.modeling.views import load_area_of_interest from apps.geoprocessing_api import tasks from apps.geoprocessing_api.permissions import AuthTokenSerializerAuthentication # noqa +from apps.geoprocessing_api.throttling import (BurstRateThrottle, + SustainedRateThrottle) @decorators.api_view(['POST']) @@ -84,6 +86,7 @@ def get_auth_token(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) @decorators.permission_classes((IsAuthenticated, )) +@decorators.throttle_classes([BurstRateThrottle, SustainedRateThrottle]) @log_request def start_rwd(request, format=None): """ @@ -285,6 +288,7 @@ def validate_location(loc): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) @decorators.permission_classes((IsAuthenticated, )) +@decorators.throttle_classes([BurstRateThrottle, SustainedRateThrottle]) @log_request def start_analyze_land(request, format=None): """ @@ -480,6 +484,7 @@ def start_analyze_land(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) @decorators.permission_classes((IsAuthenticated, )) +@decorators.throttle_classes([BurstRateThrottle, SustainedRateThrottle]) @log_request def start_analyze_soil(request, format=None): """ @@ -607,6 +612,7 @@ def start_analyze_soil(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) @decorators.permission_classes((IsAuthenticated, )) +@decorators.throttle_classes([BurstRateThrottle, SustainedRateThrottle]) @log_request def start_analyze_animals(request, format=None): """ @@ -718,6 +724,7 @@ def start_analyze_animals(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) @decorators.permission_classes((IsAuthenticated, )) +@decorators.throttle_classes([BurstRateThrottle, SustainedRateThrottle]) @log_request def start_analyze_pointsource(request, format=None): """ @@ -808,6 +815,7 @@ def start_analyze_pointsource(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) @decorators.permission_classes((IsAuthenticated, )) +@decorators.throttle_classes([BurstRateThrottle, SustainedRateThrottle]) @log_request def start_analyze_catchment_water_quality(request, format=None): """ @@ -927,6 +935,7 @@ def start_analyze_catchment_water_quality(request, format=None): @decorators.api_view(['POST']) @decorators.authentication_classes((TokenAuthentication, )) @decorators.permission_classes((IsAuthenticated, )) +@decorators.throttle_classes([BurstRateThrottle, SustainedRateThrottle]) @log_request def start_analyze_climate(request, format=None): """ diff --git a/src/mmw/mmw/settings/base.py b/src/mmw/mmw/settings/base.py index ef92f04b7..8110322ba 100644 --- a/src/mmw/mmw/settings/base.py +++ b/src/mmw/mmw/settings/base.py @@ -304,7 +304,11 @@ def get_env_setting(setting): # or allow read-only access for unauthenticated users. 'DEFAULT_PERMISSION_CLASSES': [ 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly' - ] + ], + 'DEFAULT_THROTTLE_RATES': { + 'sustained': '5000/day', + 'burst': '20/min', + }, } SWAGGER_SETTINGS = { From 6560b500662b2073dcbb4ed6356621a05981e810 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Fri, 20 Oct 2017 11:13:23 -0400 Subject: [PATCH 088/172] Drop DRB-specific map layers from BigCZ --- src/mmw/js/src/core/models.js | 6 +++- src/mmw/mmw/settings/layer_settings.py | 46 ++++++++++++++++++++------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/mmw/js/src/core/models.js b/src/mmw/js/src/core/models.js index 6f4f1cc33..75815673b 100644 --- a/src/mmw/js/src/core/models.js +++ b/src/mmw/js/src/core/models.js @@ -148,6 +148,7 @@ var LayerModel = Backbone.Model.extend({ colorRampId: null, legendUnitsLabel: null, legendUnitBreaks: null, + bigCZ: null, }, buildLayer: function(layerSettings, layerType, initialActive) { @@ -210,6 +211,7 @@ var LayerModel = Backbone.Model.extend({ colorRampId: layerSettings.color_ramp_id || null, legendUnitsLabel: layerSettings.legend_units_label || null, legendUnitBreaks: layerSettings.legend_unit_breaks || null, + bigCZ: layerSettings.big_cz, }); } }); @@ -223,7 +225,9 @@ var LayersCollection = Backbone.Collection.extend({ _.each(settings.get(options.type), function(layer) { var layerModel = new LayerModel(); layerModel.buildLayer(layer, options.type, options.initialActive); - self.add(layerModel); + if (!settings.get('data_catalog_enabled') || layerModel.get('bigCZ')) { + self.add(layerModel); + } }); } }, diff --git a/src/mmw/mmw/settings/layer_settings.py b/src/mmw/mmw/settings/layer_settings.py index 95c39fb37..d1ec76cd1 100644 --- a/src/mmw/mmw/settings/layer_settings.py +++ b/src/mmw/mmw/settings/layer_settings.py @@ -65,6 +65,7 @@ 'Mapbox', 'maxZoom': 18, 'default': True, + 'big_cz': True, }, { 'display': 'Satellite', @@ -74,16 +75,19 @@ 'item.html?id=10df2279f9684e4a9f6a7f08febac2a9">ESRI' '', 'maxZoom': 19, + 'big_cz': True, }, { 'display': 'Satellite with Roads', 'googleType': 'HYBRID', # SATELLITE, ROADMAP, HYBRID, or TERRAIN 'maxZoom': 18, # Max zoom changes based on location. Safe default + 'big_cz': True, }, { 'display': 'Terrain', 'googleType': 'TERRAIN', # SATELLITE, ROADMAP, HYBRID, or TERRAIN 'maxZoom': 20, + 'big_cz': True, }, ], 'coverage': [ @@ -100,6 +104,7 @@ 'opacity': 0.618, 'has_opacity_slider': True, 'legend_mapping': { key: names[1] for key, names in NLCD_MAPPING.iteritems()}, + 'big_cz': True, }, { 'display': 'Hydrologic Soil Groups From gSSURGO', @@ -125,6 +130,7 @@ SOIL_MAPPING[7], SOIL_MAPPING[4], ]), + 'big_cz': True, }, { 'code': 'mean_ppt', @@ -140,7 +146,8 @@ 'use_color_ramp': True, 'color_ramp_id': 'precipitation-legend', 'legend_units_label': 'Precipitation (mm/month)', - 'legend_unit_breaks': [0, '', 100, '', 200, '', 300, '', 400, '', 500] + 'legend_unit_breaks': [0, '', 100, '', 200, '', 300, '', 400, '', 500], + 'big_cz': True, }, { 'code': 'mean_temp', @@ -156,7 +163,8 @@ 'use_color_ramp': True, 'color_ramp_id': 'temperature-legend', 'legend_units_label': u'Air Temperature (\xb0C)', - 'legend_unit_breaks': [-20, '', -8, '', 4, '', 16, '', 28, '', 40] + 'legend_unit_breaks': [-20, '', -8, '', 4, '', 16, '', 28, '', 40], + 'big_cz': True, }, { 'code': 'urban_areas', @@ -167,6 +175,7 @@ 'opacity': 0.618, 'has_opacity_slider': True, 'perimeter': pa_perimeter, + 'big_cz': False, }, { 'code': 'drb_catchment_water_quality_tn', @@ -186,7 +195,8 @@ 3: 'Less than 15 kg/y', 4: 'Less than 20 kg/y', 5: 'Greater than 20 kg/y', - } + }, + 'big_cz': False, }, { 'code': 'drb_catchment_water_quality_tp', @@ -206,7 +216,8 @@ 3: 'Less than 0.90 kg/y', 4: 'Less than 1.20 kg/y', 5: 'Greater than 1.20 kg/y', - } + }, + 'big_cz': False, }, { 'code': 'drb_catchment_water_quality_tss', @@ -226,7 +237,8 @@ 3: 'Less than 750 kg/y', 4: 'Less than 1000 kg/y', 5: 'Greater than 1000 kg/y', - } + }, + 'big_cz': False, } ], 'boundary': [ @@ -247,6 +259,7 @@ 'selectable': True, 'searchable': True, 'search_rank': 30, + 'big_cz': True, }, { 'code': 'huc10', @@ -265,6 +278,7 @@ 'selectable': True, 'searchable': True, 'search_rank': 20, + 'big_cz': True, }, { 'code': 'huc12', @@ -284,6 +298,7 @@ 'selectable': True, 'searchable': True, 'search_rank': 10, + 'big_cz': True, }, { 'code': 'county', @@ -299,6 +314,7 @@ '', 'minZoom': 6, 'selectable': True, + 'big_cz': True, }, { 'code': 'district', @@ -315,6 +331,7 @@ '', 'minZoom': 5, 'selectable': True, + 'big_cz': False, }, { 'code': 'school', @@ -330,6 +347,7 @@ '', 'minZoom': 8, 'selectable': True, + 'big_cz': False, }, { 'code': 'municipalities', @@ -338,6 +356,7 @@ 'short_display': 'PA Municipalities', 'minZoom': 6, 'perimeter': pa_perimeter, + 'big_cz': False, }, ], 'stream': [ @@ -346,7 +365,8 @@ 'display': ('Continental US Medium Resolution' + ' Stream Network'), 'table_name': 'nhdflowline', - 'minZoom': 3 + 'minZoom': 3, + 'big_cz': True, }, { 'code': 'drb_streams_v2', @@ -354,8 +374,9 @@ ' Stream Network'), 'table_name': 'drb_streams_50', 'minZoom': 5, - 'perimeter': drb_simple_perimeter # Layer is only selectable when viewport - # overlaps with perimeter polygon. + # Layer selectable only when viewport overlaps perimeter polygon + 'perimeter': drb_simple_perimeter, + 'big_cz': False, }, { 'code': 'nhd_quality_tn', @@ -371,7 +392,8 @@ 3: 'Less than 3 mg/L', 4: 'Less than 4 mg/L', 'NA': 'No Data' - } + }, + 'big_cz': False, }, { 'code': 'nhd_quality_tp', @@ -387,7 +409,8 @@ 3: 'Less than 0.09 mg/L', 4: 'Less than 0.12 mg/L', 'NA': 'No Data' - } + }, + 'big_cz': False, }, { 'code': 'nhd_quality_tss', @@ -403,7 +426,8 @@ 3: 'Less than 150 mg/L', 4: 'Less than 200 mg/L', 'NA': 'No Data' - } + }, + 'big_cz': False, }, ], } From 5120c6556fadf5969a0f7c99a83883c7980d848c Mon Sep 17 00:00:00 2001 From: Matthew McFarland Date: Mon, 23 Oct 2017 10:03:14 -0400 Subject: [PATCH 089/172] Increase max size for MapShed AoI processing 5000 km2 is a minimum threshold client specified target for running mapshed jobs. This was verified to run and not time out directly on staging instances, it's unlikely that a unmodified VM dev environment will successfully complete regularly. There are higher thresholds desired, and potentially better ways to accommodate them by increasing Worker CPU counts and adjusting Celery concurrency. To meet a short-term testing deadline, I'm proposing this modest change as a first step. --- src/mmw/js/src/analyze/views.js | 7 ++++--- src/mmw/mmw/settings/gwlfe_settings.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mmw/js/src/analyze/views.js b/src/mmw/js/src/analyze/views.js index c905c3b39..307733d3d 100644 --- a/src/mmw/js/src/analyze/views.js +++ b/src/mmw/js/src/analyze/views.js @@ -78,14 +78,15 @@ var ModelSelectionDropdownView = Marionette.ItemView.extend({ if (modelPackageName === 'gwlfe' && settings.get('mapshed_max_area')) { var areaInSqKm = utils.changeOfAreaUnits(aoiModel.get('area'), aoiModel.get('units'), - 'km2'); + 'km2'), + mapshedMaxArea = settings.get('mapshed_max_area'); - if (areaInSqKm > settings.get('mapshed_max_area')) { + if (areaInSqKm > mapshedMaxArea) { alertView = new modalViews.AlertView({ model: new modalModels.AlertModel({ alertMessage: "The selected Area of Interest is too big for " + "the Watershed Multi-Year Model. The currently " + - "maximum supported size is 1000 km².", + "maximum supported size is " + mapshedMaxArea + " km².", alertType: modalModels.AlertTypes.warn }) }); diff --git a/src/mmw/mmw/settings/gwlfe_settings.py b/src/mmw/mmw/settings/gwlfe_settings.py index b1b680cb4..b2f18c07c 100644 --- a/src/mmw/mmw/settings/gwlfe_settings.py +++ b/src/mmw/mmw/settings/gwlfe_settings.py @@ -481,7 +481,7 @@ 'SSLDR': 4.4, 'SSLDM': 2.2, 'WeatherNull': -99999, # This value is used to indicate NULL in ms_weather dataset - 'MaxAoIArea': 1000, # Maximum allowed area in square kilometers + 'MaxAoIArea': 5000, # Maximum allowed area in square kilometers 'ETGrowCoeff': [ 1.00, # Hay/Pasture 0.80, # Cropland From d71eea4ac7f737e474187a1793bae6ad49af3b70 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Mon, 23 Oct 2017 11:15:09 -0400 Subject: [PATCH 090/172] Drop DRB-specific aoi selections for bigcz --- src/mmw/js/src/draw/controllers.js | 10 ++++++++-- src/mmw/js/src/draw/views.js | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/mmw/js/src/draw/controllers.js b/src/mmw/js/src/draw/controllers.js index aeabfc230..692bded28 100644 --- a/src/mmw/js/src/draw/controllers.js +++ b/src/mmw/js/src/draw/controllers.js @@ -6,7 +6,6 @@ var App = require('../app'), settings = require('../core/settings'), modelingModels = require('../modeling/models'), models = require('./models'), - _ = require('underscore'), utils = require('../core/utils'), models = require('./models'); @@ -18,7 +17,14 @@ var DrawController = { toolbarModel = new models.ToolbarModel(); toolbarModel.set('predefinedShapeTypes', - _.filter(settings.get('boundary_layers'), { selectable: true })); + settings + .get('boundary_layers') + .filter(function(layer) { + if (settings.get('data_catalog_enabled')) { + return (layer.big_cz && layer.selectable); + } + return layer.selectable; + })); if (!App.rootView.geocodeSearchRegion.hasView()) { App.rootView.geocodeSearchRegion.show(geocodeSearch); diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index cad73213e..23fae8617 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -15,6 +15,7 @@ var $ = require('jquery'), App = require('../app'), utils = require('./utils'), models = require('./models'), + settings = require('../core/settings'), coreUtils = require('../core/utils'), drawUtils = require('../draw/utils'), splashTmpl = require('./templates/splash.html'), From 36732b9a37e10d45c1570bea5eaa9b9fa29bcb26 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Mon, 23 Oct 2017 12:18:43 -0400 Subject: [PATCH 091/172] Drop DRB RWD selection for bigcz --- src/mmw/js/src/draw/views.js | 82 +++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index 23fae8617..0363e370b 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -824,6 +824,46 @@ var WatershedDelineationView = DrawToolBaseView.extend({ DrawToolBaseView.prototype.initialize.call(this, options); this.id = delineateWatershed; this.rwdTaskModel = options.rwdTaskModel; + + this.rwdDrawItems = [ + { + id: utils.NHD, + dataSource: utils.NHD, + title: 'Continental US Medium Resolution', + info: 'Click on the map to select the nearest downhill ' + + 'point on the medium resolution flow lines of the ' + + 'National Hydrography Dataset (NHDplus v2). The ' + + 'watershed area upstream of this point is ' + + 'automatically delineated using the 30 m resolution ' + + 'flow direction grid.
        ' + + 'For more information, see ' + + '' + + 'Model My Watershed Technical Documentation on ' + + 'Delineate Watershed.', + shapeType: 'stream', + snappingOn: true, + minZoom: 0, + directions: 'Click a point to delineate a watershed.' + }, + { + id: utils.DRB, + dataSource: utils.DRB, + title: 'Delaware High Resolution', + info: 'Click on the map to select the nearest downhill ' + + 'point on our Delaware River Basin high resolution ' + + 'stream network. The watershed area upstream of this ' + + 'point is automatically delineated using the 10 m ' + + 'resolution national elevation model.
        ' + + 'For more information, see ' + + '' + + 'Model My Watershed Technical Documentation on ' + + 'Delineate Watershed.', + shapeType: 'stream', + snappingOn: true, + minZoom: 0, + directions: 'Click a point to delineate a watershed.' + } + ]; }, getToolData: function() { @@ -831,45 +871,9 @@ var WatershedDelineationView = DrawToolBaseView.extend({ id: this.id, title: 'Delineate watershed', info: 'Automatically delineate a watershed from any point', - items: [ - { - id: utils.NHD, - dataSource: utils.NHD, - title: 'Continental US Medium Resolution', - info: 'Click on the map to select the nearest downhill ' + - 'point on the medium resolution flow lines of the ' + - 'National Hydrography Dataset (NHDplus v2). The ' + - 'watershed area upstream of this point is ' + - 'automatically delineated using the 30 m resolution ' + - 'flow direction grid.
        ' + - 'For more information, see ' + - '' + - 'Model My Watershed Technical Documentation on ' + - 'Delineate Watershed.', - shapeType: 'stream', - snappingOn: true, - minZoom: 0, - directions: 'Click a point to delineate a watershed.' - }, - { - id: utils.DRB, - dataSource: utils.DRB, - title: 'Delaware High Resolution', - info: 'Click on the map to select the nearest downhill ' + - 'point on our Delaware River Basin high resolution ' + - 'stream network. The watershed area upstream of this ' + - 'point is automatically delineated using the 10 m ' + - 'resolution national elevation model.
        ' + - 'For more information, see ' + - '' + - 'Model My Watershed Technical Documentation on ' + - 'Delineate Watershed.', - shapeType: 'stream', - snappingOn: true, - minZoom: 0, - directions: 'Click a point to delineate a watershed.' - } - ] + items: settings.get('data_catalog_enabled') ? + _.reject(this.rwdDrawItems, { id: utils.DRB }) : + this.rwdDrawItems, }; }, From df8263aa53eb65700f7971cf5ac9323b10ae6cd2 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Thu, 19 Oct 2017 16:56:46 -0400 Subject: [PATCH 092/172] Hide layerPicker & slider on projects/account page --- src/mmw/js/src/account/controllers.js | 2 +- src/mmw/js/src/app.js | 5 +++++ src/mmw/js/src/projects/controllers.js | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/mmw/js/src/account/controllers.js b/src/mmw/js/src/account/controllers.js index 8e3044e27..28d3718d5 100644 --- a/src/mmw/js/src/account/controllers.js +++ b/src/mmw/js/src/account/controllers.js @@ -27,7 +27,7 @@ function showAccountView() { model: new models.AccountContainerModel() }) ); - App.rootView.layerPickerRegion.empty(); + App.destroyLayerPicker(); App.state.set('active_page', coreUtils.accountPageTitle); } diff --git a/src/mmw/js/src/app.js b/src/mmw/js/src/app.js index c0a4175cb..ec3526cab 100644 --- a/src/mmw/js/src/app.js +++ b/src/mmw/js/src/app.js @@ -96,6 +96,11 @@ var App = new Marionette.Application({ this.rootView.layerPickerRegion.show(this.layerPickerView); }, + destroyLayerPicker: function() { + this.rootView.layerPickerRegion.empty(); + this.rootView.layerPickerSliderRegion.empty(); + }, + getAnalyzeCollection: function() { if (!this.analyzeCollection) { var aoi = this.map.get('areaOfInterest'), diff --git a/src/mmw/js/src/projects/controllers.js b/src/mmw/js/src/projects/controllers.js index 2b0057e9a..bbc6bf8b5 100644 --- a/src/mmw/js/src/projects/controllers.js +++ b/src/mmw/js/src/projects/controllers.js @@ -14,7 +14,7 @@ var ProjectsController = { new views.ProjectsView() ); - App.rootView.layerPickerRegion.empty(); + App.destroyLayerPicker(); App.state.set('active_page', coreUtils.projectsPageTitle); }, From eed2f43e0b7bfffe1f403bd7572944ebf9d54357 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 23 Oct 2017 13:31:28 -0400 Subject: [PATCH 093/172] Create Cinergi Specific Search Result Template * Coopt the generic "searchResult" template to be cinergi specific. cuahsi and hydroshare now have there own templates, so there's currently no need to keep around the general case --- .../templates/{searchResult.html => searchResultCinergi.html} | 2 +- src/mmw/js/src/data_catalog/views.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/mmw/js/src/data_catalog/templates/{searchResult.html => searchResultCinergi.html} (88%) diff --git a/src/mmw/js/src/data_catalog/templates/searchResult.html b/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html similarity index 88% rename from src/mmw/js/src/data_catalog/templates/searchResult.html rename to src/mmw/js/src/data_catalog/templates/searchResultCinergi.html index eb1b63137..95a4c7f12 100644 --- a/src/mmw/js/src/data_catalog/templates/searchResult.html +++ b/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html @@ -1,4 +1,4 @@ -
        +

        {{ title }}

        diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index d3a5a84b9..fdc213fa8 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -16,7 +16,7 @@ var $ = require('jquery'), filterSidebarTmpl = require('./templates/filterSidebar.html'), formTmpl = require('./templates/form.html'), pagerTmpl = require('./templates/pager.html'), - searchResultTmpl = require('./templates/searchResult.html'), + searchResultCinergiTmpl = require('./templates/searchResultCinergi.html'), searchResultHydroshareTmpl = require('./templates/searchResultHydroshare.html'), searchResultCuahsiTmpl = require('./templates/searchResultCuahsi.html'), tabContentTmpl = require('./templates/tabContent.html'), @@ -40,7 +40,7 @@ var $ = require('jquery'), var ENTER_KEYCODE = 13, PAGE_SIZE = settings.get('data_catalog_page_size'), CATALOG_RESULT_TEMPLATE = { - cinergi: searchResultTmpl, + cinergi: searchResultCinergiTmpl, hydroshare: searchResultHydroshareTmpl, cuahsi: searchResultCuahsiTmpl, }; From faadb1c44a46f4337fff7c00d46d76063f7fc805 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 23 Oct 2017 13:53:17 -0400 Subject: [PATCH 094/172] Truncate Cinergi Search Result Description (1-line) --- src/mmw/js/src/data_catalog/templates/searchResultCinergi.html | 2 +- src/mmw/sass/pages/_data-catalog.scss | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html b/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html index 95a4c7f12..f21922722 100644 --- a/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html +++ b/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html @@ -3,7 +3,7 @@

        {{ title }}

        {% if not (summary == "REQUIRED FIELD") %} -
        +
        {{ summary }}
        {% endif %} diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index 2fda7ccea..f1bfa3a36 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -90,7 +90,6 @@ .result-region { height: auto !important; - width: auto !important; padding: 6px 0px; &.paginated { @@ -225,7 +224,6 @@ .resource-description { color: $ui-grey; - font-size: $font-size-h5; padding-bottom: 3px; } From 7944179dd945fb67ce4d196a24e513efc6d2e912 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 23 Oct 2017 14:21:53 -0400 Subject: [PATCH 095/172] Add source line to cinergi result * Add source_name and contact_organizations to cinergi serializer * contact_organizations can be a list or a string, parse it to always be a list * Display source as: (source icon) "source_name / contact_organizations[0]" --- src/mmw/apps/bigcz/clients/cinergi/models.py | 5 ++++- src/mmw/apps/bigcz/clients/cinergi/search.py | 16 +++++++++++++++- .../apps/bigcz/clients/cinergi/serializers.py | 7 ++++++- .../templates/searchResultCinergi.html | 11 +++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/cinergi/models.py b/src/mmw/apps/bigcz/clients/cinergi/models.py index db89753ac..448b2d536 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/models.py +++ b/src/mmw/apps/bigcz/clients/cinergi/models.py @@ -8,9 +8,12 @@ class CinergiResource(Resource): def __init__(self, id, description, author, links, title, - created_at, updated_at, geom, cinergi_url): + created_at, updated_at, geom, cinergi_url, + source_name, contact_organizations): super(CinergiResource, self).__init__(id, description, author, links, title, created_at, updated_at, geom) self.cinergi_url = cinergi_url + self.source_name = source_name + self.contact_organizations = contact_organizations diff --git a/src/mmw/apps/bigcz/clients/cinergi/search.py b/src/mmw/apps/bigcz/clients/cinergi/search.py index d4fb1f582..1c558aaf7 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/search.py +++ b/src/mmw/apps/bigcz/clients/cinergi/search.py @@ -89,6 +89,17 @@ def parse_cinergi_url(fileid): return '{}/geoportal/?filter=%22{}%22'.format(CINERGI_HOST, fileid) +def parse_contact_organizations(contact_organizations): + """ + Contact organizations can be either a list of strings, or + a string. Make it always a list of strings + """ + if isinstance(contact_organizations, basestring): + return [contact_organizations] + + return contact_organizations + + def parse_record(item): source = item['_source'] geom = parse_geom(source) @@ -102,7 +113,10 @@ def parse_record(item): created_at=parse_date(source.get('sys_created_dt')), updated_at=parse_date(source.get('src_lastupdate_dt')), geom=geom, - cinergi_url=parse_cinergi_url(source.get('fileid'))) + cinergi_url=parse_cinergi_url(source.get('fileid')), + source_name=source.get('src_source_name_s'), + contact_organizations=parse_contact_organizations( + source.get('contact_organizations_s'))) def prepare_bbox(box): diff --git a/src/mmw/apps/bigcz/clients/cinergi/serializers.py b/src/mmw/apps/bigcz/clients/cinergi/serializers.py index a67f40c9a..54f11620e 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/serializers.py +++ b/src/mmw/apps/bigcz/clients/cinergi/serializers.py @@ -3,10 +3,15 @@ from __future__ import unicode_literals from __future__ import division -from rest_framework.serializers import CharField +from rest_framework.serializers import (CharField, + ListField) from apps.bigcz.serializers import ResourceSerializer class CinergiResourceSerializer(ResourceSerializer): cinergi_url = CharField() + source_name = CharField() + contact_organizations = ListField( + child=CharField() + ) diff --git a/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html b/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html index f21922722..f3069d2f3 100644 --- a/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html +++ b/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html @@ -7,6 +7,17 @@

        {{ summary }}

        {% endif %} + {% if source_name or contact_organizations %} +
        + + {% if source_name %} + {{ source_name }} / + {% endif %} + {% if contact_organizations %} + {{ contact_organizations[0] }} + {% endif %} +
        + {% endif %} {% if created_at %}
        {{ created_at|toDateFullYear }} From 296ca5c552ef0cc85d50ca9417475d97394207f4 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 23 Oct 2017 15:54:16 -0400 Subject: [PATCH 096/172] Add categories to cinergi result Show categories simliar to how we show cuahsi variables in the search result --- src/mmw/apps/bigcz/clients/cinergi/models.py | 4 ++- src/mmw/apps/bigcz/clients/cinergi/search.py | 29 ++++++++++++++++++- .../apps/bigcz/clients/cinergi/serializers.py | 3 ++ .../templates/searchResultCinergi.html | 6 ++++ src/mmw/js/src/data_catalog/views.js | 19 ++++++++++++ 5 files changed, 59 insertions(+), 2 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/cinergi/models.py b/src/mmw/apps/bigcz/clients/cinergi/models.py index 448b2d536..79677f0b6 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/models.py +++ b/src/mmw/apps/bigcz/clients/cinergi/models.py @@ -9,7 +9,8 @@ class CinergiResource(Resource): def __init__(self, id, description, author, links, title, created_at, updated_at, geom, cinergi_url, - source_name, contact_organizations): + source_name, contact_organizations, + categories): super(CinergiResource, self).__init__(id, description, author, links, title, created_at, updated_at, geom) @@ -17,3 +18,4 @@ def __init__(self, id, description, author, links, title, self.cinergi_url = cinergi_url self.source_name = source_name self.contact_organizations = contact_organizations + self.categories = categories diff --git a/src/mmw/apps/bigcz/clients/cinergi/search.py b/src/mmw/apps/bigcz/clients/cinergi/search.py index 1c558aaf7..58390f946 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/search.py +++ b/src/mmw/apps/bigcz/clients/cinergi/search.py @@ -100,6 +100,32 @@ def parse_contact_organizations(contact_organizations): return contact_organizations +def parse_categories(source): + """ + Categories are lists of the form: + ["Category > Material > Environmental Material > Water", + "Category > Property > Measure > Physical Quantity > Flow", ... ] + + Or just a string + "Category > Property > Measure > Physical Quantity > Flow" + + Return a list of the "leaves" (the string after the last ">") + ["Water", "Flow", ...] + """ + categories = source.get('hierarchies_cat', + source.get('categories_cat')) + if not categories or \ + not all(isinstance(c, basestring) for c in categories): + # We only handle categories that are lists of strings + return None + + if isinstance(categories, basestring): + categories = [categories] + + split_categories = [category.split(">") for category in categories] + return [c[len(c) - 1] for c in split_categories] + + def parse_record(item): source = item['_source'] geom = parse_geom(source) @@ -116,7 +142,8 @@ def parse_record(item): cinergi_url=parse_cinergi_url(source.get('fileid')), source_name=source.get('src_source_name_s'), contact_organizations=parse_contact_organizations( - source.get('contact_organizations_s'))) + source.get('contact_organizations_s')), + categories=parse_categories(source)) def prepare_bbox(box): diff --git a/src/mmw/apps/bigcz/clients/cinergi/serializers.py b/src/mmw/apps/bigcz/clients/cinergi/serializers.py index 54f11620e..6f854ece6 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/serializers.py +++ b/src/mmw/apps/bigcz/clients/cinergi/serializers.py @@ -15,3 +15,6 @@ class CinergiResourceSerializer(ResourceSerializer): contact_organizations = ListField( child=CharField() ) + categories = ListField( + child=CharField() + ) diff --git a/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html b/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html index f3069d2f3..bc6c65c70 100644 --- a/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html +++ b/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html @@ -18,6 +18,12 @@

        {% endif %}

        {% endif %} +
        + +
        + {{ top_categories }} +
        +
        {% if created_at %}
        {{ created_at|toDateFullYear }} diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index fdc213fa8..8839f7764 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -416,6 +416,25 @@ var StaticResultView = Marionette.ItemView.extend({ .join('; '), }; } + + if (this.options.catalog === 'cinergi') { + var categories = _.clone(this.model.get('categories')); + + if (!categories) { + return null; + } + + // Truncate if longer than 8 values + if (categories.length > 8) { + categories = categories.slice(0, 9); + var lastIdx = categories.length -1; + categories[lastIdx] = categories[lastIdx] + '...'; + } + + return { + 'top_categories': categories.join('; ') + }; + } }, modelEvents: { From 0dd2eb728b4a1878fe4e21aac721f32a2a6a8c41 Mon Sep 17 00:00:00 2001 From: Casey Cesari Date: Wed, 25 Oct 2017 11:56:41 -0400 Subject: [PATCH 097/172] Add source data link for NWISUV and NWISGW results Similar to NWISDV, add a link to the source data page for NWISUV and NWISGW WDC results. Refs #2403 --- src/mmw/apps/bigcz/clients/cuahsi/search.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/cuahsi/search.py b/src/mmw/apps/bigcz/clients/cuahsi/search.py index 53102d73d..618d30862 100644 --- a/src/mmw/apps/bigcz/clients/cuahsi/search.py +++ b/src/mmw/apps/bigcz/clients/cuahsi/search.py @@ -96,11 +96,20 @@ def parse_details_url(record): Ref: https://github.com/WikiWatershed/model-my-watershed/issues/1931 """ location = record['location'] - if 'NWISDV' in location: + if any(code in location for code in ('NWISDV', 'NWISGW', 'NWISUV')): parts = location.split(':') if len(parts) == 2: - _, id = parts - return 'https://waterdata.usgs.gov/nwis/uv/?site_no={}'.format(id) + code, id = parts + if code == 'NWISDV': + url = 'https://waterdata.usgs.gov/nwis/uv/?site_no={}' + return url.format(id) + elif code == 'NWISUV': + url = 'https://waterdata.usgs.gov/nwis/dv/?site_no={}' + return url.format(id) + elif code == 'NWISGW': + url = ('https://nwis.waterdata.usgs.gov/' + + 'usa/nwis/gwlevels/?site_no={}') + return url.format(id) return None From 63e175d48a74abe45cdae1366c9f51741b02036f Mon Sep 17 00:00:00 2001 From: Casey Cesari Date: Wed, 25 Oct 2017 15:45:41 -0400 Subject: [PATCH 098/172] Hide user endpoints in Swagger API documentation The user namespace is added to the user URLs, which, because of our Swagger configuration, prevents the URLs from showing up in the documentation. This was originally added in #2227, but it broke compatibility with ITSI and was removed in #2377. The namespace is added here again along with a fix to the ITSI login view. When calling reverse on a URL which is included in a namespace, the namespace must also be added to the reverse parameter. See https://stackoverflow.com/a/38390178/217378. Refs #2401 --- src/mmw/apps/user/views.py | 2 +- src/mmw/mmw/urls.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mmw/apps/user/views.py b/src/mmw/apps/user/views.py index 786218904..3752144f0 100644 --- a/src/mmw/apps/user/views.py +++ b/src/mmw/apps/user/views.py @@ -107,7 +107,7 @@ def logout(request): def itsi_login(request): redirect_uri = '{0}?next={1}'.format( - request.build_absolute_uri(reverse(itsi_auth)), + request.build_absolute_uri(reverse('user:itsi_auth')), request.GET.get('next', '/') ) params = {'redirect_uri': redirect_uri} diff --git a/src/mmw/mmw/urls.py b/src/mmw/mmw/urls.py index 71dac1033..512efca31 100644 --- a/src/mmw/mmw/urls.py +++ b/src/mmw/mmw/urls.py @@ -37,5 +37,6 @@ namespace='mmw')), url(r'^api/', include(apps.geoprocessing_api.urls)), url(r'^micro/', include(apps.water_balance.urls)), - url(r'^user/', include(apps.user.urls)) + url(r'^user/', include(apps.user.urls, + namespace='user')) ) From f1aa5f355aaf433423a3edd8deb320dfe7965d6c Mon Sep 17 00:00:00 2001 From: Justin Walgran Date: Mon, 23 Oct 2017 14:15:36 -0700 Subject: [PATCH 099/172] Add UserProfile model related to User and created on login Following the pattern of `ItsiUser` I have created a new model related to `User` to hold additional, optional information. - All additional user profile fields are optional. - `user_type` is selected from a defined list of choices and defaults to "Unspecified." - `country` is selected from a defined list of choices and defaults to "US." We will be letting users skip entering this profile information so I have added a `was_skipped` and `is_complete` flags to the `UserProfile` model and return their values from the login endpoint so that client code can present the proper prompts for the information. --- src/mmw/apps/user/countries.py | 254 ++++++++++++++++++ .../apps/user/migrations/0004_userprofile.py | 28 ++ src/mmw/apps/user/models.py | 40 +++ src/mmw/apps/user/tests.py | 32 +++ src/mmw/apps/user/views.py | 7 +- 5 files changed, 359 insertions(+), 2 deletions(-) create mode 100644 src/mmw/apps/user/countries.py create mode 100644 src/mmw/apps/user/migrations/0004_userprofile.py diff --git a/src/mmw/apps/user/countries.py b/src/mmw/apps/user/countries.py new file mode 100644 index 000000000..2107b5c0a --- /dev/null +++ b/src/mmw/apps/user/countries.py @@ -0,0 +1,254 @@ +# -*- coding: utf-8 -*- +US = 'US' +# From https://en.wikipedia.org/wiki/ISO_3166-1#Officially_assigned_code_elements # NOQA +COUNTRY_CHOICES = ( + ('AF', u'Afghanistan'), + ('AX', u'Åland Islands'), + ('AL', u'Albania'), + ('DZ', u'Algeria'), + ('AS', u'American Samoa'), + ('AD', u'Andorra'), + ('AO', u'Angola'), + ('AI', u'Anguilla'), + ('AQ', u'Antarctica'), + ('AG', u'Antigua and Barbuda'), + ('AR', u'Argentina'), + ('AM', u'Armenia'), + ('AW', u'Aruba'), + ('AU', u'Australia'), + ('AT', u'Austria'), + ('AZ', u'Azerbaijan'), + ('BS', u'Bahamas'), + ('BH', u'Bahrain'), + ('BD', u'Bangladesh'), + ('BB', u'Barbados'), + ('BY', u'Belarus'), + ('BE', u'Belgium'), + ('BZ', u'Belize'), + ('BJ', u'Benin'), + ('BM', u'Bermuda'), + ('BT', u'Bhutan'), + ('BO', u'Bolivia (Plurinational State of)'), + ('BQ', u'Bonaire, Sint Eustatius and Saba'), + ('BA', u'Bosnia and Herzegovina'), + ('BW', u'Botswana'), + ('BV', u'Bouvet Island'), + ('BR', u'Brazil'), + ('IO', u'British Indian Ocean Territory'), + ('BN', u'Brunei Darussalam'), + ('BG', u'Bulgaria'), + ('BF', u'Burkina Faso'), + ('BI', u'Burundi'), + ('CV', u'Cabo Verde'), + ('KH', u'Cambodia'), + ('CM', u'Cameroon'), + ('CA', u'Canada'), + ('KY', u'Cayman Islands'), + ('CF', u'Central African Republic'), + ('TD', u'Chad'), + ('CL', u'Chile'), + ('CN', u'China'), + ('CX', u'Christmas Island'), + ('CC', u'Cocos (Keeling) Islands'), + ('CO', u'Colombia'), + ('KM', u'Comoros'), + ('CG', u'Congo'), + ('CD', u'Congo (Democratic Republic of the)'), + ('CK', u'Cook Islands'), + ('CR', u'Costa Rica'), + ('CI', u'Côte d\'Ivoire'), + ('HR', u'Croatia'), + ('CU', u'Cuba'), + ('CW', u'Curaçao'), + ('CY', u'Cyprus'), + ('CZ', u'Czechia'), + ('DK', u'Denmark'), + ('DJ', u'Djibouti'), + ('DM', u'Dominica'), + ('DO', u'Dominican Republic'), + ('EC', u'Ecuador'), + ('EG', u'Egypt'), + ('SV', u'El Salvador'), + ('GQ', u'Equatorial Guinea'), + ('ER', u'Eritrea'), + ('EE', u'Estonia'), + ('ET', u'Ethiopia'), + ('FK', u'Falkland Islands (Malvinas)'), + ('FO', u'Faroe Islands'), + ('FJ', u'Fiji'), + ('FI', u'Finland'), + ('FR', u'France'), + ('GF', u'French Guiana'), + ('PF', u'French Polynesia'), + ('TF', u'French Southern Territories'), + ('GA', u'Gabon'), + ('GM', u'Gambia'), + ('GE', u'Georgia'), + ('DE', u'Germany'), + ('GH', u'Ghana'), + ('GI', u'Gibraltar'), + ('GR', u'Greece'), + ('GL', u'Greenland'), + ('GD', u'Grenada'), + ('GP', u'Guadeloupe'), + ('GU', u'Guam'), + ('GT', u'Guatemala'), + ('GG', u'Guernsey'), + ('GN', u'Guinea'), + ('GW', u'Guinea-Bissau'), + ('GY', u'Guyana'), + ('HT', u'Haiti'), + ('HM', u'Heard Island and McDonald Islands'), + ('VA', u'Holy See'), + ('HN', u'Honduras'), + ('HK', u'Hong Kong'), + ('HU', u'Hungary'), + ('IS', u'Iceland'), + ('IN', u'India'), + ('ID', u'Indonesia'), + ('IR', u'Iran (Islamic Republic of)'), + ('IQ', u'Iraq'), + ('IE', u'Ireland'), + ('IM', u'Isle of Man'), + ('IL', u'Israel'), + ('IT', u'Italy'), + ('JM', u'Jamaica'), + ('JP', u'Japan'), + ('JE', u'Jersey'), + ('JO', u'Jordan'), + ('KZ', u'Kazakhstan'), + ('KE', u'Kenya'), + ('KI', u'Kiribati'), + ('KP', u'Korea (Democratic People\'s Republic of)'), + ('KR', u'Korea (Republic of)'), + ('KW', u'Kuwait'), + ('KG', u'Kyrgyzstan'), + ('LA', u'Lao People\'s Democratic Republic'), + ('LV', u'Latvia'), + ('LB', u'Lebanon'), + ('LS', u'Lesotho'), + ('LR', u'Liberia'), + ('LY', u'Libya'), + ('LI', u'Liechtenstein'), + ('LT', u'Lithuania'), + ('LU', u'Luxembourg'), + ('MO', u'Macao'), + ('MK', u'Macedonia (the former Yugoslav Republic of)'), + ('MG', u'Madagascar'), + ('MW', u'Malawi'), + ('MY', u'Malaysia'), + ('MV', u'Maldives'), + ('ML', u'Mali'), + ('MT', u'Malta'), + ('MH', u'Marshall Islands'), + ('MQ', u'Martinique'), + ('MR', u'Mauritania'), + ('MU', u'Mauritius'), + ('YT', u'Mayotte'), + ('MX', u'Mexico'), + ('FM', u'Micronesia (Federated States of)'), + ('MD', u'Moldova (Republic of)'), + ('MC', u'Monaco'), + ('MN', u'Mongolia'), + ('ME', u'Montenegro'), + ('MS', u'Montserrat'), + ('MA', u'Morocco'), + ('MZ', u'Mozambique'), + ('MM', u'Myanmar'), + ('NA', u'Namibia'), + ('NR', u'Nauru'), + ('NP', u'Nepal'), + ('NL', u'Netherlands'), + ('NC', u'New Caledonia'), + ('NZ', u'New Zealand'), + ('NI', u'Nicaragua'), + ('NE', u'Niger'), + ('NG', u'Nigeria'), + ('NU', u'Niue'), + ('NF', u'Norfolk Island'), + ('MP', u'Northern Mariana Islands'), + ('NO', u'Norway'), + ('OM', u'Oman'), + ('PK', u'Pakistan'), + ('PW', u'Palau'), + ('PS', u'Palestine, State of'), + ('PA', u'Panama'), + ('PG', u'Papua New Guinea'), + ('PY', u'Paraguay'), + ('PE', u'Peru'), + ('PH', u'Philippines'), + ('PN', u'Pitcairn'), + ('PL', u'Poland'), + ('PT', u'Portugal'), + ('PR', u'Puerto Rico'), + ('QA', u'Qatar'), + ('RE', u'Réunion'), + ('RO', u'Romania'), + ('RU', u'Russian Federation'), + ('RW', u'Rwanda'), + ('BL', u'Saint Barthélemy'), + ('SH', u'Saint Helena, Ascension and Tristan da Cunha'), + ('KN', u'Saint Kitts and Nevis'), + ('LC', u'Saint Lucia'), + ('MF', u'Saint Martin (French part)'), + ('PM', u'Saint Pierre and Miquelon'), + ('VC', u'Saint Vincent and the Grenadines'), + ('WS', u'Samoa'), + ('SM', u'San Marino'), + ('ST', u'Sao Tome and Principe'), + ('SA', u'Saudi Arabia'), + ('SN', u'Senegal'), + ('RS', u'Serbia'), + ('SC', u'Seychelles'), + ('SL', u'Sierra Leone'), + ('SG', u'Singapore'), + ('SX', u'Sint Maarten (Dutch part)'), + ('SK', u'Slovakia'), + ('SI', u'Slovenia'), + ('SB', u'Solomon Islands'), + ('SO', u'Somalia'), + ('ZA', u'South Africa'), + ('GS', u'South Georgia and the South Sandwich Islands'), + ('SS', u'South Sudan'), + ('ES', u'Spain'), + ('LK', u'Sri Lanka'), + ('SD', u'Sudan'), + ('SR', u'Suriname'), + ('SJ', u'Svalbard and Jan Mayen'), + ('SZ', u'Swaziland'), + ('SE', u'Sweden'), + ('CH', u'Switzerland'), + ('SY', u'Syrian Arab Republic'), + ('TW', u'Taiwan, Province of China[a]'), + ('TJ', u'Tajikistan'), + ('TZ', u'Tanzania, United Republic of'), + ('TH', u'Thailand'), + ('TL', u'Timor-Leste'), + ('TG', u'Togo'), + ('TK', u'Tokelau'), + ('TO', u'Tonga'), + ('TT', u'Trinidad and Tobago'), + ('TN', u'Tunisia'), + ('TR', u'Turkey'), + ('TM', u'Turkmenistan'), + ('TC', u'Turks and Caicos Islands'), + ('TV', u'Tuvalu'), + ('UG', u'Uganda'), + ('UA', u'Ukraine'), + ('AE', u'United Arab Emirates'), + ('GB', u'United Kingdom of Great Britain and Northern Ireland'), + ('US', u'United States of America'), + ('UM', u'United States Minor Outlying Islands'), + ('UY', u'Uruguay'), + ('UZ', u'Uzbekistan'), + ('VU', u'Vanuatu'), + ('VE', u'Venezuela (Bolivarian Republic of)'), + ('VN', u'Viet Nam'), + ('VG', u'Virgin Islands (British)'), + ('VI', u'Virgin Islands (U.S.)'), + ('WF', u'Wallis and Futuna'), + ('EH', u'Western Sahara'), + ('YE', u'Yemen'), + ('ZM', u'Zambia'), + ('ZW', u'Zimbabwe'), +) diff --git a/src/mmw/apps/user/migrations/0004_userprofile.py b/src/mmw/apps/user/migrations/0004_userprofile.py new file mode 100644 index 000000000..cb9631ad3 --- /dev/null +++ b/src/mmw/apps/user/migrations/0004_userprofile.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +from django.conf import settings + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0006_require_contenttypes_0002'), + ('user', '0003_client_app_user'), + ] + + operations = [ + migrations.CreateModel( + name='UserProfile', + fields=[ + ('user', models.OneToOneField(primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)), + ('was_skipped', models.BooleanField(default=False)), + ('is_complete', models.BooleanField(default=False)), + ('organization', models.TextField(blank=True)), + ('user_type', models.TextField(default=b'Unspecified', choices=[(b'Unspecified', b'Unspecified'), (b'University Faculty', b'University Faculty'), (b'University Professional or Research Staff', b'University Professional or Research Staff'), (b'Post-Doctoral Fellow', b'Post-Doctoral Fellow'), (b'University Graduate Student', b'University Graduate Student'), (b'University Undergraduate Student', b'University Undergraduate Student'), (b'Commercial/Professional', b'Commercial/Professional'), (b'Government Official', b'Government Official'), (b'School Student Kindergarten to 12th Grade', b'School Student Kindergarten to 12th Grade'), (b'School Teacher Kindergarten to 12th Grade', b'School Teacher Kindergarten to 12th Grade'), (b'Other', b'Other')])), + ('country', models.TextField(default=b'US', choices=[(b'AF', 'Afghanistan'), (b'AX', '\xc5land Islands'), (b'AL', 'Albania'), (b'DZ', 'Algeria'), (b'AS', 'American Samoa'), (b'AD', 'Andorra'), (b'AO', 'Angola'), (b'AI', 'Anguilla'), (b'AQ', 'Antarctica'), (b'AG', 'Antigua and Barbuda'), (b'AR', 'Argentina'), (b'AM', 'Armenia'), (b'AW', 'Aruba'), (b'AU', 'Australia'), (b'AT', 'Austria'), (b'AZ', 'Azerbaijan'), (b'BS', 'Bahamas'), (b'BH', 'Bahrain'), (b'BD', 'Bangladesh'), (b'BB', 'Barbados'), (b'BY', 'Belarus'), (b'BE', 'Belgium'), (b'BZ', 'Belize'), (b'BJ', 'Benin'), (b'BM', 'Bermuda'), (b'BT', 'Bhutan'), (b'BO', 'Bolivia (Plurinational State of)'), (b'BQ', 'Bonaire, Sint Eustatius and Saba'), (b'BA', 'Bosnia and Herzegovina'), (b'BW', 'Botswana'), (b'BV', 'Bouvet Island'), (b'BR', 'Brazil'), (b'IO', 'British Indian Ocean Territory'), (b'BN', 'Brunei Darussalam'), (b'BG', 'Bulgaria'), (b'BF', 'Burkina Faso'), (b'BI', 'Burundi'), (b'CV', 'Cabo Verde'), (b'KH', 'Cambodia'), (b'CM', 'Cameroon'), (b'CA', 'Canada'), (b'KY', 'Cayman Islands'), (b'CF', 'Central African Republic'), (b'TD', 'Chad'), (b'CL', 'Chile'), (b'CN', 'China'), (b'CX', 'Christmas Island'), (b'CC', 'Cocos (Keeling) Islands'), (b'CO', 'Colombia'), (b'KM', 'Comoros'), (b'CG', 'Congo'), (b'CD', 'Congo (Democratic Republic of the)'), (b'CK', 'Cook Islands'), (b'CR', 'Costa Rica'), (b'CI', "C\xf4te d'Ivoire"), (b'HR', 'Croatia'), (b'CU', 'Cuba'), (b'CW', 'Cura\xe7ao'), (b'CY', 'Cyprus'), (b'CZ', 'Czechia'), (b'DK', 'Denmark'), (b'DJ', 'Djibouti'), (b'DM', 'Dominica'), (b'DO', 'Dominican Republic'), (b'EC', 'Ecuador'), (b'EG', 'Egypt'), (b'SV', 'El Salvador'), (b'GQ', 'Equatorial Guinea'), (b'ER', 'Eritrea'), (b'EE', 'Estonia'), (b'ET', 'Ethiopia'), (b'FK', 'Falkland Islands (Malvinas)'), (b'FO', 'Faroe Islands'), (b'FJ', 'Fiji'), (b'FI', 'Finland'), (b'FR', 'France'), (b'GF', 'French Guiana'), (b'PF', 'French Polynesia'), (b'TF', 'French Southern Territories'), (b'GA', 'Gabon'), (b'GM', 'Gambia'), (b'GE', 'Georgia'), (b'DE', 'Germany'), (b'GH', 'Ghana'), (b'GI', 'Gibraltar'), (b'GR', 'Greece'), (b'GL', 'Greenland'), (b'GD', 'Grenada'), (b'GP', 'Guadeloupe'), (b'GU', 'Guam'), (b'GT', 'Guatemala'), (b'GG', 'Guernsey'), (b'GN', 'Guinea'), (b'GW', 'Guinea-Bissau'), (b'GY', 'Guyana'), (b'HT', 'Haiti'), (b'HM', 'Heard Island and McDonald Islands'), (b'VA', 'Holy See'), (b'HN', 'Honduras'), (b'HK', 'Hong Kong'), (b'HU', 'Hungary'), (b'IS', 'Iceland'), (b'IN', 'India'), (b'ID', 'Indonesia'), (b'IR', 'Iran (Islamic Republic of)'), (b'IQ', 'Iraq'), (b'IE', 'Ireland'), (b'IM', 'Isle of Man'), (b'IL', 'Israel'), (b'IT', 'Italy'), (b'JM', 'Jamaica'), (b'JP', 'Japan'), (b'JE', 'Jersey'), (b'JO', 'Jordan'), (b'KZ', 'Kazakhstan'), (b'KE', 'Kenya'), (b'KI', 'Kiribati'), (b'KP', "Korea (Democratic People's Republic of)"), (b'KR', 'Korea (Republic of)'), (b'KW', 'Kuwait'), (b'KG', 'Kyrgyzstan'), (b'LA', "Lao People's Democratic Republic"), (b'LV', 'Latvia'), (b'LB', 'Lebanon'), (b'LS', 'Lesotho'), (b'LR', 'Liberia'), (b'LY', 'Libya'), (b'LI', 'Liechtenstein'), (b'LT', 'Lithuania'), (b'LU', 'Luxembourg'), (b'MO', 'Macao'), (b'MK', 'Macedonia (the former Yugoslav Republic of)'), (b'MG', 'Madagascar'), (b'MW', 'Malawi'), (b'MY', 'Malaysia'), (b'MV', 'Maldives'), (b'ML', 'Mali'), (b'MT', 'Malta'), (b'MH', 'Marshall Islands'), (b'MQ', 'Martinique'), (b'MR', 'Mauritania'), (b'MU', 'Mauritius'), (b'YT', 'Mayotte'), (b'MX', 'Mexico'), (b'FM', 'Micronesia (Federated States of)'), (b'MD', 'Moldova (Republic of)'), (b'MC', 'Monaco'), (b'MN', 'Mongolia'), (b'ME', 'Montenegro'), (b'MS', 'Montserrat'), (b'MA', 'Morocco'), (b'MZ', 'Mozambique'), (b'MM', 'Myanmar'), (b'NA', 'Namibia'), (b'NR', 'Nauru'), (b'NP', 'Nepal'), (b'NL', 'Netherlands'), (b'NC', 'New Caledonia'), (b'NZ', 'New Zealand'), (b'NI', 'Nicaragua'), (b'NE', 'Niger'), (b'NG', 'Nigeria'), (b'NU', 'Niue'), (b'NF', 'Norfolk Island'), (b'MP', 'Northern Mariana Islands'), (b'NO', 'Norway'), (b'OM', 'Oman'), (b'PK', 'Pakistan'), (b'PW', 'Palau'), (b'PS', 'Palestine, State of'), (b'PA', 'Panama'), (b'PG', 'Papua New Guinea'), (b'PY', 'Paraguay'), (b'PE', 'Peru'), (b'PH', 'Philippines'), (b'PN', 'Pitcairn'), (b'PL', 'Poland'), (b'PT', 'Portugal'), (b'PR', 'Puerto Rico'), (b'QA', 'Qatar'), (b'RE', 'R\xe9union'), (b'RO', 'Romania'), (b'RU', 'Russian Federation'), (b'RW', 'Rwanda'), (b'BL', 'Saint Barth\xe9lemy'), (b'SH', 'Saint Helena, Ascension and Tristan da Cunha'), (b'KN', 'Saint Kitts and Nevis'), (b'LC', 'Saint Lucia'), (b'MF', 'Saint Martin (French part)'), (b'PM', 'Saint Pierre and Miquelon'), (b'VC', 'Saint Vincent and the Grenadines'), (b'WS', 'Samoa'), (b'SM', 'San Marino'), (b'ST', 'Sao Tome and Principe'), (b'SA', 'Saudi Arabia'), (b'SN', 'Senegal'), (b'RS', 'Serbia'), (b'SC', 'Seychelles'), (b'SL', 'Sierra Leone'), (b'SG', 'Singapore'), (b'SX', 'Sint Maarten (Dutch part)'), (b'SK', 'Slovakia'), (b'SI', 'Slovenia'), (b'SB', 'Solomon Islands'), (b'SO', 'Somalia'), (b'ZA', 'South Africa'), (b'GS', 'South Georgia and the South Sandwich Islands'), (b'SS', 'South Sudan'), (b'ES', 'Spain'), (b'LK', 'Sri Lanka'), (b'SD', 'Sudan'), (b'SR', 'Suriname'), (b'SJ', 'Svalbard and Jan Mayen'), (b'SZ', 'Swaziland'), (b'SE', 'Sweden'), (b'CH', 'Switzerland'), (b'SY', 'Syrian Arab Republic'), (b'TW', 'Taiwan, Province of China[a]'), (b'TJ', 'Tajikistan'), (b'TZ', 'Tanzania, United Republic of'), (b'TH', 'Thailand'), (b'TL', 'Timor-Leste'), (b'TG', 'Togo'), (b'TK', 'Tokelau'), (b'TO', 'Tonga'), (b'TT', 'Trinidad and Tobago'), (b'TN', 'Tunisia'), (b'TR', 'Turkey'), (b'TM', 'Turkmenistan'), (b'TC', 'Turks and Caicos Islands'), (b'TV', 'Tuvalu'), (b'UG', 'Uganda'), (b'UA', 'Ukraine'), (b'AE', 'United Arab Emirates'), (b'GB', 'United Kingdom of Great Britain and Northern Ireland'), (b'US', 'United States of America'), (b'UM', 'United States Minor Outlying Islands'), (b'UY', 'Uruguay'), (b'UZ', 'Uzbekistan'), (b'VU', 'Vanuatu'), (b'VE', 'Venezuela (Bolivarian Republic of)'), (b'VN', 'Viet Nam'), (b'VG', 'Virgin Islands (British)'), (b'VI', 'Virgin Islands (U.S.)'), (b'WF', 'Wallis and Futuna'), (b'EH', 'Western Sahara'), (b'YE', 'Yemen'), (b'ZM', 'Zambia'), (b'ZW', 'Zimbabwe')])), + ('postal_code', models.TextField(blank=True)), + ], + ), + ] diff --git a/src/mmw/apps/user/models.py b/src/mmw/apps/user/models.py index 619cf97e6..ae0e8e0e6 100644 --- a/src/mmw/apps/user/models.py +++ b/src/mmw/apps/user/models.py @@ -8,6 +8,8 @@ from rest_framework.authtoken.models import Token +import countries + @receiver(post_save, sender=settings.AUTH_USER_MODEL) def create_auth_token(sender, instance=None, created=False, **kwargs): @@ -32,3 +34,41 @@ class ItsiUser(models.Model): def __unicode__(self): return unicode(self.user.username) + + +class UserProfile(models.Model): + UNSPECIFIED = 'Unspecified' + UNI_FACULTY = 'University Faculty' + UNI_PROFESSIONAL = 'University Professional or Research Staff' + POST_DOC = 'Post-Doctoral Fellow' + UNI_GRAD_STU = 'University Graduate Student' + UNI_UGRAD_STU = 'University Undergraduate Student' + COMMERCIAL = 'Commercial/Professional' + GOVERNMENT = 'Government Official' + K_12_STU = 'School Student Kindergarten to 12th Grade' + K_12_TEACHER = 'School Teacher Kindergarten to 12th Grade' + OTHER = 'Other' + + USER_TYPE_CHOICES = ( + (UNSPECIFIED, UNSPECIFIED), + (UNI_FACULTY, UNI_FACULTY), + (UNI_PROFESSIONAL, UNI_PROFESSIONAL), + (POST_DOC, POST_DOC), + (UNI_GRAD_STU, UNI_GRAD_STU), + (UNI_UGRAD_STU, UNI_UGRAD_STU), + (COMMERCIAL, COMMERCIAL), + (GOVERNMENT, GOVERNMENT), + (K_12_STU, K_12_STU), + (K_12_TEACHER, K_12_TEACHER), + (OTHER, OTHER), + ) + + user = models.OneToOneField(User, primary_key=True) + was_skipped = models.BooleanField(default=False) + is_complete = models.BooleanField(default=False) + organization = models.TextField(blank=True) + user_type = models.TextField(choices=USER_TYPE_CHOICES, + default=UNSPECIFIED) + country = models.TextField(choices=countries.COUNTRY_CHOICES, + default=countries.US) + postal_code = models.TextField(blank=True) diff --git a/src/mmw/apps/user/tests.py b/src/mmw/apps/user/tests.py index 0844cb3d7..db60e1ea2 100644 --- a/src/mmw/apps/user/tests.py +++ b/src/mmw/apps/user/tests.py @@ -10,6 +10,7 @@ Client) from django.contrib.auth.models import User from apps.user.views import trim_to_valid_length +from apps.user.models import UserProfile class TaskRunnerTestCase(LiveServerTestCase): @@ -95,3 +96,34 @@ def test_large_name(self): username = trim_to_valid_length( 'thisisaverylongnamethatisinfacttoolong', '.itsi') self.assertEqual(len(username), 30) + + +class UserProfileTestCase(TestCase): + + def test_default_values(self): + profile = UserProfile() + self.assertEqual( + profile.country, + 'US', + 'The default country for a new profile should be "US"') + self.assertEqual( + profile.user_type, + 'Unspecified', + 'The default user_type for a new profile should be "Unspecified"') + self.assertFalse( + profile.was_skipped, + 'The default value for was_skipped should be "False"') + self.assertEqual( + profile.organization, + '', + 'The default organization for a new profile should be blank') + self.assertEqual( + profile.postal_code, + '', + 'The default postal_code for a new profile should be blank') + + def test_can_save_without_setting_any_values(self): + user = User.objects.create(username='t', + email='t@example.com', + password='t') + UserProfile.objects.create(user=user) diff --git a/src/mmw/apps/user/views.py b/src/mmw/apps/user/views.py index 786218904..a667d7eea 100644 --- a/src/mmw/apps/user/views.py +++ b/src/mmw/apps/user/views.py @@ -22,7 +22,7 @@ from rest_framework.permissions import (AllowAny, IsAuthenticated) -from apps.user.models import ItsiUser +from apps.user.models import ItsiUser, UserProfile from apps.user.itsi import ItsiService EMBED_FLAG = settings.ITSI['embed_flag'] @@ -41,12 +41,15 @@ def login(request): if user is not None: if user.is_active: auth_login(request, user) + profile, created = UserProfile.objects.get_or_create(user=user) response_data = { 'result': 'success', 'username': user.username, 'itsi': ItsiUser.objects.filter(user_id=user.id).exists(), 'guest': False, - 'id': user.id + 'id': user.id, + 'profileWasSkipped': profile.was_skipped, + 'profileIsComplete': profile.is_complete } else: response_data = { From 5d5dbe8506bb30d539bf86feec7311e6a4f6ad16 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Mon, 23 Oct 2017 15:49:47 -0400 Subject: [PATCH 100/172] Create geoprocessing validation methods - add validation.py file with `validate_rwd` and `validate_aoi` methods - move validation logic & error messages from RWD into validation.py - create aoi shape validations to check that its: - smaller than the max area - not self-intersecting - within the borders of the continental United States --- src/mmw/apps/geoprocessing_api/validation.py | 120 +++++++++++++++++++ src/mmw/apps/geoprocessing_api/views.py | 51 +++----- 2 files changed, 137 insertions(+), 34 deletions(-) create mode 100644 src/mmw/apps/geoprocessing_api/validation.py diff --git a/src/mmw/apps/geoprocessing_api/validation.py b/src/mmw/apps/geoprocessing_api/validation.py new file mode 100644 index 000000000..8e0fc73ef --- /dev/null +++ b/src/mmw/apps/geoprocessing_api/validation.py @@ -0,0 +1,120 @@ +# -*- coding: utf-8 -*- +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division + +import json + +from numbers import Number + +from django.conf import settings +from django.contrib.gis.geos import GEOSGeometry +from rest_framework.exceptions import ValidationError + + +def validate_rwd(location, data_source, snapping, simplify): + if not check_location_format(location): + error = create_invalid_rwd_location_format_error_msg(location) + raise ValidationError(error) + + if not check_rwd_data_source(data_source): + error = create_invalid_rwd_data_source_error_msg(data_source) + raise ValidationError(error) + + if type(snapping) is not bool: + error = create_invalid_rwd_snapping_error_msg(snapping) + raise ValidationError(error) + + if not check_rwd_simplify_param_type(simplify): + error = create_invalid_rwd_simplify_param_type_error_msg(simplify) + raise ValidationError(error) + + pass + + +def validate_aoi(aoi): + if not check_analyze_aoi_size_below_max_area(aoi): + error = create_excessive_aoi_size_error_msg(aoi) + raise ValidationError(error) + + if not check_aoi_does_not_self_intersect(aoi): + error = create_invalid_shape_error_msg(aoi) + raise ValidationError(error) + + if not check_shape_in_conus(aoi): + error = create_shape_exceeds_conus_error_msg(aoi) + raise ValidationError(error) + + pass + + +def create_invalid_rwd_location_format_error_msg(loc): + return ('Invalid required `location` parameter value `{}`. Must be a ' + '`[lat, lng] where `lat` and `lng` are numeric.'.format(loc)) + + +def check_location_format(loc): + if loc is None or type(loc) is not list or len(loc) is not 2: + return False + else: + [lat, lng] = loc + return (isinstance(lat, Number) and isinstance(lng, Number) and + type(lat) is not bool and type(lng) is not bool) + + +def create_invalid_rwd_data_source_error_msg(source): + return ('Invalid optional `dataSource` parameter value `{}`. Must be ' + '`drb` or `nhd`.'.format(source)) + + +def check_rwd_data_source(source): + return source in ['drb', 'nhd'] + + +def create_invalid_rwd_snapping_error_msg(snapping): + return ('Invalid optional `snappingOn` parameter value `{}`. Must be ' + '`true` or `false`.'.format(snapping)) + + +def create_invalid_rwd_simplify_param_type_error_msg(simplify): + return ('Invalid optional `simplify` parameter value: `{}`. Must be a ' + 'number.'.format(simplify)) + + +def check_rwd_simplify_param_type(simplify): + return isinstance(simplify, Number) or simplify is False + + +def get_aoi_sq_km(aoi): + geom = GEOSGeometry(aoi, 4326).transform(5070, clone=True) + return geom.area / 1000000 + + +def create_excessive_aoi_size_error_msg(aoi): + return ('Area of interest is too exceeds maximum size: submitted {} sq km ' + 'but the maximum size is {}'.format(get_aoi_sq_km(aoi), + settings.MMW_MAX_AREA)) + + +def check_analyze_aoi_size_below_max_area(aoi): + return get_aoi_sq_km(aoi) < settings.MMW_MAX_AREA + + +def create_invalid_shape_error_msg(aoi): + return ('Area of interest is invalid: {}'.format( + GEOSGeometry(aoi, 4326).valid_reason)) + + +def check_aoi_does_not_self_intersect(aoi): + return GEOSGeometry(aoi, 4326).valid + + +def create_shape_exceeds_conus_error_msg(aoi): + return ('Area of interest boundaries must be within the boundaries of the ' + 'continental United States') + + +def check_shape_in_conus(aoi): + conus_boundaries = GEOSGeometry( + json.dumps(settings.CONUS_PERIMETER['geometry']), 4326) + return conus_boundaries.contains(GEOSGeometry(aoi, 4326)) diff --git a/src/mmw/apps/geoprocessing_api/views.py b/src/mmw/apps/geoprocessing_api/views.py index 3c7525157..9b319f388 100644 --- a/src/mmw/apps/geoprocessing_api/views.py +++ b/src/mmw/apps/geoprocessing_api/views.py @@ -2,8 +2,6 @@ from __future__ import print_function from __future__ import unicode_literals -from numbers import Number - from celery import chain, group from rest_framework.response import Response @@ -12,7 +10,6 @@ SessionAuthentication) from rest_framework.permissions import IsAuthenticated from rest_framework.authtoken.models import Token -from rest_framework.exceptions import ValidationError from django.utils.timezone import now from django.core.urlresolvers import reverse @@ -27,6 +24,9 @@ from apps.geoprocessing_api import tasks from apps.geoprocessing_api.permissions import AuthTokenSerializerAuthentication # noqa +from validation import (validate_rwd, + validate_aoi) + @decorators.api_view(['POST']) @decorators.authentication_classes((AuthTokenSerializerAuthentication, @@ -227,42 +227,13 @@ def start_rwd(request, format=None): """ user = request.user if request.user.is_authenticated() else None created = now() - location = request.data.get('location') - - def validate_location(loc): - if loc is None or type(loc) is not list or len(loc) is not 2: - return False - else: - [lat, lng] = loc - return (isinstance(lat, Number) and isinstance(lng, Number) and - type(lat) is not bool and type(lng) is not bool) - - if not validate_location(location): - error = ('Invalid required `location` parameter value ' - '`{}`. Must be a `[lat, lng] where `lat` and `lng` are ' - 'numeric.'.format(location)) - raise ValidationError(error) + location = request.data.get('location') data_source = request.data.get('dataSource', 'drb') - - if data_source not in ['drb', 'nhd']: - error = ('Invalid optional `dataSource` parameter value ' - '`{}`. Must be `drb` or `nhd`.'.format(data_source)) - raise ValidationError(error) - snapping = request.data.get('snappingOn', False) - - if type(snapping) is not bool: - error = ('Invalid optional `snappingOn` parameter value ' - '`{}`. Must be `true` or `false`.'.format(snapping)) - raise ValidationError(error) - simplify = request.data.get('simplify', False) - if not isinstance(simplify, Number) and simplify is not False: - error = ('Invalid optional `simplify` parameter value: ' - '`{}`. Must be a number.'.format(simplify)) - raise ValidationError(error) + validate_rwd(location, data_source, snapping, simplify) job = Job.objects.create(created_at=created, result='', error='', traceback='', user=user, status='started') @@ -469,6 +440,8 @@ def start_analyze_land(request, format=None): wkaoi = request.query_params.get('wkaoi', None) area_of_interest = load_area_of_interest(request.data, wkaoi) + validate_aoi(area_of_interest) + geop_input = {'polygon': [area_of_interest]} return start_celery_job([ @@ -596,6 +569,8 @@ def start_analyze_soil(request, format=None): wkaoi = request.query_params.get('wkaoi', None) area_of_interest = load_area_of_interest(request.data, wkaoi) + validate_aoi(area_of_interest) + geop_input = {'polygon': [area_of_interest]} return start_celery_job([ @@ -710,6 +685,8 @@ def start_analyze_animals(request, format=None): wkaoi = request.query_params.get('wkaoi', None) area_of_interest = load_area_of_interest(request.data, wkaoi) + validate_aoi(area_of_interest) + return start_celery_job([ tasks.analyze_animals.s(area_of_interest) ], area_of_interest, user) @@ -800,6 +777,8 @@ def start_analyze_pointsource(request, format=None): wkaoi = request.query_params.get('wkaoi', None) area_of_interest = load_area_of_interest(request.data, wkaoi) + validate_aoi(area_of_interest) + return start_celery_job([ tasks.analyze_pointsource.s(area_of_interest) ], area_of_interest, user) @@ -919,6 +898,8 @@ def start_analyze_catchment_water_quality(request, format=None): wkaoi = request.query_params.get('wkaoi', None) area_of_interest = load_area_of_interest(request.data, wkaoi) + validate_aoi(area_of_interest) + return start_celery_job([ tasks.analyze_catchment_water_quality.s(area_of_interest) ], area_of_interest, user) @@ -1013,6 +994,8 @@ def start_analyze_climate(request, format=None): wkaoi = request.query_params.get('wkaoi', None) area_of_interest = load_area_of_interest(request.data, wkaoi) + validate_aoi(area_of_interest) + geotasks = [] ppt_raster = settings.GEOP['json']['ppt']['input']['targetRaster'] tmean_raster = settings.GEOP['json']['tmean']['input']['targetRaster'] From 49e5a14e77b870a967f2387e9f0ec9e4e30cc555 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 23 Oct 2017 16:49:32 -0400 Subject: [PATCH 101/172] Add begin_date and end_date to cinergi Parse the time period from the cinergi source, and display it in the list view --- src/mmw/apps/bigcz/clients/cinergi/models.py | 4 +++- src/mmw/apps/bigcz/clients/cinergi/search.py | 18 +++++++++++++++++- .../apps/bigcz/clients/cinergi/serializers.py | 5 ++++- .../templates/searchResultCinergi.html | 16 ++++++++-------- 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/cinergi/models.py b/src/mmw/apps/bigcz/clients/cinergi/models.py index 79677f0b6..66992cf7f 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/models.py +++ b/src/mmw/apps/bigcz/clients/cinergi/models.py @@ -10,7 +10,7 @@ class CinergiResource(Resource): def __init__(self, id, description, author, links, title, created_at, updated_at, geom, cinergi_url, source_name, contact_organizations, - categories): + categories, begin_date, end_date): super(CinergiResource, self).__init__(id, description, author, links, title, created_at, updated_at, geom) @@ -19,3 +19,5 @@ def __init__(self, id, description, author, links, title, self.source_name = source_name self.contact_organizations = contact_organizations self.categories = categories + self.begin_date = begin_date + self.end_date = end_date diff --git a/src/mmw/apps/bigcz/clients/cinergi/search.py b/src/mmw/apps/bigcz/clients/cinergi/search.py index 58390f946..26a020f61 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/search.py +++ b/src/mmw/apps/bigcz/clients/cinergi/search.py @@ -126,10 +126,24 @@ def parse_categories(source): return [c[len(c) - 1] for c in split_categories] +def parse_time_period(time_period): + if not time_period: + return None, None + + time_period_dict = time_period + if isinstance(time_period, list): + time_period_dict = time_period[0] + + begin_date = time_period_dict.get('begin_dt') + end_date = time_period_dict.get('end_dt') + return begin_date, end_date + + def parse_record(item): source = item['_source'] geom = parse_geom(source) links = parse_links(source) + begin_date, end_date = parse_time_period(source.get('timeperiod_nst')) return CinergiResource( id=item['_id'], title=source['title'], @@ -143,7 +157,9 @@ def parse_record(item): source_name=source.get('src_source_name_s'), contact_organizations=parse_contact_organizations( source.get('contact_organizations_s')), - categories=parse_categories(source)) + categories=parse_categories(source), + begin_date=parse_date(begin_date), + end_date=parse_date(end_date)) def prepare_bbox(box): diff --git a/src/mmw/apps/bigcz/clients/cinergi/serializers.py b/src/mmw/apps/bigcz/clients/cinergi/serializers.py index 6f854ece6..1c2001e95 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/serializers.py +++ b/src/mmw/apps/bigcz/clients/cinergi/serializers.py @@ -4,7 +4,8 @@ from __future__ import division from rest_framework.serializers import (CharField, - ListField) + ListField, + DateTimeField) from apps.bigcz.serializers import ResourceSerializer @@ -18,3 +19,5 @@ class CinergiResourceSerializer(ResourceSerializer): categories = ListField( child=CharField() ) + begin_date = DateTimeField() + end_date = DateTimeField() diff --git a/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html b/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html index bc6c65c70..ad7ea7ea3 100644 --- a/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html +++ b/src/mmw/js/src/data_catalog/templates/searchResultCinergi.html @@ -24,14 +24,14 @@

        {{ top_categories }}

        - {% if created_at %}
        - {{ created_at|toDateFullYear }} -
        - {% endif %} - {% if author %} -
        - {{ author }} + + {% if begin_date and begin_date|toDateWithoutTime == end_date|toDateWithoutTime %} + {{ begin_date|toDateWithoutTime }} + {% elif begin_date %} + {{ begin_date|toDateWithoutTime }} – {{ end_date|toDateWithoutTime }} + {% else %} + Unknown Time Period + {% endif %}
        - {% endif %}
        From 7fb32b4da37a7034b7b827af206f4c6c5d75d98a Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 23 Oct 2017 17:35:36 -0400 Subject: [PATCH 102/172] Clean cinergi description field * Sometimes the cinergi descriptions are html, which mess up our markup when injected. Parse out the data from the description so we're always sending plain string --- src/mmw/apps/bigcz/clients/cinergi/search.py | 23 +++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/mmw/apps/bigcz/clients/cinergi/search.py b/src/mmw/apps/bigcz/clients/cinergi/search.py index 26a020f61..89d054174 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/search.py +++ b/src/mmw/apps/bigcz/clients/cinergi/search.py @@ -5,6 +5,7 @@ import requests import dateutil.parser +from HTMLParser import HTMLParser from django.contrib.gis.geos import Polygon from django.conf import settings @@ -139,6 +140,26 @@ def parse_time_period(time_period): return begin_date, end_date +def parse_description(description): + """ + Some cinergi descriptions contain html. + Parse out the data of the first element so + we always return a regular string + """ + if not description: + return None + + class DescriptionHTMLParser(HTMLParser): + contents = [] + + def handle_data(self, data): + self.contents.append(data) + + parser = DescriptionHTMLParser() + parser.feed(description) + return parser.contents[0] + + def parse_record(item): source = item['_source'] geom = parse_geom(source) @@ -147,7 +168,7 @@ def parse_record(item): return CinergiResource( id=item['_id'], title=source['title'], - description=source.get('description'), + description=parse_description(source.get('description')), author=None, links=links, created_at=parse_date(source.get('sys_created_dt')), From 01b20bb670c4993e24a7968f0a7bbecb7976b786 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Tue, 24 Oct 2017 15:16:38 -0400 Subject: [PATCH 103/172] Allow searching Cinergi on only to_date Previously if you wanted to search with a to_date you also had to include a from_date. While investigating if this 'time` query parameter corresponds to the the displayed timeperiod_nst (it does), saw it was possible to supply an empty `from_date` [here in the source](https://github.com/Esri/geoportal-server-catalog/blob/master/geoportal/src/main/java/com/esri/geoportal/lib/elastic/request/SearchRequest.java#L541) --- src/mmw/apps/bigcz/clients/cinergi/search.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mmw/apps/bigcz/clients/cinergi/search.py b/src/mmw/apps/bigcz/clients/cinergi/search.py index 89d054174..f844b2ab1 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/search.py +++ b/src/mmw/apps/bigcz/clients/cinergi/search.py @@ -188,6 +188,8 @@ def prepare_bbox(box): def prepare_date(value): + if not value: + return '' return value.strftime('%Y-%m-%d') @@ -233,7 +235,7 @@ def search(**kwargs): params.update({ 'q': prepare_query(query.lower()) }) - if from_date: + if from_date or to_date: params.update({ 'time': prepare_time(from_date, to_date) }) From 7da0213f53ed658381ce0666b97565676c672182 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Thu, 26 Oct 2017 14:03:32 -0400 Subject: [PATCH 104/172] Update, don't overwrite, DRF Production Settings * Remove `DEFAULT_PERMISSION_CLASSES` from settings/base.py. These have never really seen the light of day because of the overwriting, and we use specific permissions for each view * Use `update` to modify the REST_FRAMEWORK settings in the production and test settings --- src/mmw/mmw/settings/base.py | 5 ----- src/mmw/mmw/settings/production.py | 4 ++-- src/mmw/mmw/settings/test.py | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/mmw/mmw/settings/base.py b/src/mmw/mmw/settings/base.py index 8110322ba..be79a395d 100644 --- a/src/mmw/mmw/settings/base.py +++ b/src/mmw/mmw/settings/base.py @@ -300,11 +300,6 @@ def get_env_setting(setting): # rest_framework REST_FRAMEWORK = { - # Use Django's standard `django.contrib.auth` permissions, - # or allow read-only access for unauthenticated users. - 'DEFAULT_PERMISSION_CLASSES': [ - 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly' - ], 'DEFAULT_THROTTLE_RATES': { 'sustained': '5000/day', 'burst': '20/min', diff --git a/src/mmw/mmw/settings/production.py b/src/mmw/mmw/settings/production.py index a8d0ea0f7..b66813cc9 100644 --- a/src/mmw/mmw/settings/production.py +++ b/src/mmw/mmw/settings/production.py @@ -59,11 +59,11 @@ # END ROLLBAR CONFIGURATION # Turn off DRF GUI -REST_FRAMEWORK = { +REST_FRAMEWORK.update({ 'DEFAULT_RENDERER_CLASSES': ( 'rest_framework.renderers.JSONRenderer', ) -} +}) # Django Storages CONFIGURATION mac_metadata = instance_metadata['network']['interfaces']['macs'] diff --git a/src/mmw/mmw/settings/test.py b/src/mmw/mmw/settings/test.py index 3167b4f5d..77842378f 100644 --- a/src/mmw/mmw/settings/test.py +++ b/src/mmw/mmw/settings/test.py @@ -22,11 +22,11 @@ 'DJANGO_LIVE_TEST_SERVER_ADDRESS', 'localhost:9001') # Turn off DRF GUI -REST_FRAMEWORK = { +REST_FRAMEWORK.update({ 'DEFAULT_RENDERER_CLASSES': ( 'rest_framework.renderers.JSONRenderer', ) -} +}) # API key for testing/development GOOGLE_MAPS_API_KEY = 'AIzaSyB0D5gjoIHpmy-xdP2cr_0I-E7K6s_L0k4' From 35ae8d1fa12306fd5230c0e13e6e2c14d3a382eb Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 23 Oct 2017 12:14:58 -0400 Subject: [PATCH 105/172] Fetch HydroShare details When opening a HydroShare result, fetch it's science metadata and file list to populate content in the detail view. This result is fetched only once, and is cached for subsequent opens and closes, just like CUAHSI. --- src/mmw/js/src/data_catalog/models.js | 105 +++++++++++++++++++++++++- src/mmw/js/src/data_catalog/views.js | 4 + 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 3342098d3..c9742d9f4 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -358,6 +358,8 @@ var Result = Backbone.Model.extend({ fetching: false, error: false, mode: 'table', + scimeta: null, // HydroshareSciMeta + files: null, // HydroshareFiles Collection }, initialize: function(attrs) { @@ -380,6 +382,41 @@ var Result = Backbone.Model.extend({ return response; }, + fetchHydroshareDetails: function() { + if (this.fetchPromise && !this.get('error')) { + return this.fetchPromise; + } + + var self = this, + id = self.get('id'), + setSuccess = function() { self.set('error', false); }, + setError = function() { self.set('error', true); }, + startFetch = function() { self.set({ fetching: true, error: false }); }, + endFetch = function() { self.set('fetching', false); }, + fetchSciMeta = function() { + return $.get('https://www.hydroshare.org/hsapi/resource/' + id + '/scimeta/elements/') + .done(function(response) { + self.set('scimeta', new HydroshareSciMeta(response)); + }); + }, + fetchFileList = function() { + return $.get('https://www.hydroshare.org/hsapi/resource/' + id + '/file_list/') + .done(function(response) { + if (response.count > 0) { + self.set('files', new HydroshareFiles(response.results)); + } + }); + }; + + startFetch(); + this.fetchPromise = $.when(fetchSciMeta(), fetchFileList()) + .done(setSuccess) + .fail(setError) + .always(endFetch); + + return this.fetchPromise; + }, + fetchCuahsiValues: function(opts) { if (this.fetchPromise && !this.get('error')) { return this.fetchPromise; @@ -408,7 +445,10 @@ var Result = Backbone.Model.extend({ self.set('error', true); }, startFetch = function() { - self.set('fetching', true); + self.set({ + fetching: true, + error: false, + }); }, endFetch = function() { self.set('fetching', false); @@ -654,6 +694,69 @@ var CuahsiVariables = Backbone.Collection.extend({ model: CuahsiVariable, }); +var HydroshareSciMetaSubject = Backbone.Model.extend({ + defaults: { + value: '', + } +}); + +var HydroshareSciMetaSubjects = Backbone.Collection.extend({ + model: HydroshareSciMetaSubject, +}); + +var HydroshareSciMetaCreator = Backbone.Model.extend({ + defaults: { + name: '', + description: '', + organization: '', + email: '', + address: '', + phone: '', + homepage: '', + order: 0, + } +}); + +var HydroshareSciMetaCreators = Backbone.Collection.extend({ + model: HydroshareSciMetaCreator, +}); + +var HydroshareSciMeta = Backbone.Model.extend({ + defaults: { + creators: null, // HydroshareSciMetaCreators collection + subjects: null, // HydroshareSciMetaSubjects collection + description: '', + }, + + initialize: function(attrs) { + if (attrs.creators) { + this.set('creators', new HydroshareSciMetaCreators(attrs.creators)); + } + + if (attrs.subjects) { + this.set('subjects', new HydroshareSciMetaSubjects(attrs.subjects)); + } + } +}); + +var HydroshareFile = Backbone.Model.extend({ + defaults: { + url: '', + name: '', + size: 0, + }, + + initialize: function(attrs) { + if (attrs.url) { + this.set('name', attrs.url.substr(attrs.url.lastIndexOf('/') + 1)); + } + } +}); + +var HydroshareFiles = Backbone.Collection.extend({ + model: HydroshareFile, +}); + module.exports = { GriddedServicesFilter: GriddedServicesFilter, PrivateResourcesFilter: PrivateResourcesFilter, diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 8839f7764..33fa41c8b 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -509,6 +509,10 @@ var ResultDetailsCinergiView = ResultDetailsBaseView.extend({ var ResultDetailsHydroshareView = ResultDetailsBaseView.extend({ template: resultDetailsHydroshareTmpl, + + initialize: function() { + this.model.fetchHydroshareDetails(); + } }); var ResultDetailsCuahsiView = ResultDetailsBaseView.extend({ From 68da8b0c7132d4ebb7203626140416fb9438484f Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 23 Oct 2017 14:55:37 -0400 Subject: [PATCH 106/172] Add header, citation details to HydroShare --- .../templates/resultDetailsHydroshare.html | 90 ++++++++++++++++--- src/mmw/js/src/data_catalog/views.js | 38 +++++++- 2 files changed, 116 insertions(+), 12 deletions(-) diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html b/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html index c9c811f42..6745c7c77 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html @@ -4,19 +4,87 @@ Back

        - {{ title }} + Resource: {{ title }}

        + + + + + + + + + + + + + + + + + + + + + +
        Author + {% for creator in creators %} + {{ creator.name }}{% if creator.organization %}, {{ creator.organization }} {% endif %}
        + {% endfor %} +
        Period + {% if begin_date %} + {{ begin_date|toDateWithoutTime }} – {{ end_date|toDateWithoutTime }} + {% else %} + Unknown + {% endif %} +
        Subject + {{ subjects }} +
        Resource Type + {{ resource_type }} + + + +
        Catalog + CUAHSI HydroShare + + + +
        -
        - {% if author %} -

        - {{ author }} -

        - {% endif %} -

        - {{ created_at|toDateFullYear }} -

        - {{ description }} + {% if details_url %} + +  Source Data + + {% endif %} + +  Web Services + +

        + +
        + +
        +
        + +
        +

        Citation

        +

        + {% set comma = joiner() %} + {% for creator in creators %}{{ comma() }} {{ creator.name }}{% endfor %} + ({{ updated_at|toDateFullYear }}). + {{ title }}, HydroShare, + + {{ details_url }} +

        diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 33fa41c8b..54fa62a1f 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -510,9 +510,45 @@ var ResultDetailsCinergiView = ResultDetailsBaseView.extend({ var ResultDetailsHydroshareView = ResultDetailsBaseView.extend({ template: resultDetailsHydroshareTmpl, + modelEvents: { + 'change:fetching': 'render', + }, + + templateHelpers: function() { + var scimeta = this.model.get('scimeta'), + files = this.model.get('files'), + details_url = _.find(this.model.get('links'), {'type': 'details'}), + helpers = { + details_url: details_url ? details_url.href : null, + resource_type: '', + abstract: '', + creators: [], + subjects: '', + files: files ? files.toJSON() : [], + }; + + if (scimeta) { + var type = scimeta.get('type'); + + helpers.resource_type = type.substring(type.lastIndexOf('/') + 1, type.indexOf('Resource')); + helpers.creators = scimeta.get('creators').toJSON(); + helpers.subjects = scimeta.get('subjects').pluck('value').join(', '); + } + + return helpers; + }, + initialize: function() { this.model.fetchHydroshareDetails(); - } + }, + + onDomRefresh: function() { + window.closePopover(); + this.$('[data-toggle="popover"]').popover({ + placement: 'right', + trigger: 'focus', + }); + }, }); var ResultDetailsCuahsiView = ResultDetailsBaseView.extend({ From 12fca097e7a6188f146e7a16178b54dcf22c0da3 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 23 Oct 2017 16:20:14 -0400 Subject: [PATCH 107/172] Add abstract, contents to HydroShare Edit parent tab panel naming so it doesn't interfere with the nested tabs herein. --- src/mmw/js/src/core/filters.js | 24 ++++++++++ .../templates/resultDetailsHydroshare.html | 47 ++++++++++++++++++- src/mmw/js/src/data_catalog/views.js | 6 ++- src/mmw/sass/pages/_data-catalog.scss | 12 ++++- 4 files changed, 84 insertions(+), 5 deletions(-) diff --git a/src/mmw/js/src/core/filters.js b/src/mmw/js/src/core/filters.js index 780c32fd8..be8bfdf21 100644 --- a/src/mmw/js/src/core/filters.js +++ b/src/mmw/js/src/core/filters.js @@ -70,3 +70,27 @@ nunjucks.env.addFilter('split', function(str, splitChar, indexToReturn) { return items[indexToReturn]; }); + +nunjucks.env.addFilter('toFriendlyBytes', function(bytes) { + var roundToOneDecimal = function(x) { return Math.round(x * 10) / 10; }; + + if (bytes < 1024) { + return bytes + ' Bytes'; + } + + bytes /= 1024; + + if (bytes < 1024) { + return roundToOneDecimal(bytes) + ' KB'; + } + + bytes /= 1024; + + if (bytes < 1024) { + return roundToOneDecimal(bytes) + ' MB'; + } + + bytes /= 1024; + + return roundToOneDecimal(bytes) + ' GB'; +}); diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html b/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html index 6745c7c77..d18ba10a7 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsHydroshare.html @@ -74,7 +74,52 @@

        - +
        + +
        +
        +

        + {{ abstract }} +

        +
        +
        +

        + Last Updated {{ updated_at|toDateWithoutTime }} +

        + + + + + + + + + {% for file in files %} + + + + + {% endfor %} + +
        File NameFile Size
        + {{ file.name }} + + {{ file.size|toFriendlyBytes }} +
        +
        +
        +

        Citation

        diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 54fa62a1f..468d9dc58 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -326,7 +326,7 @@ var ErrorView = Marionette.ItemView.extend({ }); var TabContentView = Marionette.LayoutView.extend({ - className: 'tab-pane', + className: 'catalog-tab-pane tab-pane', id: function() { return this.model.id; }, @@ -398,7 +398,7 @@ var TabContentView = Marionette.LayoutView.extend({ }); var TabContentsView = Marionette.CollectionView.extend({ - className: 'tab-content', + className: 'catalog-tab-content tab-content', childView: TabContentView }); @@ -531,6 +531,7 @@ var ResultDetailsHydroshareView = ResultDetailsBaseView.extend({ var type = scimeta.get('type'); helpers.resource_type = type.substring(type.lastIndexOf('/') + 1, type.indexOf('Resource')); + helpers.abstract = scimeta.get('description'); helpers.creators = scimeta.get('creators').toJSON(); helpers.subjects = scimeta.get('subjects').pluck('value').join(', '); } @@ -548,6 +549,7 @@ var ResultDetailsHydroshareView = ResultDetailsBaseView.extend({ placement: 'right', trigger: 'focus', }); + this.$('[data-toggle="table"]').bootstrapTable(); }, }); diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index f1bfa3a36..c84ab08e7 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -85,6 +85,14 @@ margin-bottom: 10px; } } + + .hydroshare-nav-tabs > li > a { + padding: 10px 15px !important; + } + + .hydroshare-tab-content { + padding-top: 15px; + } } } @@ -167,14 +175,14 @@ overflow-y: auto; } - .tab-pane { + .catalog-tab-pane { position: absolute; top: 0; bottom: 0; width: 100%; } - .tab-content { + .catalog-tab-content { padding: 0; background: #E6E6E6; top: 0; From 4b2d220a917475a69f3ff2099f6d83e02579dce8 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 25 Oct 2017 10:49:40 -0400 Subject: [PATCH 108/172] Add More Fields To CINERGI API Results Add contact people, resource type, resource topic categories, web resource links, and web service links to display in the cinergi detail view --- src/mmw/apps/bigcz/clients/cinergi/models.py | 11 +++- src/mmw/apps/bigcz/clients/cinergi/search.py | 52 ++++++++++++++++--- .../apps/bigcz/clients/cinergi/serializers.py | 27 +++++++++- 3 files changed, 80 insertions(+), 10 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/cinergi/models.py b/src/mmw/apps/bigcz/clients/cinergi/models.py index 66992cf7f..28042363f 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/models.py +++ b/src/mmw/apps/bigcz/clients/cinergi/models.py @@ -9,8 +9,10 @@ class CinergiResource(Resource): def __init__(self, id, description, author, links, title, created_at, updated_at, geom, cinergi_url, - source_name, contact_organizations, - categories, begin_date, end_date): + source_name, contact_organizations, contact_people, + categories, begin_date, end_date, + resource_type, resource_topic_categories, + web_resources, web_services): super(CinergiResource, self).__init__(id, description, author, links, title, created_at, updated_at, geom) @@ -18,6 +20,11 @@ def __init__(self, id, description, author, links, title, self.cinergi_url = cinergi_url self.source_name = source_name self.contact_organizations = contact_organizations + self.contact_people = contact_people self.categories = categories self.begin_date = begin_date self.end_date = end_date + self.resource_type = resource_type + self.resource_topic_categories = resource_topic_categories + self.web_resources = web_resources + self.web_services = web_services diff --git a/src/mmw/apps/bigcz/clients/cinergi/search.py b/src/mmw/apps/bigcz/clients/cinergi/search.py index f844b2ab1..25f5f4be5 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/search.py +++ b/src/mmw/apps/bigcz/clients/cinergi/search.py @@ -90,15 +90,15 @@ def parse_cinergi_url(fileid): return '{}/geoportal/?filter=%22{}%22'.format(CINERGI_HOST, fileid) -def parse_contact_organizations(contact_organizations): +def parse_string_or_list(string_or_list): """ - Contact organizations can be either a list of strings, or + Fields like contact_organizations be either a list of strings, or a string. Make it always a list of strings """ - if isinstance(contact_organizations, basestring): - return [contact_organizations] + if isinstance(string_or_list, basestring): + return [string_or_list] - return contact_organizations + return string_or_list def parse_categories(source): @@ -160,6 +160,37 @@ def handle_data(self, data): return parser.contents[0] +def parse_web_resources(raw_resources): + if not raw_resources: + return [] + + resources = raw_resources + + if isinstance(raw_resources, dict): + resources = [raw_resources] + + return [{ + 'url': r.get('url_s'), + 'url_type': r.get('url_type_s') + } for r in resources] + + +def parse_web_services(raw_services): + if not raw_services: + return [] + + services = raw_services + + if isinstance(raw_services, dict): + services = [raw_services] + + return [{ + 'url': s.get('url_s'), + 'url_type': s.get('url_type_s'), + 'url_name': s.get('url_name_s') + } for s in services] + + def parse_record(item): source = item['_source'] geom = parse_geom(source) @@ -176,11 +207,18 @@ def parse_record(item): geom=geom, cinergi_url=parse_cinergi_url(source.get('fileid')), source_name=source.get('src_source_name_s'), - contact_organizations=parse_contact_organizations( + contact_organizations=parse_string_or_list( source.get('contact_organizations_s')), + contact_people=parse_string_or_list( + source.get('contact_people_s')), categories=parse_categories(source), begin_date=parse_date(begin_date), - end_date=parse_date(end_date)) + end_date=parse_date(end_date), + resource_type=source.get('apiso_Type_s'), + resource_topic_categories=parse_string_or_list( + source.get('apiso_TopicCategory_s')), + web_resources=parse_web_resources(source.get('resources_nst')), + web_services=parse_web_services(source.get('services_nst'))) def prepare_bbox(box): diff --git a/src/mmw/apps/bigcz/clients/cinergi/serializers.py b/src/mmw/apps/bigcz/clients/cinergi/serializers.py index 1c2001e95..f0ad22f9a 100644 --- a/src/mmw/apps/bigcz/clients/cinergi/serializers.py +++ b/src/mmw/apps/bigcz/clients/cinergi/serializers.py @@ -5,19 +5,44 @@ from rest_framework.serializers import (CharField, ListField, - DateTimeField) + DateTimeField, + Serializer) from apps.bigcz.serializers import ResourceSerializer +class CinergiWebResourceSerializer(Serializer): + url_type = CharField() + url = CharField() + + +class CinergiWebServiceSerializer(Serializer): + url_type = CharField() + url_name = CharField() + url = CharField() + + class CinergiResourceSerializer(ResourceSerializer): cinergi_url = CharField() source_name = CharField() contact_organizations = ListField( child=CharField() ) + contact_people = ListField( + child=CharField() + ) categories = ListField( child=CharField() ) begin_date = DateTimeField() end_date = DateTimeField() + resource_type = CharField() + resource_topic_categories = ListField( + child=CharField() + ) + web_resources = ListField( + child=CinergiWebResourceSerializer() + ) + web_services = ListField( + child=CinergiWebServiceSerializer() + ) From ffbc66cd584bcf15a2eedf85dcb6df5813c7ca6c Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Wed, 25 Oct 2017 14:22:28 -0400 Subject: [PATCH 109/172] Flesh out CINERGI Detail View --- src/mmw/js/src/data_catalog/models.js | 18 +++ .../templates/resultDetailsCinergi.html | 116 ++++++++++++++++-- src/mmw/js/src/data_catalog/views.js | 30 ++--- 3 files changed, 137 insertions(+), 27 deletions(-) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index c9742d9f4..014993a4a 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -355,6 +355,7 @@ var Result = Backbone.Model.extend({ active: false, show_detail: false, // Show this result as the detail view? variables: null, // CuahsiVariables Collection + categories: null, // Cinergi categories, [String] fetching: false, error: false, mode: 'table', @@ -512,6 +513,23 @@ var Result = Backbone.Model.extend({ return detailsUrl && detailsUrl.href; }, + topCinergiCategories: function(n) { + var categories = _.clone(this.get('categories')); + + if (!categories) { + return null; + } + + // Truncate if longer than n values + if (categories.length > n) { + categories = categories.slice(0, n + 1); + var lastIdx = categories.length - 1; + categories[lastIdx] = categories[lastIdx] + '...'; + } + + return categories.join('; '); + }, + toJSON: function() { return _.assign({}, this.attributes, { summary: this.getSummary(), diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html index 0e7e8a41c..65a949886 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html @@ -4,27 +4,117 @@ Back

        - {{ title }} + Resource: {{ title }}

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        Contacts + {% for contact in contacts %} +

        {{ contact }}

        + {% else %} + None provided + {% endfor %} +
        Organizations + {% for org in orgs %} +

        {{ org }}

        + {% else %} + None provided + {% endfor %} +
        Data collected between + {% if begin_date and begin_date|toDateWithoutTime == end_date|toDateWithoutTime %} + {{ begin_date|toDateWithoutTime }} + {% elif begin_date %} + {{ begin_date|toDateWithoutTime }} – {{ end_date|toDateWithoutTime }} + {% else %} + Unknown + {% endif %} +
        Subject + {{ top_categories }} +
        Resource Type + {{ resource_type }} / {{ resource_topic_categories_str }} +
        Source + {{ source_name }} +
        Catalog + CINERGI + + + +
        -
        - {% if author %} -

        - {{ author }} -

        - {% endif %}

        - {{ created_at|toDateFullYear }} + {% if details_url %} + +  Source Data + + {% endif %} + +  Web Services +

        - {% if not (description == "REQUIRED FIELD") %} + +
        + + {% if description and not (description == "REQUIRED FIELD") %} +

        Description

        {{ description }}

        {% endif %}

        - -  Repository - + Last Updated {{ updated_at|toDateWithoutTime }}

        + + {% if web_resources.length > 0 %} +
        +

        Web Resources

        + {% for resource in web_resources %} +
      • + {{resource.url_type}} +
        • + {% endfor %} + {% endif %} + + {% if web_services.length > 0 %} +
        +

        Web Services

        + {% for service in web_services %} +
      • + {{service.url_name}} ({{service.url_type}}) +
        • + {% endfor %} + {% endif %} diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 468d9dc58..8ea6770ff 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -418,21 +418,8 @@ var StaticResultView = Marionette.ItemView.extend({ } if (this.options.catalog === 'cinergi') { - var categories = _.clone(this.model.get('categories')); - - if (!categories) { - return null; - } - - // Truncate if longer than 8 values - if (categories.length > 8) { - categories = categories.slice(0, 9); - var lastIdx = categories.length -1; - categories[lastIdx] = categories[lastIdx] + '...'; - } - return { - 'top_categories': categories.join('; ') + 'top_categories': this.model.topCinergiCategories(8) }; } }, @@ -505,6 +492,21 @@ var ResultDetailsBaseView = Marionette.LayoutView.extend({ var ResultDetailsCinergiView = ResultDetailsBaseView.extend({ template: resultDetailsCinergiTmpl, + + templateHelpers: function() { + var topicCategories = this.model.get('resource_topic_categories'), + contactOrgs = this.model.get('contact_organizations'), + contactPeople = this.model.get('contact_people'); + + return { + 'orgs': contactOrgs ? contactOrgs.filter(utils.distinct) : null, + 'contacts': contactPeople ? contactPeople.filter(utils.distinct) : null, + 'top_categories': this.model.topCinergiCategories(20), + 'resource_topic_categories_str': topicCategories ? + topicCategories.join(", ") : null, + 'details_url': this.model.getDetailsUrl() + }; + } }); var ResultDetailsHydroshareView = ResultDetailsBaseView.extend({ From 21cb18d60dadf8bf168dc79296630ff35a909a90 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Thu, 26 Oct 2017 12:23:52 -0400 Subject: [PATCH 110/172] BiG-CZ: Close any open popups when closing the detail view --- src/mmw/js/src/data_catalog/views.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 8ea6770ff..ff9bdc097 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -486,6 +486,7 @@ var ResultDetailsBaseView = Marionette.LayoutView.extend({ }, closeDetails: function() { + window.closePopover(); this.model.collection.closeDetail(); } }); From 7226a5de9ada0c2b9556d4ed6949f02d772943bd Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Thu, 26 Oct 2017 18:40:56 -0400 Subject: [PATCH 111/172] Collapse Cinergi Details Contact and Organizations Lists * When there are more than 2 organizations or contacts, add a "View x more organizations/contacts" button and truncate the remainder --- src/mmw/js/src/data_catalog/models.js | 10 ++++ .../templates/expandableTableRow.html | 12 ++++ .../templates/resultDetailsCinergi.html | 16 +----- src/mmw/js/src/data_catalog/views.js | 55 +++++++++++++++++-- src/mmw/sass/pages/_data-catalog.scss | 4 ++ 5 files changed, 77 insertions(+), 20 deletions(-) create mode 100644 src/mmw/js/src/data_catalog/templates/expandableTableRow.html diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 014993a4a..261afcdb7 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -775,6 +775,15 @@ var HydroshareFiles = Backbone.Collection.extend({ model: HydroshareFile, }); +var ExpandableListModel = Backbone.Model.extend({ + defaults: { + expanded: false, + list_type: '', + truncate_at: 2, + list: null + } +}); + module.exports = { GriddedServicesFilter: GriddedServicesFilter, PrivateResourcesFilter: PrivateResourcesFilter, @@ -790,4 +799,5 @@ module.exports = { CuahsiValues: CuahsiValues, CuahsiVariable: CuahsiVariable, CuahsiVariables: CuahsiVariables, + ExpandableListModel: ExpandableListModel, }; diff --git a/src/mmw/js/src/data_catalog/templates/expandableTableRow.html b/src/mmw/js/src/data_catalog/templates/expandableTableRow.html new file mode 100644 index 000000000..ff6a9dc4b --- /dev/null +++ b/src/mmw/js/src/data_catalog/templates/expandableTableRow.html @@ -0,0 +1,12 @@ +{% if not list %} +None provided +{% else %} +{% for i in range(0, list.length if expanded else truncate_at) %} +

        {{ list[i] }}

        +{% endfor %} +{% if not expanded and list.length > truncate_at %} + +{% endif %} +{% endif %} diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html index 65a949886..4dadafb44 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCinergi.html @@ -9,23 +9,11 @@

        - + - + diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index ff9bdc097..a45593d17 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -35,7 +35,8 @@ var $ = require('jquery'), resultMapPopoverDetailTmpl = require('./templates/resultMapPopoverDetail.html'), resultMapPopoverListTmpl = require('./templates/resultMapPopoverList.html'), resultMapPopoverListItemTmpl = require('./templates/resultMapPopoverListItem.html'), - resultMapPopoverControllerTmpl = require('./templates/resultMapPopoverController.html'); + resultMapPopoverControllerTmpl = require('./templates/resultMapPopoverController.html'), + expandableTableRowTmpl = require('./templates/expandableTableRow.html'); var ENTER_KEYCODE = 13, PAGE_SIZE = settings.get('data_catalog_page_size'), @@ -491,22 +492,64 @@ var ResultDetailsBaseView = Marionette.LayoutView.extend({ } }); +var ExpandableTableRow = Marionette.ItemView.extend({ + // model: ExpandableListModel + template: expandableTableRowTmpl, + ui: { + expandButton: '[data-action="expand"]' + }, + + events: { + 'click @ui.expandButton': 'expand' + }, + + modelEvents: { + 'change:expanded': 'render' + }, + + expand: function() { + this.model.set('expanded', true); + } +}); + var ResultDetailsCinergiView = ResultDetailsBaseView.extend({ template: resultDetailsCinergiTmpl, + regions: { + organizations: '[data-list-region="organizations"]', + contacts: '[data-list-region="contacts"]', + }, + templateHelpers: function() { - var topicCategories = this.model.get('resource_topic_categories'), - contactOrgs = this.model.get('contact_organizations'), - contactPeople = this.model.get('contact_people'); + var topicCategories = this.model.get('resource_topic_categories'); return { - 'orgs': contactOrgs ? contactOrgs.filter(utils.distinct) : null, - 'contacts': contactPeople ? contactPeople.filter(utils.distinct) : null, 'top_categories': this.model.topCinergiCategories(20), 'resource_topic_categories_str': topicCategories ? topicCategories.join(", ") : null, 'details_url': this.model.getDetailsUrl() }; + }, + + onShow: function() { + var contactOrgs = this.model.get('contact_organizations'), + contactPeople = this.model.get('contact_people'), + orgs = contactOrgs ? contactOrgs.filter(utils.distinct) : null, + contacts = contactPeople ? contactPeople.filter(utils.distinct) : null; + + this.organizations.show(new ExpandableTableRow({ + model: new models.ExpandableListModel({ + list_type: 'organizations', + list: orgs + }) + })); + + this.contacts.show(new ExpandableTableRow({ + model: new models.ExpandableListModel({ + list_type: 'contacts', + list: contacts + }) + })); } }); diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index c84ab08e7..a903df1f4 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -272,6 +272,10 @@ margin-right: 4px; } } + + .expand-list-btn { + padding: 0; + } } .data-catalog-resource-popover { From 05cb66d9fa4d1eefc7c7e616f3fed036b49b40d6 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Fri, 27 Oct 2017 10:52:23 -0400 Subject: [PATCH 112/172] Update account page to match actual throttle rates * Update the copy on the account page to state the current default throttle rates --- src/mmw/js/src/account/templates/account.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mmw/js/src/account/templates/account.html b/src/mmw/js/src/account/templates/account.html index 23c391724..0d9e31f91 100644 --- a/src/mmw/js/src/account/templates/account.html +++ b/src/mmw/js/src/account/templates/account.html @@ -1,7 +1,7 @@

        Account

        -

        You can use your API Key to make up to 2 requests per minute

        +

        You can use your API Key to make up to 20 requests per minute, and 5000 total per day.

        {% if error %}

        {{error}} From e76168e589345eb7f31484359c70cca89e15f2ca Mon Sep 17 00:00:00 2001 From: Casey Cesari Date: Thu, 26 Oct 2017 16:50:02 -0400 Subject: [PATCH 113/172] Ensure Celery tasks get routed to matching worker Configure Celery to only send tasks to workers that match the specified stack color. This prevents tasks from getting assigned to an old worker in a blue/green deployment. Configuration is largely based on http://docs.celeryproject.org/en/latest/userguide/routing.html#manual-routing and https://github.com/rduplain/celery-simple-example. Refs #2374 Refs #2374 --- src/mmw/mmw/settings/base.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mmw/mmw/settings/base.py b/src/mmw/mmw/settings/base.py index be79a395d..bb9336133 100644 --- a/src/mmw/mmw/settings/base.py +++ b/src/mmw/mmw/settings/base.py @@ -130,8 +130,14 @@ def get_env_setting(setting): STATSD_CELERY_SIGNALS = True CELERY_CREATE_MISSING_QUEUES = True CELERY_CHORD_PROPAGATES = True -CELERY_DEFAULT_QUEUE = STACK_COLOR -CELERY_DEFAULT_ROUTING_KEY = "task.%s" % STACK_COLOR +CELERY_TASK_DEFAULT_QUEUE = STACK_COLOR +CELERY_TASK_QUEUES = { + STACK_COLOR: { + 'binding_key': "task.%s" % STACK_COLOR, + } +} +CELERY_TASK_DEFAULT_EXCHANGE = 'tasks' +CELERY_TASK_DEFAULT_ROUTING_KEY = "task.%s" % STACK_COLOR # END CELERY CONFIGURATION From d8f421bd0a3de366ef4a055e5be42e65a61bb872 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 27 Oct 2017 16:46:53 -0400 Subject: [PATCH 114/172] Use serverResults field for saving CUAHSI results In preparation for performing client-side free text search on CUAHSI results, where we will get all results from the server once and then filter them on the client side. For the CUAHSI catalog, instead of saving the results to the `results` field directly, we instead use the `serverResults` field. Currently, all the results are copied over to the `results` field, but in coming commits we will add filtering. --- src/mmw/js/src/data_catalog/controllers.js | 1 + src/mmw/js/src/data_catalog/models.js | 33 ++++++++++++++++++---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/mmw/js/src/data_catalog/controllers.js b/src/mmw/js/src/data_catalog/controllers.js index f24df368e..e7cb68300 100644 --- a/src/mmw/js/src/data_catalog/controllers.js +++ b/src/mmw/js/src/data_catalog/controllers.js @@ -46,6 +46,7 @@ var DataCatalogController = { name: 'WDC', is_pageable: false, results: new models.Results(null, { catalog: 'cuahsi' }), + serverResults: new models.Results(null, { catalog: 'cuahsi' }), filters: new models.FilterCollection([ dateFilter, new models.GriddedServicesFilter() diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 261afcdb7..e3f804a6b 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -153,6 +153,7 @@ var Catalog = Backbone.Model.extend({ stale: false, // Should search run when catalog becomes active? active: false, results: null, // Results collection + serverResults: null, // Results collection resultCount: 0, filters: null, // FiltersCollection is_pageable: true, @@ -229,6 +230,9 @@ var Catalog = Backbone.Model.extend({ startSearch: function(page) { var filters = this.get('filters'), + results = this.id === 'cuahsi' ? + this.get('serverResults') : + this.get('results'), dateFilter = filters.findWhere({ id: 'date' }), fromDate = null, toDate = null; @@ -272,7 +276,7 @@ var Catalog = Backbone.Model.extend({ contentType: 'application/json' }; - return this.get('results') + return results .fetch(request) .done(_.bind(this.doneSearch, this)) .fail(_.bind(this.failSearch, this)) @@ -280,12 +284,29 @@ var Catalog = Backbone.Model.extend({ }, doneSearch: function(response) { - var data = _.findWhere(response, { catalog: this.id }); + var data = _.findWhere(response, { catalog: this.id }), + setFields = { + page: data.page || 1, + resultCount: data.count, + }; - this.set({ - page: data.page || 1, - resultCount: data.count, - }); + if (this.id === 'cuahsi') { + var results = this.get('results'), + filtered = this.get('serverResults').toJSON(); + + if (results === null) { + results = new Results(filtered, { catalog: 'cuahsi' }); + } else { + results.reset(filtered); + } + + _.assign(setFields, { + results: results, + resultCount: results.length, + }); + } + + this.set(setFields); }, failSearch: function(response, textStatus) { From 8db76b04272334a7499fb744d3cb63df1dec64a5 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 27 Oct 2017 16:54:47 -0400 Subject: [PATCH 115/172] Free Text Search A textFilter method is added to Result model that returns truthy if a given query is found in any of the CUAHSI fields. The Results collection also has an identically named method, that filters the collection to those results that satisfy the query. When the first search completes, we filter the serverResults by the given query and include only those in the results field. On subsequent searches, we check to see if the geometry has changed or if only the query has changed. Since we fetch all results for a given geometry in the first search, we don't need to do other server searches until the geometry changes. If the geometry is the same, and only the text has changed, then we re-run the filter on the saved serverResults, and re-populate results with the filtered items. --- src/mmw/js/src/data_catalog/models.js | 54 +++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index e3f804a6b..085c76777 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -191,8 +191,25 @@ var Catalog = Backbone.Model.extend({ var self = this, error = this.get('error'), stale = this.get('stale'), - isSameSearch = query === this.get('query') && - geom === this.get('geom'); + isCuahsi = this.id === 'cuahsi', + isSameQuery = query === this.get('query'), + isSameGeom = geom === this.get('geom'), + isSameSearch = isSameQuery && isSameGeom; + + if (isCuahsi && isSameGeom && !isSameQuery) { + this.set({ loading: true }); + + var results = this.get('serverResults').textFilter(query); + this.get('results').reset(results); + + this.set({ + loading: false, + query: query, + resultCount: results.length + }); + + return $.when(); + } if (!isSameSearch || stale || error) { this.cancelSearch(); @@ -292,7 +309,8 @@ var Catalog = Backbone.Model.extend({ if (this.id === 'cuahsi') { var results = this.get('results'), - filtered = this.get('serverResults').toJSON(); + filtered = this.get('serverResults') + .textFilter(this.get('query')); if (results === null) { results = new Results(filtered, { catalog: 'cuahsi' }); @@ -518,6 +536,23 @@ var Result = Backbone.Model.extend({ return this.fetchPromise; }, + textFilter: function(query) { + var fields = [ + this.get('id').toLowerCase(), + this.get('title').toLowerCase(), + this.get('description').toLowerCase(), + (this.get('service_citation') || '').toLowerCase(), + (this.get('service_title') || '').toLowerCase(), + (this.get('service_org') || '').toLowerCase(), + this.get('sample_mediums').join(' ').toLowerCase(), + this.get('variables').pluck('concept_keyword').join(' ').toLowerCase(), + ]; + + return _.some(fields, function(field) { + return field.indexOf(query) >= 0; + }); + }, + getSummary: function() { var text = this.get('description') || ''; if (text.length <= DESCRIPTION_MAX_LENGTH) { @@ -599,6 +634,19 @@ var Results = Backbone.Collection.extend({ } currentDetail.set('show_detail', false); + }, + + textFilter: function(query) { + var lcQueries = query.toLowerCase().split(' ').filter(function(x) { + // Exclude empty, search logic terms + return x !== '' && x !== 'and' && x !== 'or'; + }); + + return this.filter(function(result) { + return _.every(lcQueries, function(lcQuery) { + return result.textFilter(lcQuery); + }); + }); } }); From 3af471f2d4982392b9908f957e28725f056be2d2 Mon Sep 17 00:00:00 2001 From: Taylor Nation Date: Mon, 30 Oct 2017 15:04:07 -0400 Subject: [PATCH 116/172] Pin dependency to numpy 1.13 --- src/mmw/requirements/base.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mmw/requirements/base.txt b/src/mmw/requirements/base.txt index 4d8a84f6a..0a26a4bf7 100644 --- a/src/mmw/requirements/base.txt +++ b/src/mmw/requirements/base.txt @@ -20,3 +20,4 @@ python-dateutil==2.6.0 suds==0.4 django_celery_results==1.0.1 ulmo==0.8.4 +numpy==1.13.0 From aca7ee59c5ae6fbd12c8da70352da762f6fbd9a1 Mon Sep 17 00:00:00 2001 From: Justin Walgran Date: Fri, 27 Oct 2017 11:09:36 -0700 Subject: [PATCH 117/172] Update to latest boostrap-select release from NPM It looks like the issue that was addressed in the Azavea fork of bootstrap-select was fixed in the main repo. Switching to the latest release version does not the behavior. --- src/mmw/npm-shrinkwrap.json | 6 +++--- src/mmw/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mmw/npm-shrinkwrap.json b/src/mmw/npm-shrinkwrap.json index 695fdb9d9..7aa131891 100644 --- a/src/mmw/npm-shrinkwrap.json +++ b/src/mmw/npm-shrinkwrap.json @@ -50,9 +50,9 @@ "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.7.1.tgz" }, "bootstrap-select": { - "version": "1.6.4", - "from": "../../tmp/npm-25360-e04608df/1472064034158-0.4662157059647143/f1755efa102a41e43fc367ba36ce905b8f2b90e1", - "resolved": "git://github.com/azavea/bootstrap-select#f1755efa102a41e43fc367ba36ce905b8f2b90e1" + "version": "1.12.4", + "from": "https://registry.npmjs.org/bootstrap-select/-/bootstrap-select-1.12.4.tgz", + "resolved": "https://registry.npmjs.org/bootstrap-select/-/bootstrap-select-1.12.4.tgz" }, "bootstrap-table": { "version": "1.11.0", diff --git a/src/mmw/package.json b/src/mmw/package.json index dd3c40544..8de2dfe08 100644 --- a/src/mmw/package.json +++ b/src/mmw/package.json @@ -24,7 +24,7 @@ "blueimp-md5": "1.1.0", "bootstrap": "3.3.4", "bootstrap-datepicker": "1.7.1", - "bootstrap-select": "git://github.com/azavea/bootstrap-select", + "bootstrap-select": "1.12.4", "bootstrap-table": "1.11.0", "browserify": "9.0.3", "chai": "1.10.0", From 68aba6600225e60e2fb6de0c085a619f04ead515 Mon Sep 17 00:00:00 2001 From: Justin Walgran Date: Tue, 24 Oct 2017 17:17:24 -0700 Subject: [PATCH 118/172] Add a profile form to the login process - The form is shown after logging in only if both the `was_skipped` and `is_complete` flags on the `UserProfile` are false. - Making the decision whether or not to show the form required passing the login response as an argument through the chain of success event handlers. - The options for the `country` and `user_type` fields are passed from Python to Javascript via the existing `window.clientSettings` object. - The nunjucks template is built at compile time, not at run time, so there is some Javascript that completes the construction of the option tags on the client. - I edited `bundle.sh` to include the `bootstrap-select` stylesheet that was previously added to the project. --- src/mmw/apps/home/views.py | 8 ++ src/mmw/apps/user/urls.py | 2 + src/mmw/apps/user/views.py | 31 ++++- src/mmw/bundle.sh | 1 + src/mmw/js/src/app.js | 27 +++++ src/mmw/js/src/user/models.js | 27 ++++- src/mmw/js/src/user/templates/baseModal.html | 17 +++ .../src/user/templates/userProfileModal.html | 25 +++++ src/mmw/js/src/user/views.js | 106 +++++++++++++++++- src/mmw/sass/components/_inputs.scss | 17 +++ 10 files changed, 255 insertions(+), 6 deletions(-) create mode 100644 src/mmw/js/src/user/templates/userProfileModal.html diff --git a/src/mmw/apps/home/views.py b/src/mmw/apps/home/views.py index dc39e0599..48448e2c6 100644 --- a/src/mmw/apps/home/views.py +++ b/src/mmw/apps/home/views.py @@ -17,6 +17,8 @@ from rest_framework.authtoken.models import Token from apps.modeling.models import Project, Scenario +from apps.user.models import UserProfile +from apps.user.countries import COUNTRY_CHOICES def home_page(request): @@ -157,6 +159,12 @@ def get_client_settings(request): 'itsi_enabled': not bigcz, 'title': title, 'api_token': get_api_token(), + 'choices': { + 'UserProfile': { + 'user_type': UserProfile.USER_TYPE_CHOICES, + 'country': COUNTRY_CHOICES, + } + }, }), 'google_maps_api_key': settings.GOOGLE_MAPS_API_KEY, 'title': title, diff --git a/src/mmw/apps/user/urls.py b/src/mmw/apps/user/urls.py index 8c89d6855..e45796bd8 100644 --- a/src/mmw/apps/user/urls.py +++ b/src/mmw/apps/user/urls.py @@ -6,6 +6,7 @@ from django.conf.urls import patterns, url from apps.user.views import (login, + profile, sign_up, forgot, resend, @@ -20,6 +21,7 @@ url(r'^itsi/login$', itsi_login, name='itsi_login'), url(r'^itsi/authenticate$', itsi_auth, name='itsi_auth'), url(r'^login$', login, name='login'), + url(r'^profile$', profile, name='profile'), url(r'^sign_up$', sign_up, name='sign_up'), url(r'^resend$', resend, name='resend'), url(r'^forgot$', forgot, name='forgot'), diff --git a/src/mmw/apps/user/views.py b/src/mmw/apps/user/views.py index a667d7eea..75bb5333d 100644 --- a/src/mmw/apps/user/views.py +++ b/src/mmw/apps/user/views.py @@ -48,8 +48,8 @@ def login(request): 'itsi': ItsiUser.objects.filter(user_id=user.id).exists(), 'guest': False, 'id': user.id, - 'profileWasSkipped': profile.was_skipped, - 'profileIsComplete': profile.is_complete + 'profile_was_skipped': profile.was_skipped, + 'profile_is_complete': profile.is_complete, } else: response_data = { @@ -89,6 +89,33 @@ def login(request): return Response(data=response_data, status=status_code) +@decorators.api_view(['POST']) +@decorators.permission_classes((IsAuthenticated, )) +def profile(request): + params = request.POST.dict() + if 'first_name' in params: + request.user.first_name = params['first_name'] + del params['first_name'] + if 'last_name' in request.POST: + request.user.last_name = params['last_name'] + del params['last_name'] + request.user.save() + + if 'was_skipped' in params: + params['was_skipped'] = str(params['was_skipped']).lower() == 'true' + params['is_complete'] = not params['was_skipped'] + else: + params['is_complete'] = True + + profile = UserProfile(**params) + profile.user = request.user + profile.save() + response_data = { + 'result': 'success' + } + return Response(data=response_data, status=status.HTTP_200_OK) + + @decorators.api_view(['GET']) @decorators.permission_classes((AllowAny, )) def logout(request): diff --git a/src/mmw/bundle.sh b/src/mmw/bundle.sh index 1bed2704e..84473523c 100755 --- a/src/mmw/bundle.sh +++ b/src/mmw/bundle.sh @@ -99,6 +99,7 @@ CONCAT_VENDOR_CSS_COMMAND="cat \ ./node_modules/font-awesome/css/font-awesome.min.css \ ./node_modules/bootstrap-table/dist/bootstrap-table.min.css \ ./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker3.min.css \ + ./node_modules/bootstrap-select/dist/css/bootstrap-select.min.css \ ./css/shim/nv.d3.min.css \ > $VENDOR_CSS_FILE" diff --git a/src/mmw/js/src/app.js b/src/mmw/js/src/app.js index ec3526cab..3b3dd0e7f 100644 --- a/src/mmw/js/src/app.js +++ b/src/mmw/js/src/app.js @@ -1,6 +1,7 @@ "use strict"; var $ = require('jquery'), + _ = require('lodash'), Marionette = require('../shim/backbone.marionette'), shutterbug = require('../shim/shutterbug'), views = require('./core/views'), @@ -138,10 +139,36 @@ var App = new Marionette.Application({ }); }, + showLoginModal: function(onSuccess) { + var self = this, + promptForProfileIfIncomplete = function(loginResponse) { + if (loginResponse.profile_was_skipped || loginResponse.profile_is_complete) { + if (onSuccess && _.isFunction(onSuccess)) { + onSuccess(loginResponse); + } + } else { + new userViews.UserProfileModalView({ + model: new userModels.UserProfileFormModel({ + successCallback: onSuccess + }), + app: self + }).render(); + } + }; + new userViews.LoginModalView({ model: new userModels.LoginFormModel({ showItsiButton: settings.get('itsi_enabled'), + successCallback: promptForProfileIfIncomplete + }), + app: self + }).render(); + }, + + showProfileModal: function (onSuccess) { + new userViews.UserProfileModalView({ + model: new userModels.UserProfileFormModel({ successCallback: onSuccess }), app: this diff --git a/src/mmw/js/src/user/models.js b/src/mmw/js/src/user/models.js index 13870abc8..aec9c8a15 100644 --- a/src/mmw/js/src/user/models.js +++ b/src/mmw/js/src/user/models.js @@ -55,6 +55,14 @@ var UserModel = Backbone.Model.extend({ } }); +var UserProfileModel = Backbone.Model.extend({ + defaults: { + was_skipped: false, + }, + + url: '/user/profile', +}); + var ModalBaseModel = Backbone.Model.extend({ defaults: { success: false, @@ -97,14 +105,27 @@ var LoginFormModel = ModalBaseModel.extend({ } }, - onSuccess: function() { + onSuccess: function(response) { var callback = this.get('successCallback'); if (callback && _.isFunction(callback)) { - callback(); + callback(response); } } }); +var UserProfileFormModel = ModalBaseModel.extend({ + defaults: { + first_name: null, + last_name: null, + organization: null, + user_type: 'Unspecified', + country: 'US', + was_skipped: false + }, + + url: '/user/profile' +}); + var SignUpFormModel = ModalBaseModel.extend({ defaults: { username: null, @@ -303,7 +324,9 @@ var ItsiSignUpFormModel = ModalBaseModel.extend({ module.exports = { UserModel: UserModel, + UserProfileModel: UserProfileModel, LoginFormModel: LoginFormModel, + UserProfileFormModel: UserProfileFormModel, SignUpFormModel: SignUpFormModel, ResendFormModel: ResendFormModel, ForgotFormModel: ForgotFormModel, diff --git a/src/mmw/js/src/user/templates/baseModal.html b/src/mmw/js/src/user/templates/baseModal.html index 9bbbc0e3d..f50e14ec5 100644 --- a/src/mmw/js/src/user/templates/baseModal.html +++ b/src/mmw/js/src/user/templates/baseModal.html @@ -16,6 +16,23 @@ {% endmacro %} +{% macro select(value, name, model, field, defaultChoice='', label='') %} +

        + + +
        +{% endmacro %} +
        diff --git a/src/mmw/js/src/user/templates/userProfileModal.html b/src/mmw/js/src/user/templates/userProfileModal.html new file mode 100644 index 000000000..b442adc4e --- /dev/null +++ b/src/mmw/js/src/user/templates/userProfileModal.html @@ -0,0 +1,25 @@ +{% extends './baseModal.html' %} + +{% block form %} +
        +
        + {{ field(first_name, 'first_name', 'First Name') }} +
        +
        + {{ field(last_name, 'last_name', 'Last Name') }} +
        +
        +{{ field(organization, 'organization', 'Organization/School') }} +{{ select(user_type, 'user_type', 'UserProfile', 'user_type', 'Unspecified', 'User Type') }} +{{ select(country, 'country', 'UserProfile', 'country', 'US', 'Country') }} +{{ field(postal_code, 'postal_code', 'Postal Code') }} +{% endblock %} + +{% block footer %} +
        + +
        +
        + +
        +{% endblock %} diff --git a/src/mmw/js/src/user/views.js b/src/mmw/js/src/user/views.js index 85815b07f..68a47a24a 100644 --- a/src/mmw/js/src/user/views.js +++ b/src/mmw/js/src/user/views.js @@ -9,6 +9,7 @@ var _ = require('underscore'), settings = require('../core/settings'), models = require('./models'), loginModalTmpl = require('./templates/loginModal.html'), + userProfileModalTmpl = require('./templates/userProfileModal.html'), signUpModalTmpl = require('./templates/signUpModal.html'), resendModalTmpl = require('./templates/resendModal.html'), forgotModalTmpl = require('./templates/forgotModal.html'), @@ -17,6 +18,7 @@ var _ = require('underscore'), itsiSignUpModalTmpl = require('./templates/itsiSignUpModal.html'); var ENTER_KEYCODE = 13; +var ESC_KEYCODE = 27; var ModalBaseView = Marionette.ItemView.extend({ className: 'modal modal-large fade', @@ -75,6 +77,10 @@ var ModalBaseView = Marionette.ItemView.extend({ if (e.keyCode === ENTER_KEYCODE) { e.preventDefault(); } + if (e.keyCode === ESC_KEYCODE && this.escapeHandler) { + e.preventDefault(); + return this.escapeHandler(e); + } }, getDisabledState: function($el) { @@ -196,10 +202,10 @@ var LoginModalView = ModalBaseView.extend({ .fail(_.bind(this.handleFailure, this)); }, - handleSuccess: function() { + handleSuccess: function(response) { this.$el.modal('hide'); this.app.user.set('guest', false); - this.model.onSuccess(); + this.model.onSuccess(response); }, handleFailure: function(response) { @@ -260,6 +266,101 @@ var LoginModalView = ModalBaseView.extend({ } }); +var UserProfileModalView = ModalBaseView.extend({ + template: userProfileModalTmpl, + + ui: _.defaults({ + firstName: '#first_name', + lastName: '#last_name', + organization: '#organization', + userType: '#user_type', + country: '#country', + postalCode: '#postal_code', + submitProfile: '.submit-profile', + skip: '.skip' + }, ModalBaseView.prototype.ui), + + events: _.defaults({ + 'click @ui.submitProfile': 'submitProfile', + 'click @ui.later': 'later', + 'keydown button': 'enterTogglesDropdown' + }, ModalBaseView.prototype.events), + + onModalShown: function() { + var self = this, + escKeyPressClosesDropdown = function (e) { + var $element = $(e.target).closest('.bootstrap-select'); + if (e.keyCode === 27) { + // Clear the textbox, hide close the dropdown, return focus to the now closed dropdown + e.preventDefault(); + $(e.target).val(''); + $element.find('.selectpicker').selectpicker('toggle'); + $element.find('button').focus(); + return false; + } + }, + inputs = [ + this.ui.country.parent().find('input'), + this.ui.userType.parent().find('input') + ]; + _.forEach(inputs, function($input) { + $input.on('keypress', escKeyPressClosesDropdown); + $input.on('focus', function() { self.escapeHandler = escKeyPressClosesDropdown;}); + $input.on('blur', function() { self.escapeHandler = undefined; }); + }); + + this.ui.firstName.focus(); + }, + + handleSuccess: function(response) { + this.handleServerSuccess(response); + this.$el.modal('hide'); + }, + + handleFailure: function(response) { + this.handleServerFailure(response); + }, + + setFields: function () { + this.model.set({ + first_name: this.ui.firstName.val(), + last_name: this.ui.lastName.val(), + organization: this.ui.organization.val(), + user_type: this.ui.userType.val(), + country: this.ui.country.val(), + postal_code: this.ui.postalCode.val() + }, { silent: true }); + }, + + primaryAction: function() { + this.model + .fetch({ + method: 'POST', + data: this.model.attributes }) + .done(_.bind(this.handleSuccess, this)) + .fail(_.bind(this.handleFailure, this)); + }, + + dismissAction: function() { + this.model + .fetch({ + method: 'POST', + data: { was_skipped: true }}) + .done(_.bind(this.handleSuccess, this)) + .fail(_.bind(this.handleFailure, this)); + }, + + enterTogglesDropdown: function(e) { + if (e.keyCode === ENTER_KEYCODE) { + e.preventDefault(); + // In testing the form is validated and submitted unless this call to 'toggle' is delayed + setTimeout(function () { $(e.target).siblings('.selectpicker').selectpicker('toggle'); }, 100); + return false; + } + return true; + } +}); + var SignUpModalView = ModalBaseView.extend({ template: signUpModalTmpl, @@ -415,6 +516,7 @@ var ChangePasswordModalView = ModalBaseView.extend({ module.exports = { LoginModalView: LoginModalView, + UserProfileModalView: UserProfileModalView, SignUpModalView: SignUpModalView, ResendModalView: ResendModalView, ForgotModalView: ForgotModalView, diff --git a/src/mmw/sass/components/_inputs.scss b/src/mmw/sass/components/_inputs.scss index 2df8262a3..a1b44f7f4 100644 --- a/src/mmw/sass/components/_inputs.scss +++ b/src/mmw/sass/components/_inputs.scss @@ -137,3 +137,20 @@ to { width:0; background:transparent; } } } + +//Select Inputs +.custom-select-group { + position: relative; + margin: 4rem 0; + + /* LABEL ======================================= */ + label { + left: 0; + top: -24px; + font-size: $font-size-h5; + color: $active; + font-weight: normal; + position: absolute; + pointer-events: none; + } +} From cd84dea8a9cb65592d2c165e3f83a85149bad425 Mon Sep 17 00:00:00 2001 From: Matthew McFarland Date: Mon, 30 Oct 2017 21:27:50 -0400 Subject: [PATCH 119/172] Clone reference to gis_data prior to mutating A recent change to serialization and storage data type on the client made gis_data, once a string, an object. As an object, the reference stored by the project model and in the mergedGisData var were the same, thus persisting any subsequent changes back to the model, unintentially. Doing a deepClone of the gis_data before updating values prevents the core project gis_data from being changed, and having that change shared across scenarios. --- src/mmw/js/src/modeling/models.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mmw/js/src/modeling/models.js b/src/mmw/js/src/modeling/models.js index c59d5d195..3557b370d 100644 --- a/src/mmw/js/src/modeling/models.js +++ b/src/mmw/js/src/modeling/models.js @@ -898,7 +898,7 @@ var ScenarioModel = Backbone.Model.extend({ // Merge the values that came back from Mapshed with the values // in the modifications from the user. var modifications = self.get('modifications'), - mergedGisData = project.get('gis_data'); + mergedGisData = _.cloneDeep(project.get('gis_data')); modifications.forEach(function(mod) { _.assign(mergedGisData, mod.get('output')); From 4a942cd1055d1cadd89c03960bfeffe05f9b8c92 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Fri, 27 Oct 2017 16:22:43 -0400 Subject: [PATCH 120/172] Send profile status in GET login and POST profile responses We were sending the status of the profile (skipped + complete) only when posting a login. We'll need this information also for users with an active session so we can display their blue dot if they need to fill out the profile. To avoid another GET request, also provide the profile status information in the response of the /profile request --- src/mmw/apps/user/views.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mmw/apps/user/views.py b/src/mmw/apps/user/views.py index 99b66b8f9..6d2b2be86 100644 --- a/src/mmw/apps/user/views.py +++ b/src/mmw/apps/user/views.py @@ -68,14 +68,16 @@ def login(request): elif request.method == 'GET': user = request.user - if user.is_authenticated() and user.is_active: + profile, created = UserProfile.objects.get_or_create(user=user) response_data = { 'result': 'success', 'username': user.username, 'itsi': ItsiUser.objects.filter(user_id=user.id).exists(), 'guest': False, - 'id': user.id + 'id': user.id, + 'profile_was_skipped': profile.was_skipped, + 'profile_is_complete': profile.is_complete, } else: response_data = { @@ -111,7 +113,9 @@ def profile(request): profile.user = request.user profile.save() response_data = { - 'result': 'success' + 'result': 'success', + 'profile_was_skipped': profile.was_skipped, + 'profile_is_complete': profile.is_complete, } return Response(data=response_data, status=status.HTTP_200_OK) From 0be4ba995f7c21d2c7f0edb04e0981c390e66aba Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Thu, 26 Oct 2017 11:36:18 -0400 Subject: [PATCH 121/172] Show blue dot if profile form hasn't been filled out If the user hasn't filled out the profile form yet, show a blue dot next to their name in the app header. If the user has just skipped the form for that login session, show a popover on the dot explaining they can click the dot to fill the form out whenever they're ready (it links to the account profile page). To deal with the timing of when user fetches happen wrt to showing the profile form, use the profile response to set attributes on the user model so another user fetch doesn't have to be done. --- src/mmw/js/src/core/templates/header.html | 16 ++++++++++ src/mmw/js/src/core/views.js | 23 ++++++++++++-- src/mmw/js/src/user/models.js | 4 ++- src/mmw/js/src/user/views.js | 5 +++ src/mmw/sass/base/_header.scss | 38 +++++++++++++++++++++++ 5 files changed, 83 insertions(+), 3 deletions(-) diff --git a/src/mmw/js/src/core/templates/header.html b/src/mmw/js/src/core/templates/header.html index 38e77d0c9..745ab417f 100644 --- a/src/mmw/js/src/core/templates/header.html +++ b/src/mmw/js/src/core/templates/header.html @@ -11,6 +11,18 @@
      • {{ username }} + + {% if not profile_is_complete %} +
        + {% endif %} +
          @@ -28,3 +40,7 @@
        • + +{% if show_profile_popover %} +
        +{% endif %} diff --git a/src/mmw/js/src/core/views.js b/src/mmw/js/src/core/views.js index f7146d7b1..27eb62d92 100644 --- a/src/mmw/js/src/core/views.js +++ b/src/mmw/js/src/core/views.js @@ -112,7 +112,8 @@ var HeaderView = Marionette.ItemView.extend({ ui: { login: '.show-login', logout: '.user-logout', - cloneProject: '.clone-project' + cloneProject: '.clone-project', + skippedProfilePopover: '[data-toggle="popover"]', }, events: { @@ -185,7 +186,25 @@ var HeaderView = Marionette.ItemView.extend({ }); }); view.render(); - } + }, + + onRender: function() { + if (this.model.get('show_profile_popover')) { + this.ui.skippedProfilePopover.popover({ + placement: 'bottom', + trigger: 'manual', + viewport: { + 'selector': '.map-container', + 'padding': 10 + } + }); + this.ui.skippedProfilePopover.popover('show'); + this.$el.find('#popover-close-button').on('click', _.bind(function() { + this.ui.skippedProfilePopover.popover('hide'); + this.model.set('show_profile_popover', false); + }, this)); + } + }, }); // Init the locate plugin button and add it to the map. diff --git a/src/mmw/js/src/user/models.js b/src/mmw/js/src/user/models.js index aec9c8a15..e17e26cc8 100644 --- a/src/mmw/js/src/user/models.js +++ b/src/mmw/js/src/user/models.js @@ -6,7 +6,9 @@ var Backbone = require('../../shim/backbone'), var UserModel = Backbone.Model.extend({ defaults: { itsi: false, - guest: true + guest: true, + profile_is_complete: false, + show_profile_popover: false // does the user need the blue dot explanatory popover? }, url: '/user/login', diff --git a/src/mmw/js/src/user/views.js b/src/mmw/js/src/user/views.js index 68a47a24a..d9dc2abc5 100644 --- a/src/mmw/js/src/user/views.js +++ b/src/mmw/js/src/user/views.js @@ -313,6 +313,11 @@ var UserProfileModalView = ModalBaseView.extend({ }, handleSuccess: function(response) { + this.app.user.set({ + 'show_profile_popover': response.profile_was_skipped, + 'profile_was_skipped': response.profile_was_skipped, + 'profile_is_complete': response.profile_is_complete + }); this.handleServerSuccess(response); this.$el.modal('hide'); }, diff --git a/src/mmw/sass/base/_header.scss b/src/mmw/sass/base/_header.scss index ba613ce76..209e764b0 100644 --- a/src/mmw/sass/base/_header.scss +++ b/src/mmw/sass/base/_header.scss @@ -327,3 +327,41 @@ header { } } } + +.profile-reminder-dot { + border-radius: 50%; + margin-left: 3px; + vertical-align: middle; + margin-top: -2px; + border: 6px solid #238cea; + display: inline-block; +} + +.popover.bottom.profile-popover { + width: 400px; + background: $ui-secondary; + padding: 1rem; + > .popover-title { + padding: 0; + padding-bottom: 1rem; + background: $ui-secondary; + color: $paper; + font-size: $font-size-h2; + } + + > .popover-content { + background: $ui-secondary; + color: $paper; + padding: 0; + padding-bottom: 1rem; + } + + > .arrow:after { + border-bottom-color: $ui-secondary; + } +} + +.profile-fade-background { + top: $height-lg; + display: block; +} From 7b311b71266d3f439c0ffc20f176b5ac19e5b3d1 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 31 Oct 2017 09:59:36 -0400 Subject: [PATCH 122/172] Use ulmo fork Because of parse issues in the main repo. See here for background: https://github.com/WikiWatershed/model-my-watershed/issues/2417#issuecomment-340684860 --- src/mmw/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mmw/requirements/base.txt b/src/mmw/requirements/base.txt index 0a26a4bf7..1779d6982 100644 --- a/src/mmw/requirements/base.txt +++ b/src/mmw/requirements/base.txt @@ -19,5 +19,5 @@ retry==0.9.1 python-dateutil==2.6.0 suds==0.4 django_celery_results==1.0.1 -ulmo==0.8.4 +git+git://github.com/emiliom/ulmo@wml_values_md#egg=ulmo numpy==1.13.0 From 29028b3a92d7d82ec004545b2ed2eea6398ea770 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 31 Oct 2017 10:00:33 -0400 Subject: [PATCH 123/172] Fetch one year of data instead of one month While this makes the NWISUV a little longer wait, this ensures we get data for other services, some of which may have data that is less frequent than once a month. --- src/mmw/js/src/data_catalog/models.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 085c76777..04c1c8699 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -717,8 +717,8 @@ var CuahsiVariable = Backbone.Model.extend({ // to be either from begin date to end date, or 1 week up to end date, // whichever is shorter. if (!from || moment(from).isBefore(begin_date)) { - if (end_date.diff(begin_date, 'months', true) > 1) { - params.from_date = moment(end_date).subtract(1, 'months'); + if (end_date.diff(begin_date, 'years', true) > 1) { + params.from_date = moment(end_date).subtract(1, 'years'); } else { params.from_date = begin_date; } From f549061bf6872fbaa509be5389ef49bee85ff936 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 31 Oct 2017 10:02:52 -0400 Subject: [PATCH 124/172] Use full day for single date results Some results, instead of having a range of dates for their values, have a single date instead. Previously we would send the same date as start and end for the range in the API call, which excluded any data not recorded at midnight of that date. In cases when the start and end dates are the same, we now add one day to the end date and ensure data collected any time during that day is retrieved. --- src/mmw/js/src/data_catalog/models.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 04c1c8699..10ee2cf12 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -732,6 +732,11 @@ var CuahsiVariable = Backbone.Model.extend({ params.to_date = moment(to); } + if (params.from_date.format(DATE_FORMAT) === + params.to_date.format(DATE_FORMAT)) { + params.to_date.add(1, 'days'); + } + params.from_date = params.from_date.format(DATE_FORMAT); params.to_date = params.to_date.format(DATE_FORMAT); From 8c9ee6e139995a21736b2259bf40026ba833754f Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 31 Oct 2017 10:43:39 -0400 Subject: [PATCH 125/172] Remove no data values from response Most of this diff is a rewrite to make it flow better, the only new thing being the addition of a response.variable.no_data_value check. If it exists, we filter out any such values from the response before adding it to the variable. --- src/mmw/js/src/data_catalog/models.js | 41 ++++++++++++++++++--------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 10ee2cf12..6468eb9ca 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -752,24 +752,37 @@ var CuahsiVariable = Backbone.Model.extend({ }, parse: function(response) { - var mrv = null; - - if (response.values && response.values.length > 0) { - var values = this.get('values'); + var values = this.get('values'), + ndv = response.variable.no_data_value, + newValues = response.values, + variable = { + name: response.variable.name, + data_type: response.variable.data_type, + sample_medium: response.variable.sample_medium, + units: response.variable.units.abbreviation, + most_recent_value: null, + }; - values.reset(response.values); - mrv = response.values[response.values.length - 1].value; - } else { + if (newValues === null || newValues === undefined || _.isEmpty(newValues)) { this.set('error', 'No values returned from API'); + return variable; } - return { - name: response.variable.name, - data_type: response.variable.data_type, - sample_medium: response.variable.sample_medium, - units: response.variable.units.abbreviation, - most_recent_value: mrv, - }; + if (ndv !== null && ndv !== undefined) { + newValues = _.filter(newValues, function(v) { + return v.value !== ndv; + }); + } + + if (_.isEmpty(newValues)) { + this.set('error', 'No valid values returned from API'); + return variable; + } + + values.reset(newValues); + variable.most_recent_value = _.last(newValues).value; + + return variable; }, getChartData: function() { From b465435a8aa3be325875a41d196288349b59359f Mon Sep 17 00:00:00 2001 From: Matthew McFarland Date: Tue, 31 Oct 2017 11:33:49 -0400 Subject: [PATCH 126/172] Reset models affected by modification bug Resets the possibly affected multi-year model results by removing the calculated GIS parts, forcing a recomputation when accessed again. --- .../migrations/0024_fix_gwlfe_gis_data.py | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/mmw/apps/modeling/migrations/0024_fix_gwlfe_gis_data.py diff --git a/src/mmw/apps/modeling/migrations/0024_fix_gwlfe_gis_data.py b/src/mmw/apps/modeling/migrations/0024_fix_gwlfe_gis_data.py new file mode 100644 index 000000000..3cb054f1e --- /dev/null +++ b/src/mmw/apps/modeling/migrations/0024_fix_gwlfe_gis_data.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations + + +def fix_gis_data_serialization(apps, schema_editor): + """ + Release 1.20.0 introduced a change which let the project "gis_data" + field get updated by modifications on a scenario. This effectively + meant that modifications were being applied to all scenarios and that + removing them did not actually remove their effect from the gwlf-e + input. For projects that were created and suffered from that bug, + clearing out the gis_data on Project and the results on Scenario + will force them to be recomputed with the fix applied. + """ + + Project = apps.get_model('modeling', 'Project') + bug_released_date = '2017-10-17' + + # Apply fix to Multi-Year projects created after the release + for project in Project.objects.filter(created_at__gte=bug_released_date, + model_package='gwlfe'): + project.gis_data = None + for scenario in project.scenarios.all(): + scenario.results = None + scenario.save() + + project.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('modeling', '0023_fix_gis_data_serialization'), + ] + + operations = [ + migrations.RunPython(fix_gis_data_serialization, + migrations.RunPython.noop) + ] From c7bc4640857c56a5c9ccd9a36944981d25412a59 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 30 Oct 2017 16:43:22 -0400 Subject: [PATCH 127/172] Refactor: Prefer listenTo for callbacks This ensures that the listener will be removed when the view is removed, thus a cleaner approach. Also replace _.bind call with self references inside updateFilterSidebar. Also rewrite templateHelpers to be a little more straightforward. --- src/mmw/js/src/data_catalog/views.js | 30 +++++++++++----------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index a45593d17..0bed95263 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -210,17 +210,17 @@ var FormView = Marionette.ItemView.extend({ }, initialize: function() { - var updateFilterSidebar = _.bind(function() { - if (App.rootView.secondarySidebarRegion.hasView()) { - this.showFilterSidebar(); - } - - this.render(); + var self = this, + updateFilterSidebar = function() { + if (App.rootView.secondarySidebarRegion.hasView()) { + self.showFilterSidebar(); + } - }, this); + self.render(); + }; // Update the filter sidebar when there's a new active catalog - this.collection.on('change:active', updateFilterSidebar); + this.listenTo(this.collection, 'change:active', updateFilterSidebar); }, getFilters: function() { @@ -270,18 +270,12 @@ var FormView = Marionette.ItemView.extend({ }, templateHelpers: function() { - var filters = this.getFilters(); - - if (!filters) { - return { filterNumText: '' }; - } - - var numActiveFilters = filters.countActive(); + var filters = this.getFilters(), + numActiveFilters = filters && filters.countActive(), + filterNumText = numActiveFilters ? '(' + numActiveFilters + ')' : ''; return { - filterNumText: numActiveFilters > 0 ? - '(' + numActiveFilters + ')' : - null + filterNumText: filterNumText }; } }); From da9f26788cb1a3de2e8280e16e6b3cc06f9cc3ef Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 30 Oct 2017 17:11:48 -0400 Subject: [PATCH 128/172] Add download results button The button is added to the formView for visibility purposes, as there is no room in the tabContentView. We listen for the load event of each catalog, and if the current catalog is loaded and has non-zero results, the button is shown. --- src/mmw/js/src/data_catalog/templates/form.html | 5 +++++ src/mmw/js/src/data_catalog/views.js | 12 +++++++++++- src/mmw/sass/pages/_data-catalog.scss | 8 ++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/data_catalog/templates/form.html b/src/mmw/js/src/data_catalog/templates/form.html index 76df4e111..c9791108d 100644 --- a/src/mmw/js/src/data_catalog/templates/form.html +++ b/src/mmw/js/src/data_catalog/templates/form.html @@ -18,4 +18,9 @@ />
        + +
        diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 0bed95263..60c8dd117 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -198,6 +198,7 @@ var FormView = Marionette.ItemView.extend({ ui: { filterToggle: '.filter-sidebar-toggle', searchInput: '.data-catalog-search-input', + downloadButton: '#bigcz-catalog-results-download', }, events: { @@ -221,6 +222,11 @@ var FormView = Marionette.ItemView.extend({ // Update the filter sidebar when there's a new active catalog this.listenTo(this.collection, 'change:active', updateFilterSidebar); + + // Update the download button visibility on catalog load events + this.collection.forEach(function(catalog) { + self.listenTo(catalog, 'change:loading', self.render); + }); }, getFilters: function() { @@ -272,9 +278,13 @@ var FormView = Marionette.ItemView.extend({ templateHelpers: function() { var filters = this.getFilters(), numActiveFilters = filters && filters.countActive(), - filterNumText = numActiveFilters ? '(' + numActiveFilters + ')' : ''; + filterNumText = numActiveFilters ? '(' + numActiveFilters + ')' : '', + catalog = this.collection.getActiveCatalog(), + results = catalog && catalog.get('results'), + downloadVisible = results && results.length > 0; return { + downloadVisible: downloadVisible, filterNumText: filterNumText }; } diff --git a/src/mmw/sass/pages/_data-catalog.scss b/src/mmw/sass/pages/_data-catalog.scss index a903df1f4..91da02dc1 100644 --- a/src/mmw/sass/pages/_data-catalog.scss +++ b/src/mmw/sass/pages/_data-catalog.scss @@ -529,3 +529,11 @@ color: #555; padding-left: 0; } + +#bigcz-catalog-results-download { + position: absolute; + right: 1.5rem; + top: 56px; + border: 0; + background-color: transparent; +} From fd7520b27586c383a8dcf68d236e756fef8de3e1 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 30 Oct 2017 17:18:31 -0400 Subject: [PATCH 129/172] Download results as JSON Assemble all displayed results' JSON, and download it to a file. The file will be named in the fashion: bigcz-{catalog}-{query}-{date-time-stamp}.json Note that the format of the JSON is that of the Result Model, and not of the values that came in from the API. Thus, it will have some extraneous fields like loading and error. But in the interest of a efficiency and minimalism, this is tolerable. --- src/mmw/js/src/data_catalog/views.js | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 60c8dd117..6ad32700e 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -204,6 +204,7 @@ var FormView = Marionette.ItemView.extend({ events: { 'keyup @ui.searchInput': 'onSearchInputChanged', 'click @ui.filterToggle': 'onFilterToggle', + 'click @ui.downloadButton': 'downloadResults', }, onBeforeDestroy: function() { @@ -229,6 +230,45 @@ var FormView = Marionette.ItemView.extend({ }); }, + downloadResults: function() { + var catalog = this.collection.getActiveCatalog(), + results = catalog && catalog.get('results'); + + if (!results) { + return null; + } + + var json = JSON.stringify(results.toJSON()), + blob = new Blob([json], { type: 'data:text/plain;charset=utf-8'}), + url = URL.createObjectURL(blob), + a = document.createElement('a'), + dateString = (new Date()).toJSON() + .replace(/[T:]/g, '-') + .substr(0, 19), // YYYY-MM-DD-hh-mm-ss + dashedQuery = this.model.get('query') + .trim() + .toLowerCase() + .replace(/\W+/g, '-'), + filename = 'bigcz-' + catalog.id + '-' + + dashedQuery + '-' + dateString + '.json'; + + if (navigator.msSaveBlob) { + // IE has a nicer interface for saving blobs + navigator.msSaveBlob(blob, filename); + } else { + // Other browsers have to use a hidden link hack + a.style.display = 'none'; + a.setAttribute('download', filename); + a.setAttribute('href', url); + + document.body.appendChild(a); + a.click(); + document.body.removeChild(a); + } + + URL.revokeObjectURL(url); + }, + getFilters: function() { var activeCatalog = this.collection.getActiveCatalog(); From f533ad08152622eb7a5d573d2ffa41780e80ea3e Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 31 Oct 2017 14:27:07 -0400 Subject: [PATCH 130/172] Exclude extraneous fields from JSON download To keep results consistent and download size small, we exclude any details that may have been fetched for individual results. --- src/mmw/js/src/data_catalog/views.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 6ad32700e..69588386f 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -238,8 +238,20 @@ var FormView = Marionette.ItemView.extend({ return null; } - var json = JSON.stringify(results.toJSON()), - blob = new Blob([json], { type: 'data:text/plain;charset=utf-8'}), + var data = results.map(function(r) { + var exclude = ['show_detail', 'fetching', 'error', 'mode'], + cr = _.clone(_.omit(r.attributes, exclude)); + + if (!_.isNull(cr.variables)) { + cr.variables = cr.variables.map(function(v) { + return _.clone(_.omit(v.attributes, ['values', 'error'])); + }); + } + + return cr; + }), + blob = new Blob([JSON.stringify(data)], + { type: 'data:text/plain;charset=utf-8'}), url = URL.createObjectURL(blob), a = document.createElement('a'), dateString = (new Date()).toJSON() From de1a9aeebbaf4ef4aa28c2848dbf7ab33e881a63 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 30 Oct 2017 13:49:52 -0400 Subject: [PATCH 131/172] Make HydroShare dates timezone aware Some of the dates in the API response were timezone aware, while others were not. Since DATE_MIN was defined without timezone awareness, it could only be compared to similarly naive datetimes. Using Django's make_aware utility, DATE_MIN is initialized with a timezone. Values coming in from the API are checked for timezone awareness, and are made aware if needed. This ensures that no information is lost, and comparisons are made between like objects. --- src/mmw/apps/bigcz/clients/hydroshare/search.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/hydroshare/search.py b/src/mmw/apps/bigcz/clients/hydroshare/search.py index 2a61d34dc..a0c51b0e1 100644 --- a/src/mmw/apps/bigcz/clients/hydroshare/search.py +++ b/src/mmw/apps/bigcz/clients/hydroshare/search.py @@ -11,6 +11,7 @@ from django.core.cache import cache from django.conf import settings from django.contrib.gis.geos import Point, Polygon +from django.utils.timezone import make_aware from apps.bigcz.models import ResourceLink, ResourceList from apps.bigcz.utils import RequestTimedOutError @@ -21,11 +22,15 @@ CATALOG_NAME = 'hydroshare' CATALOG_URL = 'https://www.hydroshare.org/hsapi/resource/' -DATE_MIN = datetime(1776, 7, 4, 0, 0) +DATE_MIN = make_aware(datetime(1776, 7, 4, 0, 0)) def parse_date(value): - return dateutil.parser.parse(value) + d = dateutil.parser.parse(value) + if d.tzinfo is None or d.tzinfo.utcoffset(d) is None: + return make_aware(d) + else: + return d def parse_box(box): @@ -167,11 +172,11 @@ def search(**kwargs): if from_date: records = [r for r in records - if r.end_date and r.end_date >= from_date] + if r.end_date and r.end_date >= make_aware(from_date)] if to_date: records = [r for r in records - if r.begin_date and r.begin_date <= to_date] + if r.begin_date and r.begin_date <= make_aware(to_date)] results = sorted(records, key=nullable_attrgetter('end_date', DATE_MIN), From a1b585d529ebc9b8eb06e71dbc0a4d2956c575af Mon Sep 17 00:00:00 2001 From: Matthew McFarland Date: Wed, 1 Nov 2017 15:14:19 -0400 Subject: [PATCH 132/172] Use correct link template for NWIS sites The url portion `uv` and `dv` were swapped. --- src/mmw/apps/bigcz/clients/cuahsi/search.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mmw/apps/bigcz/clients/cuahsi/search.py b/src/mmw/apps/bigcz/clients/cuahsi/search.py index 618d30862..d014b3331 100644 --- a/src/mmw/apps/bigcz/clients/cuahsi/search.py +++ b/src/mmw/apps/bigcz/clients/cuahsi/search.py @@ -101,10 +101,10 @@ def parse_details_url(record): if len(parts) == 2: code, id = parts if code == 'NWISDV': - url = 'https://waterdata.usgs.gov/nwis/uv/?site_no={}' + url = 'https://waterdata.usgs.gov/nwis/dv/?site_no={}' return url.format(id) elif code == 'NWISUV': - url = 'https://waterdata.usgs.gov/nwis/dv/?site_no={}' + url = 'https://waterdata.usgs.gov/nwis/uv/?site_no={}' return url.format(id) elif code == 'NWISGW': url = ('https://nwis.waterdata.usgs.gov/' + From bdb651e1d8ec8649970be52015db263a1ea0c4f7 Mon Sep 17 00:00:00 2001 From: Casey Cesari Date: Wed, 1 Nov 2017 16:00:54 -0400 Subject: [PATCH 133/172] Remove RWD point if RWD cancel button is clicked Work in https://github.com/WikiWatershed/model-my-watershed/pull/2171 preserved RWD map layers on failure. A side-effect of this work was that the initial RWD point was also preserved on cancellation. The point is now explicitly removed when the cancel button is clicked. Refs #2447 --- src/mmw/js/src/draw/views.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index 0363e370b..23d30828a 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -173,7 +173,12 @@ var DrawWindow = Marionette.LayoutView.extend({ onShow: function() { var self = this, - resetRwdDrawingState = function() { + resetRwdDrawingState = function(e) { + // If the cancel button was clicked + if (e && e.type === 'click') { + self.model.clearRwdClickedPoint(App.getLeafletMap()); + } + self.resetDrawingState({ clearOnFailure: false }); From 20fd02d2aa28c08e1f25e47d6dada3d5f1013963 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Wed, 1 Nov 2017 16:08:53 -0400 Subject: [PATCH 134/172] Adjust analyze tab height in tabbed view When the Analyze window is in a tab, when both analyze and data are available as tabs, its contents weren't scrolling correctly. By calculating the height and taking into account other items on the page, we ensure that the container's height is set in a way that allows all content to scroll and be visible. --- src/mmw/sass/components/_tabs.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mmw/sass/components/_tabs.scss b/src/mmw/sass/components/_tabs.scss index c929ba27a..fb414115a 100644 --- a/src/mmw/sass/components/_tabs.scss +++ b/src/mmw/sass/components/_tabs.scss @@ -68,6 +68,12 @@ .tab-content { // Set a specific height to allow y-scroll: height: 100% !important; + + &.analyze-tab-content { + // Height under the main header (height-lg), the analyze / data bar + // header (height-xl) and the tabs (42px) + height: calc(100% - #{$height-lg} - #{$height-xl} - 42px) !important; + } } } From 81db33f160e287282a467c48773fff6bfabd8989 Mon Sep 17 00:00:00 2001 From: Justin Walgran Date: Thu, 26 Oct 2017 08:44:36 -0700 Subject: [PATCH 135/172] Add user profile page content This commit adds a form on the "profile" tab of `/account` to display and edit user profile details. - I moved the saving of the profile to a Django REST Framework serializer to keep the persistence details out of the view. - I styled the text fields on the form to match the wireframes but I did not style the bootstrap-select dropdown menus. We will be restyling them across the app in a future commit. --- src/mmw/apps/user/serializers.py | 30 +++++++ src/mmw/apps/user/views.py | 81 +++++++++---------- src/mmw/js/src/account/templates/profile.html | 78 ++++++++++++++++++ src/mmw/js/src/account/views.js | 72 ++++++++++++++++- src/mmw/js/src/app.js | 24 +++--- src/mmw/js/src/user/models.js | 18 ++--- src/mmw/js/src/user/views.js | 6 +- src/mmw/sass/pages/_account.scss | 28 +++++++ 8 files changed, 266 insertions(+), 71 deletions(-) diff --git a/src/mmw/apps/user/serializers.py b/src/mmw/apps/user/serializers.py index a870be093..bc79c5822 100644 --- a/src/mmw/apps/user/serializers.py +++ b/src/mmw/apps/user/serializers.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals from django.contrib.auth.models import User +from models import UserProfile from rest_framework import serializers @@ -10,3 +11,32 @@ class UserSerializer(serializers.ModelSerializer): class Meta: model = User fields = ('id', 'username', 'is_staff') + + +class UserProfileSerializer(serializers.Serializer): + user_id = serializers.IntegerField(required=True) + organization = serializers.CharField(required=False, allow_blank=True) + user_type = serializers.CharField(required=False, allow_blank=True) + postal_code = serializers.CharField(required=False, allow_blank=True) + country = serializers.CharField(required=False, allow_blank=True) + first_name = serializers.CharField(required=False, allow_blank=True) + last_name = serializers.CharField(required=False, allow_blank=True) + was_skipped = serializers.BooleanField(required=False) + is_complete = serializers.BooleanField(required=True) + + def create(self, validated_data): + user_id = validated_data.get('user_id', None) + if user_id is not None: + user = User.objects.filter(id=user_id).first() + if user is not None: + if 'first_name' in validated_data: + user.first_name = validated_data['first_name'] + del validated_data['first_name'] + if 'last_name' in validated_data: + user.last_name = validated_data['last_name'] + del validated_data['last_name'] + user.save() + profile, created = UserProfile.objects.update_or_create( + user_id=user_id, + defaults=validated_data) + return profile diff --git a/src/mmw/apps/user/views.py b/src/mmw/apps/user/views.py index 6d2b2be86..fc95bce06 100644 --- a/src/mmw/apps/user/views.py +++ b/src/mmw/apps/user/views.py @@ -24,6 +24,7 @@ from apps.user.models import ItsiUser, UserProfile from apps.user.itsi import ItsiService +from apps.user.serializers import UserProfileSerializer EMBED_FLAG = settings.ITSI['embed_flag'] @@ -34,6 +35,26 @@ def login(request): response_data = {} status_code = status.HTTP_200_OK + def make_successful_response_data(user): + profile, created = UserProfile.objects.get_or_create(user=user) + return { + 'result': 'success', + 'username': user.username, + 'itsi': ItsiUser.objects.filter(user_id=user.id).exists(), + 'guest': False, + 'id': user.id, + 'profile_was_skipped': profile.was_skipped, + 'profile_is_complete': profile.is_complete, + 'profile': { + 'first_name': user.first_name, + 'last_name': user.last_name, + 'organization': profile.organization, + 'country': profile.country, + 'user_type': profile.user_type, + 'postal_code': profile.postal_code, + } + } + if request.method == 'POST': user = authenticate(username=request.REQUEST.get('username'), password=request.REQUEST.get('password')) @@ -41,16 +62,7 @@ def login(request): if user is not None: if user.is_active: auth_login(request, user) - profile, created = UserProfile.objects.get_or_create(user=user) - response_data = { - 'result': 'success', - 'username': user.username, - 'itsi': ItsiUser.objects.filter(user_id=user.id).exists(), - 'guest': False, - 'id': user.id, - 'profile_was_skipped': profile.was_skipped, - 'profile_is_complete': profile.is_complete, - } + response_data = make_successful_response_data(user) else: response_data = { 'errors': ['Please activate your account'], @@ -69,16 +81,7 @@ def login(request): elif request.method == 'GET': user = request.user if user.is_authenticated() and user.is_active: - profile, created = UserProfile.objects.get_or_create(user=user) - response_data = { - 'result': 'success', - 'username': user.username, - 'itsi': ItsiUser.objects.filter(user_id=user.id).exists(), - 'guest': False, - 'id': user.id, - 'profile_was_skipped': profile.was_skipped, - 'profile_is_complete': profile.is_complete, - } + response_data = make_successful_response_data(user) else: response_data = { 'result': 'success', @@ -94,30 +97,22 @@ def login(request): @decorators.api_view(['POST']) @decorators.permission_classes((IsAuthenticated, )) def profile(request): - params = request.POST.dict() - if 'first_name' in params: - request.user.first_name = params['first_name'] - del params['first_name'] - if 'last_name' in request.POST: - request.user.last_name = params['last_name'] - del params['last_name'] - request.user.save() - - if 'was_skipped' in params: - params['was_skipped'] = str(params['was_skipped']).lower() == 'true' - params['is_complete'] = not params['was_skipped'] + data = request.data + if 'was_skipped' in data: + data['was_skipped'] = str(data['was_skipped']).lower() == 'true' + data['is_complete'] = not data['was_skipped'] else: - params['is_complete'] = True - - profile = UserProfile(**params) - profile.user = request.user - profile.save() - response_data = { - 'result': 'success', - 'profile_was_skipped': profile.was_skipped, - 'profile_is_complete': profile.is_complete, - } - return Response(data=response_data, status=status.HTTP_200_OK) + data['is_complete'] = True + + data['user_id'] = request.user.pk + + serializer = UserProfileSerializer(data=data, + context={"request": request}) + if serializer.is_valid(): + serializer.save() + return Response(serializer.data, status=status.HTTP_200_OK) + + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) @decorators.api_view(['GET']) diff --git a/src/mmw/js/src/account/templates/profile.html b/src/mmw/js/src/account/templates/profile.html index dbfc29ce8..cfc78dddf 100644 --- a/src/mmw/js/src/account/templates/profile.html +++ b/src/mmw/js/src/account/templates/profile.html @@ -1 +1,79 @@ +{% macro select(value, name, model, field, defaultChoice='', label='') %} + + +{% endmacro %} +

        Profile

        + +{% if error %} +

        + {{error}} +

        +{% endif %} + + diff --git a/src/mmw/js/src/account/views.js b/src/mmw/js/src/account/views.js index ffc5aef9f..2523551f9 100644 --- a/src/mmw/js/src/account/views.js +++ b/src/mmw/js/src/account/views.js @@ -1,19 +1,82 @@ "use strict"; -var Clipboard = require('clipboard'), +var $ = require('jquery'), + Clipboard = require('clipboard'), Marionette = require('../../shim/backbone.marionette'), + _ = require('underscore'), moment = require('moment'), + App = require('../app'), userViews = require('../user/views'), userModels = require('../user/models'), modalViews = require('../core/modals/views'), modalModels = require('../core/modals/models'), models = require('./models'), + settings = require('../core/settings'), containerTmpl = require('./templates/container.html'), profileTmpl = require('./templates/profile.html'), accountTmpl = require('./templates/account.html'); var ProfileView = Marionette.ItemView.extend({ - template: profileTmpl + template: profileTmpl, + + ui: { + firstName: '#first_name', + lastName: '#last_name', + organization: '#organization', + userType: '#user_type', + country: '#country', + postalCode: '#postal_code', + saveChanges: '[data-action="save_changes"]' + }, + + events: { + 'click @ui.saveChanges': 'saveChanges' + }, + + modelEvents: { + 'change': 'render' + }, + + onRender: function() { + var self = this, + choices = settings.get('choices'), + addOptions = function(model, field, selectedValue) { + $.each(choices[model][field], function(index, choice) { + var value = choice[0]; + var text = choice[1]; + var selected = value === selectedValue ? ' selected ' : ''; + self.$el.find('#' + field).append(''); + }); + self.$el.find('#' + field).selectpicker(); + }; + addOptions('UserProfile', 'country', self.model.get('country') || 'US'); + addOptions('UserProfile', 'user_type', self.model.get('user_type') || 'Unspecified'); + _.defer(function() { self.ui.firstName.focus(); }); + }, + + saveChanges: function () { + var model = this.model; + + model.save({ + first_name: this.ui.firstName.val(), + last_name: this.ui.lastName.val(), + organization: this.ui.organization.val(), + user_type: this.ui.userType.val(), + country: this.ui.country.val(), + postal_code: this.ui.postalCode.val(), + error: null, + saving: true + }) + .done(function() { + App.user.set('profile_is_complete', true); + }) + .fail(function() { + model.set('error', 'There was a problem saving your profile.'); + }) + .always(function() { + model.set('saving', false); + }); + } }); var AccountView = Marionette.ItemView.extend({ @@ -125,6 +188,7 @@ var AccountContainerView = Marionette.LayoutView.extend({ initialize: function() { this.tokenModel = new models.ApiTokenModel(); + this.profileModel = new userModels.UserProfileModel(App.user.get('profile')); }, showActivePage: function() { @@ -132,7 +196,9 @@ var AccountContainerView = Marionette.LayoutView.extend({ switch(activePage) { case models.PROFILE: - this.infoContainer.show(new ProfileView()); + this.infoContainer.show(new ProfileView({ + model: this.profileModel + })); break; case models.ACCOUNT: this.infoContainer.show(new AccountView({ diff --git a/src/mmw/js/src/app.js b/src/mmw/js/src/app.js index 3b3dd0e7f..121465671 100644 --- a/src/mmw/js/src/app.js +++ b/src/mmw/js/src/app.js @@ -143,19 +143,19 @@ var App = new Marionette.Application({ showLoginModal: function(onSuccess) { var self = this, promptForProfileIfIncomplete = function(loginResponse) { - if (loginResponse.profile_was_skipped || loginResponse.profile_is_complete) { - if (onSuccess && _.isFunction(onSuccess)) { - onSuccess(loginResponse); + if (loginResponse.profile_was_skipped || loginResponse.profile_is_complete) { + if (onSuccess && _.isFunction(onSuccess)) { + onSuccess(loginResponse); + } + } else { + new userViews.UserProfileModalView({ + model: new userModels.UserProfileFormModel({ + successCallback: onSuccess + }), + app: self + }).render(); } - } else { - new userViews.UserProfileModalView({ - model: new userModels.UserProfileFormModel({ - successCallback: onSuccess - }), - app: self - }).render(); - } - }; + }; new userViews.LoginModalView({ model: new userModels.LoginFormModel({ diff --git a/src/mmw/js/src/user/models.js b/src/mmw/js/src/user/models.js index e17e26cc8..28ce2bb13 100644 --- a/src/mmw/js/src/user/models.js +++ b/src/mmw/js/src/user/models.js @@ -59,7 +59,14 @@ var UserModel = Backbone.Model.extend({ var UserProfileModel = Backbone.Model.extend({ defaults: { - was_skipped: false, + first_name: '', + last_name: '', + organization: '', + country: '', + user_type: '', + postal_code: '', + error: null, + saving: false }, url: '/user/profile', @@ -116,15 +123,6 @@ var LoginFormModel = ModalBaseModel.extend({ }); var UserProfileFormModel = ModalBaseModel.extend({ - defaults: { - first_name: null, - last_name: null, - organization: null, - user_type: 'Unspecified', - country: 'US', - was_skipped: false - }, - url: '/user/profile' }); diff --git a/src/mmw/js/src/user/views.js b/src/mmw/js/src/user/views.js index d9dc2abc5..40004b448 100644 --- a/src/mmw/js/src/user/views.js +++ b/src/mmw/js/src/user/views.js @@ -314,9 +314,9 @@ var UserProfileModalView = ModalBaseView.extend({ handleSuccess: function(response) { this.app.user.set({ - 'show_profile_popover': response.profile_was_skipped, - 'profile_was_skipped': response.profile_was_skipped, - 'profile_is_complete': response.profile_is_complete + 'show_profile_popover': response.was_skipped, + 'profile_was_skipped': response.was_skipped, + 'profile_is_complete': response.is_complete }); this.handleServerSuccess(response); this.$el.modal('hide'); diff --git a/src/mmw/sass/pages/_account.scss b/src/mmw/sass/pages/_account.scss index c48e1161a..97fcf9610 100644 --- a/src/mmw/sass/pages/_account.scss +++ b/src/mmw/sass/pages/_account.scss @@ -47,6 +47,7 @@ .error { color: $ui-danger; + margin: 1em 0 1em 0; > .account-inline-error-icon { margin-right: 5px; } @@ -93,3 +94,30 @@ right: auto; } } + +.user-profile-section { + label { + color: $text-muted; + font-size: $font-size-h5; + font-weight: 500; + display: block; + } + + input { + width: 100%; + padding: 0.75rem 0.5rem; + } + + p { + margin: 0 0 2rem 0; + } + + .col-sm-6 { + padding: 0 8rem 0 0; + } + + .btn-save > .spinner:after { + top: 16px; + right: -30px; + } +} From beca986234053bcbdd64d23c5fd23f0c30670d67 Mon Sep 17 00:00:00 2001 From: Justin Walgran Date: Tue, 31 Oct 2017 19:07:08 -0700 Subject: [PATCH 136/172] Update shared modal styling * This more closely matches styling in the updated wireframes. * `.custom-input-group` was used to make "Material" styled text boxes that we will no longer be using. --- src/mmw/js/src/user/templates/baseModal.html | 10 +- src/mmw/sass/bootstrap/_modals.scss | 1 - src/mmw/sass/components/_inputs.scss | 98 ------------------- src/mmw/sass/components/_modals.scss | 99 ++++++++++++++++---- 4 files changed, 83 insertions(+), 125 deletions(-) diff --git a/src/mmw/js/src/user/templates/baseModal.html b/src/mmw/js/src/user/templates/baseModal.html index f50e14ec5..e80f564f0 100644 --- a/src/mmw/js/src/user/templates/baseModal.html +++ b/src/mmw/js/src/user/templates/baseModal.html @@ -1,9 +1,7 @@ {% macro field(value, name, label='', type='text') %} -
        +
        + - - -
        {% endmacro %} @@ -47,14 +45,14 @@

        {{ title }}

        {% block errors %} {% if client_errors %} -
          +
            {% for error in client_errors %}
          • {{ error }}
            • {% endfor %}
          {% endif %} {% if server_errors %} -
            +
              {% for error in server_errors %}
            • {{ error }}
              • {% endfor %} diff --git a/src/mmw/sass/bootstrap/_modals.scss b/src/mmw/sass/bootstrap/_modals.scss index 837558e93..de7f15622 100644 --- a/src/mmw/sass/bootstrap/_modals.scss +++ b/src/mmw/sass/bootstrap/_modals.scss @@ -101,7 +101,6 @@ // Footer (for actions) .modal-footer { - padding: $modal-inner-padding; text-align: right; // right align buttons border-top: 1px solid $modal-footer-border-color; @include clearfix; // clear it in case folks use .pull-* classes on buttons diff --git a/src/mmw/sass/components/_inputs.scss b/src/mmw/sass/components/_inputs.scss index a1b44f7f4..afb78ba32 100644 --- a/src/mmw/sass/components/_inputs.scss +++ b/src/mmw/sass/components/_inputs.scss @@ -39,104 +39,6 @@ } } -//Text Inputs -.custom-input-group { - position: relative; - margin: 4rem 0; - - input { - font-size: $font-size-p; - padding: 10px 10px 10px 0; - display: block; - width: 100%; - border: none; - border-bottom: 1px solid $black-24; - } - input:focus { outline:none; } - - /* LABEL ======================================= */ - label { - color: $black-24; - font-size: $font-size-p; - font-weight: normal; - position: absolute; - pointer-events: none; - left: 0; - top: 10px; - transition: 0.2s ease all; - -moz-transition: 0.2s ease all; - -webkit-transition: 0.2s ease all; - } - - /* active state */ - input:focus ~ label, input:valid ~ label { - top: -11px; - font-size: $font-size-h5; - color: $active; - } - - /* BOTTOM BARS ================================= */ - .bar { - position:relative; - display:block; - width:100%; - } - - .bar:before, .bar:after { - content:''; - height: 2px; - width: 0; - bottom: 1px; - position: absolute; - background: $active; - transition: 0.2s ease all; - -moz-transition: 0.2s ease all; - -webkit-transition: 0.2s ease all; - } - .bar:before { - left: 50%; - } - .bar:after { - right: 50%; - } - - /* active state */ - input:focus ~ .bar:before, input:focus ~ .bar:after { - width: 50%; - } - - /* HIGHLIGHTER ================================== */ - .highlight { - position: absolute; - height: 60%; - width: 100px; - top: 25%; - left: 0; - pointer-events: none; - opacity: 0.5; - } - - /* active state */ - input:focus ~ .highlight { - -webkit-animation: inputHighlighter 0.3s ease; - -moz-animation: inputHighlighter 0.3s ease; - animation: inputHighlighter 0.3s ease; - } - - /* ANIMATIONS ================ */ - @-webkit-keyframes inputHighlighter { - from { background:#5264AE; } - to { width:0; background:transparent; } - } - @-moz-keyframes inputHighlighter { - from { background:#5264AE; } - to { width:0; background:transparent; } - } - @keyframes inputHighlighter { - from { background:#5264AE; } - to { width:0; background:transparent; } - } -} //Select Inputs .custom-select-group { diff --git a/src/mmw/sass/components/_modals.scss b/src/mmw/sass/components/_modals.scss index 1048ad449..35e452a96 100644 --- a/src/mmw/sass/components/_modals.scss +++ b/src/mmw/sass/components/_modals.scss @@ -10,6 +10,16 @@ border-radius: 0!important; border: 0px solid $black-12; box-shadow: 0 0 6px $black-24; + + label { + display: block; + } + + input { + width: 100%; + padding: 0.75rem 0.5rem; + margin: 0.5rem 0 2.5rem 0; + } } .modal-content.modal-content-padded { @@ -72,6 +82,16 @@ //Large Modal .modal-large { + .errors { + list-style: none; + background-color: lightpink; + border-width: 1px; + border-style: solid; + border-color: red; + padding: 1rem; + color: red; + } + .modal-content { padding: 0; @@ -93,11 +113,69 @@ .modal-body { padding: 2rem; + + .btn-active { + font-weight: bolder; + } + + p { + margin-bottom: 2rem; + } + + /* Reference: https://codepen.io/scottzirkel/pen/yNxNME */ + .hr-text { + line-height: 1em; + position: relative; + outline: 0; + border: 0; + color: darken($ui-light, 10%); + text-align: center; + font-size: 1.25em; + height: 1.5em; + &:before { + content: ''; + background: darken($ui-light, 10%); + position: absolute; + left: 0; + top: 50%; + width: 100%; + height: 1px; + } + &:after { + content: attr(data-content); + position: relative; + display: inline-block; + color: black; + + padding: 0 .5em; + line-height: 1.5em; + // this is really the only tricky part, you need to specify the background color of the container element... + color: #818078; + background-color: #fcfcfa; + } + } + + + .actions { + margin-top: 2rem; + text-align: center; + } } .modal-footer { - padding: 0 2rem 2rem 2rem; border: 0; + text-align: center; + + a { + color: $brand-primary; + cursor: pointer; + text-decoration: none; + } + + .footer-content { + background-color: #f4f4f4; + padding: $modal-inner-padding; + } } } } @@ -140,25 +218,6 @@ } // Sign Up -.sign-up { - position: absolute; - top: 1rem; - right: 2rem; -} - -.resend { - position: absolute; - top: 1rem; - left: 50%; - transform: translateX(-50%); -} - -.forgot { - position: absolute; - top: 1rem; - left: 2rem; -} - .modal-popup { .fa { font-size: $font-size-h2; From 0b993c3a4126a1c7b67c06fae806e59f0fd9919b Mon Sep 17 00:00:00 2001 From: Justin Walgran Date: Tue, 31 Oct 2017 19:09:04 -0700 Subject: [PATCH 137/172] Update login modal layout Matches the revised wireframes. --- src/mmw/js/src/user/templates/loginModal.html | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/src/mmw/js/src/user/templates/loginModal.html b/src/mmw/js/src/user/templates/loginModal.html index 3752a4665..3b4da5e2f 100644 --- a/src/mmw/js/src/user/templates/loginModal.html +++ b/src/mmw/js/src/user/templates/loginModal.html @@ -1,33 +1,30 @@ {% extends './baseModal.html' %} -{% block preamble %} -
              - -
              -
              - -
              - +{% block header %} +

              Login to your account

              {% endblock %} {% block form %} - {{ field(username, 'username', 'Username') }} - {{ field(password, 'password', 'Password', 'password') }} +{{ field(username, 'username', 'Username') }} +{{ field(password, 'password', 'Password', 'password') }} +
              + +
              +
              +
              + + {% if showItsiButton %} + + {% endif %} +
              +
              + + +
              {% endblock %} {% block footer %} -
              - -
              -
              - Or continue as -
              -
              - - {% if showItsiButton %} - - {% endif %} -
              +
              +

              Don't have an account?

              +
              {% endblock %} From 20fbae42f9dedf9cf2ec8965b740a0fce927f135 Mon Sep 17 00:00:00 2001 From: Justin Walgran Date: Tue, 31 Oct 2017 19:39:02 -0700 Subject: [PATCH 138/172] Update password reset request modal * Matches the revised wireframes. * The checkboxes are no used by the backend so I removed them. This was the only form making use of the checkbox macro so I removed it also. --- src/mmw/js/src/user/models.js | 4 ---- src/mmw/js/src/user/templates/baseModal.html | 9 -------- .../js/src/user/templates/forgotModal.html | 21 ++++++++++++------ src/mmw/js/src/user/views.js | 22 ++++++++++++++----- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/src/mmw/js/src/user/models.js b/src/mmw/js/src/user/models.js index 28ce2bb13..d4377297e 100644 --- a/src/mmw/js/src/user/models.js +++ b/src/mmw/js/src/user/models.js @@ -191,10 +191,6 @@ var ForgotFormModel = ModalBaseModel.extend({ errors.push('Please enter an email address'); } - if (!attrs.username && !attrs.password) { - errors.push('Please check user name and/or password'); - } - if (errors.length) { this.set({ 'client_errors': errors, diff --git a/src/mmw/js/src/user/templates/baseModal.html b/src/mmw/js/src/user/templates/baseModal.html index e80f564f0..5fb68d2dd 100644 --- a/src/mmw/js/src/user/templates/baseModal.html +++ b/src/mmw/js/src/user/templates/baseModal.html @@ -5,15 +5,6 @@
        {% endmacro %} -{% macro checkbox(value, name, label='') %} -
        - -
        -{% endmacro %} - {% macro select(value, name, model, field, defaultChoice='', label='') %}
        - - - -
        + + {% endmacro %}
        diff --git a/src/mmw/js/src/user/templates/userProfileModal.html b/src/mmw/js/src/user/templates/userProfileModal.html index b442adc4e..2d6947aed 100644 --- a/src/mmw/js/src/user/templates/userProfileModal.html +++ b/src/mmw/js/src/user/templates/userProfileModal.html @@ -1,11 +1,15 @@ {% extends './baseModal.html' %} +{% block header %} +

        Complete your profile

        +{% endblock %} + {% block form %}
        -
        +
        {{ field(first_name, 'first_name', 'First Name') }}
        -
        +
        {{ field(last_name, 'last_name', 'Last Name') }}
        @@ -13,13 +17,10 @@ {{ select(user_type, 'user_type', 'UserProfile', 'user_type', 'Unspecified', 'User Type') }} {{ select(country, 'country', 'UserProfile', 'country', 'US', 'Country') }} {{ field(postal_code, 'postal_code', 'Postal Code') }} + + + {% endblock %} {% block footer %} -
        - -
        -
        - -
        {% endblock %} diff --git a/src/mmw/sass/components/_inputs.scss b/src/mmw/sass/components/_inputs.scss index afb78ba32..cfea10e56 100644 --- a/src/mmw/sass/components/_inputs.scss +++ b/src/mmw/sass/components/_inputs.scss @@ -41,18 +41,18 @@ //Select Inputs -.custom-select-group { - position: relative; - margin: 4rem 0; - - /* LABEL ======================================= */ - label { - left: 0; - top: -24px; - font-size: $font-size-h5; - color: $active; - font-weight: normal; - position: absolute; - pointer-events: none; - } +.bootstrap-select { + margin: 0.5rem 0 2.5rem 0; + + .btn-default { + color: inherit; + border-color: #dddddd; + padding: 0.75rem 0.5rem; + border-width: 1px; + border-radius: 0; + } + + .btn-default:hover, .btn-default:focus { + background-color: inherit; + } } diff --git a/src/mmw/sass/components/_modals.scss b/src/mmw/sass/components/_modals.scss index 35e452a96..55c5fa080 100644 --- a/src/mmw/sass/components/_modals.scss +++ b/src/mmw/sass/components/_modals.scss @@ -20,6 +20,10 @@ padding: 0.75rem 0.5rem; margin: 0.5rem 0 2.5rem 0; } + + .col-sm-6 { + padding: 0; + } } .modal-content.modal-content-padded { From 58adf2097c8b1b37c8288d18810179c8f0ef7b01 Mon Sep 17 00:00:00 2001 From: Justin Walgran Date: Wed, 1 Nov 2017 12:41:22 -0700 Subject: [PATCH 144/172] Update resend activation email modal layout * Matches the revised wireframes --- src/mmw/js/src/user/templates/resendModal.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mmw/js/src/user/templates/resendModal.html b/src/mmw/js/src/user/templates/resendModal.html index 5745c12fe..d06680cb2 100644 --- a/src/mmw/js/src/user/templates/resendModal.html +++ b/src/mmw/js/src/user/templates/resendModal.html @@ -1,17 +1,17 @@ {% extends './baseModal.html' %} -{% block form %} - {% if success %} - Please check your email to activate your account. - {% else %} - {{ field(email, 'email', 'Email', 'email') }} - {% endif %} +{% block header %} +

        Send confirmation email

        {% endblock %} -{% block footer %} +{% block form %} {% if success %} +

        + Please check your email to activate your account. +

        {% else %} - + {{ field(email, 'email', 'Email', 'email') }} + {% endif %} {% endblock %} From 3b40cf79c8529ee6df81bd5cc347deca1028ab5f Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Wed, 1 Nov 2017 17:32:17 -0400 Subject: [PATCH 145/172] Mark Compare View scroll state for ITSI screenshot Previously any scrolling in the compare view would be lost when the screen was scraped for a screenshot. Now we record the current scroll state into the child's margin-top property so that the screenshotting code gets it as part of the HTML. --- src/mmw/js/src/app.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/mmw/js/src/app.js b/src/mmw/js/src/app.js index 121465671..722d0798c 100644 --- a/src/mmw/js/src/app.js +++ b/src/mmw/js/src/app.js @@ -230,12 +230,16 @@ function toggleCompareViewForITSIScreenshot(adjustForScreenshot) { compareCloseButton = '.compare-close', compareChartButton = '#compare-input-button-chart', compareTableButton = '#compare-input-button-table', + compareSections = '.compare-sections', compareChartRow = '.compare-chart-row', compareTableRow = '.compare-table-row', compareScenariosRow = '.compare-scenarios', compareMapsRow = '.compare-scenario-row-content'; if (adjustForScreenshot) { + $(compareSections + '> div').css('margin-top', + '-' + $(compareSections).scrollTop() + 'px' + ); $(compareDialog).addClass(itsiCompareDialog); $(compareModalContent).addClass(itsiCompareModal); $(compareCloseButton).hide(); @@ -261,6 +265,12 @@ function toggleCompareViewForITSIScreenshot(adjustForScreenshot) { } else if ($(compareTableRow).length) { $(compareTableRow).removeClass(itsiCompareRow); } + + var mtString = $(compareSections + '> div').css('margin-top'), + marginTop = parseInt(mtString.substring(1, mtString.length - 2)); + + $(compareSections + '> div').css('margin-top', ''); + $(compareSections).scrollTop(marginTop); } } From 835abcc0869ca6293f3f22e21b630e9dafe446b5 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Thu, 2 Nov 2017 11:49:11 -0400 Subject: [PATCH 146/172] Change splash page text for BigCZ - make draw tool splash page text configurable from settings - add MMW & BigCZ splash page text settings - render proper page text for each incarnation of the app --- src/mmw/apps/home/views.py | 2 +- src/mmw/js/src/draw/settings.js | 33 ++++++++++++++++ src/mmw/js/src/draw/templates/splash.html | 46 ++++++++++++++++++----- src/mmw/js/src/draw/views.js | 15 ++++++++ 4 files changed, 85 insertions(+), 11 deletions(-) create mode 100644 src/mmw/js/src/draw/settings.js diff --git a/src/mmw/apps/home/views.py b/src/mmw/apps/home/views.py index 48448e2c6..77866f5d6 100644 --- a/src/mmw/apps/home/views.py +++ b/src/mmw/apps/home/views.py @@ -134,7 +134,7 @@ def get_client_settings(request): # BiG-CZ mode applies when either request host contains predefined host, or # ?bigcz query parameter is present. This covers staging sites, etc. bigcz = settings.BIGCZ_HOST in request.get_host() or 'bigcz' in request.GET - title = 'Critical Zone Data Explorer' if bigcz else 'Model My Watershed' + title = 'BiG CZ Data Portal' if bigcz else 'Model My Watershed' max_area = settings.BIGCZ_MAX_AREA if bigcz else settings.MMW_MAX_AREA EMBED_FLAG = settings.ITSI['embed_flag'] client_settings = { diff --git a/src/mmw/js/src/draw/settings.js b/src/mmw/js/src/draw/settings.js new file mode 100644 index 000000000..74219942a --- /dev/null +++ b/src/mmw/js/src/draw/settings.js @@ -0,0 +1,33 @@ +'use strict'; + +var mmwSplashPageText = { + heading: 'Explore, analyze and model human impacts on your watershed', + subheading: 'Analyze real geo-data, model storms, and compare potential impact of conservation and development scenarios in a watershed.', + drawToolOneName: 'Select Area', + drawToolOneDescription: 'Explore map layers and select an area of interest.', + drawToolTwoName: 'Analyze', + drawToolTwoDescription: 'See land cover, soil groups, point sources and other factors impacting water.', + drawToolThreeName: 'Model', + drawToolThreeDescription: 'Use one of two models to simulate different scenarios of human impacts on water.', + getStartedButtonTitle: 'Get started', + openProjectButtonTitle: 'Open Project', +}; + +var bigCZSplashPageText = { + heading: 'Discover, Visualize, and Access Data Integrated Across Bio- & Geo- Science of the Critical Zone', + subheading: 'Discover and visualize datasets from diverse earth surface science disciplines and repositories.', + drawToolOneName: 'Select Area', + drawToolOneDescription: 'Explore map layers and select an area of interest.', + drawToolTwoName: 'Analyze', + drawToolTwoDescription: 'See land cover, soil groups, and climate statistics.', + drawToolThreeName: 'Search Data', + drawToolThreeDescription: 'Search three catalogs with free text, area of interest, and other filters.', + getStartedButtonTitle: 'Get started', + bigCZLinkTitle: 'Go to BigCZ.org for more info', + bigCZLink: 'https://bigcz.org/', +}; + +module.exports = { + mmwSplashPageText: mmwSplashPageText, + bigCZSplashPageText: bigCZSplashPageText, +}; diff --git a/src/mmw/js/src/draw/templates/splash.html b/src/mmw/js/src/draw/templates/splash.html index bee93a656..d656c2810 100644 --- a/src/mmw/js/src/draw/templates/splash.html +++ b/src/mmw/js/src/draw/templates/splash.html @@ -1,27 +1,42 @@

        - Model My Watershed: Explore, analyze and model human impacts on your watershed + {{ splashPageText.heading }}

        - Analyze real geo-data, model storms, and compare potential impact of conservation and development scenarios in a watershed. + {{ splashPageText.subheading }}

        -

        1Select Area

        +

        + + 1 + + {{ splashPageText.drawToolOneName }} +

        - Explore map layers and select an area of interest. + {{ splashPageText.drawToolOneDescription }}

        -

        2Analyze

        +

        + + 2 + + {{ splashPageText.drawToolTwoName }} +

        - See land cover, soil groups, point sources and other factors impacting water. + {{ splashPageText.drawToolTwoDescription }}

        -

        3Model

        +

        + + 3 + + {{ splashPageText.drawToolThreeName }} +

        - Use one of two models to simulate different scenarios of human impacts on water. + {{ splashPageText.drawToolThreeDescription }}

        @@ -31,7 +46,18 @@

        3Model

        - +{% if dataCatalogEnabled %} + +{% else %} + +{% endif %} diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index 23d30828a..4171fa746 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -18,6 +18,7 @@ var $ = require('jquery'), settings = require('../core/settings'), coreUtils = require('../core/utils'), drawUtils = require('../draw/utils'), + drawSettings = require('./settings'), splashTmpl = require('./templates/splash.html'), windowTmpl = require('./templates/window.html'), aoiUploadTmpl = require('./templates/aoiUpload.html'), @@ -240,6 +241,20 @@ var SplashWindow = Marionette.ItemView.extend({ 'openProject': '#splash-open-project', }, + templateHelpers: function() { + if (settings.get('data_catalog_enabled')) { + return { + dataCatalogEnabled: true, + splashPageText: drawSettings.bigCZSplashPageText, + } + } + + return { + dataCatalogEnabled: false, + splashPageText: drawSettings.mmwSplashPageText, + } + }, + initialize: function() { clearAoiLayer(); }, From 57df15aabf099ba0ebebf3053394bdb8adc7696e Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Thu, 2 Nov 2017 12:39:14 -0400 Subject: [PATCH 147/172] Update draw tool tooltip text for MMW and BigCZ - since the changes apply to each app, we change the hard coded values rather than introducing a conditional --- src/mmw/js/src/draw/views.js | 20 ++++++-------- src/mmw/mmw/settings/layer_settings.py | 36 +++++++++++++------------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index 4171fa746..8c7a5f9e4 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -742,10 +742,9 @@ var DrawAreaView = DrawToolBaseView.extend({ 'on the map and repeatedly clicking at boundary corners. ' + 'Close the polygon by double clicking on the last ' + 'point or clicking on the first point.
        ' + - 'For more information, see ' + + 'See ' + '' + - 'Model My Watershed Technical Documentation on ' + - 'Draw Area.', + 'our documentation on Draw Area.', minZoom: 0, directions: 'Draw a boundary.' }, @@ -754,10 +753,9 @@ var DrawAreaView = DrawToolBaseView.extend({ title: 'Square Km', info: 'Draw a perfect square with one kilometer sides, by ' + 'clicking on the map where the square’s center will be.
        ' + - 'For more information, see ' + + 'See ' + '' + - 'Model My Watershed Technical Documentation on ' + - 'Draw Area.', + 'our documentation on Draw Area.', minZoom: 0, directions: 'Click a point.' } @@ -856,10 +854,9 @@ var WatershedDelineationView = DrawToolBaseView.extend({ 'watershed area upstream of this point is ' + 'automatically delineated using the 30 m resolution ' + 'flow direction grid.
        ' + - 'For more information, see ' + + 'See ' + '' + - 'Model My Watershed Technical Documentation on ' + - 'Delineate Watershed.', + 'our documentation on Delineate Watershed.', shapeType: 'stream', snappingOn: true, minZoom: 0, @@ -874,10 +871,9 @@ var WatershedDelineationView = DrawToolBaseView.extend({ 'stream network. The watershed area upstream of this ' + 'point is automatically delineated using the 10 m ' + 'resolution national elevation model.
        ' + - 'For more information, see ' + + 'See ' + '' + - 'Model My Watershed Technical Documentation on ' + - 'Delineate Watershed.', + 'our documentation on Delineate Watershed.', shapeType: 'stream', snappingOn: true, minZoom: 0, diff --git a/src/mmw/mmw/settings/layer_settings.py b/src/mmw/mmw/settings/layer_settings.py index d1ec76cd1..2bcc7bb70 100644 --- a/src/mmw/mmw/settings/layer_settings.py +++ b/src/mmw/mmw/settings/layer_settings.py @@ -250,10 +250,10 @@ 'helptext': 'US Geological Survey Hydrologic Units of the ' 'eight-digit level (Hydrologic Unit Code 8), averaging' ' 700 sq. mi. (1,813 km2).
        ' - 'For more information and data sources, see Model ' - 'My Watershed Technical Documentation on Boundaries.' + 'target=\'_blank\' rel=\'noreferrer noopener\'>' + 'our documentation on boundaries.' '', 'minZoom': 6, 'selectable': True, @@ -269,10 +269,10 @@ 'helptext': 'US Geological Survey Hydrologic Units of the ' 'ten-digit level (Hydrologic Unit Code 10), averaging' ' 227 sq. mi. (588 km2).
        ' - 'For more information and data sources, see Model ' - 'My Watershed Technical Documentation on Boundaries.' + 'target=\'_blank\' rel=\'noreferrer noopener\'>' + 'our documentation on boundaries.' '', 'minZoom': 8, 'selectable': True, @@ -289,10 +289,10 @@ 'helptext': 'US Geological Survey Hydrologic Units of the ' 'twelve-digit level (Hydrologic Unit Code 12), ' 'averaging 40 sq. mi. (104 km2).
        ' - 'For more information and data sources, see Model ' - 'My Watershed Technical Documentation on Boundaries.' + 'target=\'_blank\' rel=\'noreferrer noopener\'>' + 'our documentation on boundaries.' '', 'minZoom': 8, 'selectable': True, @@ -307,10 +307,10 @@ 'table_name': 'boundary_county', 'helptext': 'County lines for each state in the continental ' 'United States.
        ' - 'For more information and data sources, see Model ' - 'My Watershed Technical Documentation on Boundaries.' + 'target=\'_blank\' rel=\'noreferrer noopener\'>' + 'our documentation on boundaries.' '', 'minZoom': 6, 'selectable': True, @@ -324,10 +324,10 @@ 'helptext': 'Congressional Districts for the United States House ' 'of Representatives, for the 113th Congress: 1/3/2013' '–1/3/2015.
        ' - 'For more information and data sources, see Model ' - 'My Watershed Technical Documentation on Boundaries.' + 'target=\'_blank\' rel=\'noreferrer noopener\'>' + 'our documentation on boundaries.' '', 'minZoom': 5, 'selectable': True, @@ -340,10 +340,10 @@ 'table_name': 'boundary_school_district', 'helptext': 'Public School District boundaries in the ' 'continental United States.
        ' - 'For more information and data sources, see Model ' - 'My Watershed Technical Documentation on Boundaries.' + 'target=\'_blank\' rel=\'noreferrer noopener\'>' + 'our documentation on boundaries.' '', 'minZoom': 8, 'selectable': True, From f441e688a13c247bd3c85cf9bfb9b706cba5347c Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Thu, 2 Nov 2017 12:41:16 -0400 Subject: [PATCH 148/172] Replace "Search data sources ->" w/ "Search Data" --- src/mmw/js/src/analyze/templates/dataSourceButton.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mmw/js/src/analyze/templates/dataSourceButton.html b/src/mmw/js/src/analyze/templates/dataSourceButton.html index 9788d4ba1..2faab824f 100644 --- a/src/mmw/js/src/analyze/templates/dataSourceButton.html +++ b/src/mmw/js/src/analyze/templates/dataSourceButton.html @@ -1,4 +1,3 @@ From 6ea786d583eb1f91ce2fe2a44e8953a6d456ee87 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Thu, 2 Nov 2017 12:42:31 -0400 Subject: [PATCH 149/172] Data sources -> Datasets --- src/mmw/js/src/data_catalog/templates/window.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mmw/js/src/data_catalog/templates/window.html b/src/mmw/js/src/data_catalog/templates/window.html index e4ac65b20..436a88056 100644 --- a/src/mmw/js/src/data_catalog/templates/window.html +++ b/src/mmw/js/src/data_catalog/templates/window.html @@ -1,7 +1,7 @@

        - Data sources + Datasets

        From 4e95fa129ca9fd966a698b088f22b6ef161d5908 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Thu, 2 Nov 2017 12:52:58 -0400 Subject: [PATCH 150/172] Set app-specific header About link --- src/mmw/js/src/core/templates/header.html | 2 +- src/mmw/js/src/core/views.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/core/templates/header.html b/src/mmw/js/src/core/templates/header.html index 745ab417f..e51e170e9 100644 --- a/src/mmw/js/src/core/templates/header.html +++ b/src/mmw/js/src/core/templates/header.html @@ -4,7 +4,7 @@
          -
        • About
          • +
        • About
          • {% if guest %}
          • {% else %} diff --git a/src/mmw/js/src/core/views.js b/src/mmw/js/src/core/views.js index 27eb62d92..6227354d5 100644 --- a/src/mmw/js/src/core/views.js +++ b/src/mmw/js/src/core/views.js @@ -136,6 +136,8 @@ var HeaderView = Marionette.ItemView.extend({ return { 'title': settings.get('title'), 'itsi_embed': settings.get('itsi_embed'), + 'aboutLink': settings.get('data_catalog_enabled') ? + 'https://bigcz.org/' : 'https://wikiwatershed.org/', }; }, From 79dc8cf2888a16bb74863af2e2bdd9236669f2fe Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Thu, 2 Nov 2017 13:30:04 -0400 Subject: [PATCH 151/172] Set app-specific Select Area text --- src/mmw/js/src/draw/settings.js | 12 ++++++++++++ src/mmw/js/src/draw/templates/window.html | 9 +++------ src/mmw/js/src/draw/views.js | 11 +++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/mmw/js/src/draw/settings.js b/src/mmw/js/src/draw/settings.js index 74219942a..2edf0a7be 100644 --- a/src/mmw/js/src/draw/settings.js +++ b/src/mmw/js/src/draw/settings.js @@ -27,7 +27,19 @@ var bigCZSplashPageText = { bigCZLink: 'https://bigcz.org/', }; +var mmwSelectAreaText = { + headerDescription: 'Explore mapped layers, such as streams, land cover, soils, boundaries and observations, using the layer selector in the lower left of the map.', + selectAreaExplanation: 'analyze the factors that impact water in your area and to begin to model different scenarios of human impacts.', +}; + +var bigCZSelectAreaText = { + headerDescription: 'Explore mapped layers, such as streams, land cover, and boundaries, using the layer selector in the lower left of the map.', + selectAreaExplanation: 'analyze the mapped layers within your area and to initiate a search for data.', +}; + module.exports = { mmwSplashPageText: mmwSplashPageText, bigCZSplashPageText: bigCZSplashPageText, + mmwSelectAreaText: mmwSelectAreaText, + bigCZSelectAreaText: bigCZSelectAreaText, }; diff --git a/src/mmw/js/src/draw/templates/window.html b/src/mmw/js/src/draw/templates/window.html index 5cfabfadd..09e9ddea6 100644 --- a/src/mmw/js/src/draw/templates/window.html +++ b/src/mmw/js/src/draw/templates/window.html @@ -1,15 +1,12 @@

          Select Area

          - Explore mapped layers, such as streams, land cover, soils, boundaries and - observations, using the layer selector in the lower left of the map. For - more information on data layers and their sources, see Model My Watershed - Technical Documentation on Layers. + {{ selectAreaText.headerDescription }} See + our documentation on layers.

          Select an Area of Interest in the continental United States, using the suite - of tools below, to analyze the factors that impact water in your area and - to begin to model different scenarios of human impacts. + of tools below, to {{ selectAreaText.selectAreaExplanation }}

          diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index 8c7a5f9e4..efbfe1f87 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -164,6 +164,17 @@ var DrawWindow = Marionette.LayoutView.extend({ uploadFileRegion: '#upload-file-region' }, + templateHelpers: function() { + if (settings.get('data_catalog_enabled')) { + return { + selectAreaText: drawSettings.bigCZSelectAreaText, + } + } + return { + selectAreaText: drawSettings.mmwSelectAreaText, + } + }, + initialize: function() { var map = App.getLeafletMap(), ofg = L.featureGroup(); From b364dc627053611386a8476636436f86b6c4f79d Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Thu, 2 Nov 2017 13:38:44 -0400 Subject: [PATCH 152/172] Lint --- src/mmw/js/src/draw/views.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index efbfe1f87..ec7ba770b 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -168,11 +168,11 @@ var DrawWindow = Marionette.LayoutView.extend({ if (settings.get('data_catalog_enabled')) { return { selectAreaText: drawSettings.bigCZSelectAreaText, - } + }; } return { selectAreaText: drawSettings.mmwSelectAreaText, - } + }; }, initialize: function() { @@ -257,13 +257,13 @@ var SplashWindow = Marionette.ItemView.extend({ return { dataCatalogEnabled: true, splashPageText: drawSettings.bigCZSplashPageText, - } + }; } return { dataCatalogEnabled: false, splashPageText: drawSettings.mmwSplashPageText, - } + }; }, initialize: function() { From 9d5ff71b20ab9db6229fc195d42608d7abb0dbc6 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 3 Nov 2017 11:55:25 -0400 Subject: [PATCH 153/172] List supported catalogs in Splash page Also add tooltip with detailed description. --- src/mmw/js/src/draw/templates/splash.html | 31 +++++++++++++++++++++++ src/mmw/js/src/draw/views.js | 4 +++ 2 files changed, 35 insertions(+) diff --git a/src/mmw/js/src/draw/templates/splash.html b/src/mmw/js/src/draw/templates/splash.html index d656c2810..da5245073 100644 --- a/src/mmw/js/src/draw/templates/splash.html +++ b/src/mmw/js/src/draw/templates/splash.html @@ -38,6 +38,37 @@

          {{ splashPageText.drawToolThreeDescription }}

          + {% if dataCatalogEnabled %} +
            +
          1. + CINERGI + + + +
            2. +
          2. + HydroShare + + + +
            3. +
          3. + CUAHSI Water Data Center (WDC) + + + +
            4. +
          + {% endif %}

          diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index ec7ba770b..7ff7d8893 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -270,6 +270,10 @@ var SplashWindow = Marionette.ItemView.extend({ clearAoiLayer(); }, + onShow: function() { + this.$('[data-toggle="popover"]').popover(); + }, + events: { 'click @ui.start': 'moveToDraw', 'click @ui.openProject': 'openOrLogin', From 203b2b2448b52d1a1680a59dfa5e5b74bcb2b4f9 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 3 Nov 2017 12:02:18 -0400 Subject: [PATCH 154/172] Move logos below Get Started button --- src/mmw/js/src/draw/templates/splash.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mmw/js/src/draw/templates/splash.html b/src/mmw/js/src/draw/templates/splash.html index da5245073..8ab3b6956 100644 --- a/src/mmw/js/src/draw/templates/splash.html +++ b/src/mmw/js/src/draw/templates/splash.html @@ -71,10 +71,7 @@

          {% endif %}

        - - - -
        +
        {% endif %} + +
        + + + From 602e115a11a8f27f5239f628cc79f86b15dbedd6 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 3 Nov 2017 12:32:08 -0400 Subject: [PATCH 155/172] Add BiG-CZ sponsor logos, conditional displays --- src/mmw/img/logo-bigcz.png | Bin 0 -> 63133 bytes src/mmw/img/logo-nsf.png | Bin 0 -> 58393 bytes src/mmw/img/logo-wpf.png | Bin 0 -> 84287 bytes src/mmw/js/src/draw/templates/splash.html | 7 +++++++ 4 files changed, 7 insertions(+) create mode 100644 src/mmw/img/logo-bigcz.png create mode 100644 src/mmw/img/logo-nsf.png create mode 100644 src/mmw/img/logo-wpf.png diff --git a/src/mmw/img/logo-bigcz.png b/src/mmw/img/logo-bigcz.png new file mode 100644 index 0000000000000000000000000000000000000000..ef1b9492de11342d4e8f89ad0288ce6a20b97854 GIT binary patch literal 63133 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 G-+uuu1j8o) literal 0 HcmV?d00001 diff --git a/src/mmw/img/logo-nsf.png b/src/mmw/img/logo-nsf.png new file mode 100644 index 0000000000000000000000000000000000000000..178a3d40bef03bad4ca91d5bafa9a603e23c459d GIT binary patch literal 58393 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 literal 0 HcmV?d00001 diff --git a/src/mmw/img/logo-wpf.png b/src/mmw/img/logo-wpf.png new file mode 100644 index 0000000000000000000000000000000000000000..333bf51f2690584e02919aaf6aada02ad085bf05 GIT binary patch literal 84287 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 literal 0 HcmV?d00001 diff --git a/src/mmw/js/src/draw/templates/splash.html b/src/mmw/js/src/draw/templates/splash.html index 8ab3b6956..2c9de818c 100644 --- a/src/mmw/js/src/draw/templates/splash.html +++ b/src/mmw/js/src/draw/templates/splash.html @@ -92,5 +92,12 @@

        +{% if dataCatalogEnabled %} +         + + + +{% else %} +{% endif %} From 28af96a121157bb0e41be88d56767103c978b2e7 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 3 Nov 2017 12:40:21 -0400 Subject: [PATCH 156/172] Style Fixes --- src/mmw/js/src/draw/settings.js | 2 +- src/mmw/sass/pages/_draw.scss | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/draw/settings.js b/src/mmw/js/src/draw/settings.js index 2edf0a7be..2eedfb70f 100644 --- a/src/mmw/js/src/draw/settings.js +++ b/src/mmw/js/src/draw/settings.js @@ -21,7 +21,7 @@ var bigCZSplashPageText = { drawToolTwoName: 'Analyze', drawToolTwoDescription: 'See land cover, soil groups, and climate statistics.', drawToolThreeName: 'Search Data', - drawToolThreeDescription: 'Search three catalogs with free text, area of interest, and other filters.', + drawToolThreeDescription: 'Search three catalogs with free text, area of interest, and other filters:', getStartedButtonTitle: 'Get started', bigCZLinkTitle: 'Go to BigCZ.org for more info', bigCZLink: 'https://bigcz.org/', diff --git a/src/mmw/sass/pages/_draw.scss b/src/mmw/sass/pages/_draw.scss index a20a1fd42..eb9565f7f 100644 --- a/src/mmw/sass/pages/_draw.scss +++ b/src/mmw/sass/pages/_draw.scss @@ -37,8 +37,15 @@ } & p { + margin-left: 35px; + font-size: $font-size-h4; + } + + ol { margin-left: 30px; font-size: $font-size-h4; + line-height: $line-height-base; + color: $black-65; } } From 9d9c9bfc4b40754e741315bc5b3dd77b5c9260ed Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 3 Nov 2017 13:00:59 -0400 Subject: [PATCH 157/172] Add BiG-CZ specific favicon --- src/mmw/apps/core/templates/head.html | 4 ++-- src/mmw/apps/home/static/favicon-bigcz.png | Bin 0 -> 1854 bytes src/mmw/apps/home/static/favicon-bigcz@2x.png | Bin 0 -> 3231 bytes src/mmw/apps/home/views.py | 3 +++ 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/mmw/apps/home/static/favicon-bigcz.png create mode 100644 src/mmw/apps/home/static/favicon-bigcz@2x.png diff --git a/src/mmw/apps/core/templates/head.html b/src/mmw/apps/core/templates/head.html index 0b4954a7e..7b6c4440e 100644 --- a/src/mmw/apps/core/templates/head.html +++ b/src/mmw/apps/core/templates/head.html @@ -8,8 +8,8 @@ {% endblock metatitle %} - - + + diff --git a/src/mmw/apps/home/static/favicon-bigcz.png b/src/mmw/apps/home/static/favicon-bigcz.png new file mode 100644 index 0000000000000000000000000000000000000000..8aa7f460719e5dd5ff195fd2504c030624b1d36f GIT binary patch literal 1854 zcmZWq3se(l79M<18mTK9L5g4)r0TNCB;g?m2^dHSi4riu1G-emV+bLVgghjG0Oq2>qBGAVhMbVNG zf>>D1$7o{@$y8)56A3k=5i$(1n19p{e2gWf0%MJb9RbLsv| z4}^WC)6nkH^Kk;^ay(L?Dq!5S|DTiC6@IRVB#Od@WX{axzhT++Mgf`Jf57rJNR5_~{DgQJjUYZsF$p8HV)1MUtolI$sS_K_Z^ujwKM0BZS~d#_uE(iHi&$HIor$6#|D3EmaG7`JxXo zAybE-r4}K*hL)R+7|Y`V%a9pSBEz6(EaU-zS(?PpFIdH8`eIlNKMw-Q!vjmi5ddI& zt|s^HZeJSugwM6@z3hvOEbH|H`c}(w4;niR;~3Q~J#PptJ6vzDkl592M4j_!wti*v z&?DM@6~l_&U9H)BMmJQyV^gl!Q+3nWRor&Z_Nsp^nwx9J*IfuAk6zn@<_nGl@Q4PBqLX zyAli9`x}LVG{F0ta>(0urPelYqh^NcW9+*ePz~0ytxm$dqV3(#bA3njinltA|&wb4MPZxU;QIJAV8Ec6)*4li6d|=UOA)Y7qoo<$I-iPi;nd>@JVw+^RKX&Sx zjbQy)WcEblvClL9tXrMSWt?Sw_(tvaY#p{P8h;HG?Z!fy?ZFqa($*awG z|9Qu2bkL}s+IuS{?DA>sq2*(}DyHiC#u9(I@fVQGjY;yDb|6Vx z!YtlTx?EHJjh9o5E8&RWvYw~hD6qbsRR0}q)#hS1db;XIjks<&#p$Q>9mc`Y!DE~s zT<1k)4j)R3G*60^17pJ(|9(cHxfJjJa!v9P7dJbVO2wSn-Dopu+12UAiZgg#Qo3T? zj}q;8Hwy3FNo8F6M?lcyODJdRf7tL$?V5xCJ2v|KNbNA?!@I+fo&H`sy8R+I=Z$TS zpq!q%BJY(&6YISoZEHzm0(!v5kUTgtxaCmSqgz(yX2P2fklnD&o7drZ`j^7)3mKko ziJVJryRAbo69YQkaQ9@Bs(G_9WX4ZFZ*SdeeFcp@c=c;`p{rf?YN_Mxr#MR9(Ft24n12r|N1=C*xw&G^>z6S<<9pQ_sA+nW*PMq#UB6bWN!R_S8b&{?Z~5a zdL9MsIde~T{`%nl0kd-e4-tD6iyU0 zro8E#pWZ(!+mT6)RZ^r@&KX?Ky=e9Zm#)3R{-JtHmwnZ^hYn3Uc@m3Tulq`3W}kk4 zGsff0IGCndE3_OqkWCQFC)WkHO2_5NDH2VrF!t=I0f1W6HP>5OT5>P61s$jo?|kA} zyX{r%jp nap>cJvax}7=I7_<1d$e2fT{9=)GGeG>9@yXaOl;(k!k-2_;m=d literal 0 HcmV?d00001 diff --git a/src/mmw/apps/home/static/favicon-bigcz@2x.png b/src/mmw/apps/home/static/favicon-bigcz@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..078aeb36a0ef90851b36f69c146ea12db81492b6 GIT binary patch literal 3231 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 U7ecFTw*D*dSS!p8WB2I)0jYtq{{R30 literal 0 HcmV?d00001 diff --git a/src/mmw/apps/home/views.py b/src/mmw/apps/home/views.py index 77866f5d6..780aa3651 100644 --- a/src/mmw/apps/home/views.py +++ b/src/mmw/apps/home/views.py @@ -134,6 +134,7 @@ def get_client_settings(request): # BiG-CZ mode applies when either request host contains predefined host, or # ?bigcz query parameter is present. This covers staging sites, etc. bigcz = settings.BIGCZ_HOST in request.get_host() or 'bigcz' in request.GET + favicon = 'favicon-bigcz' if bigcz else 'favicon' title = 'BiG CZ Data Portal' if bigcz else 'Model My Watershed' max_area = settings.BIGCZ_MAX_AREA if bigcz else settings.MMW_MAX_AREA EMBED_FLAG = settings.ITSI['embed_flag'] @@ -168,6 +169,8 @@ def get_client_settings(request): }), 'google_maps_api_key': settings.GOOGLE_MAPS_API_KEY, 'title': title, + 'favicon': favicon + '.png', + 'favicon2x': favicon + '@2x.png', } return client_settings From f8a85a68b55a89d9bb01a9eb72a8b6f84099c683 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 3 Nov 2017 14:30:32 -0400 Subject: [PATCH 158/172] Splash Page Updates * Remove gray border from BiG-CZ logo * Make BiG-CZ and WikiWatershed logos central, rathe than grouped with the sponsors * Add WPF, NSF to MMW as well, in that order --- src/mmw/img/logo-bigcz.png | Bin 63133 -> 60416 bytes src/mmw/js/src/draw/templates/splash.html | 18 ++++++++++++++---- src/mmw/sass/pages/_draw.scss | 6 ++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/mmw/img/logo-bigcz.png b/src/mmw/img/logo-bigcz.png index ef1b9492de11342d4e8f89ad0288ce6a20b97854..429d9d819ca6839db021b1e1bb185bbca9399ff2 100644 GIT binary patch delta 59759 zcmW(+by!qS7hXbGKwt$4>5y)a?j=N8K)SoT>q-gINOwpG2uLg)f^?U3*V0HgeEa+E zU;FHHXYS0LnRCv2-gmN(P(IJ0P=8fbevgewf(ZhFus_I2tARks*&q;-CKwsPVlv7i*s2#<6VWg@(Hr$G zKr0&>7S^LMck}8yJ>Q@r^aIKFhlOF0bE%O`pEmwU^KyFvI=(=*8>~5IyP}Asq-@@5 z$uXamX+>_h=ke{*NgLe#q-ia-@YBf8-4|?$JYC-xqf^H{Tw828Wu-f_A4$jAG+T(togNf2j1Ft}6D>AFBwhs5I4LDY*GHmrIaMJOI zy!SD?Ra>vT81Vl2BE#Iqy|MpdDUV^^ldVdbE4A-qdS2&Ajn1+?foR`a^?mUudPqb< zV+3krk8@~w64S{b;K2mcP#KNaP)L}x^l9kl!F5>WP=Q}-OK|XgCChPHd1Y03B|A;a z;CAI8b@)$cH_9ohEBF;M68C^2H;-t5#$UH~KxA3;FI@5Zf|utqKV3shOZ3wHlSe@A z>dCEW2fA&Ar1bxv?t;(m&B(7t%$ESTP5va*vS<*TOfac6m^zpm$wV&K1KYs_SA?O- zqr3>31WA0Rk|3c0gF{gzF{x$7CC7WM$7xs$gzTqG!nMJ8VBtqLS{lSthD_@hK+S!8 zek!5p!qv0&8h=VZBX!)?k`^0;3X+J&H%)t;>mdl|LaXiw(tP!^9TAX%el_alrOuf>2Y3&(7p!!W!J9`9AlLLfvkJC z`HqmmZWb9dSlhiABz66HGGFYu%@cTC?B4X8i(CIU)o%R=_cqcGF1L#GbD0=8sQ$xn zbw!Q&U&E+QnTf4AD8Qw<$l>^_%%5L%-uG5e;0^fy*Qy-RNKb$`!ixI|f9mN+AI=Lp zsNuMiD*JlxawSXCEK8+52peQ?7}e=MN4aQ5`KFepB;db>ZeQKo5*4{l73pst&9A~( zRj_o*mh$R^m-Ly_&I9en-_BRcA5=V}N|qZO6b4@RHv)etn-2b)?~YR8!I7-ZKYKp! z8&zMYFG?;L5}VcbYz0j-w@Z5^-b%wl9#nzS!%zcvvHupE5HF#!0YjzCiuJ?j6Z$=u-#%H5HZQFEuulc_*vA(4-aAMOb%~3`dCs8=M_9;0~OOJG|gdO9h z8v*O%wO{-UU&o>T*Q=?rbn^;c=!{BH2<34u#gUlc30`MqYBG+fUm;uuLs&i<|JAEk zA4BA3Gl$)DJjb54c+xA~>b*j;_;=98b>ZR5cA(!0E^rT)dz?6(kxB!^=etd*CNFn5 zN4AgM|AkBxa{N8iYe;a6KetU<@(U{i2(biFAvB>7C}-W8vHMlt{RVN&=J8`N;ybU7 z7$z@o&lJBb3uYXa9iRV_AVljSh=~pPROPq+{U0=@pv&(Q3ty|54BHr%k0Y6pWdENe z|EjL8Ut#>XLgB&_0yhy65nvEv`ozT-l{U{;0qQ~fk@(t59U~>%Y6gwR+lxTziJnyb z&?6FWVcYK1d}ynA>H>dR%vy@%^)B&O*?t+s`nk{;RAqjk_bPg5d7qeF*$@2#ZW;(e zx60Zl-VBZt?N~pA8ph1x2)*yK7XKOyM_4n3F`;s{^T*i9T&jPi9(tY^29ISxbv)@Q zPPsrR=OMNAMn&U7Z)W(?D}Y7bnCR83>a7U(0A-O(3$H^3irr%63-+FiBqlWK1byb;`a7ASIXC3Vr;#hPS&`n;_^rE=H+qZZWM7S%p`xS;y z*@@1Yw$=rgI^iz`Lf%ED$00r&D&3qzOE+z%zJiOZI93v`(_GNc|{i z;my#$3G~8#2g+YLb#-fv&xKK$k-s{_JI(pjWv6I>Uo4w)A4wWIo0|HCYOY4aMXkyJ z-VhBScIYlmN>*himpzt;#+_o}Vzi(k`&RZ@xt99rx9tUCO`bjv>$`MY0><0ALM2td zRpcSIhvxO0ed|I$gi*T8G4_PC?z9r;?{N!-3=#y@|NRIVWM0{4J%BNN9JeL(i6Qqm zRdm^&)T`_kdRL(ji?faL@?Iqg7q%N0Z30&F4MhC@@4IADA}dcuYEI(l8CnFzDmiV* zh6^?sL|x4BmlS8qL!v6+o^ zJsZ|@{;B-0u%Wij$}}TopOKnIPjYQpU{k(P%Nc~Tl71G%Qy101z5_wr{X?oRl~>+xAWab%Fgq`Rt2(% zzt)V&A`T}iVQuBJEw|svlh1ZsCe|%JF?S~tICJgqTe8=SF!Ck{-AF_V=B>UhH_LWO z`344S)q@Br1kyF~N3?|14GtK}NlWu5l1kx!jP`kr3@Q`laAk0a#r=s>E#M)_HVt%e zUh3Cl;5UShs+78hJoHppd#0wXk*7Ly@^|?9F{>tg3%s)hqS~m|qqyxJO-4%6aU9gs zd0p-u?9lMuaxc*mQpkwEtr+1z$_SJgKZ5?nl&90T1ASK0W%{(~Lk#S5hBaM>;p!T} z1#7?_0kd_$wKX@(r%jpP56>1G1_)-lq?P@b$gnFFF@7Q+|RRy|1P z3{~B;u)}20b!m@^iZO9NE^GH_OIW9Eu_*V+wnU54>V5JPU)rJ?)*H5Q`nH>orLi z{=v!{?Ac$ypW~yhn#n8O!X1~`%TgYFmt-RMedtoyTrQP0gqu3Nhb_nzi%fIA+}r|Y zaEA7*aJO`>#ewoF+gMY@=3o~(WUo1_q9QktZXAt4U6iC&3OwGwH<%^Y=KIWr2mBojeC&OH@T$PLMFGB%p_O-u6aq$Iz8Ow*c=tP^QDT zHndf@wzwO(8EyNExr9$gwF*o}J?Dahz;vsmx+5qev+{>#-OG&&PU5a`?+#bSB#yfw;J!Mi%} z;Gw@QK8(~eS?gzi0eE4L`lgE)g(b_nD~&H7Nmb329l2KkUkxTq{vsHRuZYoWV3z*( zcLX40wsig=g^y3!akY@?^yC?HBz{?{V&r}*gEDmIut;x?q~Nz6^dkum>PjszW^;RU zb5ofuOnEmy_Hcr_C$AXmU3G?|wi zZ5K6*PS1{0LtX~g+Z^IB^X>lr{;v!U*d9`-}NoL!-bu@emxZbxOKBKzZ0pinu{81l$w%nyeKIPt2d4ES4r*@u=yzd zuzC`BEiCMHY_Fok-e`P~xq7yfs1j)76;%5v2^#Ehpo6( zFLR;TAW+|>kdvr=o?6qZ5ox;-fLNu7o5;w2;_-TQwlm|WQODEYDnY+Zo01Bn4wKt| z&i9l{wFPyAP;VW;-v6OHl}y|V_Z)*E>))SyU^+2ku|CEn3^jH6gW<$En$TueRCP59 zuK2^hKC!Fn>T3GT9XB`%Wvl5y7*YF;3`f1gVm+HJj5fjq=|E_9&2RGwu;wrMQlb3y zeVeq=9~Ma|X2TL%0|L6SflDAYN!x&zg{(c2d5jre8|m1S%)5ZP{zc})3yDi9t@}D% z8xR>`ExRF)#P?SB3Tc}W;I}FCJc&o3d+R=47g;!+Ki$6;$gbkNBi}0<6mQfR3=xzf(T$9ytMaZ7nU8_cxou z;qOygVnZ;Fck0U~bwAJ*uCbQvF4l|w`wBdC!WsV`5FlTq6<2ymDQ z3^#VsJobHIrgqaED=mJ<;XgDQW7dRY$)aiYbfr@dgh0PNmQ@1wb64-`8%S$^s#kBz zmr@x|P3>uQ>X5q zj*bkqCPULyf@Z?LVO1>T#=}6zdQGOLn5f+CG)iN1W|&enDW#hTRWj45XsQI zHyJ#sCphN-7Kwy`&6`lou9^UoKr?Nd`)?iVF+&X;rD{Dw8s0YGcc`HK2k5cWt!1*U z_9=w(A-L%-R0|n|WGuh>3%*vxz@7b+EbWdqb}sg?&SKEZ$h`{H-i)2U*;HfxtAXMdG$QHqOzq^Cfut(rSyxy+rM+0v?eWoDuST`K z-G9}Vpj@`cnXl-R1xu^7>KhPM6`OIrSu$Yg5T|2@4ZkA%RMW3eKfq=UlBhJI{KCf@ z)!Yg=i7580co;m`^yDhR(%Kd@%4Bz!AJL2ZkX?=k+XY_}RD*p?XDit<$DVd#o?)jK zF(e@LxzNv7I!Cu$2V;lxQ_gP?#uF|g7+)69?MdT{c3H*6QBw3jX<2>jfB#fJm0X59 zcD{0cJXG)4cJuu7NBkwuOX67^>l`~P>OJ5t8+}s6Qv3Fyqu`_{CC+?9fHz9oy?JFP}1S)V();ShT6c72K7JB@$+^IK7IseI+C?Mdl!9(aP)XLcKEY9Iy2kPWQdo{EqWAFOWg`*i`mX6SCHS-KP-W$OU9RZSay97d3Cy)rGZF+Hbm zj>ih8>?WJdE&`7bxKAdZL+eSq-&Fcf%6ApBmL|J*Ub0huHKtdAf1LqF=`bK{p{h9& zJJskrV^LjFlM4|dG6|Svy@*Cvr+#c-XjD%dq3>nmzjL&!T#-$LdFn#+tvU> z&c&kyc!JL$9AX;n(C63~ssvj zSK)zG_92$EzHVDCZ9!zT(3R-ExW`^vD=9v^V>_hyo)0|aWkqtyzsL^XGBX$zdP zwl$*4u#g)x%Hn-%VqQy&CXTN7 zt+v5iuXuq=<)->yH>YvW*RA}mVmwaa{@43=fEYiFWAj|_w=F&@D_8)_8}jcr5o^^v zD^ZCh^zSg197Z9k?zZU|)v$*LQQHpRkDolDYAu$KV)5PNTUyWX*M);ud1tK`hUGZMCZat$+_ zelM$;<o^dg=q4nA?SVAF|o?Z%3_bx>K)IIC%{>vgHl$JpSO39 zQ{a6|dwb5+mH~&{X1)|Yylwqb7*2I`;@#IGb{dyUMxsA6@1vVMqXu5Zovf&vHUMVZ zF3zs)=UaW2n=eJbq9X7Uh`I|EKNzDIl5eVmzM%NbT==2aN^R<7soHF@-eJ}V2yhdA z>bU9QaA?~tkQT9=C#>Z8QhDJ1I0L7@wq$vms}s4aT6bsq>9n_9%V)nC53b~+o8u^C zU}riLW=CUFm3g~+$2;r)@Obh(1?1$Q!mMSQxK$jeiy&&4rLaj5W2su{v=eZhc@pq^ zwdmMn^JKJswRnO^qhh{Fw~G4A{+WCV10K7GI{w{~kOF%OMu7*5D}+%^u@0F`d%6Z~ zk=BUdE(s}|Og~zr1U5-W?V6>w|4W0<1>vn1Tk5P)Y6zq$P_@yN1~7%XW>B=t(qsQ% zmX9^H^nvShj(Qz0Jv}a--0Y`zO#k$K+92u>LBI&IK4@dRrm@%F-Lr`JrF-!y*$1qg zU-9rK?7dHw_jys3S^*kE1ye%IITg<2LJU{$=?<+2uYA+vDuE6BT>q2%mDR<}Uu>8x z%$oD+ezJQ_##tw;K*#fn-*MA^Sx4rW*3ED9s+)T|@fE~-4&|a_!NHdavg=}$uTAz0vlc$#_{qTxh*sx(ci$1dXpn2Bd zS_R(z)Y`scD36gJif7txFWKW37rO7j&hxYBS9~soG$u75IHq(L_=msa_I515GY8go z+zbS+-mj1v?OxrH-+xmnd{CY($PV@E9`fx|uph_lL{%!6*`(9z$I<)dSC8j>Od7hH zy14cUN3Z(DN7%R8Pv0%9p5`dvF&_)&ebW$gKTFK@9rIgVoLw}V*TlYd9Z)CTN;Z@m zAU+p)9$)}+AAaYypWp&FQf5Y-9?OW>Uslz@u+!|2iOid;YQQ=Af{3oRi7FJ_8;U0{ zEZAUQS*D9c-TD(Swm(#YcbI4;7VGhzAGSSR!Y{9{by6%|y3@kP6}P9Y2f_~NUIf9R zzdpyr#u|Dpdo;Y;+H^6vPSJDp>tRuj>2YgM^aWVv*j(JMk8%UKx4jap>h?mH_e`S5 zK&ni?v0qoEkCm3@E4sa|cnGN^*4BrLaaX@(t!9<4rtK84IGWv%CHUcPgPAxII)z2> zEZktGwemEO1gt)7?GQ{{a2lYZ3eFx3BO`0mDspzFL269?d^uSSoYh--=*<@P;!|yh z`v4t}%T@f2B2r9Y9+|QU>Fc&Q&}kY=?$UoHCSz_>3@3wS2i_OmVPlzQlj7+> z_Qoq_I?+3qn98?U)9WmA0-EN%EX4+%nRxEX3A7(2;#4eB7q_-7PIW(h-DTYAjG+#F zO)^DD>prE_(0Z0!Wj!qOaA5Sf^QlUtVnjWU2JErYVmPn&_l39_0^oODhamQS3&5q& zfI92p)P6go)w-cEi-1SWjJ_=G2hqO~aR_0bVFC)9F zrxjVvtQHWjvZ58}d%nqBelG)15N8@5>C)n41KG5?n86TJ)K`B&KXu#g4iHd0`=qro z$d$r(mqF{HhagN4XHhnRrQlvw7mF$6bIkGLH5_=dI_GdkAYJ}t{{w_k^!thl>4+Qp zNKIm)RMHR=M44;#?n;S2;9d{7ZvfQIIA%RMt{;V!MNSK~hna4G71BzFaF2kDp~alc z{Tbm3v>x13wd7&(5xqNDS9brW-lHTAB#`T^r-Vt(tiDvO%wPSa;jGGyDLx)a5U7dN zjGk6i=Z9h7X+4~tUDWkQ>c-3`fdZzqy+TInSO+Je^S^)ou#gZh)FEK4JX6K%@#fn3 zrRMNo=ud+z;_sdT?IxDWhw)E<*C$pAw;ih+zG#~lG}1BQYuP9Mv*Tymf6)%JeRg!7 zpI}wEIIKhWD{#_=xdDGS{k_GUT+=c=%yo_)@A<;|7wh9OB+gfhu<+1 zIPdsO6;PV!~=E=x&#Wcyi!zxp!5TJ;_o1eF8VvmQ*Vt2q1&wYm}!efRE1 zQg6b5W3)$+Abz5{`uX*5VDk%UgZ&DgO1F?OW(NR*MnKj;q@Z6G=P9J^KAYRA+dr>@ zPedu)4t?%dqHu(sX-GCl0|o*dl$rT??7VM^nA={+XnM!WuUsxHh$sY*a3B1E@%DXz zP-*DxjUau< zO92&WgV%?@wxxy;dCfc3VE8S)iO$qPJ%nrBRq}T`;usH4p{zO-IQHut)g#uG&uPUK zalSzy!}AO`iU9X}CXN6b6`CD^E5)Qhp55rSr~A@F%Bi033(S3Pp)GIAV`M7jj!sAN zG&HQHNi^q(3AOU2XYJG@(u0#dt2U5Av0 zIjMMF9kK&%_5oCJhHtb7QJodP=EzM~`AB&`*T?Ub`-2oyQ#kY=%qsWsW)l#Wm6c^( ztf@$GfA*4??L&V09ke$IBX}?OXXEmmD^?+rZT7^KZMJ8~q$k@?Y0zw|JQ^kU_Q$_u zD`pT9<1p=Po~uj&R&XIF%&Hy@2v6hhe-0_1% za)hn~80j-4%YE_#_U_${_B)`~2nXQ}xxsUY;*5#d_QQOx(P@zQeXX=sWOJvSa427= zfakO>Dm6861HF95avZKv*<$V?7V91eL4QEKY{kAJVU%8q(G=b4EUK5oP{x?PuU^^;jP7C8db^1Mcdv064QHwX5$ zmqw3slDVKslu9lUn+*IcK6c}WDZIR}#Ufb!Lc1sbwxe*4hC_y0yIBlf_{Uo|@aWP! z!N_TZpqhJcq>5n^&^$YHPr}ggFJVTAo1cp+ngds@U4H6+T^Ly=L#J+IU9DbX#N|o-eff)X zwo+DRXPTbTo&7h|N|4d-f=DQOXf{=oxy}#U%Uv43)MPgtuxKwxHge&JKVkRj+`J~2 zbD-F>@y({qh}!HWnLC)nHmYO4`wr;qk1ey)Hl98U)dk%y=t{fJ--H_um;$5_RykWWvNSJ zlYP8f^Dtf?#jyz+kt+!E__hpcC~RuSXW5LMLZ5q5VY+1R)S=xzMw8IXgD0 zx5OW#4?i=AiXqiO`)T^~1uPR9HE51bu)5#L)+_niFIXiSMw5X)qp8_hET}?gz?{LB z^#w9dAz6Ev1HhC{@>3uB6wC6Hz_D$|2AFR-LjKRu49$TdL%A^sQN z0ZNC)tTEup$c(G6o;BD7y(IsDZ=vwOD^A(R)#l|)=&j*-mMWp*`8@5~;C3t3x*OLZ z%iTY#imHz~`46pQMi%n|sT9GX#zc}?XGZ^S-v%d9^%1Gh8!Ix$CdmAfir+ky((#nD z`P*vOPI!2ZTXj&RxZAe0#NWRWf+5`>48gSwNs*uw-z& zOngj&RQwBSUGr~7D-C$Z`nb=R$?bjs^S~7gACzvcvfK^Ok zNNb#^eFp#MndWX(O}YkUm*e0vN=M$PA%;zI4uk^oc7 z)`x8-bu-243B)GEK)8fWr7-|kHoOu6lZ4PPeBw9gywVZw9m2IsZ`AEL4R^nDRZ`^Q zAV~H_^|6Si@5yTN%U-Jim&c8PkG@chPGaimFQl{Y@H&@#i53YB%V8-9lIghZI_C?P z&#K=lyg62e7T2GNZT9k1!k$zCcE@=1-8h!$qIDdGYqg`!RQ=nvWd|5JwGA1U|9Re& zkMx!DP{_p^U-WC>5|{7tM-&zfwDF z=q3&l{ZNh#m;1y?E3h7p6Z$XzgHy5;T7|V{nqw!bKL&LZq~qz5_VV~?e>TfOx(&Ox zc~X~!E}1#kvyFz6zX{3K^tjeF8s88+K-}?kcR%kT4c0Y4ICVk>6=55yvb;sEOS7&?7M@D$OYbjzqmU zVNu56rnB^jJq)wSRY2dkics?9qJeB}IZJx2uL7KY>t#7%y7w~S7&oTTk9S&e@8YlB z5e!p$lc+8bAc?33$n^@E>4Wo=b1r9NUKJBovqh-|I}fQb5;L?y{I1>|hXUufPBn@( z^>Wig))ke{j@-hXTU`M;U%-zPWmW)7!{~^qi^3aZ&dC$7fY6 z7=#1@d-^W_K{w@y)sZ5eC;o_at@{?~+(f>3QH+1nphqmh|4;cs51VSE_IkPIt{ARY zLFy9eI$Jq`-keMDKwohPKCP2Kkt%WaHu_;@3otH$*y?8kNp(wxvmomtVt8VrIV2~wPRe4k+>9vlkf|`)#4Vb2 zPCyM-;itKj@*EOMRnvvoG29$JJA}MJQC(|TJ$w2jIm{D>P47j5!?ek2lQs02sbQ4= zlGN-MfE6=*s1NjoVxb7%SI9ceAL+6};0?QZDfR>tX{+c~zhf;=L@}i!1o?Z z&6X>qVaG&Z=6`*>Y}MwgZqO1Nr&8yMsZ)`xrZ(7e++1Fb{B*|gyx_vR@MWrz( zL^3Nkqb4+Fq49wbMMdSOzeWL#LC}@QoNHBiMa_T3v%gR)U~4qI243DkqT1v`sP4y} ztZMcm$XR}PJ+Edzi?Zn7f|T^Rx~9K+WOeehl$mGWT16VmNWshKbjL3Ezdq4f`^2K? z+PY_@>ICYdl-8-rW2BG#a$&CxN)t;8oP;MrZ^d%C3E`&h`3;m6ur2PPqEw4b;*Y3I z!QI7eqNB{=7s4|&hE^~@=^paiGSC6lrPG?-D>M8gri*V|B|UO1I}+zP(q^ygpd>7^ z_4J5==sF=T`5Yx>zb0(q8IIgbkjmz+CC<|NCYmhfc!bq{`fe7^Z zb>H0*FPB|}aUacB3cq9}Kdw49y!Y{ho;jyQL`E~;a?YGdm5IhENDY6?;V`PGt83pz zF#$y}-{)6!%L+?gGS3442q>AcwC{ z8drLc6y@UJcpp+F>QJ}2I~y+mhGi1W^aS{k9-Au83EyGBj2a8*vj##H3Ic)il>Gd% z{^IO;RRkdpoGc;qtw~kg2iza7T3a)z?&Gf=(^}0s9&UauKyNK|Q9u+TTL!{g%G<2D4zL<#ythQYTu4CoeDNZ1P5XooD)}(@|V^Xikb;tzC;nGSTWgwz_ ztRSklYX44WwxrSj-BVpqrS?cPM}NhqR#sHCT!&QS$96h%!FD8jF>FMle` zu|T>BKR~wXYE5yK%(Vmy<5-suH?ZRe%xiLRK~zba$tc)Kn!!<`emNB6zgJkN`Lx703)5*;;Ln47%lOcP%!TlY5z$IcK*?K* z+Ak?RvF>}u!z7AxEMUj*-*zC1jDMq~u?_3mQD2@P#z-lBcd3VJxO)HQsOpCFb{C^n z9<2DxF85LR>6c8Vc_rV31+SA{>{W^fq6C9IuiqY!m!vm8>8FT_^R)TSC9xavIeDB0 z=gc=uLpUyC;i-eN*aT%2J?TfSbpuwX7N zOc_+&r61s*XqG;NsV%7|Qsm0t-uJ4vFna3S{hHPJODXKi=uzetza^Zn+AF_dr5;#J<;OwG>onzUn35r^;IuV;`Shr8&Iy&KndBLHg5tl- zf)e;DT9+qZ0u)#v3WPLO>F8axKIm`L{q>iyo{2)23J+6e&0YT963>72&$eG;+!8FfkItFsdGyVR zq;Hx}b7@hjr9+LO;7(L^C==|5g{x^&-=l{(m>L9OANsC4E{E-k^2%6DAzCxirI*+$ z8Uvsn-Yr_%(q!h3#29u`lqRUt5Fsa%LpLMVdEJ6@L>fWK3jq=oQU&W)X}BWI)(1nr z9N*?D--HXko2l6oq}jK)JzI|h9!|zYuUoa3Vh|kEB0YmHI$*baTSr1^_e;h6D8Wvc z;-yj2dft%+4w$1@u=&Y6OL#P7NkvdW!L*9td_uY;Vr>2|ji-rT4oC10>lvC4(=~4M^O$A{MX#Z9 zOiEhqNl@2OK_WFwwx~qncakSCja~(D-sI)`rEU(tECLLxw~n|78~GxB`n>=`o8E=z z1*Q{8oQ&4s`xU%&&$e=Q-d#TNIhmAoGEh+KRpIm^)G@6Elq&F@?({00i9P7VB>sA!%hXLT#Ru$pVK*+k)d z5h+iQWX!^o=KMnAN+*~+cqt9`Q{1y#b&Si!uPFvUsaug>9~C#K}r0V1_VjLonu){Kcw&SQIYRvkh_UQi$^IBkydYNj|+YK_TsSwRMX2?L{VZ z?j^=TW^y~ezr|{u{Pq=iiIUDLERZmN{;*YLHuGEJ;YUz+)PM1y!s6C?l}0>tRNZiG zjQ%^9({eD}$7{u>FWYNnz4`dBmeKhRe}|2E59T7bTatTmYCyH-+*rqd^_9_2tCvaTc;Nm>`HG+j;K zX24>`44)#`l!hQ;FG)NDqc`kK$-f<~`F?u|%-5Tyn}X1_TD%c-8cR}Dc!{3{dIe2V zoAp2f-6|F=T?edQzcCBO+Wcbor57t#;$ z2&dn|yUrhfpA&EP*6?$ApIbNC70IM1na`t!3gZ@eRgnvsak|t=`C@oNq>E@3saS`F zjGvzDCxIzB^BOO5gjD3_kJf*TjA|G{L#UzDC7cZhRZIn81Uti0c zo}&z4u$PIt?Gzn+7bC?L0D<^~_J5}hLAt)ZnFqvLh<-lt{V^E_KsSVs(w*oV^%q`c~ejVA)vYMBr;DzvT@ z$>85#6>z}kfrNhZ6ZziWD<>hdO@60`F}Kl`pGeLUi$$UZrD=v&qcf7=9MZq)1GGFG z2G2YA;{V*UhJGSa>BCR#1}PW04K9fK8pJphjLNwu8ctO&hnxB)m@M-Gl{<#&1K>L* z-@`kOs)Mr!pFHnL(#RTm35p+L{XG8PKAhHtMueR;4wGch=zbtzWTQqD=PG1OylZZ) z)&~Sb(}-1C%!FfQm|#B{6J+>NsNem;{_MbjCrW?D{x9VBwIF^p4}z40GJPT@;PHAl z&ICMD_64?zHwAFIxC4j(g60;0P@ZpCKg%`Jb5*MOaa)vbOkY*3*C=q@{$H%t`U12D z70#`#zGSU@FUL;QFu>OqTKXtqqd(iA@~{pcd*lxVTVqp4>PQ8Qnv@zRZFqN4h@}PM zf!4+YD~iH4UHooTEgMuNqj9*?W#gTb*ESHo!_)wyF?H~4QdlikB3q8nkdVy6Qx%W3%M7WzDTvKed3#1 zb>TIXo>)Bo@Qq@tx5X+#ZvV%0hDx^Z!6y4PGxvPU|AlJ**=!`U!8p`D!dP!|&{N@T zo8Dw6de5D$`7@A_3Ue`dKHFRc`MhtQ;r=i7HNA$0bGM8@zicPs7P>wY)|bZhxH}d2>Oo-Tr+RKhOQ=`_~hvb zm%t(b_Xd|vYh2BT^3>EkcjtFc;OzCxv7Zh<(+sQtbt2sJEIjY({1KXW+c5-%HdkLU zaNeHeJYST$6nLLqC3N&InhRQo-4P;lC8ba_btHlbxmvAv;#*wIcwT&+D90vNs;X%#Q_LP31b;$txj*m}{vW4}UXw?Er{up~K1zyV>o(vtCbs%dsgbsStUa)^3AS z-VWc8X2f(DHe;B2LiEDU;mD{TBtGER1|%KVlowJ>ZUUtz8jYyBJ5J> z)gL|Y-EhS6(K2=%r9|AigixD*o289_$c}dxWm@nI4QEXu#>c+(713}u;i54Ehr|`=+CIm(!-szJDrpf4F9U{& z#9ypJ@nI<>FThrj;d+$V|)-Y(6S;|AY1Ph`!@V3UScI>12y!Y443T=wKK*#);r%>=op){n<_F=d0R{I z_+c~KhnyiOfasB2f90yml!rI8D>eA1jWa@t9~cr#e_w~jyS?)M&!dZp1E&Y2hbxV3 z{-0LA(zcP3EntDt@N9$2gBTz6-=tW)l4p%tAj}pu(ODt4$TZK_WhvS?ol6NypX@|wDH9MnwU8wGH%t^hNBI+ypIgjjK&($WkzS1fY4@<<| z1NoyM&zN0b^Pj0^$O~pbwRZu7GTYE_!=yvAX}31B&7n*pr9sC0M6=jyIxU|!BzshJ zp#}f$+2282(-TJyJ*XH8nwFY>wLIJxlTS`fWy)PRkJirH(`TR7=umIlkD0M)AoeNy zUYj%Hg$T8w=~-OGkHM}#Z|Q60L~?ddPD+wIGsAw=q3M1oO*6J^#?Q`d7GWSE zPjATky2ao)_B;Ua>RT=_-U=dtKoDAK#%e~oH1|yO7f@>*L;!1RYeT5G5Mr>4cW_fr zc&nzE%ALP2O)b3VPnF^FGs6;vyn=8LZDK(C>$7A+%P1)LRj^Xt@Z###mB+zM+uj4e zch0QDdJbIl<~NFy?|CK@9UJd_%RYmn&@{L=2{P+J3J7=zH=L+`lzXtBt~kJ@yisD= zua5r=F?$`=V|wZ>LQzsjE?MFB{sSHCrS@-P{$r1GMcbuM?eP=0Z}gEsY9D%a_)f<7 z+x>zuBvH48goHV+z|^xIH|rqrNg%EZs`H0&u!la`cfETAEh3a)Khrp zfHxnp(|{6A*yL$n?mvXy%wBsz{B9!7(Pz1--r*J0cxWf^pukF879+T0&s*krOHZw$xj1RC#mU!#le&F|6M0f zmZvW%DN&!&;TR%Ll=t+sGz8~cEQW+gA^JQtnmG{|)yE@cWGkr|dvtl|%f0<8e#dRC z@+p<%MftMJp)`%>!zshVVn;wxbpaxEc)sHA*ofx0s0^}oU*-^pi=iCEt&VFWwE&(+ zuc7r9g`ZF|NI^96Hkr5vT^Y19(>HZu2G83;tD{xiSlF934Q#aV@CreHbMwZAlG&P{ z%0)r%s70V)@qaw?!|t|1>GJgIQ|b1-xX9FD?8C1nm)Qo7slDWj{^`Vz7ABT%A+QT` z_Mmxf^b55?Gs1sC?SX;`%sHdyo3=-B8i5T^Mp(Q{F`+bom+ ze>9y{R2*HDg&S|&5+Jw*2_D?t2_D?t-K~J2!Gk-&2^Ks+)gG+v#)dOMrd_hs{2%+=(a)Q75QQFkQf#1%iT4mSKaBK4t=!DvF$}K%CN9+ zFE203qyZ5bB$em3fkAgAcpTQdDn;|IxjI7R?uJ{whbD1KQEe%q=sn>$>f^-qGUK`(im3hT})>giy^5YvG@20mot^LvMqjZPD^OTe7y7 zh2!J`f#t*aqH;rx%>lb7dvMCfZY1=r}`w5(*H57)w&{*kNug z5xx=wT^L@d{0bsD)plE5A69~I9xpd{s(gukY}Dhyjq^(vr^rIyR~B8IFhu;A*=j;3 zM=>ZIC_(t;4rUzbXV{dCg$2^l=FP^D@Csk4(&#?HK;88mPLFt?UNF%UOB@XL!YNMK zrq{H`DdDyzm5{6WeA;QBV4w)D;ky^eXs=PZOP*4KD!4Sj)+YEU)Mke<&ov(*D_tI{ z%iOO)c|?coCgM1V5^_kIA{_Qo-rpOwVEr0AI0+k-L&VSSBSGVk+G$&jrLK{R3T%+_ zy@tZ)jPA3{{SE;CWjnZ`3iDdGjp#7>8_dt<783f%qjmd42%DqP)N5j$QQ+14Z$h74 zW-r&<$Q)L~+NZ}%>%8|Rw8aR9=3t4qI@^hn}Ij*C#7;bCT>eXsHfZwgdc^KtMivP20IPk=ncJrg^=O1nd#G zgD~+1TpG5)bJd?6ld?(+oEWn4}+oGmUoK}E5} zHx8=^9t{apDuO0G;d9m=3lkGv>ZFW3Wo7!ZFTvrMjj*3$n!QdlkLWb@80UyX42AUs z-QTh`R%1D-eU8;+xzloyK`wo9>yU>Zl`P_bdj%~aF)^qlB~d+vd&qj{*H--4^;_-x zP4{}O*NkPFs8G5upIcUvaj4}OnqZyR949;1uZy3bBPoLJMpK!P(=ciAP{-;87!Iry zQiJa+lK4fNL=@g_*p8BGi1XUVsSl2IU3Zzb2!4K*QB+A>1F_Mvz3LKsFp&+LN zxDseB8Zs6|M~T(Q@E|HNoVeI3o2sx9o-#f}5S1Lbj^RH*oJ(t1yX(nWBUvMdZ81q4 z)&_+qwtM|P{^`3=Y4mwTgPq>6%l{%IDV2tXNecr5>*nhE7e~6@n&c7wNpCoJt5N`w6a^=e!-ie-tY*X6X>hS*7NQM z!xV7y`L3$ky0uHxc>zw!cAD;09kYwJi9IeYn1UjD*JDUWY)f_EH)%v@b_<-WU7xi3 zT^|(6vy5e|VY4*`C?CbN)@7h;Cg4ec8ONuYsQC6ITxyE71oHhMPj4jo6whQl9XTf! zGntuiD5KaV(kx9C7)q>ub4f7D5K%2ULZRDVwqo5UGq+g+t7JW>c9C(^*$2T?DL66e zvGOrFkqY(-)u~L{77dvrBLE{?@*2lEqIOOpR@so=Dp9JyW>gXJO5k2iE}Q?-m>yS| zPr5Mf5~iTSKBv5@gP*mZ*L1COn^djqq08gHt{;cUtG%JH+2XcAN?vwC z!}a5d*h)#TZkjZ=Cm9suBvl=aQ=?@g6rC!JJ$Y+)*3F(%LeV}K5Z$>i(`Ee!+NIz6 zFkTI6`VF!xppu%7B|rw7MMX(7+v#et3P-6g8;tbEtq2#AV>wxevi0v;NV%)&aZLW& z5Z};Ha2%s5{(KORqd@D&Jf>WxF;cNFi+#dpc~@LY@t%5o98u~T|1MX_ei1j8DGzUR z@%LL8PTK?xY7CJ8VA9V?+o8zqJzJwK-Q%v>KZCuT_4DUbX#1n<;cxs<+#gw*9$toB z-i2J;qB)tIB&JGLtJ8wjjXX1JdbXC+dXWO6l%VP2;SpPbukLqc0FltYlWyk)fJ>JqoQ1E|qHuYny{`-t&II9<#N7>Q) z276{xd1Z%WB(1JnbasQQno}d3F*VkyEeR9n<I#zs zEG>WZPCK)Ca-&@rV!0x8J)Rj)m;4giil_D5Cy9VP12oG`UV`=<$pUmg47gxD$pX_C z7SM8)lo%X{JJ>3gZk`xHx=BoossIk8!}KG(gdZ6VLzw zp$Z2ErGQ3O(^L^`HrYICEPr+{qY#5CQm&pU!QerTp(Yj*s`*uCamK(8J~!_z3^f$v zhJo*J(=fE@=E%3L4lmxoU(>PWz-*xZy-tcj;Pq$B!-vJi7yH_dUHAM)A&F@?uUkcb zRzYsU5sQmKlA2oY+c*-HDbK&3*R2Q)yMPP&YjRJKVNN(ad+A16 zetE4@moLa-2#CQl_ji#`#2}B!Unrn|PfFwA{b1rS4ZeMs5Hw1pq#1vtBzRSL3xYRd z#N!z4?0!>}*9AK?G2&Utz90mX<7RDlx%a`;U75i;-jUyH;c(Q8KQiV6NHvFg^Sz(^ zgyQNsRPI^bvefmYLY`>5zM;Dg9ebj{9zp}C^iQpmpZBu^ap9T&_=jHp4b}MW39>r< zDrc&>+c1r!fNfhlNIhB_nM%SE#k=X~=xSk>I}C8y-#M*gQ9!Lo6aTHM2+hACRFt^8 zH?>kT7cvo_ex7jwmxlrm0$KcD#S4)7J+;8GJ3htu;0VVW?Or#f~O=DmUS3gZrooe%MTh< z0hWJ7-W6682E5(~!X|?dr>ke3q}Fb~c+mMDH$k})ZB9M2r@p6*6UV73LMbvHd^=XcLSuqa=!yV2?R|cDfzl`OOpJoJ+J9z_?m_BEiA77nIWl76pmKs5v~mI*kbXl3 z8hfJVSg2dNSSom(W#>^|$lcgEAWL-I3MzTxqPx+#EDH#vLS)t#QCJCxb-Nr8D;gTj^N{78GR` z@#w<(6dd?`Xl!4VsNHe!d7^ru7k;<&n6k#)*nNUKn>T;WMJ;ddzwP~h0wGD8`m%c= zIpV(3P2}yG|6w&RRKNG^>}#^|!$-TBWn~{#N$A_@sfQ`3|AusMk~_>A%OTu`;DSi_o1D9;}QX(>t+7PGEL8fOzf{3)u(Gef1EnO(rhvY5l6tUk*L9MAo_ z9707S!hE)X_aPkf+^^EX05NSh?dA0-&_9PvI`c+V}@^ z|1r5WN6}lmW1V7Qt*q_G!+2&UXUn!w*ArdfgC?}3T}Alx^0)qHQ?*qy5jV|7d|aYw zHN92G+oQVn$m$!8gM{g3(@OLH4`~(j280cySwnmjOsO9h?CLh!YpiuO^6f4hc6_nq zfV~ENukYghOPXH}Xu2NP487O*o0PPwbg0_)C2x9gBpk+W(Eh-LO193sSxl1BP6@MC zgU*dmXpr|y#SL*qLMo55-__b_rx{wN0q}es9?JV2pZwtLfip4#-)Q_Zy6zjzFYFkL zs}=6>l$uTGYJysRE)aZ01fK%@F-6y5V8{-)($FJERSMCLLu`YA+6@kuF9Ca#6GTe2 zc9tqPFz<0}aLcg&K_9JWC|~YCkucwm+d05qaomW=n$-VH+C^A(LzwS3etb1JuQF6n z;aRQHr`vAb+WWYX@VKsBp;492D3vdE{6KRusxIlAgAD^6Y07g|;81B{h%?m@kR^hv4EhgmipX_gbKdbXEC0~sh1;HL6JfllLJFw_%PqEjVDdLlUS zV-lVK^R>1)(0A1{2a;Wjsg^go>gygoNVU0o2vZ`D4pW{aOIbYW(AUFmNeu=cDv7Er zZOl+gFg3x%h;jwuG@MrV^cTPcRdmC=31w)dZgmP9uA-XRkfwGVg?ihN+WPYtOjp=HO*W9T`DZsGX`M^H)gu27!bB2Xg@N)pO%JK`k%R zzSzD`#nZw{SN-+*P+6J^@cM0MEFqH};wzA0U(`XRD$)P((-+0`mpRerG2`cj_Oj&c zf*XCO`>XI;0D;;s4`y*qtW^adQw4OKSAH~tEl@M)WeNw-m+N&53})Ay2!e|7W3s&J zPWJG6LL9_g6miwJGk{C5g_ol~{6ABju!7(ob&>h-5^28KzM+I2K^BW+9apN4hVSjL z6Z>OmR7A!W=*7S~QhGml<%7Rv?cq&SO5|IEon@{&IQqEajbEZrA9)(Ca@+z{} zo=m#@fru*w-44a}WL8^8P>lN>+y@=e7gGAq{T&y)p8I7h$|G+S<&tj`wCZQyLRiZ6 z{`;OymzT^L(hcnj8iH}+oMW_FE$c6- z`-=eZzmEsAt!9-Zd9A3S@1zUQXJt~<_uN^=lmQ7*;zU|ZsgxK#^;8qg!64NQGe`h# zJn6^{bMK5YGxo*zfq-Is#WVtU5ox8xyhRm?vd_ow;1PrIKxobHMb)BDktWPs z=+$@ZKo>NsiI2qC&Upj`5_`;vep~6Rh7SX5LHnCA>s-%5(uq$4>76@mw_U*g22gO= z)|*(UscONAN^U;JW;9C)4s~n2=*L%qTwZt!i7X@$gU$k9zcSU>xL6o=j~`+uEL?^} zVQP=hMekC~-rZ1Q^fH*mPAIpUh47H*(x=7mwzuE;5T-qxcbf(n3u+C_vJQ?|aYj9q zyn8PaUGWVM1kVEp%Hl)*rF3~N3Luk)yysjf6V-Hv{3aDu!ANrD46`62cQgT41)F;F z1zG$oQbL#1dJL*`PgrZH_!*GhF2&qFW?f(uMT7`v9_y?2eM7(TyJ~0T5D%;}{iWJg zFErp#_SjxZ#9;Y*2rh`J|jj0{;Seg8gdY= z^V0+86y!h{y81Mt!u5Uy)3`mb59-vlyL{VuJoO6c0=iutR_e&wWzH^~tm0_Mp-S8W zdusi?3}}4};855=ZP3YO{^J$PE6>CzaG=q0RhDAys>uKJd61Wft3;&pv}>1pk5|OZFN*SdkTB-uzl4YU zm+j7pY+hcbOO=2pW0CW7z;~~`267e(t=97`JQN7sIL=tJ9Y3EACP;$tF(Y6lTR~u^zHBNL;v3AA_vGHX{iUnsYK=qiU?*4 zT=Q6t?S>6kLUET4KAz!7g1US$Z#Fq%C##qF(e31DCDs-3;hX}IIJ zHfdSowD62o>uR0b#-YUML!hBSs@-@*%3k&)<{TZo4SOUM?D$mG9on5%o$z`=ND?zp zxWy+0p_pBvjEti0cAs)&N>>26tOwpw^}YkGI_^`{p;Lh|H0{SdlD3=ZnI2 zbw|&8N7z2ft-U5w6l))W^5o2=JEwfGKg5|VA_{(A?fIa1clOohF=+WbwBwG^+a+?1 zSLV6A;%G8S`-kOZrtuls3YD)Re(zkWVlw=W>tF0nQD{@t-^UmGNzrw8U`<{S zn=T=I@j8l38$EAjWyO8PF<!EHk0?gof5X}I8oUO+zNN1+ zc+XrdD{aC)n#bo1pNKu8S z){GOq4i`N}2j}a6MdH*?0mA?Ce?PXl27JC+{n)w3-r0q&c&xMEJ1eoU!wIKkHHUxz zlIX@&H$sg07)2C@LG&eRNTa_L-@R;Tis{18c)c{u=c^@;7Ka!`Wq5g82B{ADu~1Xn zHGlgnZ}{6O{^z3kTD%rrB-ehsCcL_G)w7sz_?fg?aVdBU`~8tQ0V80(Nf7MgUtKM)f+f{to1*>|5WA`vexb$_|ni)LV<#uMhZNQrdDdR3O+?a z6q|)#S7CN=v(wtF2X*@SEdcZ>8eOP&ZG7sv<2-w~G5OF=I8G;%e5)j#86S*d6;mK9zEV)X$EZ#LnTEjhAFV5GpjPC(ef{wTiBsnIBTQ>( zwTDh-68UDnsev3EjInh=s&#UzP>jTOuGM&&c~{pV2i%xoupHk7C58kpGO3Dz?JO+^ zKDZ!8O;FSCUWXzcNw(N7C4MtQHFL<0VJ$E|Xiw29!Lv^pl_d*>8m?WM+J9h0KzS z&m6}ju*{ap;Oco-MMnn(s&4kvXL~I;c5vqy%|i}6<&c+!rx1dZl?~iaJ8of|9Djq@ zv3oqeiqQG8eT}U>n_r$_6L-XCBi<>4e8DI=$w41rxK~a|V+(`-hkZ2{3C~YfW|mzV z#rqc#Qr#Xe<}H82*esk;R+Xkn!6M^&vFekDX%C_I8?F5ap~FZ`k+@PLSFQU|K9qwATOhyGn7HBsL95%pmg-Y0Jb=$q{Xi7DP;L{P!X2=s%$LbwcIv@Q-@7e+E zr!_L~RT1cQ7VdwkK(OEn!czHzg3E^*m(#{W9%=BTRcyH0FcH4#@i1THyE1n)xsXSq ztF4eAk@}odfq2JTO1mL9lr*?v)YWBV%(~Zo!k)$*@xC(tp zg-Nut?P2_Mtq(XQe<^P8C=)*J_LTUrFj^zL(A?Y{s$D=J-EY{FXEomzF2Awf1!JNn z`CD|ZtS1nF>0mqwW`zn##*!F<=fkd-L&mb4r$4twg3xQbkN>@2hwA`fsPFHZRg8sf zRD1FsF>xyImM+fLI#yc94A(s8Tz84?^K>ih-O_q+v5;;IWbq%|t-@q73@}I`rxo~E zQ+>5Q|ARNsH;2m2l_6R?Gt;8hlf{Vn(PGAhOEmFL01r1`YJTNS2q!Yt7lyB7*Oa`f zQxzv|yqN=zb|?23JyUuBg%W7R*Z1@F(u>VMcIzpE)8W12fuhFYDDIs-Nfvbe`1HYd z)?|)k^M!)?5Rvvf!1&>UzgD27x?1N9@@_5l^H9K}t_r4E7r{z|L=O!jtN&PjwSLP< zVGQeXhd(mStTldq=XEnW8$=aCHAm~I>Jtd?3BAG6h@qtHd3OaU(j8t>?g?2?;j6ji z3~UCJevK0cv22JS3kOssr^lQ4E2B3zn-BC1|HXx)4K}6g@RO3ec`9aNNBu|caZjUQ z6}g0x|K2n6&VJH5`L}isj(fz>Ce^TbZ2tfp#up?LS%@H9jcH;<-g&z2 z30<@QUBg1~TX#<>HmUaBTJG#5*{e?JFy)Ow1XYC&|_@Ttjf?t9_l7oAgzy!CMJmN@-jFqZzIl z`(r?1w6nRtt^f92^VnEmX%g{A^gD9-nwCnYpN7X9wXd--k66lJzQIQSI-H<(ii;Jd{=B;P z$r4=Oyg|!56fonyXswy=jrh14w3Djc`4pSpwRcdN)g(Pi5%T{mLH`Q#76QfH^sC?D ztKR&|$|^5y-yvJTGQ* z$xR6o(ZV+OPp^L#4mbigTfbYGn;heMFAuLt%$A@JH>>LRF}Hd*5h`@)XP$yF!9Dg= zD>F4Rc^PXjeCR*Lr1%}!x&JxZWVok6sm`zGe>88d6rK^$rngfg> zQegM-Hgk1!{=!t^dM2|{!i(-Di;YL~@~S(x&Up{GVEZq>gDEJ|8g6463P~mv23SS8 z?QJ(=`VIE05}~mBZG1nf{kuvx+X34SJ&6l?EkLA7;?z>^s9%=nHmVZzL_xy)as>MT z8HzdGZ)w*&ZGYme)op0zLvWUh0HEF|{wyo-l%ZjgAPIPdD9fcZX%@SI-e?>#TG)`* zh#V~y(by7~ORj5t4(E37Uo0H#Z{v++hF1}06ie{P2o5& z${M?5G6$NH;XMxwNRo1y8^`%UBbj~l$sV69=qWT(B=abY~vLPVS5dzDF+BG|5-so`XA2Q(}A&-g( z(&zJPU*klHa-y;sW_t<7}Lg0~U?{CNBu5INZapRHQ;=c!mw53)E&y$=) zeosX#`wsL>Z<2zFEZ(_u7Z^^k_{*3|f7%F*Hr{)_+y-|#h!Xtk!mp7ZhwB!-DNt{^Xh^9pN zLRP4qJ(xSN10~v8KA|8vY+2@O6V@fs6s}?4Rpxmi%T`b%jvV94g7{z_OMAWZuASgq zMr6-+rFQMhVHfa{4Qrk~U0;I_7vo`cC(YG#&ael(82Ee2ax>>+$rKjeUuB0Ff%s$J zlh(bw$LYSVrC;aPyf1yS&Euj|uuc@l%6L;4biKSqnz|H%x;n08;mRsUK)pY^(YG>Q z(FbXl`(47l0ZeR@%0JC2Tn ze?@7vusML8(FLg+JZujMyE$|%Oy;Cap^wBwRWrYm_Y=q)#=l?^M@piza;FWZi`}Fy={K#*e zhL@)!xK#409MmuKJER25=w#PC(BW5PT+_K5J;iAZ)*Zx-swfyFml~5Qt~Q>>JNr|j zu5IIY@;i5pk25i#<01@U6@KgCJZLPamAbw+-qN0!D1$|{0&I6Y%>@2ND1J_=`f0in z;L10*mQdBNjBi5rj`$^XfvfJW{*LG zd!CvnDr`ETx;5x0J3B&CHY26k8)=w&-Gf50T5qXXp}85rL*RCDc&I-QwT5Ax3^_mD zQq5OV)XxnVzo$9!Hq2di zXPr*Q!hm}goG--{``2FBM!cLjtjqTfIO#a;6zsaL*1ef}?0j8@8l64xLSD9$RrU{# z+`eV0q&f2>w*^ChV7JW6vGjai+oTV(>S2N@vm9*(KS#8z{?rZgsJBhi_fR|4av zTnX_tYxrL-lKqvlGM6X7h}uB7sU{{&ts*jS(DhUJo7O1p{efT)HFs8Id@&wx5Xgej4XIF88kRWdBk{ojB2YH=ihh`WAW$J5T? zl<4adVaGpd7%WLp#L;j%P;vf{;QhSGG!mAlZD%K^_sFZ$cB&{*xa9_NPPArRJ7Ue`q^hnA64J2V{;f>e`yjFFJL6=xn za#jAp5{?J=GI8-A?&G*e1T)hcW&*3rW-htjmf6@V1kdWFWa61%FF_9b{w-=h-y|3M zn)hA*UTASH22!}F?xMtT2C~P_!-^|@PofgmE*M@-pB>xbfN^lF6V{%iyvNN?k{+vS zK6=uFOC`l7jolZQ2-(_yR(NJ&MzNAu4OG*Z=V|zm(|NWN*pM8GQQggJPZ41kMM+~M z#kBYFClvmxD9a}%Cyp-!U!5d_K#OUHXXs-IdVgkSfF!IT91wM@yA7uM)6 zV(EnnIN7&)ylX@KNcDLvPW_-N1&O~!&T7oTm9|wus*4lUi&t187X3!P##P8dS>>pW zu#2D-V9kNvbe2e2`VAx3@%Eo*xH~9}>=;^;erQfb#}Boh4Q=|UBH5Xx5=X^9jP(gq zg@i*F2SnJ{<6@koE$FlF>b=A{`OWnJYR?2GvEOOpb5SxO47O-;L-%xzT4$XJkN|%- zp$ZS%=a*GkR>TO$k2!}Wr$+CvrIwy~3y^96Oj5tx5tF8JeKohPzq>dEZ5OV)b1<9O zP_*dY>8Gj*3Zg?}W<|LaH7K8peD9 z5cuB|XqBIwWuz30iIn>I`+$bvhnhkBTMY2~U%-3`9asCys@FizL(BQ^i;94$X3P3D zIQiXQUBwVf%H{Pv7GTw|dFbFr%Mw$__wbQJmPU3YizAZoT`DhI1`FrOAudvc%kc%O zb3Yf8n;6*oXT-B^vesO4NGMTezEycM1!X zUHgLv&{_P7&gfT=j?w`&IJi_@q-+3FybBp_Q~nDESQQ>AfxtisVZV=oQ^N^RFFLKC zmc2jD_#+32`CHe69_UakO8j8>chPZD>^%_rsLF>TdQYI2fvvhmw5db&2thaPJo6^E ziiR>4gp)zy{z_PYH5TI${);wjBrGPX8zCs-5>&menGMrXlc7UZ0@**atz*b)k0NUrc?3DOFos== z#vc1OOPY+RW9(ngy6;yfJjIU{E*0?xdM*n)`c~vH=H%gHqK< zZkpbOZSW`P7yIlV>fBvuXI7(F7z=YrT~ddHAD!7u6`muE^^tWkR{1QyBW+&(B{W1v zwfQ&xqDCB``ef?-J)D3}YW$GqFA>rehl!YkSVwMMR%0Rv5V1bwjXW3uR zVYl@bTau6l%@uK#nrF68M$l(uZvnRWcGt%xA=z9;!PCqCwt_if(pc)7sL3HR%mo#H zg|xJYl)tOrY^0B~BguY|lZRae|j;K!L-_z&VeO6v8Z% z9oL-DsR~7Wci`-5LFIBMripfe8ED4L@iC&g>;H(9Ju z3@{XnRjJ}5P34Y0xRS;aeJ8cSrtoAhjKYYDQ<7@AC*lK$-m<&+YIb)I{fHYMvO{5O zF<;vGz9rPZ2Sqqc?OSe*3{DRN2~fm@c>t^`Mx`XcjC?6z=?m9BG*6U4x?v z+l({1MTOYRvtN^E=fXs8?xoUkg{N47 z7eK9)p{{k=bSsT^lrJ{gx4mAt-0aq?h+QLzljIszYL%Z0F&34Z9u z4>U_%G%uch8~4_C2Xu#si^DYU&f$@W>WPJj6M`E9Qnje}XGf-^_wXCmNE_7_0H%QD zJQ4Oio$m7aH>KLS%_AcZ0kw|-;(nwufIN_Eon<5i0ujN-nDI0zA*zhOBl?pflr8($ z|9uE?0KMY!TOFDB{Eye6Fcp!`A0$^!z%)39v+HFIN}gI7aelT#$1R z6t#w_<#|!c9dnCsH#`wr)It}+Clv&C`73zGjuM@VpE%OJ-zry{qYcx?UFB$heR0g) z+!m6*ps(COYS)ieom??c9;?Xn;?=^xIDs313=dDZ?_d^Pcz#tQrC&<&nW6&n6mj^? zDdA5xZ3Gb~%{hnvRpw&}VJL%}Sz^4L(Gq$_m#wVU{(H_5Xd&d}QA!@<6z?oE)$-px zcl)*l6vq3AxHP*K6!d&$>^y)VCfk*A)O`o%+I#BimZhQj9z=w4=x>>b8$BjJY0Tmw zOyTw~uN8_h;FL>$`J$C1a0Jw}l;R?ATuK$A+cn(1VayMB6OCJJ(ET)7W=u8TyU&8| z5aYutKKTx1kWyhDGJS44b3vB<5o|)jR?8$jI7pu3WW>@q-75sU$>P^yIB;^4BgE75 z-XvtO;`ABclXXS|!EnS+3=9c);{L2{N+@&L1rY4S4j|hz%An<5JsH>T z#YN17lt@A*U+kY<(Qa>dAFHw@9y*YLseS1U4La|&x%^UuaW@+yd ztDNa%TXn0tpW8Mf03SJs>vQg@EJreJM!5zVchx$aD~xTl=b7i9bHH7f52gg-XWQK|`N_(hkJ+F7V< z>W!n<^NLJg1!sV#!2@@5sDi?ox6S{ssHk(5qcp6%zrFV0(9|whg!X?i_<@Se_F=w3eQA@=c?DW zyMXLoFK@8`<3KUQ=&Q=`CeoqT^I(EI;<(qz*R!wp)VPu+7RE*BZQ_7%)-UPNej8qk zQXX;EIbNOc3YvtIZBAe8wSOR0)ggM7#;U0M`=o6iw1h@-iP}Xf1+}lF=}a|*QOn^9 z3g!__2}^Nyvu)ydaOtv_uGJUL+`r4=q{Yo1a>`SH#V;S|{1Nk}A$-xZT}o7@sCqVd z_^Y!8@HS>iiVF1Pw#7mJee_&lPy(LAKHAIFi`8iCKJUw!~@}s zE!Oz}@7i@b=azS_JO23%Tq8jqix*p}GnZ{Oh%S_ayy~}zuy%@?E!CUVF&M$pf&Kmb(kMDsn;q=bqKspS zmoyYGxz;!D2c&t&-)pEdQcfN$uMHv;UG* z|B~`s3&j>%=LOjf!Gf?w?zfxw^8KIcSlVw-{?z+k&MO!+*)41iATVjy3OtkpJ1|!R zHV$L}@!=@ZwDJ27b13A-kr?igI(ugs76SwPKuBA*3LC;JuJeu=&wct+qjx3wes`G!i z#!$1vO0!v(C=uA`P87C_qjERQMFL5HONy;F2OuwjB>fUUFOl0+0jcplw@sAi z_^vz_kG9VeMJdkxHW~0-p;ftw^nR9+R&UY8WRj!TafIrK!~Lv;b7Y?9q?3kXwOPX=ju4ZQ~elM`H9)j zD#dtRlCVxpb~{HF7eFs!z@QEYXSlHFN2W+7O%idqF=?o2t@-2E~iJG8~hX6&Qrmh2mvd-dp6i*UYDm54@Ep#x$*Pbf>vYQ6vMlVSEL$@=11oU=o4#)dI)F;eE?>BS#^{EK6t>`Da6?Fh~>Cz8@{ zcDO%J0Jxx@y6nHMW)*$wg)Msz`?G9CA*;5#9R@-`kgt$1MzN8I3hu6LyMVQa@j)2> z_Brs?;N5d2#DODQtjxEtL=6w0QeKNRxWJdF^PXM7aR*dyYk{WC3cc6AXCP535atG5 zWA^EhZ_-F!5_?@|mqWpB@g!=mz6ms^$2PPm1H{8FLL-56VpTb9q$?O1B2 z8IY0FasqEEneA{Df)i7q)?NXIr+IHuX;dn6yLZZgBzlx<=eQ@TJtN~K$>zP9zJDJN zbhYWS zO!R)l6WZa7H8fck?biB~sj_|nyWAf3ts$3Ry=#nLze@C6u7>xYfD$uV7bOe>_Q#CR zg`i%{3Sjwbf$vxs?_wjNfw73dxcMG!0@CGnQ_VePzGmrGxF%5xmj0gMten}il99MC zGXp&pNd2cN-LMl~fe_8T4j^OVC-d=gUZVhSX>178+K6oD2Y)^hO>JTpNEEjb_i5hP zYI;=D&T;<1cVT|2fHD7}e9L^8sH5MOx$6r~o6LHX{azPv9z*d81@eHyAKaL?>#s2| z8(A8LTqgjVTZhmtvmV=90^%MRCu%v7)nwGuz@jfSty$aNpn>r1^B%Iv?;Tb{`PpQF zSMg?g`97>~%@+ZExL{U;K9GFWdcLXwMPXE^BLn()m?ES*k!y{wqyzLpFj8MSJJnUPf)n@0 z2at;Dy(-L(S?H{)v7g?86w?b3REcZ(TF>-j7i>nvv#scQuMC^GO=cSD71o0n48K?b? zQeO56KLBQEC5j-*_T}c)v2RxxNo^|6G&b~cO{rZ2NAKM}8YUdL8BfYG%CWVu+L=>~ zgj(+JgU6;Y_o-c{ zb`>rG!A70yHJ~s#CgAlGT=_pS!TIlJ67eIN2Ad`Ov*yZ{yOh$*wFYY|t2XTl7=uBa z{qp23L^*;UljjvWeTOzQj~d&CPFB{Dl13Uf zpJa3C?by*_3oYxBk6nnPK5X||7NaEw)9nCHS`+{l14|4Yr?1(}sW-)xPF1lq5X)E`=(u$w5maVt_x z@gl7Gbaa5M?D8#-P(wa4*mQSD&}l__&fr|F5f2EQ=@j_D+?i7pOHXOwOAj|)ShA_||Y z-iKZ!@cl2BK^>B)W-6$@vMcWEIb2>^alBL2wc8gWwPF>?fqtTuw#PpU>5%_b z$Lt{v?_L4Mbxz}@$#W2=J?#iZA2U2HY{Qr9NrSYR&A+eE+nGgm-JKqlzh4WCamtf-X5Pz1b^_S z%Q3;DpG&Urf#3K0@qzTO{UaynLD*`Eoz|3BD&_KetWqPgN&9asXcoG#khpDLq-1kP zJNkfsf0I)bf#}jO*!g>m1G6g|cd{X7Ef=1#8(@Lr+68F?kFEQ6vE#r($KC&^xZ+bH z7i&yLp4fEXE+aP_5AzchMG)h1OgP>X*F~;>^?v3;X4EP18_ECndo6i-BDL@J%L2RJ zllA8(mc7X&!w*6Y=nD{cU55S)@-;dsH}w=SXFRMYmNaE}7OJw)?!%6=9nAPoXQ8w? zF~^u{P*_8>A!(MgAXR=7DmSQx+qvv(tURK9dN_Wj(opWU30siAz!RA)wP&A$ zo;Oa%T0^u=$Sg-0%|%jwZI5b4WI6YzrI>t}ZI?XpV8u)J0U>uD(dho16u-6QZ1hlgyqX*~Sh=n5go(CVg+Mm_;a1bmT*Z4xPTnQO?+ncP)Siq%+DXl&`*+~=d;6zy-U3lK0|sV;WM zy=6VGF0Ej-)3G?V4tu7WOQxWDjWKhG`p?XG*N6$vH$=#q&RPWegyAGQdE43D{6x{b z9vCELhjwU8zacygd-eB;1?Op)7q30<694jy;D_~HbVbikzJVPV>zZFvPU&7Gd-oaA zP!4vQGw|U=-myspB7LEqEKAo-7MA0H4K;ajOoiTz?o;PzoY+XFyHlbS<7xYEQPyl{M}us{GdCNvuP`cNC7Vhldig{yF~%opd5pkt#OK ze_QsVS1%|CZnkvpvU=K6@NEk7yzONY$t@F#6w5yBp5M0k_AwZUOEv<0{(onbj#|e? zU%BbMwoNl4y0%&24u&BQEgW_m>mkfiD#SJ^U_dqso~=SUuk0;o@(=r#f|iQmbNQ7r zndQh5d^EXKVuQ>3iL1Z)N%~R9W-`L14#81yePW+96%f87Ass4lR;dJw#UoSU!TuyG zg2Xz+9#tk!L1$mL$LMl-W7I5&x4n4_yZgvGjc-59ib!vmdE#jZsI{|?cBHk)^r#C% zfgs~Bf-kUe$+NbduXI2{)_MBz7Y6b=zo(Z0!PVcndKWj%)~uA9w<)A?{l1t?df}kB zTDOft$G9a!%NPpOr8wgz?fIab)QW2~PE!1E9TsDzQRT3Hwqe(yP=h^Kfy_~*M^FQ- z{@;C#o=aKIa-|;c2cz5*Mo}B`{@IGTGRXW#C_C1GE(%j6F-W?|O@Km0%ptCh0A28{ zkJQB{h)(nZyjKsUG3 z3>30``m25I=CQx2|HkR~!`8|CZcFZtYc?GOtYCpE%x>wPv^NJ5`43 z;AZGnO`M98$2P3>=h1~@%(ssn$UjGb?{iT%b&E>8Svb4)YgD810ul2FzW4`W6)O-4 z2nZxtD^g$-`9FTxxZk)|Q`;Q_R@8x0r5^rlQIN4=gVZp7l*069b1~QEMn^%eZiI&X zLwjpmoaVq;KFj>VxmQ@}^4k$S#paf8so%Z7&=`sEiH?aWSw+C=e^~BfF@?BLF6oNt zq5f#b9v0SJ*@-1j6|zt0J4+)+CPvPSN0*(gE6$3@FB)-qrCmEHgK&NE;JF!%AGvPI zoJH&Z)F&kSqo9yf7YWig@r9gC<|%m2(x)DO)~)&VbEBm$8O1G7*xvsF;~Yfqm$A(i zQ-AstM-oHJ*Y`x3J$@=`!2}%=)tgo!h%D~eWzZ58 zmM4#P#D-+dy81=tiu6;fur5Sve1f_rco}GobJS+&^?*&+194d@z0m1xytJ0ZC#}+>EG{v6@kW8ob7%3G1Sa4`Od+X?E0g0cKYd@H1b^KkSh;DWxt;J@I*2D zium1D#R$>y_G!BLO#!YHC=hw7s3k(JX3UpvU-BE}g2aU(#d5f#=mzwK0Sd9j^_tvV#&yIQTQ)5f-a8r1eu@z zc>x~9^Z2%x5+HaINZj`U9!DDr~ zU2ce-AVdBv22_rWO>GkUJSz=o3{*;uKj$Kyc9Ka$I7`V2u166Cd@h%HdlX#wsrziX zV}F&4c2{pjKd5vM^y5ks+J_gZaLHy6kP}%t`p3j(^`9w0zWI%&j-7JMrj{kf-J8e5 zNFd7p^Aa}`^)fob`7HKa^o$f106QOM#X})77FfAJDxhR(iJ7>k;z=Ux+&O`+M1-SW zmo>37Jv1O&v*d|KCkwW`=;>XHbybKB4AdR(^J@B?~wn)LV^IGmO;0=f^(55`*l=akLt32;5n=2RH5--U%e8*c1eB4{{^l zPRt;Jt@|106Yv8Anl{M0ydaVUah(O%T{^wT+DvPFT-?vS-(Smd>fuo)h^V-;sF)xEwS*&du z2A9Kk+w@DFXhFkBrzSl6VV8G+bj4tInCs;* z(~Gq2uzG;gcD3meQSU*dHepqx-OWk)Dwz@?gBpMae#0xmo4D3fCbz zdbaqL$EnYGxEhmXj&_h77J$ef6G(m)F~D*sPFm=8Ocm9CbHzgnaO-%46yzmeEU0vj zw@hVWq^K!Gy-_Yq_td;x?eTGw8UbTO5s`^D?YHwwRJQ=C*uHY*)Gv{^}@ zpiYm`oLrdA0UT#QBHbbgTT>(mDcC{(Ew{B$-J31Cir@D}k=8B8XRVz#f0<;JyYFwu z5{ady;TM1Spbb>Vnn3KaK-~MnVA3s76zjLQ`!ky#4MeX8?>Z@+z~aHx<+`C)Qb2`R z#Pz}xx7fo-cQ+XER)(ji25AWEawWl$nfcBa=2KnoBYHwURj@J_Z zmqBaTY_8Zx_*xh&W^0JU<>R*r#QX_g(+oI7vi0XsYXUc98N2-<~sr&svPpvAIjgjeq_&U*=B>8SnSnib*|r# zOb%(a_9b&>k~>H<3a}MAD!W1sYfn}b*uT}es;+Ru^HU6_c`ej6$d$^TEq~+Fe3!sI z7uC$XDdkO&^q`c|Nkz}Zyey{q;T}zSyTTd*8F3WG`!{Q_mwn&X$^|#6fo?xaJ@^%r zTMoT+E!HZN)ovi29VJ)Ub}T(5E!_?eHLKUvMkubBujFZXJTC}2&K%QhK5x0IT))IV z2e9>|lNDgtwt`jLlOnV48ni@UiEq1-u+5z@fNLb)`D?v-|GzZR$gfwec(yMC?=O%E zz0qGzruewErt6|sgg77nF>$`VTn-RrKK$vwh_Cc8>6zPg{MNSati6|-*T~w}A`_be zGW0oH{0MQE+d>y*GR~9r_dTZDY+H@TrUa8Kv7o8sb!o@l?eO_UcHw(9GYyr zEOcrjca%HriEbH1Izh`a-b;O1?H@uYf|lH*8FBz^zYp=!48>xj?YrxKIvbyVhSw7= z*ZS}6knM52E({uK5etLgoKC14 zHgsNOL%A<`*O>ZRP8X%P&?l{9YO!?>Q%&#rh~kJ8=M!gHbkj&cDl?l4Y|D+Px;t(Xl=!vjI_&B5n8PQc7~nrxGH$f$~V=_wAV-mLg` zTM8QqRPk9H9PylDr~^nDQ8} zW~C3aj8lAOMpT&)I1005LkxMAy<8Panbu?v=IFx)*bL|nL~#@k6n;4RYF*E*3NHS0 z-uekCGD{P6+=af3a1$QiA~n*Kw<8yt2~$~;N^HdX0f{`ABfVUTQfjBeOjZ5@dA>cW z9fMoGj=MRHMTOTf+m4;aPR|=aj(&P{V*Zl}i+{q|iq00|GRh;~b2jTluyGI5TFG}> z_gU}#N#K5UWuw!$g6{Vu6e<}Oz&p%SH2~}C^VslRL8^@|FE@8FzyUS9bX)RquD*l3 zg%OD1V5+FOIk|tdS@DsQSN|~moKBT;ofpIc7vu0v`ut;q; z{%0FMEF1)w)Lt`~7_Tx@TdbuzVVvBIYbalvU(6_Sx1DY0I$6bbif?l9Ykl5npt=)J zf6g6$RWyT{k3Orw^xqH6y(5`7h&{+Zjf6FitZ9H&#DhL=>fr=!exo~Rm_lGL*!wW5 zyw{XhrO`5ycCl-odNQ}nLjsNNZOnyXwA03Dz7NT>E!U%#KA(nRW_7bS6}hg{{o3-F z>(fBMCw#j{)K}%!tmL`l(&>KgUYR~s158-o&adb?jq?B^_08r(?xz>B8>DYg(nkAj z`z^=ve5cugkn2-h&+C@s^@Zh{hGwubxR;nVkq&b2V;V5hzV~vCr>!F|nXs^;2Ku%| z4AD@PIN%)kxDv8JsXXthii0gnBz$xwl&ip;AD3NarK`bPzfkP^Cob=r_?#Qgo^lwY zBN)D{XKhV!V*J1dps%Ht!YFoO& z?jLw{<`)&oTKhE&(y;rRi0oT8aCukP*dYBcEN5DN8-h<_e)Bl@k{Zz@I?5hsKBOSg zmSu=(9A>FGlhYl+?kWAHNFoR4CK5>$>%E6&^m%|sl!S1Ij%!ziT>&wlRK|Hjk6rSf@#}8P;PP~>(64RaLHPm!&Gcw;_3LSL1ec^(ra|D3%qovn-E`}eM zfFGNcg3G-zK-f{cdBO^n_nH9msD%hzf~-B;iR&8#oKEXJndw8G%G#eQXvvH)P{Y!} z7P;ULO~y_7dpKygAxntyH83I&8Hk(Z@?evQ#mB_xLI-_?kMh=CxT5WVYpV4gV-v>A2q&356}tnS{r z!C6N9TZ7`>J)fxW_#3N>r20y=KXyRwoq*y!o;zeb$_C|m{Ol!jb{bOpYk+jshg!rE z6&cK=2m;%p#%XkNrsGCxM5sm8y7E(8KKI9VwL8|v^0PY-RRliqFAYSp}kNYv-ATInYWcmtKlSq@9g0p%DL-(YvrWByWWOy zy~Q~_G1jpGJ3s$RL?^^tvuQQitiyiIf+=03NgIJw;n6JL?0&-~PM=k}tD!qSceOUX zRySp}bdR8rC|sxNvXpljmX&p42PvvTrRYnnzr1qExY(y1HZX`dik26j<^#Qff!gA; z2m6I~)y|UsP{XgGyQ<1QPblp#^W^Y;B$#joW&3DY|Nh+4=yyWcRKyEM+sW3_RUHR3 zvR4RKa2aXs?yufj?*rDDtT)IjxSrIO=vYh!ZGE1 zgtd@Cdqgfg#-9~_GCpRKZT(g3nK0#a$2KcyU-5H_8bEhA5s~pghA0(U z-hAe{P+yNJFafEzP947_q?YqluVXZ%N9vKzZvk3%z%A!`Z!C3}9SBc%kr#ZusTfCI za6pOpF~Qy^!fs@=4WxLf0WNPPrY6sWWT^=ZT6@@t4b}>$!eBre+%CwAHnM_mvaYG4 z;O={N&s$^!v!hcHnNEk1apf4^IhEBpqs@x!!9zz3LDeK#MxquCg%ie-Q|}|HE{$nsy^`CuOMa+(5d5nb%pW)kA zsG<%hw@-zerT_7dY}9|IliJJG%rtI93-|%?zJs@QFL7I}{TGvNuz~n*i@;zbqR2Mv zQTuk6sBTh<03=e!718kx|Gl9O3Y5V8JdpI>I$dpYcDtC1R4kJ#gZ;X*)3CwE9#SM8 zC6>kuh9Xs<92oeQj3#QtN=PKgh4zkW6OT~?(Z%&n%wB;ofV}6bEh|cyKjn!gZM;F| zxy&MF1#gSBm^@zbwz6E@v!B+FegAK8I!^bpf=-@i7XU;rrvGB^wG+ojzQ4P|yXqg5 zl&;T|S$P7pg3~eu_>74FLa+R(%I;CgLN705aLfxgT<@CG)?r7SnKM*REK;B`y2YAU z7`$!wG;~hR8St0DKrh*S8?w4F(BdV~aio?%_pGt7W6yI_#dZSg{r-gy6{L+8Ecw#4 zcx2RueJ7z)=)&(NZTBsXt3Jx4& z7i#5>Iba$>hp?yZtmS^}I}OpxX5fE6aT&!@2^%aAzw%K;TY6{&qU-!rN%)f4sO>xi zWcEzY&6%ty<4+3Af+ws?Rfs$;d?@=#0Am}ygR>*&G@5{s{O_*mj_;^nV+CUI2e+5L ztLcvD9X?VIxRq(2%93vS@u~f`Q`WPg-P}R;M1Y@kEvxZRm_`4Uiq;{Z{n9%n=*5YX zCauc=0trPSDZq?E-gFLeU}_9DH1O^Kfef(o1NBiiPc`!gU)dFrixnwGYq}yL**Jw> zJG)N|HD6c3fCfa#`ZtB*yHnduAZszS_uR9jgO0yMbjYoipu;iJ*i_3^Noi%%R*0`w zFGCM7^Vmh@^V#CJvmRlyIK|7QSSdR|7OM9#CAep zdg`8YCP_PBjhGl#W9U83ANG@v`rk~6++ry&guthLb}0}9nSL!LTU|r`^dVYC^vXgX zCYrEa1TyLr@J|^1k{6K8v{pDcf4BWWuM!hcX1mgG+J|n|H}LC!s@3ZP5rVW%Abf#Q zm^kWo5UJIA$_p)Z;Fqmm&6m?^ww>+4|LpO&);ry9OB(KSj%7WKb%bV)*U^;tv1B0M z$45$*zy0f_F{+0y@LjL;(@}zy(1#8Z4U|dr8ZD6DE$mE)IH}1NtZo_>m`E zPpYK&?_lh8ZfLfKkb`-?#Z0;7Z}aA52w3wu3rF$h84AF^y@u+g1-}5G+;ePhp{@}^ z5R!)+tdIc~VUTgGzsW+xwBnt1!f3GFSQk@z?}Gd4xN0{bXJ(U%q*@6rbg>e;SYgYN zqfeRUQ;-Q0JWevTYdFnD>4+RvI%tw&3xlf3*CW1N#ytM2qj;W9W+tE^@CQv-oNAN7 z;_Lb53@y0>Sl)WYEva@tY+RBwkKhNyb#h7Y;N27qlI2 zfdkZ^(hXax_&5idc~To##@MX z|J@PlIsDG$aE)1suc{-2|89CCArb}I=aU5-K;2;f*0;h0dAOSkfXb-(A!YX>kpeBl zkdHnU3~vU_jlNKk&{Pye3f5*{K!4C?_CNOzNU`}Ogsa!FV*Lm-zwdObD4hhGYL-Fv zE6(p2kK`7D(t}B{z*zHq{A!Rcu`xbeIRWmgXLCJ(5LNpbJ-$lAtiO1e1%v z!-7VD*f%H<>g>3f9m79CLf+sW9x6YmEOF}ZA~fPKJ7M34arXy5c#F%9_6dpglZqKD zk_$>h3|QzLTYX4Ogg$IO_d;Mm$ickjm%HoZMu<#~8b&`uAqTaRZl_cEXY23`cu`Oa z#R6;wte^U3_D%8zR~970J4d8nmM_ahuY3N!&r~Rzw$jGJ0VX?!<4=Nb+mb06@8y|~ zWqS1NQ>RNk!jbISHh?NrPFwPyj+(9$KrukZ5E5mgdyjn+#of=MeWR|31L;5UMkXCu z*pjAqf*HN?+6?{bUkf}|&uIrfS4TLu#<_|d(fEgUCYUTW0Ipcut^jLVLHBhUhJ5Xn z#kC0i>l(jC5gaChb0m|nF@7&~Ssa}Kj!Nkqb%;8Kc$m0w7cQ9}h@|IB(wk?Jrys=p zJhbIbTqkvSL;&qg{~=POF0}3{XNyR8x#Q8?RAe z@dS!7*{ihM>802Fg^!{c7s7|1mXTYnG{wge`n<~Kh#%&BJ1w8mZX-QUG9v`f9z?o- zmUmB!_(rKEK98CSu9Ue<-@o3!%&9{D;$Gk-r?;yw{aF8TendDQ4Y1?E3C+2=RnIb3h?zTxym2nS%GCYWu8(>abwK`JjOh>A53M70 z&R6Eb{`RQ5p(o@pRY(E!%$Xki!`>iJ=(uOX)5uTZ8$dY;ZI1W$~i{zGa9A9UenDoZ%DUQXE>Ab&^GR#Kia6^ov~QcP_+%JQ#NqWeF84#EZkH-Lu~P)Kw*;5bZa=*+Iv zOA_=v<38v*R<+cim5hEmh^~Yb$$qt*BP0oCbrg1@>_HW2&~)Hu3dx}#aVBo3UEx6f zC{07s$3AAonJS-;Ng*TaUeO|=`Ze+6Dvvxbvo8N6gcLu(I~)rIWguO7SLX{RgEzMj zMc#hdHNQl3gFPcA6aDGQ!)do&O?qsn+p6xWr_H7v%BsZ&%3kyFl_`V5d*@BzEI#KP8u?eq+9LEuQ z_xpuo$oNNr$J02dnIrii=+SKzZcvx|aGgBe-NH?qOAXt|%+%_*#x{2ZHt=}Fq+-aW zFvK(V(+@AA{%}`#kfT|cn`b5DQ%jqvsZpkLI*!#G1P8)%T9Z#DNVO#5#m8;3&m;O8q#OAldPs^i0*l^8Q`IWf0xOc^W@gII=EI7v=e-$1M z@yh0k#J(pW3D$9&k=We{AAZ=-<)1hvaFbKGZzx}B_)T{-WIXc+7ExRgKK(Z8>sHd(7?>`Ax3|F+iZVJB{&}5NSnniMR_i7s z$`Gp3b1|=5E9cYbV#36&B9SSTjq<<=ON?HLyL&3HY2x~<1X>{n7YsyV3Arbg($#1U zZ$0AWq8CLbhxq|Hi9{5x5chab4)1+oLd}ii1V~446uS)Nd^D@MLa#(1EBtk1} zpK8eP>T}{Z9KC0xzsc^4!%r&hbT4gaQPqtj{vnr+HW!N!`>hKDu2mUTzJxv&5&tr7bKUq|UbXI*F~r#O)@M(}-5=L4`T|_BIG(an9%| zR*1Qs9iKgI65LrIn-be68aUPh`B7_=H|d;2&iidFxtakk{oAJ>?o~5 ze=vr^Hy|or2(q4$cjM#x8S8fSJWMklyB>xNI!LCJ#HYGwBOi$&m#HC_LK8e_a3S%8 z6@kg74#}ZLF0JH3QdW#pDUlhX4anB=d$7(l!$4v(q31Cgy4&`Y=sjP?UXFzQCT3iu zLLLSU`W4k5O-hyyb<=tW@u#8V)ihr#js$_UV}837e$5$^eZlv9^k$JY+R9nJf6wM{ z(Y(}%o@gvFaygXqvx8Ua;f6`_mJLUU_@Fgg-Hyv|YrN^+v?To7@btwnuu=Gd@2sh` zp@GwJUi2vkVf1 zy|gto72K#7GV7sQ=C(DPJO%R(*tHQ$*IF<$<&;?R z&c(|YI?3hMZ594|_V2DTAmBS?2;ePOFT{if)ulL%D}cI6$U^OPpIh%>?|gNhSPTk) zJMbN}mZR%8^w|kw7ftl=ArAHN|pj=DTeV_XfCi6k5c+uc5N^kj(jgB?4Lm9>*7dzz9G1@784#`A`nE-(O-ncp#3J8!J>i zcdEZ%qL&#GK`4-Nbi(dPpfV-h46=VZ$b$Q4ZI-T%#WL2oe#L5W*6QM=h6YP$gz?hW z9R=FV8}YnbDg@*#MwJ0N)rPx4dwYPjAFoe^Xg1-(IH?ZNyyn3{=ZzczHR&hP-J)ey&Fdv{fJDWE-iuyFN#80 z>($Ql%(;%HF*HKd-^s6RkMhoY$eugETNEhus&92fa~nV|71IARr`nty?cZb81abfp z5(LJ8{!6%cu6MN~<;>Jn^q8@1FFfozU5EP}eW%<3dYodYdM4zpInaoclaqs;T|WYm zZBOLs&kXTHI2XTM;`44LP_UO+xfIHdJ$n7c-??Xz$yC+!}L9mPC z$bI|?Z@gocsCgLO~vp+%i2 z7o_HIuYqmHBbL@|Z}M#vdXL*Msgtwwy3@Xn?q~PArF};AU%EU$Nz>IANYEY)_LC$x zhFvp0G_9Ds(FnZH-L$=$P9rztz1k)W5Nfz-6yOUjGKk}_2Z?o0 z$#xN?sohVpm|y}io4e?pTVyS)MWlZSBGw1l!+&re`s&y+!+pB$$v5uvhXr_s!G8_? z$T{Rj^4N5A(gP~A5_TIc;s;h0rF^zu8gft;7gRz!Zu@yrB-8os*^!M}DOJCHvrDVD z{yATE_bY!F8iilIMdmb@Q-Z0ejF1Jlqs5_V!<(Qew@-UH7xl1a1q100PBXbOBg|^`xY-Ij?vof z;8g~U0PQ%AFE}T|?H3ea%hiv+u$ELK61PsH4pLCqCHq;e9qqn6?F=cOQp&~KF9$yO*EXDPcKZ_ES-0M=KU2!5sRz_s+dSnR zH`#pM`pLj%!eRqd>vxMzt45ZbF==%xVlVGgF~ban**O$EPFe8pih;}`WW~lc8xi_g zu+GA%ym?%;4Hp4u^N0(gyt(@r85t>Z|NGHZp=G#*rQhn1EFu5ctr0E~9LduvN)YK9 zu}zzELkI-Qc~`Hl^4BysFHPQ(Nk$eZ(TFZs;N&n#Yh##3nqRDhe4UJCZ(N(nYwqta z_$}AwZok%RCt8ARW}RAM*|_H1s@6MP^Ac|Bm7ABpi8#IBaXSbZm2|Og+pizjc%OKy zB~vnciq2@zkn6w zZL*YY<>v@b5(pl!3lfFeV~KPPgC=Zj+z?TWk%+)wT3xlmkpMF93TKiXmr2Pn9z49N zeno6h-eB@s*Z}=_Zyrxjg5b z$m|XwK$2^yJsK#hGsmVswnS<6gA08mS>B0f8_r?>zXuqxM<$s;J>1{E;L`6`9Z^7~<90*#?VM1_cI1 zDeH4{$@2OCQwjd9R*wO7nd-!gJ8nueu#KLG&;8DdigoW_6^UwqyYCq>5@(Bdltuk9;6+qYiFjzob5LAkU!} zk~5m{i|_bzm!XaWEfm$xCch}W4=4{8+FQ8q66jrVg2kBsbl+?GwEs5PScO^Umfr@%xpHmSg(qy+Fn zl&m6wiK|)7Em9iO@4B-kHX3D?lUv|xZ2>L^@X7DGZlk{VK))2q(vLF|W3E;@W(-76 zOAHx1>QITYO1}eNbJqCjwcs`@@y#uVvD*N-n|M7k00xFi=d7#S*Jb0?7NYz4`Bcj` zmBq+3d1e>?Df`$#lEMfolVxD_A9jg!7ad`B7HA=tp-K9e7-VGXcS3| z3=#T6b8d{6)|4$kv7Y@ihivypAjbX^4cU}WbU)~ZYo~=}8o4^%XfA*G?_QN&ySA0Kz5wLVB8$ghO_5PW+J-FvncfgEIj zp~}nQ+P~CPSAR0Xr|b>H@L3vfDX?9wyF4s}9M4su2;9s(xe-kR_o?t0J7YEGIxO85 zv$9-{lT(6pYBM3w2ubK0yrRk&`)3h)LybF=wW+J`v(K=8Q6Kaxw|tlAC$4j-gK`G9 zH=UXTz``I|Iyl)?(3XPmQyYhWFPf8h#0Nfq7d@7xB z6^>WDkpx!`E7ql(_)4#_L`R;$w?j9-0YPrtv)9T>IMCwl%FpAYz|W=FeqT9!7`ehw zM@SR?Qmb;TF(bt$T|5jm=npCU?Ex{%&X9{Kssw=}t0D9wIn*$dzHkDC735N%KYuQ; zuxzQIl~z-eR;`(<);)vU9}B-Atkb4NK>|tRR+o`UF7xAKiA<)mV0#USB21+-n*B~= zynon^1XkcZYz2}I97x;IegwL*5?kDEHYpYuAxGHsPi2V(YYhgQD2~)n!+Hw`=_d&* zOXC<}L5#eW05GN_34h6t1*@1K76whr#t&>6M3EAKC`9t`Q=iGwrCpqyjzW~G-W0@t z*_rShJFhqy67U~rfC)j&kT+bab!y`xp#Q5UI=x`lIV&lxIFw4fW~*)5P+Lh@UNkWq z<PQUDa?cBJOg>)87UA2EghU=T8jXL;Dry?j2hv0fr^coBkf3|zmcQGu~=#Z z7+9txNIRLZ;fAWmIWJV2#3j5_XL53JJ^#iTu*HO9$TRj&J!~Onl(vp4{4|uV zcB>>LbHQtrGxCY8Gp%ooKzBba!-VO7#bLzI12PjxRKUOVjdXUk915-moO28CBsfz! zKKWE>BKE2XfJwg5$e6`D{y_b$8$%(5@u(kgptE=%#~zbOjsHIPtE2 zDv%g*vE@)lL`z{ERv$d020jI6B5+faO;0o&;q}N!W|I` z>5*@%X3SqAj_9+6Wma zHNa+U(?4sQ@dUUkoZksoSD(nvo_{C0B<%FyuzdnnZiYBeI*o>T?{-$hW{Q@BSCB(Z$&y~|5P6S=rg9Pk9RhrOEIG}WU>JiA+J`!^ zzs13m8YrI*F##sREYtJIpk*}#lP*;<3|<8IxGcyIOr}iktw6%Dnw3u>DFvwo*@qHY zSX2HFP}OB+ImVd&+f70A;>JAQW2S#Z#V5)F{o=m3u+6)lw=a|$0C~PGH%gGwkzF=w zolGS>TGpA1anhVFlFM?6N~nWk$ggk$p)z}$n%MKV z%;q7zC5j{zd4(-$m;HE^ov(MP|2<45Nc=bQ-(S`L*1~DQT0Q!qZoL26@6wf_ku$4p zDM7VVwS|s|>Ymnd@`oBxauOZD?@vO96~_3BknVk-7LuXSc#Q=1!$&Yz?1_>tT+!f? zGLzgNd-sS{>&@`IYevLMqYCj+U)eLQ(u3s1{@f`J9-NoYKWEC0D@iE;%I|T!MgdzN z(Fq>_Sj~l0XIKj1{}2b~5MTH_Da9uP|2@P}v+)B70R}aYN9xXg_cg=QT>zgUFUL;0 zTkv*P89*BXKrlxQ`ISgjniKPHpd{00GH*rP^2s;h!gP_7$Bvbx*l5ge-s3@7jSa&7 z%bHIxNC_z+g)xzeq2Muh8QaayNp}K)yul2!;gOO&nQY@pLd3;8%W*KkAV2UP_xcQ>W7vl-H_JDelNvlF&efkQHl3%= zl>zZ4k9Zpo5@6|W?7mc{>E`hIi4%S+{0(eqC?WciL$@D_jyiA#OLtK*1{2+QA1VBR zbu*xjAtsCg(~%;21NCR0bNnH0OuMcf79u;{eDBI@k|vc zhda@d$H&J|^$la;TzYxDA6gTagh2EoyvtKl%k%T=Q-J5G%kD^26dKU6(U;(v@}{1i zobWEM1Dl6aZ_zOG)KxIqkzdIm$8qs&t$w#FVT3e1Fj8Q_;dMvinFaI#OH)(LFMGSX zpZQFN<0um8A)l84aGjxpfyGYg)%ZNt)W8;`au^2Dl`+F16eeWlRzVikN zeFVV_v`<=N`cD2CtoFHU5{rmdl~O>31xq=={-TIkmZukgtb3F;%R zw>N|ZMB|4g0%M1@qaNAUli~Jnc8-CN<%oa6jn|+1qXzhc`Ed&yYYtc`=p+>hAsRM1 z0Je|10L%CLUs7nW5C}I5jMmrej9^9P6ww$ti~C_mm9G-RZMm3PhRd;6)(nU!jUf;D z(`ASG-M<5#O93BsP-a-)I~0q-Z99CS{R_nA{q40@K_I?{8AA|*CxOxBVv}I~*82Ib zyiqQbMH#~%1l083xP5$1zsGJ`4&cfOfE`|*x&CMl!#7GK2xpi2Z(L9UjXI?*st;O( zW`ly2(N8K#8bb`0032~|;eKvQy9$|Lf_i<>qClIKt1*~42nQ6!VrDduEqRvM3$el8 z_!{V@86X70ar75;n|(@pSgzo)|13{DK)h1~3nC7hsn#bZgpvRk>PHigvLLb~pyhhA zOtGRGHC(Jr(5b_Kudq<*ul23C0Uu0>R&ApngEdBcL-KPf;;KA;Vv12>QW$hfn}t-Q zY{xlXTK{m@WEN4&iiK}Bc>9u0cULZ< zId(Q5uOpyQIQB>`n=EQ z?IB92%#HFwcae%I)&rj16KO1Cz0rWljb3U|@E}^CU6$Z1_#AQ&F0!_8>so6r+xFw&-|E^?Vh{#tgeGc^xU7JoWfEEh zOGZpku{e@Ax#@ivho69rW9F~ckyo_eE-!77cxvE?=0PX#AV3I%2%1c?^aZ0uaKU~e zS^Prqkz~{`S_m>bE=g=eJAmFf^5@=|E(h2oQ)m(XP)pa4+fxS({m9MTdYq#;>ZW*0a+)Blk;GT^Qg2=aie@1*Lz zbzMgz{=w;;MPm@HlU*leo%$JOH46FeDotz@q&Qk6kn1tpVf5}s2>^vw&HII)6HDvs zid_n!KHY95FQV|M0RIxPeUf?CKKAPt-bhw5NobZ*jHkb)Dz4uUj!6rI3$NwX$q>h? zI-@E#VO&jo5krjdrwi7C^t4mX5;=rs-7u3KKZVP-Be2*ZmCH7R-vl9_9g=29L<(Ft z913CE^BLsYauG0@FzpXZ?k;0YRFGoLC_t%v9Y6UL>2>2u^RZDC6$nx8XXe1Xh!_Sw2Y4&p zijFHg-<}dXuQ0#JSEGCecxaTb4_RtHL>dX_fGPfF;RsKh<+wW8{Qs-!E5oAdzPHB! z;gOb7T11crl@2MT1VOq(K%^PEj?z*h-3SO0(lK<1w1RXDFu(|d#0=f>ZvMYd@BTnt zbGY_7d!Mz}y4St#13$_?JN5&{Bzbn@E<}9A&wG;Ib_d(+e^k8B7ZA(%&q$twh~9 zZ$)sBM+uBRNd3NZVCZBLa4hXDvhywbBF|RdQa(xa7v8xKy`Tt3eyFYW4d;-@|0}4+pF=t@ zvLQF>-uZ_(e58u|#e>hC^%>fZj+wJYrMV>Sl~}%bcHil9JXi%N`&{e{(-8Qs_Ii0w zE19*pfDbaP`&D8d-&X*dzuDz-;7jLCJO*0o~=Qde`WB9cC9 ziP0sH^y*>hy%qnt+?s;d%oD?d%Mm#(e@Qy6GAiLmBM=%*%L4fk|GwxImsTINnKO5cJs)@{sSw^kF=fR zWhps|KNVO16&589R>byojeRxv#~|m?$ss>bSb=kwZQ|$q%M% z_kLj$zcvK1S0uq$REmL0aqYw_vOH)|b~jdV;pUV%spz$XjNfN9R50a7uqPJx1T9@) z6a`@C;LM=MVY zqpsA_mh>ugANd(CN$=ecB|PG5+c9u(FiQH$?^||4FuLr@@tU~S&}6!zvh>blWo9uY z2d12FRs-P%*1_cB%MqH&k7~Ii$z&h79|qoj8o>XTz`JAoEtcmz|4S_C`zL&eNR8+_ zBh4AznxVN7yOUW$E8g56?+@KRPs>j?qHBN-l-QmKn7vYVpMzGFtsL9X;zLsB zHDRo6dm~)%m0usbawSX!rqx;eJB*F7OOb=9y5H&VzJZ8b9Cub)DRB2}&Gk5;$g)Sy zM!jiMy&Q0`yWcX<=T&@@xO<~rEjyIVB1)h;ka;RQKDzWUr~NQ8gImZ=;#l9QmG&Ry zbyxNgUn|vFEp)+uFi3H`Dp29NM!ME0Z#N}(((8pyboJ1i&L>pbas&W?z0MbY-)3lX zKR~C)8{70PiZi`drag<0!mIgcscU}igz0kc+ug@DA=B{jFp%q9x^35dmFw)3_7(Z8 z=p~Y_qt>sxdp0^GZMvJ>MmfzaO`z`Ud{c^O3=@z0Of%*R9d=(>AkCmOtES3c3k{6d zf5R7wa~c9=F3ou4Tw|53VmS@Dlk3DVu>ECQ6 z5sbxgzpjf~^s)XrGM`&>119p^`<(#nTCkPL^lZyS5}Ees)44xdFEuE&#|y0lK-6%X z&aTZzvnt~u-nG-mW>GGBQ%yEF_H6rYXJ@6D3>Ro6RiZo5E1#sVM=g1jSgx=5ljOma zUAgxJVspDE`z_-%ci;VPBdg!vkqJ#Nra=v?|3dqRYt8)ZZW|%>I`n5XjD*uD_R>P3BqN(%9GSG31$Gbha{cZ|G z{PlJ3ZYNFd`j#~K>9$qBKjA$O4ik-WxiABp z-+SCu@2Y`4Yx7?#@?tZslCuX#FPP&p(y8rVUqux+)a;^SS(TIPbkR=}hUlP0)YRC| z)by2H+r%sPAeb54#+USA+Ir@%Hj#4vRdU~KNNVbq)vfW&dLQRNSy4}2wJ1mugp(dH%rxoYWim7Z~}u~!rZ1uV!9sR|W3DQ;0!YHvb^G%lJax+u86Rfdk2$kCQtom zY82(`9D^j>5yl4MfxKV% zlxJjfcc>jZcc8#KE%`*x{>$l(eApw`eK0QMuH=IM{sZ0(^H=>^O}^^cz*i+_yVtDg zEW4eKu-9KT_8WhgYVWhYiJ+s4uQKW&nFcwk2}48Dp%j-0U71X**e&Skwz3g&r8`>> z^zVb8oa|9O~_0o3-WQ)y^Dvnw%;B*2R;DsaQ6f+*| zP&XES2_G-k21jB3yhaDJU&nig&ms;nNtiS4B?A1HZIJ`;*4X5jvw!##Dl3`DxCK9y zn;LU?9)VRbq^KNKH&81^O$)neJ~CtiXSLjkPtM>?tbb&L*Fg(Fj$(uVMJJN>LsqN< zJ3UNJYC;cLtF&_LQk#EV1YRTiTCRheVh=4?Pjx$3D=9ZY45rsQ9320dO8LGDFoNve z_}4{a#o8rAom53$G&>cTn=*G^Y5J~^-u3e{xoQs+_xDC7RuE*Mq zT0G&A*D`q`V$x}0dQ++&&CVy|b5kdN zRW>e=@XGkZ27~R()1C_z(+vJho0E%P-Ffn>5zat1V zl-!yOWx2l5;#Pt&FzMn9kR^&4A|MY*rZl-9KJee?C^7+2RhH}Tmoc;F*4xcW`!1%c z#6ayXTFlR@+il1-Z}zMQI>P|H%*gKhaUzuYbAw`nFJ;56Ql4|)TlS8sUpVM;$)>Q$ z^e)iV$aqs_+Zo2BEz_70bct~hOob$H&AT9L-(N|UKqgBda7BGQtz<0;l1_vRUej0a zzR&WLpU4=HQiX{+`LB4N^xbE=#0MflAIwts-%S>3t)~p$V0ULs@p7AtniwizoF9&L zNPcN7^zY!_$!&`{&TGTP9ga24T*H z1tdvW`Q)X#P1RNV8Yle=o;iMw{B|exa)Mt<$%ZX6okgjjPSPkz-lQ-~sP*D>U5Kyk zY$u7wWFm^b>aY0nclMyU&J;+-b9OVN=}_;lw%pDCSVHJ;zyxMkCcpkn`JsZ}W6E!J z=78~Pl2ou-v5@{)Y63{h2AuK^wZXIu*gqFf6qNzOKxk%wK8!Vxb@vp zmm>e9fcJrPl4>7v$5K6BX$q1}`GW{bI-jP(G$sEl#WzXNmLfui&$Lvu|id#sY>w->X| zHyZ8AdAm$n-HxrGlTp)xm+2(1*!STAg%-Amyth|*mw>&ur#uL5Qv~)Y?7cbdSnh$R z$a_DVIuOUaRcIj3aFc}u=M41GVi?4!_oSY#hiQB$ zU{CQda+`yUA2ShY>F;);)n3g#dD$6K-IJl~?Ukb47fg7ktYyiyt+Wuv983$(<>1z< zaPCidls^?xT%2qgFulT)ULww%ea9D7Vcz*&f7AhxcVE2|Ae*)0wv5t~pWKU17Xs~> zoPhPu2@4Rj_(`Baxnc6mgm_*2+6eHGsC12nXQ5eDf%9-;o)~m)NpsX?~w{ zh9M1?!_pfBA%0&n+(wipjnL<58^z$=qp9Hj$ffh0d)P!v`&?67McnGw+P3Ft>PEb} zMCIFIg?vQ?ZoGr#-Y4P3|4@4WUuK;a9{BoZoO?YE9-W{2Jz79;&6`$c40k9^_0#%a065*Czj>+@83Yw zAP=RZMN208lSO91O26^E4*5o(cR0r07B?6>*_hwr%EvdT-Nmn}Jv{PnBOB<*jjCs_ z|D5N#-cMV}Z7fW}DB^rLceyfNaht}3-)Y`YgTh6d+kOCI32!8U)nA;f)6vmw_K1!w z9az9;PZlCu&>@)MQHImZFDGUjIG#eRiL15m-yCrhwY0P}$JS$OurUY4)8inQM z&{~m=GJ;iG+o^dm9kl!P5{uW?{>`sCu*Qqjl%fB&TAbDQ24GL{{c&BC8+t#H!WZE( zvP`KB`EGUGl6(@d-2bAO&v-Cr*5BZCaAUd}w6EH=7c$%`Kb}Dk{_*IHDQ}H?93F<> zbjuSHAmKw>5!;YBTI~J)Ahl%Az_rN|lFB8YD4P@*E z;$b9rH>zu&y2wyokGnf)G=7`6b=9wY=7cT&B{1rU?(R3^TFC?Ks|e0XQ|P?+GpmX~ z6|&9Kx5ndb8fDj}$Dt0zICRHnw`=Y-+T&G=Vu24{X8nfzk;B5Xx3;!~3UhZd-kw#Q zoM5sq;YFUFM_V~vk$e}&L(u$;k4Su9aj_$y7ku*p#B*#)83KT=c7f@%nnK?oJv+*P4+dPG?;97n zJuJETVotv`*Cw${%jf*$5Rh#9Re1F`98f2MXpojic+Li#dN$uX*r*;du2_%|Khb=Y z+<%QM!3W+2HJq%KWcy+p7{on}9Kvr=N~E4(zv?8piVNVkIc$gZ#j~5bk81}QYG}7- z%^oSrx1OZgO_ZBn{(7vQ=<^LEBn%qew)Jf?PvcJ^3G*LU1a*xC?+y8t0ny>*gru)y zgmdJb{7>e*(9!OsvzO?IBskqlG4Ek-9+zZ>^D)$?9^?fLB(P{ordoTI!CbJFm-4zyB@7 zu(@NK6MJEYx%&PT#+8+2Gk~lUV+$DlA+72dR4OCjF){^^!Su zP<%+|)c7x(2I#msZg|NoID9~i&t>tgCwar3q1tw$u7S1|Hgnq^NO1%=@UQY;|09(? z+4=+>1+lwg$>@y{xGBNZ4Hdo?w>kH$M8hm0hZ9gAfCk)Kr30J4Se58{poNC_)>gcGs_4uvU9!YeE%Msisfz!fM(9COLPQ5U* zm{{bxBX^qGH_y$PV-UAqVo8S_P>r>eVPs^+(sfWm<^I-peKym6J^z~8+8*?9#F#tm znXc|6@R-HK#Gc`}h9hI)V|WUZP&GZLaUHzy&tn#mvGH+#a3TV@A%IRWc-8S$!Mc81 z{@mh5HBAN(u84p5l3qCAtiBS>|A}1w{H=dK%xX{35D8=~gdJz=Eip7sWxg#$Mb0wN zA9r#5ynj9qGtYrxxoE#3eb5yZvGU5!(BWmXCNLCcX)9nRATV1Wf3ICI%Kp_=`UEyI zGE!wfEhs~FCiJG4{F$xi=+x8`+mVEVf^J|ssZl#%pWwsnQLQbt`)2y8;xWvtjR2kL zW6$Q+bB^H?(h^H7TqpWFcPIs&Zd7Yml;ufK5-AYXHl=FvyRVIvgFO^rDB$MuRWe?~ zRXK*ovx>P%zoZRf%KmB9QDy zO1!)PbtJb*&C%r<3U%b5q1a|VH@+MN?6)N4zKo`RBguxvby4*}C|wwrWa#*@2i=-N z`D|x-mW9%l6#RymbscE--aQj~@HeIAh2>|3oEqJG-@oa;w6Vb$d+KO99hqsGHb2fv@qe?oI*dA*K>QdxT!=;2w(U&ns!SG1{xtN-aQFY6 zHlAqsM@mF1s|-2}C1eUOz zaI!R?{xRuu@83KFPA0(DZQK0s5z+c1yz;^s2gDo}A*wA~d-cYzjTPm+_!Iz|^8(9= zM({Ac8a9|up7#H?^_o0{_x>@KVcEXh=ibm?30~Q40|M}vuB0n0E2jv12)D2JH}78s zhoeOp(d^La*y}d`9beRK8;3|VGR@tB+;|iPUCz0$o9uUmuI2p)wj)_&mt*~6=ppz! zaQOF-Ndd1LWV3MI7%!x#g}%|-)Di|GCRBVN%ieuxlLl;%RB=zN*>i$NbOf@!EWuvE zWb#`x>t*Ru{wK+;d+O%UdDZ-aNH8Y0- zF@VnXdc@cATk#n_jU{(PlTJi*&S=gHsh?%7Pj(3)G3U#SHygi~s z^(oMmtG3@V54O91-=;Zv^}O{yt+1ofv0-X8>4iSPZ2LB`!&RaLvWYyJqeYUYqYw*73I?Vrg>q!k<3y8#Y5(lAtSVv$6U- z4d&aHQ_|Ee72>jzH9$MzQ>El&3^Vfl=pR^qhDKF;|1~EaNdiP7NWl#^4*nWoYk?&>*Bo+M?gVXgdq5$WBw`FgnQC>DqUS?rnx}~Ox(obg&IIoe^##&jK zBzU12WylRA0>=j(4}dIB%e{(s^X-0wOi{11q-CAtmf0&w&0YlkbdVEFHEMMGSE!NK z@AO;|DsmCWrWKT=U7VsMJ%NWVG#1znT=WXpWmeYbQDh3AY4}$*=BupIjBLs@x4vbH z`EsBPya&m~-P1{>&zyg!Jxv(7)+~f!SVvzkURWTJZ;G7SqfWy{3en`?7WV?n8K!QZ z%C>3~aDy^|_cP1=XO{&|zqLxWW4O8cQw~M6Os;=%^E*$o;_gyxyG= z|HnXx4&>9!tp%sqv;73Q<y?RIW-adqwq zkz*4LFq0Xgiz@i)t=pE}Q4N3NRMytlTjn$r`70Sbo5(Y4DU5~1#7m6kK-vqsJa4;1 zHSDecUgpR9d|N5#e$%WGrDQt?NeR1&y?6eIbBn_D#@`@v1ufo3=jX8qmigC41E8ex z@-K{|aP-`u!NeNu6>2^c36BlEHe$j@!jfx)AXnR1Zg_Y_5Hft(u~$(+QX9S9d>o+2(MU@;F}| z?$~`AcQdQn%B8KjH^I*|p~>uXy=$O=32-QYHN5VgO|EIZ%XHLh}c>5DgjZzlshLzRWO4+4O>_GbL5Z!vVXOOu3pU;M4Mw)EkcdzhP8 z3lNkQd^6yyBIATKK4OCg=v}GbQ{^BY9pBfXn(p=-1fdc5NQi>DoPEsh9H9X5=o6*& z#figt|HE6-M>19oxYt0jrIl&kbFB#e&h8y>x$3^07Ox8ZU-DG-An^9!DWJ=q3+6@G z+Cg@odh&A0m|hqfBG<-CJaO}z2$u5#v#%{?E8eDAH@!I-^}HEjz{Hv~d%0}gCJ#+u zdNKDXKglZfp#YKGWHf{68G5d*?KB;AhAK5goH$sPXSnu1LY-rw?8i20g44aA=GHr^ zAuI3`9(I3#)G~@}WO(@aWPRPh(2z<2x~sS2sz^eRqxc|B^_YSAk2|v5 zC8ebf>l5l1M`6+zK(_8b*}-J)fn;NkV=B|urG%nyd%dFFv`xzrBA&|!XN|THh1=a* zelQrGzmmL+)*QcTklxr1GM5vS>5}!_p2~6{bZ^o1z|FT<|Gr16+jtlmDEKc4{>S&B zx0Cr+pn-|=!&bg-%GvJ=0YT5?k7vM%v=F{shNyA4rif#74bK%Gh41C)kc|0M9~_)C8S-Kpb8O=VlrMrk4j z=3s&jtQ!5IxM9XzlV`a}OJiy2Z@wEl1MO7mcAgv*?&bZfK2Aiy{%MZ*A{S%tcjYBSJtyO{MW{yA`l@1`@T}B!K$9c zZ@!^qiGJ!5Ocog4N&l&#-3QZR-WEScDl73LbB}V(Cwr>eW(b_>VC~KYnc1nZ!Cm9N zzTQrrH$Jpc5(U2zYyhiL;c65fRxi8v9l88QGJgAKRd^R|EgP5!w;ggqT}zvl`q=IC zKnj~{wYLhTrQOqyQxmhbmtcHBaE*ZZJ(;XwuLBjLZIJ2#hQ*3?Y(Kym_{ifWx;P}F z+^vaYH51e89q_irtfEDjhv~m4dQn$!-_g<00dy3awe%P_M!wyH_+KP5hevzB?5 z_258YSIbCId;k{n&D+m(hSo%|Sk?o7j0hnhx|`ZyoU-&8G&6%6rJfOW9_@{)14)ekDgHy^0pod2apXrsodd&#j&u?bDx(LWi8`t4n1@l~AMMcH%mxb%|v1;EgL7$^$ z(BdeqfNJ{JXXIIS3tP>NWV!4+PKZ0!JGc0DRL7YkmO^MuL;}u^D$I{G3aVy2CfkXl)3?&;9Tgz)d&YSN2bP+9~^rX z{DHm^wdh^ZkM>>SMU+HsG*Ji|qkNrGLDbY#y;(QQdt8zXd8hk%`?%ut75J($k03e{Z%1BIHPF7a7IP}%z zKyZO=lP4|!lj(V|iA=s@$wwPMl)PKqQM%MZcnKyrB(eJ|DT!JsuHV5F+@2yEFxw60 zQJd4%m>^Oqpa*KItE(H(J9lUj5oFF^84Mt+m6a9X$O0r!YjrU!I5_x7t#CbHWE>i= z1uO77U6@J4`I!c#XMk^rj@KscAE-Ee5k)KDFjJG1lmsrP(5IrHpb&H;aF^r&rDHho zCITT3P|e7|z|fH@&zF*fqQi3-^sXu^E32$@nXPvLk8^*2-(>nOxQ^nwtTE}sY5OZf z0^leoJ3DdLzlxlRJI>J7eWiC;;)sO+hd~j%u+pNUyC5sDwb=P0hF(n3`Y=ir#{(w=4Hq4)@D$Qv6QPfkw2 z*Uzjk!1E^=nTfp`QWR@G3a%hFI5;=}Gu7gR5|#5uB=wTU4`p0OaK65=LGe9H-o=`^%rSyApf^*Sq!N9st^jM#6(f6d!v*g@8OLCMZO)uz~Gz?ZMdo f|IIFTZSnFJZXspXQzcp)Q= literal 63133 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 G-+uuu1j8o) diff --git a/src/mmw/js/src/draw/templates/splash.html b/src/mmw/js/src/draw/templates/splash.html index 2c9de818c..49366d70b 100644 --- a/src/mmw/js/src/draw/templates/splash.html +++ b/src/mmw/js/src/draw/templates/splash.html @@ -92,12 +92,22 @@

        +
        {% if dataCatalogEnabled %} - - - {% else %} - {% endif %} +
        + +

        Supported by:

        + +{% if dataCatalogEnabled %} + + + +{% else %} + + + +{% endif %} diff --git a/src/mmw/sass/pages/_draw.scss b/src/mmw/sass/pages/_draw.scss index eb9565f7f..0c104dc86 100644 --- a/src/mmw/sass/pages/_draw.scss +++ b/src/mmw/sass/pages/_draw.scss @@ -50,6 +50,12 @@ } .splash-logo { + max-width: 250px; + display: block; + margin: 1rem auto; +} + +.splash-sponsor-logo { height: 52px; margin-top: 1rem; padding: 1rem; From 0139395bcd1d8565ff4e2f6d57e763dbb034955e Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Thu, 2 Nov 2017 16:12:53 -0400 Subject: [PATCH 159/172] Text Updates for BiG-CZ * Change WDC tab name to CUAHSI WDC * Change WDC detail name to CUAHSI Water Data Center (WDC) * Add tooltip to WDC catalog name in detail view * Update chart time presets to be 1 week, 1 month, 1 year * Remove abstract and citation from WDC free text search --- src/mmw/js/src/data_catalog/controllers.js | 2 +- src/mmw/js/src/data_catalog/models.js | 2 -- .../data_catalog/templates/resultDetailsCuahsi.html | 10 +++++++++- src/mmw/js/src/data_catalog/views.js | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/mmw/js/src/data_catalog/controllers.js b/src/mmw/js/src/data_catalog/controllers.js index e7cb68300..f8b4c27a2 100644 --- a/src/mmw/js/src/data_catalog/controllers.js +++ b/src/mmw/js/src/data_catalog/controllers.js @@ -43,7 +43,7 @@ var DataCatalogController = { }), new models.Catalog({ id: 'cuahsi', - name: 'WDC', + name: 'CUAHSI WDC', is_pageable: false, results: new models.Results(null, { catalog: 'cuahsi' }), serverResults: new models.Results(null, { catalog: 'cuahsi' }), diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 6468eb9ca..7a3d33338 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -540,8 +540,6 @@ var Result = Backbone.Model.extend({ var fields = [ this.get('id').toLowerCase(), this.get('title').toLowerCase(), - this.get('description').toLowerCase(), - (this.get('service_citation') || '').toLowerCase(), (this.get('service_title') || '').toLowerCase(), (this.get('service_org') || '').toLowerCase(), this.get('sample_mediums').join(' ').toLowerCase(), diff --git a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html index b48bef52a..cc0777b01 100644 --- a/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html +++ b/src/mmw/js/src/data_catalog/templates/resultDetailsCuahsi.html @@ -43,7 +43,15 @@

        - +
        Contacts - {% for contact in contacts %} -

        {{ contact }}

        - {% else %} - None provided - {% endfor %} -
        Organizations - {% for org in orgs %} -

        {{ org }}

        - {% else %} - None provided - {% endfor %} -
        Data collected between
        CatalogWater Data Center + CUAHSI Water Data Center (WDC) + + + +
        diff --git a/src/mmw/js/src/data_catalog/views.js b/src/mmw/js/src/data_catalog/views.js index 69588386f..e6ff76ae3 100644 --- a/src/mmw/js/src/data_catalog/views.js +++ b/src/mmw/js/src/data_catalog/views.js @@ -914,8 +914,8 @@ var CuahsiChartView = Marionette.ItemView.extend({ selected: 1, buttons: [ { type: 'week', count: 1, text: '1w' }, - { type: 'week', count: 2, text: '2w' }, { type: 'month', count: 1, text: '1m' }, + { type: 'year', count: 1, text: '1y' }, ], }, From 610231c42ed2c5b112cd3c5205a21881bbb04457 Mon Sep 17 00:00:00 2001 From: Matthew McFarland Date: Sat, 4 Nov 2017 17:58:38 -0400 Subject: [PATCH 160/172] Send GA event for AoI creation Send an event for AOI creation and specify the method used for creation. Additionally, for named boundaries, send a boundary name event. --- src/mmw/js/src/draw/views.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index 23d30828a..9d8e6f535 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -31,7 +31,8 @@ var selectBoundary = 'selectBoundary', delineateWatershed = 'delineateWatershed', aoiUpload = 'aoiUpload', freeDraw = 'free-draw', - squareKm = 'square-km'; + squareKm = 'square-km', + GA_AOI_CATEGORY = 'AoI Creation'; var codeToLayer = {}; // code to layer mapping @@ -419,6 +420,7 @@ var AoIUploadView = Marionette.ItemView.extend({ var geojson = JSON.parse(jsonString); this.addPolygonToMap(geojson.features[0]); + ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'geojson'); }, handleShpZip: function(zipfile) { @@ -432,6 +434,8 @@ var AoIUploadView = Marionette.ItemView.extend({ self.reprojectAndAddFeature(shp, prj); }) .catch(_.bind(self.handleShapefileError, self)); + + ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'shapefile'); }, reprojectAndAddFeature: function(shp, prj) { @@ -664,6 +668,9 @@ var SelectBoundaryView = DrawToolBaseView.extend({ codeToLayer[layerCode] = ol; grid.on('click', function(e) { + ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'boundary-' + layerCode); + ga('send', 'event', GA_AOI_CATEGORY, 'boundary-aoi-create', e.data.name); + getShapeAndAnalyze(e, self.model, ofg, grid, layerCode, shortDisplay); }); @@ -776,6 +783,7 @@ var DrawAreaView = DrawToolBaseView.extend({ .then(function(shape) { addLayer(shape); navigateToAnalyze(); + ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'freedraw'); }).fail(function(message) { revertLayer(); displayAlert(message, modalModels.AlertTypes.error); @@ -812,6 +820,7 @@ var DrawAreaView = DrawToolBaseView.extend({ return [parseFloat(coord[0]), parseFloat(coord[1])]; }); + ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'squarekm') return box; }).then(validateShape).then(function(polygon) { addLayer(polygon, '1 Square Km'); @@ -902,6 +911,7 @@ var WatershedDelineationView = DrawToolBaseView.extend({ utils.placeMarker(map) .then(function(latlng) { + ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'rwd-' + dataSource); return validatePointWithinDataSourceBounds(latlng, dataSource); }) .then(function(latlng) { From a757d216768f5385c3f11b0f267b484158225093 Mon Sep 17 00:00:00 2001 From: Matthew McFarland Date: Sat, 4 Nov 2017 19:24:03 -0400 Subject: [PATCH 161/172] Send GA event for analysis type When a request for analysis is made, send a GA event that records the analysis type, whether it was in the DRB and the size in km2 of the aoi. --- src/mmw/js/src/analyze/models.js | 8 +++++++- src/mmw/js/src/core/utils.js | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/mmw/js/src/analyze/models.js b/src/mmw/js/src/analyze/models.js index 58db6c104..cf85ef579 100644 --- a/src/mmw/js/src/analyze/models.js +++ b/src/mmw/js/src/analyze/models.js @@ -5,7 +5,8 @@ var $ = require('jquery'), Backbone = require('../../shim/backbone'), settings = require('../core/settings'), utils = require('../core/utils'), - coreModels = require('../core/models'); + coreModels = require('../core/models'), + turfArea = require('turf-area'); var LayerModel = Backbone.Model.extend({}); @@ -44,6 +45,11 @@ var AnalyzeTaskModel = coreModels.TaskModel.extend({ result = self.get('result'); if (aoi && !result && self.fetchAnalysisPromise === undefined) { + var gaEvent = self.get('name') + '-analyze', + gaLabel = utils.isInDrb(aoi) ? 'drb-aoi' : 'national-aoi', + gaAoiSize = turfArea(aoi) / 1000000; + ga('send', 'event', 'Analyze', gaEvent, gaLabel, parseInt(gaAoiSize)); + var isWkaoi = utils.isWKAoIValid(wkaoi), taskHelper = { contentType: 'application/json', diff --git a/src/mmw/js/src/core/utils.js b/src/mmw/js/src/core/utils.js index fe6309ddb..cb0cbe846 100644 --- a/src/mmw/js/src/core/utils.js +++ b/src/mmw/js/src/core/utils.js @@ -513,6 +513,13 @@ var utils = { // Array.filter(distinct) to get distinct values distinct: function(value, index, self) { return self.indexOf(value) === index; + }, + + isInDrb: function(geom) { + var layers = settings.get('stream_layers'), + drb = _.findWhere(layers, {code: 'drb_streams_v2'}).perimeter; + + return !!intersect(geom, drb); } }; From 8ba260c5d60eb00e981d4ad3c915e517e018d907 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Mon, 6 Nov 2017 11:31:20 -0500 Subject: [PATCH 162/172] Add catchment & aoi area guards - add guards to check that catchment & aoi area isn't zero before using those values in division ops - if catchment area is 0, return True (& count the catchment as intersecting), since PostGIS has determined that it intersects prior to reducing the geometry to an empty list in the simplify operation - if aoi area is ever 0, return False since there aren't any possible intersections --- src/mmw/apps/geoprocessing_api/calcs.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mmw/apps/geoprocessing_api/calcs.py b/src/mmw/apps/geoprocessing_api/calcs.py index a5762bd2e..8be765180 100644 --- a/src/mmw/apps/geoprocessing_api/calcs.py +++ b/src/mmw/apps/geoprocessing_api/calcs.py @@ -182,7 +182,13 @@ def catchment_intersects_aoi(aoi, catchment): catchment_geom = GEOSGeometry(json.dumps(catchment), srid=4326) reprojected_catchment = catchment_geom.transform(5070, clone=True) - if not reprojected_catchment.valid: + if catchment_geom.area == 0: + return True + elif reprojected_catchment.area == 0: + return True + elif aoi.area == 0: + return False + elif not reprojected_catchment.valid: return False aoi_kms = aoi.area / 1000000 From 0c3665edc6e4279d2794512fb2d823932ecd7dde Mon Sep 17 00:00:00 2001 From: Justin Walgran Date: Mon, 6 Nov 2017 12:11:46 -0700 Subject: [PATCH 163/172] Remove bottom margin from modals to prevent unneeded scrolling Removing the bottom margin prevents the page from scrolling when a modal dialog is completely on screen but less than 72px from the bottom of the browser frame. --- src/mmw/sass/components/_modals.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mmw/sass/components/_modals.scss b/src/mmw/sass/components/_modals.scss index 55c5fa080..013289cad 100644 --- a/src/mmw/sass/components/_modals.scss +++ b/src/mmw/sass/components/_modals.scss @@ -3,7 +3,7 @@ background-color: $black-54; .modal-dialog { - margin: 72px auto; + margin: 72px auto 0 auto; } .modal-content { From 618e4395a82415a3339b2f99849bd8ce71ab4fe9 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Mon, 6 Nov 2017 14:03:50 -0500 Subject: [PATCH 164/172] Add AoI size limit to draw description --- src/mmw/js/src/draw/settings.js | 4 ++-- src/mmw/js/src/draw/templates/window.html | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mmw/js/src/draw/settings.js b/src/mmw/js/src/draw/settings.js index 2eedfb70f..622931dbb 100644 --- a/src/mmw/js/src/draw/settings.js +++ b/src/mmw/js/src/draw/settings.js @@ -29,12 +29,12 @@ var bigCZSplashPageText = { var mmwSelectAreaText = { headerDescription: 'Explore mapped layers, such as streams, land cover, soils, boundaries and observations, using the layer selector in the lower left of the map.', - selectAreaExplanation: 'analyze the factors that impact water in your area and to begin to model different scenarios of human impacts.', + selectAreaExplanation: 'Select an Area of Interest in the continental United States, using the suite of tools below, to analyze the factors that impact water in your area and to begin to model different scenarios of human impacts.', }; var bigCZSelectAreaText = { headerDescription: 'Explore mapped layers, such as streams, land cover, and boundaries, using the layer selector in the lower left of the map.', - selectAreaExplanation: 'analyze the mapped layers within your area and to initiate a search for data.', + selectAreaExplanation: 'Select an Area of Interest (AoI) in the continental United States, using the suite of tools below, to analyze the mapped layers within your area and to initiate a search for datasets and visualize time series data. Currently the AoI must be smaller than 1,500 km2.', }; module.exports = { diff --git a/src/mmw/js/src/draw/templates/window.html b/src/mmw/js/src/draw/templates/window.html index 09e9ddea6..84e1c9e77 100644 --- a/src/mmw/js/src/draw/templates/window.html +++ b/src/mmw/js/src/draw/templates/window.html @@ -4,9 +4,7 @@

        Select Area

        our documentation on layers.

        - Select - an Area of Interest in the continental United States, using the suite - of tools below, to {{ selectAreaText.selectAreaExplanation }} + {{ selectAreaText.selectAreaExplanation }}

        From 328622078701d6eb81b21384c761e82e6d986ba0 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 6 Nov 2017 15:48:37 -0500 Subject: [PATCH 165/172] Fix Compare View Header Styling * Make input modal label styling more specific, so the label styling doesn't apply to other modals, like the compare view's precipitation label --- src/mmw/js/src/user/templates/baseModal.html | 4 ++-- src/mmw/sass/components/_modals.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mmw/js/src/user/templates/baseModal.html b/src/mmw/js/src/user/templates/baseModal.html index 752cf55e1..aaccededf 100644 --- a/src/mmw/js/src/user/templates/baseModal.html +++ b/src/mmw/js/src/user/templates/baseModal.html @@ -1,7 +1,7 @@ {% macro field(value, name, label='', type='text') %}
        - - + +
        {% endmacro %} diff --git a/src/mmw/sass/components/_modals.scss b/src/mmw/sass/components/_modals.scss index 55c5fa080..a8391fb62 100644 --- a/src/mmw/sass/components/_modals.scss +++ b/src/mmw/sass/components/_modals.scss @@ -11,11 +11,11 @@ border: 0px solid $black-12; box-shadow: 0 0 6px $black-24; - label { + .modal-text-input-label { display: block; } - input { + .modal-text-input { width: 100%; padding: 0.75rem 0.5rem; margin: 0.5rem 0 2.5rem 0; From e3256f4a9292ed8e6c18edf462c898f76f713a93 Mon Sep 17 00:00:00 2001 From: Matthew McFarland Date: Sun, 5 Nov 2017 11:11:40 -0500 Subject: [PATCH 166/172] Send GA events for Model activities Sends a Google Analytics event for creating a modeling project, creating a scenario and adding modifications. Events or labels include the project model package type. --- src/mmw/js/src/analyze/models.js | 2 +- src/mmw/js/src/draw/views.js | 14 +++++++------- src/mmw/js/src/modeling/constants.js | 8 ++++++++ src/mmw/js/src/modeling/controllers.js | 3 +++ src/mmw/js/src/modeling/models.js | 13 +++++++++++-- 5 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 src/mmw/js/src/modeling/constants.js diff --git a/src/mmw/js/src/analyze/models.js b/src/mmw/js/src/analyze/models.js index cf85ef579..451f86fb0 100644 --- a/src/mmw/js/src/analyze/models.js +++ b/src/mmw/js/src/analyze/models.js @@ -48,7 +48,7 @@ var AnalyzeTaskModel = coreModels.TaskModel.extend({ var gaEvent = self.get('name') + '-analyze', gaLabel = utils.isInDrb(aoi) ? 'drb-aoi' : 'national-aoi', gaAoiSize = turfArea(aoi) / 1000000; - ga('send', 'event', 'Analyze', gaEvent, gaLabel, parseInt(gaAoiSize)); + window.ga('send', 'event', 'Analyze', gaEvent, gaLabel, parseInt(gaAoiSize)); var isWkaoi = utils.isWKAoIValid(wkaoi), taskHelper = { diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index 9d8e6f535..8dba561a7 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -420,7 +420,7 @@ var AoIUploadView = Marionette.ItemView.extend({ var geojson = JSON.parse(jsonString); this.addPolygonToMap(geojson.features[0]); - ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'geojson'); + window.ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'geojson'); }, handleShpZip: function(zipfile) { @@ -435,7 +435,7 @@ var AoIUploadView = Marionette.ItemView.extend({ }) .catch(_.bind(self.handleShapefileError, self)); - ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'shapefile'); + window.ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'shapefile'); }, reprojectAndAddFeature: function(shp, prj) { @@ -668,8 +668,8 @@ var SelectBoundaryView = DrawToolBaseView.extend({ codeToLayer[layerCode] = ol; grid.on('click', function(e) { - ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'boundary-' + layerCode); - ga('send', 'event', GA_AOI_CATEGORY, 'boundary-aoi-create', e.data.name); + window.ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'boundary-' + layerCode); + window.ga('send', 'event', GA_AOI_CATEGORY, 'boundary-aoi-create', e.data.name); getShapeAndAnalyze(e, self.model, ofg, grid, layerCode, shortDisplay); }); @@ -783,7 +783,7 @@ var DrawAreaView = DrawToolBaseView.extend({ .then(function(shape) { addLayer(shape); navigateToAnalyze(); - ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'freedraw'); + window.ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'freedraw'); }).fail(function(message) { revertLayer(); displayAlert(message, modalModels.AlertTypes.error); @@ -820,7 +820,7 @@ var DrawAreaView = DrawToolBaseView.extend({ return [parseFloat(coord[0]), parseFloat(coord[1])]; }); - ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'squarekm') + window.ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'squarekm'); return box; }).then(validateShape).then(function(polygon) { addLayer(polygon, '1 Square Km'); @@ -911,7 +911,7 @@ var WatershedDelineationView = DrawToolBaseView.extend({ utils.placeMarker(map) .then(function(latlng) { - ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'rwd-' + dataSource); + window.ga('send', 'event', GA_AOI_CATEGORY, 'aoi-create', 'rwd-' + dataSource); return validatePointWithinDataSourceBounds(latlng, dataSource); }) .then(function(latlng) { diff --git a/src/mmw/js/src/modeling/constants.js b/src/mmw/js/src/modeling/constants.js new file mode 100644 index 000000000..f19b10eb9 --- /dev/null +++ b/src/mmw/js/src/modeling/constants.js @@ -0,0 +1,8 @@ +module.exports = { + GA: { + MODEL_CATEGORY: "Modeling", + MODEL_CREATE_EVENT: "project-create", + MODEL_SCENARIO_EVENT: "scenario-create", + MODEL_MOD_EVENT: "-modification-create", + } +}; diff --git a/src/mmw/js/src/modeling/controllers.js b/src/mmw/js/src/modeling/controllers.js index 94b324b10..61dbd02ee 100644 --- a/src/mmw/js/src/modeling/controllers.js +++ b/src/mmw/js/src/modeling/controllers.js @@ -4,6 +4,7 @@ var $ = require('jquery'), _ = require('lodash'), Backbone = require('../../shim/backbone'), App = require('../app'), + constants = require('./constants.js'), settings = require('../core/settings'), router = require('../router').router, views = require('./views'), @@ -109,6 +110,8 @@ var ModelingController = { }, makeNewProject: function(modelPackage) { + window.ga('send', 'event', constants.GA.MODEL_CATEGORY, constants.GA.MODEL_CREATE_EVENT, modelPackage); + var project; if (settings.get('itsi_embed')) { project = App.currentProject; diff --git a/src/mmw/js/src/modeling/models.js b/src/mmw/js/src/modeling/models.js index 3557b370d..df783c73f 100644 --- a/src/mmw/js/src/modeling/models.js +++ b/src/mmw/js/src/modeling/models.js @@ -5,6 +5,7 @@ var $ = require('jquery'), _ = require('lodash'), utils = require('../core/utils'), settings = require('../core/settings'), + constants = require('./constants.js'), App = require('../app'), coreModels = require('../core/models'), turfArea = require('turf-area'), @@ -683,11 +684,16 @@ var ScenarioModel = Backbone.Model.extend({ }, addModification: function(modification) { - var modifications = this.get('modifications'); + var modifications = this.get('modifications'), + modelPackage = App.currentProject.get('model_package'), + modKeyName = modelPackage === GWLFE ? 'modKey' : 'value'; + + window.ga('send', 'event', constants.GA.MODEL_CATEGORY, + modelPackage + constants.GA.MODEL_MOD_EVENT, modification.get(modKeyName)); // For GWLFE, first remove existing mod with the same key since it // doesn't make sense to have multiples of the same type of BMP. - if (App.currentProject.get('model_package') === GWLFE) { + if (modelPackage === GWLFE) { var modKey = modification.get('modKey'), matches = modifications.where({'modKey': modKey}); @@ -963,6 +969,7 @@ var ScenariosCollection = Backbone.Collection.extend({ createNewScenario: function() { var currentConditions = this.findWhere({ 'is_current_conditions': true }), + modelPackage = currentConditions.get('taskModel').get('taskName'), scenario = new ScenarioModel({ is_current_conditions: false, name: this.makeNewScenarioName('New Scenario'), @@ -972,6 +979,8 @@ var ScenariosCollection = Backbone.Collection.extend({ inputs: currentConditions.get('inputs').toJSON(), }); + window.ga('send', 'event', constants.GA.MODEL_CATEGORY, constants.GA.MODEL_SCENARIO_EVENT, modelPackage); + this.add(scenario); this.setActiveScenarioByCid(scenario.cid); }, From d57323b6358dd63d236dd9f71a0fb87bc7533ea4 Mon Sep 17 00:00:00 2001 From: Matthew McFarland Date: Mon, 6 Nov 2017 15:01:08 -0500 Subject: [PATCH 167/172] Update tests to define ga function Google Analytics collect function are not available in the test environment and is mocked out to prevent errors. --- src/mmw/js/src/core/testUtils.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mmw/js/src/core/testUtils.js b/src/mmw/js/src/core/testUtils.js index 77225f95d..a11e261ed 100644 --- a/src/mmw/js/src/core/testUtils.js +++ b/src/mmw/js/src/core/testUtils.js @@ -2,6 +2,9 @@ var $ = require('jquery'); +// Mock the Google Analytics function for tests +window.ga = function() {}; + // Should be called after each unit test. function resetApp(app) { app.map.off(); From 1cf390908523f4b081de3824ff6d032627543b14 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 6 Nov 2017 16:00:31 -0500 Subject: [PATCH 168/172] Style Input Modals * After restyling the login modals, the other input modals (rename scenario, share project url, rename project) lost their styling. * Match their styling to the new login forms --- src/mmw/js/src/core/modals/templates/inputModal.html | 6 ++---- src/mmw/js/src/core/modals/templates/shareModal.html | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/mmw/js/src/core/modals/templates/inputModal.html b/src/mmw/js/src/core/modals/templates/inputModal.html index 5db9ba873..13c5f2471 100644 --- a/src/mmw/js/src/core/modals/templates/inputModal.html +++ b/src/mmw/js/src/core/modals/templates/inputModal.html @@ -5,10 +5,8 @@

        {{ title }}

        - - - - + +
        diff --git a/src/mmw/js/src/core/modals/templates/shareModal.html b/src/mmw/js/src/core/modals/templates/shareModal.html index c2069a586..5294cdf4b 100644 --- a/src/mmw/js/src/core/modals/templates/shareModal.html +++ b/src/mmw/js/src/core/modals/templates/shareModal.html @@ -8,10 +8,8 @@

        Share {{ text }}

        Sorry, only saved {{ text }}s are able to be shared. Please log in to share your work.

        {% else %}
        - - - - + +
        {% endif %} From 6a7177ed523a47a88b1f4a005215dd82d83cb3f3 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Fri, 3 Nov 2017 14:51:05 -0400 Subject: [PATCH 169/172] Move callback function to options from attributes Previously a success callback function was added to a model's attributes, and was being sent to the server during save, causing server side errors. Now we pass in that callback via options, so it is not added to the list of attributes sent to the server. --- src/mmw/js/src/app.js | 12 +++++++----- src/mmw/js/src/user/models.js | 16 ++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/mmw/js/src/app.js b/src/mmw/js/src/app.js index 75488dbd1..b22b7f601 100644 --- a/src/mmw/js/src/app.js +++ b/src/mmw/js/src/app.js @@ -145,7 +145,9 @@ var App = new Marionette.Application({ var loginModalView = new userViews.LoginModalView({ model: new userModels.LoginFormModel({ showItsiButton: settings.get('itsi_enabled'), - successCallback: function(loginResponse) { + }, + { + onSuccess: function(loginResponse) { if (loginResponse.profile_was_skipped || loginResponse.profile_is_complete) { if (onSuccess && _.isFunction(onSuccess)) { onSuccess(loginResponse); @@ -154,8 +156,8 @@ var App = new Marionette.Application({ loginModalView.$el.modal('hide'); loginModalView.$el.on('hidden.bs.modal', function() { new userViews.UserProfileModalView({ - model: new userModels.UserProfileFormModel({ - successCallback: onSuccess + model: new userModels.UserProfileFormModel({}, { + onSuccess: onSuccess }), app: self }).render(); @@ -169,8 +171,8 @@ var App = new Marionette.Application({ showProfileModal: function (onSuccess) { new userViews.UserProfileModalView({ - model: new userModels.UserProfileFormModel({ - successCallback: onSuccess + model: new userModels.UserProfileFormModel({}, { + onSuccess: onSuccess }), app: this }).render(); diff --git a/src/mmw/js/src/user/models.js b/src/mmw/js/src/user/models.js index d4377297e..eb2f879e7 100644 --- a/src/mmw/js/src/user/models.js +++ b/src/mmw/js/src/user/models.js @@ -84,11 +84,18 @@ var LoginFormModel = ModalBaseModel.extend({ defaults: { username: null, password: null, - successCallback: null }, url: '/user/login', + initialize: function(attrs, opts) { + if (opts && opts.onSuccess && _.isFunction(opts.onSuccess)) { + this.onSuccess = opts.onSuccess; + } else { + this.onSuccess = _.noop; + } + }, + validate: function(attrs) { var errors = []; @@ -113,13 +120,6 @@ var LoginFormModel = ModalBaseModel.extend({ }); } }, - - onSuccess: function(response) { - var callback = this.get('successCallback'); - if (callback && _.isFunction(callback)) { - callback(response); - } - } }); var UserProfileFormModel = ModalBaseModel.extend({ From b46de5fabe159edaf0474c4b2f558f9a19002504 Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Tue, 7 Nov 2017 16:49:44 -0500 Subject: [PATCH 170/172] Throttle NWISUV sites to 1 month These sites have a lot of data, and fetching one year worth of it can sometimes overutilize the server's resources. We restrict them to 1 month fetches, keeping the rest at 1 year. --- src/mmw/js/src/data_catalog/models.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index 7a3d33338..a065e7d1a 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -13,6 +13,11 @@ var PAGE_SIZE = settings.get('data_catalog_page_size'); var DATE_FORMAT = 'MM/DD/YYYY'; var WATERML_VARIABLE_TIME_INTERVAL = '{http://www.cuahsi.org/water_ml/1.1/}variable_time_interval'; +var SERVICE_PERIODS = { + 'NWISUV': 'months', // For NWISUV sites, fetch 1 month of data + '*' : 'years', // For all else, fetch 1 year of data +}; + var FilterModel = Backbone.Model.extend({ defaults: { @@ -709,14 +714,16 @@ var CuahsiVariable = Backbone.Model.extend({ wsdl: this.get('wsdl'), site: this.get('site'), variable: this.get('id'), - }; + }, + service = params.site.split(':')[0], + duration = SERVICE_PERIODS[service] || 'years'; // If neither from date nor to date is specified, set time interval - // to be either from begin date to end date, or 1 week up to end date, - // whichever is shorter. + // to be either from begin date to end date, or 1 `duration` up to end + // date, whichever is shorter. if (!from || moment(from).isBefore(begin_date)) { - if (end_date.diff(begin_date, 'years', true) > 1) { - params.from_date = moment(end_date).subtract(1, 'years'); + if (end_date.diff(begin_date, duration, true) > 1) { + params.from_date = moment(end_date).subtract(1, duration); } else { params.from_date = begin_date; } From ceaabad12a8ceba8de40a2b53ba664d7264f9dcc Mon Sep 17 00:00:00 2001 From: Terence Tuhinanshu Date: Wed, 8 Nov 2017 10:53:41 -0500 Subject: [PATCH 171/172] Delete fetchPromise on results fetch When a filter changes, all results for a catalog are refetched. It is possible that a filter may include results that were already included. In this case, there isn't a new instance of the result, but the existing instance is refreshed. When this happens, its CuahsiVariables collection is reset, with no detail values. Previously, if a result details page had been viewed, it had fetched the detail values for said CuahsiVariables, and cached them, using a fetchPromise that would only be resolved once. After fetching them for the first time, we simply returned the fetchPromise so they would not be fetched again. When the values are reset, the actual detail values are gone, but the cached fetchPromise remains, thus preventing values from being fetched anew. By deleting the fetchPromise when receiving new values, we ensure that when a detail page is opened for a previously fetched and repeatedly filtered result, the values for its CuahsiVariables are refetched. --- src/mmw/js/src/data_catalog/models.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js index a065e7d1a..3500d6806 100644 --- a/src/mmw/js/src/data_catalog/models.js +++ b/src/mmw/js/src/data_catalog/models.js @@ -421,6 +421,7 @@ var Result = Backbone.Model.extend({ if (variables instanceof CuahsiVariables) { variables.reset(response.variables); delete response.variables; + delete this.fetchPromise; } } From 50481bbc1fd5304065a58bc289e43005871ecaa6 Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Thu, 9 Nov 2017 15:11:59 -0500 Subject: [PATCH 172/172] Update libpq glob to reflect main PostgreSQL repository See: http://apt.postgresql.org/pub/repos/apt/dists/trusty-pgdg/main/binary-amd64/ --- deployment/ansible/group_vars/all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all index 5f70c5d41..4307d8bd7 100644 --- a/deployment/ansible/group_vars/all +++ b/deployment/ansible/group_vars/all @@ -23,7 +23,7 @@ postgresql_database: mmw postgresql_version: "9.4" postgresql_package_version: "9.4.*.pgdg14.04+1" postgresql_support_repository_channel: "main" -postgresql_support_libpq_version: "10.0-*.pgdg14.04+1" +postgresql_support_libpq_version: "10.1-*.pgdg14.04+1" postgresql_support_psycopg2_version: "2.7" postgis_version: "2.1" postgis_package_version: "2.1.*.pgdg14.04+1"