Merge pull request #3648 from bcgov/v4.1.3-66.43-hotfix

V4.1.3 66.43 hotfix

etl/PAIMS_PIMS_ACQUISITION_PROJECT/PAIMS_PIMS_ACQUISITION_PROJECT.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.33027.164
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{C9674DCB-5085-4A16-B785-4C70DD1589BD}") = "PAIMS_PIMS_ACQUISITION_PROJECT", "PAIMS_PIMS_ACQUISITION_PROJECT\PAIMS_PIMS_ACQUISITION_PROJECT.dtproj", "{FFB4319E-731E-4A34-95B7-E7BAABE0D007}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Development|Default = Development|Default
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FFB4319E-731E-4A34-95B7-E7BAABE0D007}.Development|Default.ActiveCfg = Development
+		{FFB4319E-731E-4A34-95B7-E7BAABE0D007}.Development|Default.Build.0 = Development
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7FA745E7-ECBD-43B2-8912-7B10C509198B}
+	EndGlobalSection
+EndGlobal

etl/PAIMS_PIMS_ACQUISITION_PROJECT/PAIMS_PIMS_ACQUISITION_PROJECT/PAIMS_PIMS_ACQUISITION_PROJECT.dtproj.user

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DataTransformationsUserConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Configurations>
+    <Configuration>
+      <Name>Development</Name>
+      <Options>
+        <AssessmentRuleSuppressionSetting />
+        <UseWinAuth>false</UseWinAuth>
+        <WinAuthUserName />
+        <WinAuthDomain />
+        <UserIDs />
+        <UserPasswords />
+        <OfflineMode>false</OfflineMode>
+        <ProgressReporting>true</ProgressReporting>
+        <ParameterConfigurationSensitiveValues>
+          <ConfigurationSetting>
+            <Id>LastModifiedTime</Id>
+            <Name>LastModifiedTime</Name>
+            <Value xsi:type="xsd:dateTime">2023-12-05T22:45:19.4750621Z</Value>
+          </ConfigurationSetting>
+        </ParameterConfigurationSensitiveValues>
+      </Options>
+    </Configuration>
+  </Configurations>
+</DataTransformationsUserConfiguration>

etl/PAIMS_PIMS_ACQUISITION_PROJECT/PAIMS_PIMS_ACQUISITION_PROJECT/Project.params

@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<SSIS:Parameters xmlns:SSIS="www.microsoft.com/SqlServer/SSIS" />

source/backend/api/Pims.Api.csproj

@@ -2,9 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>4.1.2-66.43</Version>
-    <Version>4.1.2-66.43</Version>
-    <AssemblyVersion>4.1.2.66</AssemblyVersion>
+    <Version>4.1.3-66.43</Version>
+    <Version>4.1.3-66.43</Version>
+    <AssemblyVersion>4.1.3.66</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>
   </PropertyGroup>

source/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "4.1.2-66.43",
+  "version": "4.1.3-66.43",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",

source/frontend/public/tenants/tenant.json

@@ -13,8 +13,8 @@
   },
   "layers": [],
   "propertiesUrl": "ogs-internal/ows?service=wfs&request=GetFeature&typeName=PIMS_PROPERTY_LOCATION_VW&outputformat=json&srsName=EPSG:4326&version=2.0.0&",
-  "parcelMapFullyAttributed": {
-    "url": "https://openmaps.gov.bc.ca/geo/pub/WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_FA_SVW/ows",
-    "name": "pub:WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_FA_SVW"
+  "parcelMap": {
+    "url": "https://openmaps.gov.bc.ca/geo/pub/WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_SVW/ows",
+    "name": "pub:WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_SVW"
   }
 }

source/frontend/src/components/common/mapFSM/models.ts

@@ -1,7 +1,7 @@
 import { FeatureCollection, Geometry } from 'geojson';
 import { LatLngBounds, LatLngLiteral } from 'leaflet';
 
-import { PMBC_FullyAttributed_Feature_Properties } from '@/models/layers/parcelMapBC';
+import { PMBC_Feature_Properties } from '@/models/layers/parcelMapBC';
 import {
   PIMS_Property_Boundary_View,
   PIMS_Property_Location_View,
@@ -11,17 +11,14 @@ export interface FeatureSelected {
   readonly clusterId: string;
   readonly pimsLocationFeature: PIMS_Property_Location_View | null;
   readonly pimsBoundaryFeature: PIMS_Property_Boundary_View | null;
-  readonly fullyAttributedFeature: PMBC_FullyAttributed_Feature_Properties | null;
+  readonly pmbcFeature: PMBC_Feature_Properties | null;
   readonly latlng: LatLngLiteral;
 }
 
 export interface MapFeatureData {
   readonly pimsLocationFeatures: FeatureCollection<Geometry, PIMS_Property_Location_View>;
   readonly pimsBoundaryFeatures: FeatureCollection<Geometry, PIMS_Property_Boundary_View>;
-  readonly fullyAttributedFeatures: FeatureCollection<
-    Geometry,
-    PMBC_FullyAttributed_Feature_Properties
-  >;
+  readonly pmbcFeatures: FeatureCollection<Geometry, PMBC_Feature_Properties>;
 }
 
 export interface RequestedFlyTo {
@@ -45,16 +42,13 @@ export const emptyPimsBoundaryFeatureCollection: FeatureCollection<
   features: [],
 };
 
-export const emptyFullyFeaturedFeatureCollection: FeatureCollection<
-  Geometry,
-  PMBC_FullyAttributed_Feature_Properties
-> = {
+export const emptyPmbcFeatureCollection: FeatureCollection<Geometry, PMBC_Feature_Properties> = {
   type: 'FeatureCollection',
   features: [],
 };
 
 export const emptyFeatureData: MapFeatureData = {
   pimsLocationFeatures: emptyPimsLocationFeatureCollection,
   pimsBoundaryFeatures: emptyPimsBoundaryFeatureCollection,
-  fullyAttributedFeatures: emptyFullyFeaturedFeatureCollection,
+  pmbcFeatures: emptyPmbcFeatureCollection,
 };

source/frontend/src/components/common/mapFSM/useLocationFeatureLoader.tsx

@@ -3,27 +3,27 @@ import { LatLngLiteral } from 'leaflet';
 import { useCallback } from 'react';
 
 import { useAdminBoundaryMapLayer } from '@/hooks/repositories/mapLayer/useAdminBoundaryMapLayer';
-import { useFullyAttributedParcelMapLayer } from '@/hooks/repositories/mapLayer/useFullyAttributedParcelMapLayer';
 import { useLegalAdminBoundariesMapLayer } from '@/hooks/repositories/mapLayer/useLegalAdminBoundariesMapLayer';
+import { useParcelMapLayer } from '@/hooks/repositories/mapLayer/useParcelMapLayer';
 import { usePimsPropertyLayer } from '@/hooks/repositories/mapLayer/usePimsPropertyLayer';
 import { useMapProperties } from '@/hooks/repositories/useMapProperties';
 import { MOT_DistrictBoundary_Feature_Properties } from '@/models/layers/motDistrictBoundary';
 import { MOT_RegionalBoundary_Feature_Properties } from '@/models/layers/motRegionalBoundary';
 import { WHSE_Municipalities_Feature_Properties } from '@/models/layers/municipalities';
-import { PMBC_FullyAttributed_Feature_Properties } from '@/models/layers/parcelMapBC';
+import { PMBC_Feature_Properties } from '@/models/layers/parcelMapBC';
 import { PIMS_Property_Location_View } from '@/models/layers/pimsPropertyLocationView';
 
 export interface LocationFeatureDataset {
   location: LatLngLiteral;
   pimsFeature: Feature<Geometry, PIMS_Property_Location_View> | null;
-  parcelFeature: Feature<Geometry, PMBC_FullyAttributed_Feature_Properties> | null;
+  parcelFeature: Feature<Geometry, PMBC_Feature_Properties> | null;
   regionFeature: Feature<Geometry, MOT_RegionalBoundary_Feature_Properties> | null;
   districtFeature: Feature<Geometry, MOT_DistrictBoundary_Feature_Properties> | null;
   municipalityFeature: Feature<Geometry, WHSE_Municipalities_Feature_Properties> | null;
 }
 
 const useLocationFeatureLoader = () => {
-  const fullyAttributedService = useFullyAttributedParcelMapLayer();
+  const pmbcService = useParcelMapLayer();
   const adminBoundaryLayerService = useAdminBoundaryMapLayer();
   const adminLegalBoundaryLayerService = useLegalAdminBoundariesMapLayer();
 
@@ -32,7 +32,7 @@ const useLocationFeatureLoader = () => {
   } = useMapProperties();
   const { findOneByBoundary } = usePimsPropertyLayer();
 
-  const fullyAttributedServiceFindOne = fullyAttributedService.findOne;
+  const pmbcServiceFindOne = pmbcService.findOne;
   const adminBoundaryLayerServiceFindRegion = adminBoundaryLayerService.findRegion;
   const adminBoundaryLayerServiceFindDistrict = adminBoundaryLayerService.findDistrict;
   const adminLegalBoundaryLayerServiceFindOneMunicipality =
@@ -50,12 +50,12 @@ const useLocationFeatureLoader = () => {
       };
       try {
         // call these APIs in parallel - notice there is no "await"
-        const fullyAttributedTask = fullyAttributedServiceFindOne(latLng);
+        const pmbcTask = pmbcServiceFindOne(latLng);
         const regionTask = adminBoundaryLayerServiceFindRegion(latLng, 'GEOMETRY');
         const districtTask = adminBoundaryLayerServiceFindDistrict(latLng, 'GEOMETRY');
 
         const [parcelFeature, regionFeature, districtFeature] = await Promise.all([
-          fullyAttributedTask,
+          pmbcTask,
           regionTask,
           districtTask,
         ]);
@@ -97,7 +97,7 @@ const useLocationFeatureLoader = () => {
       return result;
     },
     [
-      fullyAttributedServiceFindOne,
+      pmbcServiceFindOne,
       adminBoundaryLayerServiceFindRegion,
       adminBoundaryLayerServiceFindDistrict,
       adminLegalBoundaryLayerServiceFindOneMunicipality,