Skip to content

Commit c7373fe

Browse files
devinleighsmithdevinleighsmith
authored
Merge pull request #3648 from bcgov/v4.1.3-66.43-hotfix
V4.1.3 66.43 hotfix
2 parents 897a2c5 + 996440f commit c7373fe

File tree

55 files changed

+21557
-1068
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+21557
-1068
lines changed

‎etl/PAIMS_PIMS_ACQUISITION_PROJECT/PAIMS_PIMS_ACQUISITION_PROJECT.sln

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.33027.164
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{C9674DCB-5085-4A16-B785-4C70DD1589BD}") = "PAIMS_PIMS_ACQUISITION_PROJECT", "PAIMS_PIMS_ACQUISITION_PROJECT\PAIMS_PIMS_ACQUISITION_PROJECT.dtproj", "{FFB4319E-731E-4A34-95B7-E7BAABE0D007}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Development|Default = Development|Default
11+
EndGlobalSection
12+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13+
{FFB4319E-731E-4A34-95B7-E7BAABE0D007}.Development|Default.ActiveCfg = Development
14+
{FFB4319E-731E-4A34-95B7-E7BAABE0D007}.Development|Default.Build.0 = Development
15+
EndGlobalSection
16+
GlobalSection(SolutionProperties) = preSolution
17+
HideSolutionNode = FALSE
18+
EndGlobalSection
19+
GlobalSection(ExtensibilityGlobals) = postSolution
20+
SolutionGuid = {7FA745E7-ECBD-43B2-8912-7B10C509198B}
21+
EndGlobalSection
22+
EndGlobal

‎etl/PAIMS_PIMS_ACQUISITION_PROJECT/PAIMS_PIMS_ACQUISITION_PROJECT/PAIMS_PIMS_ACQUISITION_PROJECT.dtproj

Lines changed: 385 additions & 0 deletions
Large diffs are not rendered by default.

‎etl/PAIMS_PIMS_ACQUISITION_PROJECT/PAIMS_PIMS_ACQUISITION_PROJECT/PAIMS_PIMS_ACQUISITION_PROJECT.dtproj.user

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<DataTransformationsUserConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<Configurations>
4+
<Configuration>
5+
<Name>Development</Name>
6+
<Options>
7+
<AssessmentRuleSuppressionSetting />
8+
<UseWinAuth>false</UseWinAuth>
9+
<WinAuthUserName />
10+
<WinAuthDomain />
11+
<UserIDs />
12+
<UserPasswords />
13+
<OfflineMode>false</OfflineMode>
14+
<ProgressReporting>true</ProgressReporting>
15+
<ParameterConfigurationSensitiveValues>
16+
<ConfigurationSetting>
17+
<Id>LastModifiedTime</Id>
18+
<Name>LastModifiedTime</Name>
19+
<Value xsi:type="xsd:dateTime">2023-12-05T22:45:19.4750621Z</Value>
20+
</ConfigurationSetting>
21+
</ParameterConfigurationSensitiveValues>
22+
</Options>
23+
</Configuration>
24+
</Configurations>
25+
</DataTransformationsUserConfiguration>

‎etl/PAIMS_PIMS_ACQUISITION_PROJECT/PAIMS_PIMS_ACQUISITION_PROJECT/Package.dtsx

Lines changed: 20910 additions & 0 deletions
Large diffs are not rendered by default.

‎etl/PAIMS_PIMS_ACQUISITION_PROJECT/PAIMS_PIMS_ACQUISITION_PROJECT/Project.params

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0"?>
2+
<SSIS:Parameters xmlns:SSIS="www.microsoft.com/SqlServer/SSIS" />

‎source/backend/api/Pims.Api.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Project Sdk="Microsoft.NET.Sdk.Web">
33
<PropertyGroup>
44
<UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
5-
<Version>4.1.2-66.43</Version>
6-
<Version>4.1.2-66.43</Version>
7-
<AssemblyVersion>4.1.2.66</AssemblyVersion>
5+
<Version>4.1.3-66.43</Version>
6+
<Version>4.1.3-66.43</Version>
7+
<AssemblyVersion>4.1.3.66</AssemblyVersion>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>
1010
</PropertyGroup>

‎source/frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "frontend",
3-
"version": "4.1.2-66.43",
3+
"version": "4.1.3-66.43",
44
"private": true,
55
"dependencies": {
66
"@bcgov/bc-sans": "1.0.1",

‎source/frontend/public/tenants/tenant.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
},
1414
"layers": [],
1515
"propertiesUrl": "ogs-internal/ows?service=wfs&request=GetFeature&typeName=PIMS_PROPERTY_LOCATION_VW&outputformat=json&srsName=EPSG:4326&version=2.0.0&",
16-
"parcelMapFullyAttributed": {
17-
"url": "https://openmaps.gov.bc.ca/geo/pub/WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_FA_SVW/ows",
18-
"name": "pub:WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_FA_SVW"
16+
"parcelMap": {
17+
"url": "https://openmaps.gov.bc.ca/geo/pub/WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_SVW/ows",
18+
"name": "pub:WHSE_CADASTRE.PMBC_PARCEL_FABRIC_POLY_SVW"
1919
}
2020
}

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FeatureCollection, Geometry } from 'geojson';
22
import { LatLngBounds, LatLngLiteral } from 'leaflet';
33

4-
import { PMBC_FullyAttributed_Feature_Properties } from '@/models/layers/parcelMapBC';
4+
import { PMBC_Feature_Properties } from '@/models/layers/parcelMapBC';
55
import {
66
PIMS_Property_Boundary_View,
77
PIMS_Property_Location_View,
@@ -11,17 +11,14 @@ export interface FeatureSelected {
1111
readonly clusterId: string;
1212
readonly pimsLocationFeature: PIMS_Property_Location_View | null;
1313
readonly pimsBoundaryFeature: PIMS_Property_Boundary_View | null;
14-
readonly fullyAttributedFeature: PMBC_FullyAttributed_Feature_Properties | null;
14+
readonly pmbcFeature: PMBC_Feature_Properties | null;
1515
readonly latlng: LatLngLiteral;
1616
}
1717

1818
export interface MapFeatureData {
1919
readonly pimsLocationFeatures: FeatureCollection<Geometry, PIMS_Property_Location_View>;
2020
readonly pimsBoundaryFeatures: FeatureCollection<Geometry, PIMS_Property_Boundary_View>;
21-
readonly fullyAttributedFeatures: FeatureCollection<
22-
Geometry,
23-
PMBC_FullyAttributed_Feature_Properties
24-
>;
21+
readonly pmbcFeatures: FeatureCollection<Geometry, PMBC_Feature_Properties>;
2522
}
2623

2724
export interface RequestedFlyTo {
@@ -45,16 +42,13 @@ export const emptyPimsBoundaryFeatureCollection: FeatureCollection<
4542
features: [],
4643
};
4744

48-
export const emptyFullyFeaturedFeatureCollection: FeatureCollection<
49-
Geometry,
50-
PMBC_FullyAttributed_Feature_Properties
51-
> = {
45+
export const emptyPmbcFeatureCollection: FeatureCollection<Geometry, PMBC_Feature_Properties> = {
5246
type: 'FeatureCollection',
5347
features: [],
5448
};
5549

5650
export const emptyFeatureData: MapFeatureData = {
5751
pimsLocationFeatures: emptyPimsLocationFeatureCollection,
5852
pimsBoundaryFeatures: emptyPimsBoundaryFeatureCollection,
59-
fullyAttributedFeatures: emptyFullyFeaturedFeatureCollection,
53+
pmbcFeatures: emptyPmbcFeatureCollection,
6054
};

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@ import { LatLngLiteral } from 'leaflet';
33
import { useCallback } from 'react';
44

55
import { useAdminBoundaryMapLayer } from '@/hooks/repositories/mapLayer/useAdminBoundaryMapLayer';
6-
import { useFullyAttributedParcelMapLayer } from '@/hooks/repositories/mapLayer/useFullyAttributedParcelMapLayer';
76
import { useLegalAdminBoundariesMapLayer } from '@/hooks/repositories/mapLayer/useLegalAdminBoundariesMapLayer';
7+
import { useParcelMapLayer } from '@/hooks/repositories/mapLayer/useParcelMapLayer';
88
import { usePimsPropertyLayer } from '@/hooks/repositories/mapLayer/usePimsPropertyLayer';
99
import { useMapProperties } from '@/hooks/repositories/useMapProperties';
1010
import { MOT_DistrictBoundary_Feature_Properties } from '@/models/layers/motDistrictBoundary';
1111
import { MOT_RegionalBoundary_Feature_Properties } from '@/models/layers/motRegionalBoundary';
1212
import { WHSE_Municipalities_Feature_Properties } from '@/models/layers/municipalities';
13-
import { PMBC_FullyAttributed_Feature_Properties } from '@/models/layers/parcelMapBC';
13+
import { PMBC_Feature_Properties } from '@/models/layers/parcelMapBC';
1414
import { PIMS_Property_Location_View } from '@/models/layers/pimsPropertyLocationView';
1515

1616
export interface LocationFeatureDataset {
1717
location: LatLngLiteral;
1818
pimsFeature: Feature<Geometry, PIMS_Property_Location_View> | null;
19-
parcelFeature: Feature<Geometry, PMBC_FullyAttributed_Feature_Properties> | null;
19+
parcelFeature: Feature<Geometry, PMBC_Feature_Properties> | null;
2020
regionFeature: Feature<Geometry, MOT_RegionalBoundary_Feature_Properties> | null;
2121
districtFeature: Feature<Geometry, MOT_DistrictBoundary_Feature_Properties> | null;
2222
municipalityFeature: Feature<Geometry, WHSE_Municipalities_Feature_Properties> | null;
2323
}
2424

2525
const useLocationFeatureLoader = () => {
26-
const fullyAttributedService = useFullyAttributedParcelMapLayer();
26+
const pmbcService = useParcelMapLayer();
2727
const adminBoundaryLayerService = useAdminBoundaryMapLayer();
2828
const adminLegalBoundaryLayerService = useLegalAdminBoundariesMapLayer();
2929

@@ -32,7 +32,7 @@ const useLocationFeatureLoader = () => {
3232
} = useMapProperties();
3333
const { findOneByBoundary } = usePimsPropertyLayer();
3434

35-
const fullyAttributedServiceFindOne = fullyAttributedService.findOne;
35+
const pmbcServiceFindOne = pmbcService.findOne;
3636
const adminBoundaryLayerServiceFindRegion = adminBoundaryLayerService.findRegion;
3737
const adminBoundaryLayerServiceFindDistrict = adminBoundaryLayerService.findDistrict;
3838
const adminLegalBoundaryLayerServiceFindOneMunicipality =
@@ -50,12 +50,12 @@ const useLocationFeatureLoader = () => {
5050
};
5151
try {
5252
// call these APIs in parallel - notice there is no "await"
53-
const fullyAttributedTask = fullyAttributedServiceFindOne(latLng);
53+
const pmbcTask = pmbcServiceFindOne(latLng);
5454
const regionTask = adminBoundaryLayerServiceFindRegion(latLng, 'GEOMETRY');
5555
const districtTask = adminBoundaryLayerServiceFindDistrict(latLng, 'GEOMETRY');
5656

5757
const [parcelFeature, regionFeature, districtFeature] = await Promise.all([
58-
fullyAttributedTask,
58+
pmbcTask,
5959
regionTask,
6060
districtTask,
6161
]);
@@ -97,7 +97,7 @@ const useLocationFeatureLoader = () => {
9797
return result;
9898
},
9999
[
100-
fullyAttributedServiceFindOne,
100+
pmbcServiceFindOne,
101101
adminBoundaryLayerServiceFindRegion,
102102
adminBoundaryLayerServiceFindDistrict,
103103
adminLegalBoundaryLayerServiceFindOneMunicipality,

0 commit comments

Comments
 (0)