Merge pull request #361 from NickPhura/ACRFD-13

ACRFD-13: feature model update, code cleanup, rotating refresh button support new refresh response type.
bcgov · Jun 20, 2019 · 1791638 · 1791638
2 parents 080d052 + 01863e2
commit 1791638
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 17 deletions.
diff --git a/src/app/applications/application-aside/application-aside.component.ts b/src/app/applications/application-aside/application-aside.component.ts
@@ -156,8 +156,6 @@ export class ApplicationAsideComponent implements OnInit, OnDestroy {
             try {
               _.each(features, feature => {
                 const f = JSON.parse(JSON.stringify(feature));
-                // needs to be valid GeoJSON
-                delete f.geometryName;
                 const featureObj: GeoJSON.Feature<any> = f;
                 const layer = L.geoJSON(featureObj);
                 this.fg.addLayer(layer);

diff --git a/src/app/applications/application-detail/application-detail.component.html b/src/app/applications/application-detail/application-detail.component.html
@@ -36,7 +36,7 @@ <h1>Crown land File: {{application.clFile}}</h1>
         <button class="btn btn-icon" title="Refresh this application with the latest data from Tantalis"
           (click)="refreshApplication()"
           [disabled]="isRefreshing">
-          <i class="material-icons">
+          <i class="material-icons" [ngClass]="{'rotating': isRefreshing}">
             refresh
           </i>
         </button>

diff --git a/src/app/applications/application-detail/application-detail.component.ts b/src/app/applications/application-detail/application-detail.component.ts
@@ -185,9 +185,14 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy {
       .refreshApplication(this.application)
       .pipe(takeUntil(this.ngUnsubscribe))
       .subscribe(
-        updatedApplication => {
-          // updated the application with the latest data
-          this.application = { ...this.application, ...updatedApplication };
+        updatedApplicationAndFeatures => {
+          // update the application with the latest data
+          this.application = {
+            ...this.application,
+            ...updatedApplicationAndFeatures.application
+          };
+          // update the features with the latest data
+          this.application.features = updatedApplicationAndFeatures.features;
         },
         error => {
           this.isRefreshing = false;

diff --git a/src/app/models/feature.ts b/src/app/models/feature.ts
@@ -1,11 +1,14 @@
 export class Feature {
   _id: string;
   type: string;
-  applicationID: string;
-  isDeleted: boolean;
   geometry: {
     type: string;
-    coordinates: any;
+    geometries: [
+      {
+        type: string;
+        coordinates: any;
+      }
+    ];
   };
   properties: {
     INTRID_SID: number;
@@ -31,15 +34,15 @@ export class Feature {
     OBJECTID: number;
     SW_ANNO_CAD_DATA: any; // TODO: what type is this?
   };
-  geometryName: string;
+  isDeleted: boolean;
+  applicationID: string;
 
   constructor(obj?: any) {
     this._id = (obj && obj._id) || null;
     this.type = (obj && obj.type) || null;
-    this.applicationID = (obj && obj.type) || null;
-    this.isDeleted = (obj && obj.isDeleted) || null;
     this.geometry = (obj && obj.geometry) || null;
     this.properties = (obj && obj.properties) || null;
-    this.geometryName = (obj && obj.geometryName) || null;
+    this.isDeleted = (obj && obj.isDeleted) || null;
+    this.applicationID = (obj && obj.type) || null;
   }
 }
diff --git a/src/app/services/api.ts b/src/app/services/api.ts
@@ -28,6 +28,16 @@ interface ILocalLoginResponse {
   accessToken: string;
 }
 
+/**
+ * refreshApplication response type.
+ *
+ * @interface IRefreshApplicationResponse
+ */
+interface IRefreshApplicationResponse {
+  application: Application;
+  features: Feature[];
+}
+
 @Injectable()
 export class ApiService {
   public token: string;
@@ -282,9 +292,9 @@ export class ApiService {
     return this.http.delete<Application>(`${this.pathAPI}/${queryString}`, {});
   }
 
-  refreshApplication(app: Application): Observable<Application> {
+  refreshApplication(app: Application): Observable<IRefreshApplicationResponse> {
     const queryString = `application/${app._id}/refresh`;
-    return this.http.put<Application>(`${this.pathAPI}/${queryString}`, {});
+    return this.http.put<IRefreshApplicationResponse>(`${this.pathAPI}/${queryString}`, {});
   }
 
   saveApplication(app: Application): Observable<Application> {
@@ -296,13 +306,13 @@ export class ApiService {
   // Features
   //
   getFeaturesByTantalisId(tantalisId: number): Observable<Feature[]> {
-    const fields = ['type', 'tags', 'geometry', 'geometryName', 'properties', 'isDeleted', 'applicationID'];
+    const fields = ['type', 'tags', 'geometry', 'properties', 'isDeleted', 'applicationID'];
     const queryString = `feature?isDeleted=false&tantalisId=${tantalisId}&fields=${this.buildValues(fields)}`;
     return this.http.get<Feature[]>(`${this.pathAPI}/${queryString}`, {});
   }
 
   getFeaturesByApplicationId(applicationId: string): Observable<Feature[]> {
-    const fields = ['type', 'tags', 'geometry', 'geometryName', 'properties', 'isDeleted', 'applicationID'];
+    const fields = ['type', 'tags', 'geometry', 'properties', 'isDeleted', 'applicationID'];
     const queryString = `feature?isDeleted=false&applicationId=${applicationId}&fields=${this.buildValues(fields)}`;
     return this.http.get<Feature[]>(`${this.pathAPI}/${queryString}`, {});
   }