Merge pull request #2144 from bcgov/feat/gwells-2051

[FEATURE][GWELLS-2051] Added "Well - aquifer parameters" filter on the map on Aquifer Summary page and Aquifer Search Page

app/backend/wells/migrations/0146_add_aquifer_parameters_to_wells_view.py

@@ -0,0 +1,47 @@
+
+from django.db import migrations
+
+UPDATE_GWELLS_WELLS_VIEW_SQL = """
+    DROP VIEW postgis_ftw.gwells_well_view;
+    CREATE VIEW postgis_ftw.gwells_well_view AS
+        SELECT
+            well_tag_number,
+            aquifer_id,
+            artesian_conditions AS artesian,
+            COALESCE
+              (hydraulic_conductivity::text, transmissivity::text, storativity::text)
+              IS NOT NULL 
+              as has_hydraulic_info,
+            street_address,
+            identification_plate_number,
+            observation_well_number,
+            obs_well_status_code AS observation_well_status_code,
+            ems,
+            well_publication_status_code = 'Published' AS is_published,
+            geom,
+            EXISTS (
+                SELECT 1
+                FROM aquifer_parameters
+                WHERE aquifer_parameters.well_tag_number = well.well_tag_number
+            ) as has_aquifer_parameters
+        FROM well
+        WHERE geom IS NOT NULL;
+        GRANT SELECT ON postgis_ftw.gwells_well_view TO ftw_reader;
+"""
+
+class Migration(migrations.Migration):
+    """
+    This migration adds the field 'has_aquifer_parameters' to the gwells_well_view
+    under the postgis_ftw schema in the gwells database. The purpose of this field
+    is to check whether there is existing pump test/aquifer parameter data for a well, and then display
+    a different well icon on the well search map if this data exists.
+    """
+    dependencies = [
+        ('wells', '0145_auto_20231127_2105'),
+    ]
+
+    operations = [
+        migrations.RunSQL(
+          UPDATE_GWELLS_WELLS_VIEW_SQL
+        )
+    ]

app/frontend/src/aquifers/components/AquiferMap.vue

@@ -53,7 +53,9 @@ import {
   WELLS_SOURCE,
   AQUIFERS_SOURCE,
   observationWellsLayer,
-  WELLS_OBSERVATION_LAYER_ID
+  WELLS_OBSERVATION_LAYER_ID,
+  WELLS_AQUIFER_PARAMETER_LAYER_ID,
+  wellsAquiferParameters,
 } from '../../common/mapbox/layers'
 import {
   LayersControl,
@@ -68,7 +70,8 @@ import {
   createAquiferPopupElement,
   createWellPopupElement,
   createEcocatPopupElement,
-  createWaterLicencePopupElement
+  createWaterLicencePopupElement,
+  createWellAquiferParametersPopupElement
 } from '../popup'
 
 import cadastralLegendSrc from '../../common/assets/images/cadastral.png'
@@ -146,13 +149,15 @@ export default {
             {
               imageSrc: wellsArtesianLegendSrc,
               label: 'artesian'
-            },
-            {
-              imageSrc: wellsHydraulicLegendSrc,
-              label: 'aquifer parameters'
             }
           ]
         },
+        {
+          show: false,
+          id: WELLS_AQUIFER_PARAMETER_LAYER_ID,
+          label: 'Wells - aquifer parameters', 
+          imageSrc: wellsHydraulicLegendSrc
+        },
         {
           show: false,
           id: WELLS_OBSERVATION_LAYER_ID,
@@ -312,6 +317,10 @@ export default {
           [WELLS_BASE_AND_ARTESIAN_LAYER_ID]: {
             snapToCenter: true,
             createTooltipContent: this.createWellPopupElement
+          },
+          [WELLS_AQUIFER_PARAMETER_LAYER_ID]: {
+            snapToCenter: true,
+            createTooltipContent: this.createWellPopupElement
           }
         }
 
@@ -349,7 +358,8 @@ export default {
           surfaceWaterLicencesLayer({ layout: { visibility: 'none' } }),
           groundWaterLicencesLayer({ layout: { visibility: 'none' } }),
           wellsBaseAndArtesianLayer({ layout: { visibility: 'none' }, filter: wellLayerFilter(this.showUnpublishedWells) }),
-          observationWellsLayer({ layout: { visibility: 'none' } })
+          observationWellsLayer({ layout: { visibility: 'none' } }),
+          wellsAquiferParameters({ layout: { visibility: 'none' } })
         ]
       }
     },
@@ -468,7 +478,13 @@ export default {
     createWellPopupElement (features, { canInteract }) {
       return createWellPopupElement(features, this.map, this.$router, {
         canInteract,
-        wellLayerIds: [ WELLS_BASE_AND_ARTESIAN_LAYER_ID, WELLS_OBSERVATION_LAYER_ID ]
+        wellLayerIds: [ WELLS_BASE_AND_ARTESIAN_LAYER_ID, WELLS_OBSERVATION_LAYER_ID, WELLS_AQUIFER_PARAMETER_LAYER_ID ]
+      })
+    },
+    createWellAquiferParametersPopupElement (features, { canInteract }) {
+      return createWellAquiferParametersPopupElement(features, this.map, this.$router, {
+        canInteract,
+        wellLayerIds: [ WELLS_AQUIFER_PARAMETER_LAYER_ID]
       })
     },
     createEcocatPopupElement (features, { canInteract }) {

app/frontend/src/aquifers/components/SingleAquiferMap.vue

@@ -35,6 +35,7 @@ import {
   wellsEmsLayer,
   wellsUncorrelatedLayer,
   wellsBaseAndArtesianLayer,
+  wellsAquiferParameters,
   aquifersLineLayer,
   aquifersFillLayer,
   setupAquiferHover,
@@ -44,6 +45,7 @@ import {
   DATABC_ECOCAT_SOURCE_ID,
   AQUIFERS_FILL_LAYER_ID,
   WELLS_BASE_AND_ARTESIAN_LAYER_ID,
+  WELLS_AQUIFER_PARAMETER_LAYER_ID,
   WELLS_EMS_LAYER_ID,
   WELLS_UNCORRELATED_LAYER_ID,
   aquiferLayerFilter,
@@ -56,7 +58,9 @@ import {
   WELLS_SOURCE,
   AQUIFERS_SOURCE,
   observationWellsLayer,
-  WELLS_OBSERVATION_LAYER_ID
+  WELLS_OBSERVATION_LAYER_ID,
+  
+
 } from '../../common/mapbox/layers'
 import { computeBoundsFromMultiPolygon } from '../../common/mapbox/geometry'
 import { LayersControl, LegendControl } from '../../common/mapbox/controls'
@@ -134,13 +138,15 @@ export default {
             {
               imageSrc: wellsArtesianLegendSrc,
               label: 'artesian'
-            },
-            {
-              imageSrc: wellsHydraulicLegendSrc,
-              label: 'aquifer parameters'
             }
           ]
         },
+        {
+          show: true,
+          id: WELLS_AQUIFER_PARAMETER_LAYER_ID,
+          label: 'Wells - aquifer parameters', 
+          imageSrc: wellsHydraulicLegendSrc
+        },
         {
           show: false,
           id: WELLS_OBSERVATION_LAYER_ID,
@@ -274,6 +280,10 @@ export default {
           [WELLS_UNCORRELATED_LAYER_ID]: {
             snapToCenter: true,
             createTooltipContent: this.createWellPopupElement
+          },
+          [WELLS_AQUIFER_PARAMETER_LAYER_ID]: {
+            snapToCenter: true,
+            createTooltipContent: this.createWellPopupElement
           }
         }
         setupFeatureTooltips(this.map, tooltipLayers)
@@ -317,6 +327,7 @@ export default {
           surfaceWaterLicencesLayer({ layout: { visibility: 'none' } }),
           groundWaterLicencesLayer({ layout: { visibility: 'none' } }),
           wellsBaseAndArtesianLayer(),
+          wellsAquiferParameters(),
           observationWellsLayer({ layout: { visibility: 'none' } }),
           wellsEmsLayer({ layout: { visibility: 'none' } }),
           wellsUncorrelatedLayer({ layout: { visibility: 'none' } })
@@ -425,7 +436,8 @@ export default {
           WELLS_BASE_AND_ARTESIAN_LAYER_ID,
           WELLS_OBSERVATION_LAYER_ID,
           WELLS_UNCORRELATED_LAYER_ID,
-          WELLS_EMS_LAYER_ID
+          WELLS_EMS_LAYER_ID,
+          WELLS_AQUIFER_PARAMETER_LAYER_ID
         ]
       })
     },

app/frontend/src/aquifers/popup.js

@@ -6,7 +6,7 @@ import {
   AQUIFERS_FILL_LAYER_ID,
   DATABC_ECOCAT_LAYER_ID,
   DATABC_GROUND_WATER_LICENCES_LAYER_ID,
-  DATABC_SURFACE_WATER_LICENCES_LAYER_ID
+  DATABC_SURFACE_WATER_LICENCES_LAYER_ID,
 } from '../common/mapbox/layers'
 import { popupItems, popupItem } from '../common/mapbox/popup'
 
@@ -132,7 +132,6 @@ export function createAquiferPopupElement (features, map, $router, options = {})
 
   return container
 }
-
 // Creates a <div> for the ecocat's popup content
 export function createEcocatPopupElement (features, map, options = {}) {
   const canInteract = Boolean(options.canInteract)

app/frontend/src/common/mapbox/layers.js

@@ -4,6 +4,7 @@ const VECTOR_TILE_SERVER = `${window.location.protocol}//${window.location.host}
 
 export const WELLS_SOURCE_ID = 'postgis_ftw.gwells_well_view'
 export const WELLS_BASE_AND_ARTESIAN_LAYER_ID = 'wells-with-artesian'
+export const WELLS_AQUIFER_PARAMETER_LAYER_ID = 'wells-with-aquifer-parameters'
 export const WELLS_UNCORRELATED_LAYER_ID = 'wells-uncorrelated'
 export const WELLS_EMS_LAYER_ID = 'wells-ems'
 export const WELLS_OBSERVATION_LAYER_ID = 'wells-observation'
@@ -283,7 +284,6 @@ export function wellsBaseAndArtesianLayer (options = {}) {
     'circle-radius': 3,
     'circle-stroke-color': [
       'case',
-      ['boolean', ['get', 'has_hydraulic_info']], '#5dfa57',
       ['to-boolean', ['get', 'artesian']], '#EE14CA',
       'transparent'
     ],
@@ -294,7 +294,22 @@ export function wellsBaseAndArtesianLayer (options = {}) {
 
   return vectorLayerConfig(layerId, options.source || WELLS_SOURCE_ID, options.layerType || 'circle', styles, options.layout, filter)
 }
+// Builds MapBox layer config object for wells with aquifer parameters with a green outline
+export function wellsAquiferParameters (options = {}) {
+  const layerId = options.id || WELLS_AQUIFER_PARAMETER_LAYER_ID
+  const styles = defaultsDeep(options.styles, {
+    'circle-color' : '#0162FE',
+    'circle-radius' : 3,
+    'circle-stroke-color': '#5dfc00',
+    'circle-stroke-width': 2.5
+  })
+
+  const filter = [
+    'to-boolean', ['get', 'has_aquifer_parameters']
+  ]
 
+  return vectorLayerConfig(layerId, options.source || WELLS_SOURCE_ID, options.layerType || 'circle', styles, options.layout, filter)
+}
 // Builds MapBox layer config object for searched wells with artesian ones with a fuchsia outline
 export function searchedWellsLayer (options = {}) {
   const layerId = options.id || SEARCHED_WELLS_LAYER_ID
@@ -307,9 +322,6 @@ export function searchedWellsLayer (options = {}) {
     'circle-radius': 5,
     'circle-stroke-color': [
       'case',
-      ['to-boolean', ['get', 'storativity']], '#5dfa57',
-      ['to-boolean', ['get', 'transmissivity']], '#5dfa57',
-      ['to-boolean', ['get', 'hydraulic_conductivity']], '#5dfa57',
       ['to-boolean', ['get', 'artesian_conditions']], '#EE14CA',
       'black'
     ],

app/frontend/src/wells/components/SearchMap.vue

@@ -41,7 +41,8 @@ import {
   FOCUSED_WELL_ARTESIAN_IMAGE_ID,
   wellLayerFilter,
   SEARCHED_WELLS_LAYER_ID,
-  WELLS_SOURCE
+  WELLS_SOURCE,
+wellsAquiferParameters
 } from '../../common/mapbox/layers'
 import { LegendControl, BoxZoomControl, SearchOnMoveControl, ClearSearchCriteriaControl } from '../../common/mapbox/controls'
 import { createWellPopupElement } from '../popup'
@@ -245,7 +246,8 @@ export default {
           DATABC_CADASTREL_LAYER,
           wellsBaseAndArtesianLayer({ filter: wellLayerFilter(this.showUnpublished) }),
           searchedWellsLayer(),
-          focusedWellsLayer()
+          focusedWellsLayer(),
+          wellsAquiferParameters()
         ]
       }
     },