Display file marker location when opening sidebar

bcgov · Jul 5, 2024 · ad3d9a4 · ad3d9a4
1 parent 500cfc2
commit ad3d9a4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/source/frontend/src/features/mapSideBar/context/sidebarContext.tsx b/source/frontend/src/features/mapSideBar/context/sidebarContext.tsx
@@ -7,7 +7,7 @@ import { Api_LastUpdatedBy } from '@/models/api/File';
 import { ApiGen_Concepts_File } from '@/models/api/generated/ApiGen_Concepts_File';
 import { ApiGen_Concepts_Project } from '@/models/api/generated/ApiGen_Concepts_Project';
 import { exists } from '@/utils';
-import { getLatLng } from '@/utils/mapPropertyUtils';
+import { getLatLng, locationFromFileProperty } from '@/utils/mapPropertyUtils';
 
 export interface TypedFile extends ApiGen_Concepts_File {
   fileType: FileTypes;
@@ -120,7 +120,8 @@ export const SideBarContextProvider = (props: {
   const resetFilePropertyLocations = useCallback(() => {
     if (exists(fileProperties)) {
       const propertyLocations = fileProperties
-        .map(x => getLatLng(x.property?.location))
+        .map(x => locationFromFileProperty(x))
+        .map(y => getLatLng(y))
         .filter(exists);
 
       setFilePropertyLocations && setFilePropertyLocations(propertyLocations);

diff --git a/source/frontend/src/hooks/useDraftMarkerSynchronizer.ts b/source/frontend/src/hooks/useDraftMarkerSynchronizer.ts
@@ -6,16 +6,15 @@ import { useMapStateMachine } from '@/components/common/mapFSM/MapStateMachineCo
 import { IMapProperty } from '@/components/propertySelector/models';
 import useDeepCompareEffect from '@/hooks/util/useDeepCompareEffect';
 import useIsMounted from '@/hooks/util/useIsMounted';
+import { latLngFromMapProperty } from '@/utils';
 
 /**
  * Get a list of file property markers from the current form values.
  * As long as a parcel/building has both a lat and a lng it will be returned by this method.
  * @param modifiedProperties the current form values to extract lat/lngs from.
  */
 const getFilePropertyLocations = (modifiedProperties: IMapProperty[]): LatLngLiteral[] => {
-  return modifiedProperties.map<LatLngLiteral>((property: IMapProperty) => {
-    return { lat: Number(property?.latitude ?? 0), lng: Number(property?.longitude ?? 0) };
-  });
+  return modifiedProperties.map((property: IMapProperty) => latLngFromMapProperty(property));
 };
 
 /**

diff --git a/source/frontend/src/utils/mapPropertyUtils.ts b/source/frontend/src/utils/mapPropertyUtils.ts
@@ -266,3 +266,18 @@ export function pinFromFeatureSet(featureset: LocationFeatureDataset): string |
     null
   );
 }
+
+export function locationFromFileProperty(
+  fileProperty: ApiGen_Concepts_FileProperty | undefined | null,
+): ApiGen_Concepts_Geometry | null {
+  return fileProperty?.location ?? fileProperty?.property?.location ?? null;
+}
+
+export function latLngFromMapProperty(
+  mapProperty: IMapProperty | undefined | null,
+): LatLngLiteral | null {
+  return {
+    lat: Number(mapProperty?.fileLocation?.lat ?? mapProperty?.latitude ?? 0),
+    lng: Number(mapProperty?.fileLocation?.lng ?? mapProperty?.longitude ?? 0),
+  };
+}