Merge branch 'release/1.33.2'

src/mmw/apps/geoprocessing_api/calcs.py

@@ -64,9 +64,15 @@ def stream_data(results, geojson, datasource='nhdhr'):
     sql = f'''
         WITH stream_intersection AS (
             SELECT ST_Length(ST_Transform(
-                      ST_Intersection(geom,
-                                      ST_SetSRID(ST_GeomFromGeoJSON(%s),
-                                                 4326)),
+                      CASE
+                        WHEN ST_CoveredBy(geom,
+                                          ST_SetSRID(ST_GeomFromGeoJSON(%s),
+                                                     4326))
+                        THEN geom
+                        ELSE ST_Intersection(geom,
+                                             ST_SetSRID(ST_GeomFromGeoJSON(%s),
+                                                        4326))
+                      END,
                       5070)) AS lengthm,
                    stream_order,
                    slope
@@ -82,7 +88,7 @@ def stream_data(results, geojson, datasource='nhdhr'):
         '''
 
     with connection.cursor() as cursor:
-        cursor.execute(sql, [geojson, geojson])
+        cursor.execute(sql, [geojson, geojson, geojson])
 
         if cursor.rowcount:
             columns = [col[0] for col in cursor.description]

src/mmw/apps/geoprocessing_api/tasks.py

@@ -11,6 +11,7 @@
 import requests
 
 from django.conf import settings
+from django.core.cache import cache
 
 from mmw.settings import layer_classmaps
 
@@ -85,12 +86,28 @@ def start_rwd_job(location, snapping, simplify, data_source):
 
 
 @shared_task
-def analyze_streams(results, area_of_interest, datasource='nhdhr'):
+def analyze_streams(results, area_of_interest, datasource='nhdhr', wkaoi=None):
     """
     Given geoprocessing results with stream data and an area of interest,
     returns the streams and stream order within it.
+
+    If a wkaoi is specified and caching is enabled, the results will be
+    cached and reused.
     """
-    return {'survey': stream_data(results, area_of_interest, datasource)}
+    key = None
+
+    if wkaoi and settings.GEOP['cache']:
+        key = f'db_{wkaoi}__{datasource}__stream_data'
+        cached = cache.get(key)
+        if cached:
+            return {'survey': cached}
+
+    survey = stream_data(results, area_of_interest, datasource)
+
+    if key:
+        cache.set(key, survey, None)
+
+    return {'survey': survey}
 
 
 @shared_task

src/mmw/apps/geoprocessing_api/views.py

@@ -652,7 +652,7 @@ def start_analyze_streams(request, datasource, format=None):
                             wkaoi,
                             cache_key=datasource),
         nlcd_streams.s(),
-        tasks.analyze_streams.s(area_of_interest, datasource)
+        tasks.analyze_streams.s(area_of_interest, datasource, wkaoi)
     ], area_of_interest, user)
 
 

src/mmw/apps/modeling/mapshed/calcs.py

@@ -321,16 +321,21 @@ def stream_length(geom, datasource='nhdhr'):
     sql = f'''
           SELECT ROUND(SUM(ST_Length(
               ST_Transform(
-                  ST_Intersection(geom,
-                                  ST_SetSRID(ST_GeomFromText(%s), 4326)),
+                  CASE
+                    WHEN ST_CoveredBy(geom,
+                                      ST_SetSRID(ST_GeomFromText(%s), 4326))
+                    THEN geom
+                    ELSE ST_Intersection(geom,
+                                         ST_SetSRID(ST_GeomFromText(%s), 4326))
+                  END,
                   5070))))
           FROM {settings.STREAM_TABLES[datasource]}
           WHERE ST_Intersects(geom,
                               ST_SetSRID(ST_GeomFromText(%s), 4326));
           '''
 
     with connection.cursor() as cursor:
-        cursor.execute(sql, [geom.wkt, geom.wkt])
+        cursor.execute(sql, [geom.wkt, geom.wkt, geom.wkt])
 
         return cursor.fetchone()[0] or 0  # Aggregate query returns singleton
 

src/mmw/apps/modeling/mapshed/tasks.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from copy import deepcopy
 from celery import shared_task
 from django.conf import settings
 
@@ -50,7 +51,7 @@ def collect_data(geop_results, geojson, watershed_id=None, weather=None,
     area = geom.transform(5070, clone=True).area  # Square Meters
 
     # Data Model is called z by convention
-    z = settings.GWLFE_DEFAULTS.copy()
+    z = deepcopy(settings.GWLFE_DEFAULTS)
 
     z['watershed_id'] = watershed_id
 

src/mmw/apps/user/views.py

@@ -1,5 +1,6 @@
 import rollbar
 
+from copy import deepcopy
 from uuid import uuid1
 
 from django.contrib.auth import (authenticate,
@@ -110,7 +111,7 @@ def make_successful_response_data(user):
 @decorators.api_view(['POST'])
 @decorators.permission_classes((IsAuthenticated, ))
 def profile(request):
-    data = request.data.copy()
+    data = deepcopy(request.data)
     if 'was_skipped' in data:
         data['was_skipped'] = str(data['was_skipped']).lower() == 'true'
         data['is_complete'] = not data['was_skipped']