Fix importing of LOI properties (#1957)

google · Aug 11, 2024 · d080c09 · d080c09
1 parent 4cbea52
commit d080c09
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/functions/src/import-geojson.spec.ts b/functions/src/import-geojson.spec.ts
@@ -36,6 +36,7 @@ import {GroundProtos} from '@ground/proto';
 
 import Pb = GroundProtos.ground.v1beta1;
 const l = registry.getFieldIds(Pb.LocationOfInterest);
+const pr = registry.getFieldIds(Pb.LocationOfInterest.Property);
 const g = registry.getFieldIds(Pb.Geometry);
 const p = registry.getFieldIds(Pb.Point);
 const c = registry.getFieldIds(Pb.Coordinates);
@@ -78,7 +79,10 @@ describe('importGeoJson()', () => {
     },
     [l.submissionCount]: 0,
     [l.source]: 1, // IMPORTED
-    [l.properties]: {name: 'Dinagat Islands', area: 3.08},
+    [l.properties]: {
+      name: {[pr.stringValue]: 'Dinagat Islands'},
+      area: {[pr.numericValue]: 3.08},
+    },
     jobId: 'job123',
     predefined: true,
     geometry: {type: 'Point', coordinates: TestGeoPoint(10.1, 125.6)},

diff --git a/functions/src/import-geojson.ts b/functions/src/import-geojson.ts
@@ -25,10 +25,10 @@ import {GroundProtos} from '@ground/proto';
 import {Datastore} from './common/datastore';
 import {DocumentData} from 'firebase-admin/firestore';
 import {toDocumentData, deleteEmpty} from '@ground/lib';
-import {Feature, Geometry, Position} from 'geojson';
+import {Feature, GeoJsonProperties, Geometry, Position} from 'geojson';
+import {ErrorHandler} from './handlers';
 
 import Pb = GroundProtos.ground.v1beta1;
-import {ErrorHandler} from './handlers';
 
 /**
  * Read the body of a multipart HTTP POSTed form containing a GeoJson 'file'
@@ -187,10 +187,26 @@ function toLoiPb(
     customTag: id?.toString(),
     source: Pb.LocationOfInterest.Source.IMPORTED,
     geometry: geometryPb,
-    properties,
+    properties: toLoiPbProperties(properties),
   });
 }
 
+function toLoiPbProperties(properties: GeoJsonProperties): {
+  [k: string]: Pb.LocationOfInterest.Property;
+} {
+  return Object.fromEntries(
+    Object.entries(properties ?? {}).map(([k, v]) => [k, toLoiPbProperty(v)])
+  );
+}
+
+function toLoiPbProperty(value: any): Pb.LocationOfInterest.Property {
+  return new Pb.LocationOfInterest.Property(
+    typeof value === 'number'
+      ? {numericValue: value}
+      : {stringValue: value.toString()}
+  );
+}
+
 function toGeometryPb(geometry: Geometry): Pb.Geometry {
   switch (geometry.type) {
     case 'Point':