Merge pull request #401 from NickPhura/ACRFD-13

ACRFD-13: feature model update, unused code cleanup.

Author: NickPhura

src/app/applications/details-panel/details-map/details-map.component.ts

@@ -73,8 +73,6 @@ export class DetailsMapComponent implements AfterViewInit, OnDestroy {
       // safety check
       this.application.features.forEach(f => {
         const feature = JSON.parse(JSON.stringify(f));
-        // needs to be valid GeoJSON
-        delete feature.geometry_name;
         const featureObj: GeoJSON.Feature<any> = feature;
         const layer = L.geoJSON(featureObj);
         this.appFG.addLayer(layer);

src/app/models/feature.ts

@@ -2,12 +2,17 @@
 // this is the data structure as returned by Tantalis
 //
 export class Feature {
+  id: string;
+  type: string;
   geometry: {
     type: string;
-    coordinates: any;
+    geometries: [
+      {
+        type: string;
+        coordinates: any;
+      }
+    ];
   };
-  geometry_name: string;
-  id: string;
   properties: {
     CODE_CHR_STAGE: string;
     CROWN_LANDS_FILE: string;
@@ -32,13 +37,11 @@ export class Feature {
     TENURE_SUBTYPE: string;
     TENURE_TYPE: string;
   };
-  type: string;
 
   constructor(obj?: any) {
-    this.geometry = (obj && obj.geometry) || null;
-    this.geometry_name = (obj && obj.geometry_name) || null;
     this.id = (obj && obj.id) || null;
-    this.properties = (obj && obj.properties) || null;
     this.type = (obj && obj.type) || null;
+    this.geometry = (obj && obj.geometry) || null;
+    this.properties = (obj && obj.properties) || null;
   }
 }

src/app/services/api.ts

@@ -274,13 +274,13 @@ export class ApiService {
   // Features
   //
   getFeaturesByTantalisId(tantalisID: number): Observable<Feature[]> {
-    const fields = ['applicationID', 'geometry', 'geometryName', 'properties', 'type'];
+    const fields = ['applicationID', 'geometry', 'properties', 'type'];
     const queryString = `feature?tantalisId=${tantalisID}&fields=${this.buildValues(fields)}`;
     return this.http.get<Feature[]>(`${this.apiPath}/${queryString}`);
   }
 
   getFeaturesByApplicationId(applicationId: string): Observable<Feature[]> {
-    const fields = ['applicationID', 'geometry', 'geometryName', 'properties', 'type'];
+    const fields = ['applicationID', 'geometry', 'properties', 'type'];
     const queryString = `feature?applicationId=${applicationId}&fields=${this.buildValues(fields)}`;
     return this.http.get<Feature[]>(`${this.apiPath}/${queryString}`);
   }