[UXP-206] try to use given coordinates when geocoding API call fails

Author: Andrea Barbasso

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/googlemaps-group/googlemaps-group.component.spec.ts

@@ -7,10 +7,10 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderMock } from '../../../../../../../../shared/mocks/translate-loader.mock';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { LoadMoreService } from '../../../../../../../services/load-more.service';
-import { GooglemapsComponent } from '../../../../../../../../shared/googlemaps/googlemaps.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ConfigurationDataService } from '../../../../../../../../core/data/configuration-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../../../../shared/remote-data.utils';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 describe('GooglemapsGroupComponent', () => {
   let component: GooglemapsGroupComponent;
@@ -80,7 +80,9 @@ describe('GooglemapsGroupComponent', () => {
           provide: TranslateLoader,
           useClass: TranslateLoaderMock
         }
-      }), BrowserAnimationsModule],
+      }),
+        BrowserAnimationsModule,
+        HttpClientTestingModule],
       providers: [
         { provide: 'fieldProvider', useValue: mockField },
         { provide: 'itemProvider', useValue: testItem },
@@ -91,8 +93,8 @@ describe('GooglemapsGroupComponent', () => {
       ],
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [
-        GooglemapsGroupComponent,
-        GooglemapsComponent]
+        GooglemapsGroupComponent
+      ]
     })
     .compileComponents();
 

src/app/shared/googlemaps/googlemaps.component.spec.ts

@@ -4,11 +4,12 @@ import { By } from '@angular/platform-browser';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { GooglemapsComponent } from './googlemaps.component';
+import { LocationService } from '../../core/services/location.service';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 describe('GooglemapsComponent', () => {
 
   let component: GooglemapsComponent;
-
   let fixture: ComponentFixture<GooglemapsComponent>;
 
   const coordinates = '@41.3455,456.67';
@@ -19,17 +20,29 @@ describe('GooglemapsComponent', () => {
 
   const confResponse$ = createSuccessfulRemoteDataObject$({ values: ['valid-googlemap-key'] });
 
+  const locationService = jasmine.createSpyObj('locationService', {
+    findPlaceCoordinates: jasmine.createSpy('findPlaceCoordinates'),
+    findPlaceAndDecimalCoordinates: jasmine.createSpy('findPlaceAndDecimalCoordinates'),
+    searchByCoordinates: jasmine.createSpy('searchByCoordinates'),
+    isValidDecimalCoordinatePair: jasmine.createSpy('isValidDecimalCoordinatePair'),
+    isDecimalCoordinateString: jasmine.createSpy('isDecimalCoordinateString'),
+    isSexagesimalCoordinateString: jasmine.createSpy('isSexagesimalCoordinateString'),
+    isValidCoordinateString: jasmine.createSpy('isValidCoordinateString'),
+    parseCoordinates: jasmine.createSpy('parseCoordinates'),
+  });
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
+      imports: [ HttpClientTestingModule ],
       declarations: [ GooglemapsComponent ],
       providers: [
-      { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: LocationService, useValue: locationService }
       ]
     })
-    .compileComponents();
+      .compileComponents();
   });
 
-
   beforeEach(() => {
     fixture = TestBed.createComponent(GooglemapsComponent);
     component = fixture.componentInstance;

src/app/shared/googlemaps/googlemaps.component.ts

@@ -6,6 +6,7 @@ import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { isNotEmpty } from '../empty.util';
 import { RemoteData } from '../../core/data/remote-data';
 import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { LocationService } from '../../core/services/location.service';
 
 @Component({
   selector: 'ds-googlemaps',
@@ -48,6 +49,7 @@ export class GooglemapsComponent implements OnInit {
     private renderer: Renderer2,
     private configService: ConfigurationDataService,
     private cdr: ChangeDetectorRef,
+    private locationService: LocationService,
   ) {
   }
 
@@ -85,14 +87,26 @@ export class GooglemapsComponent implements OnInit {
    * Set latitude and longitude when metadata has an address
    */
   setLatAndLongFromAddress() {
-    return new Promise((reslove, reject) => {
+    return new Promise((resolve, reject) => {
       new google.maps.Geocoder().geocode({ 'address': this.coordinates }, (results, status) => {
         if (status === google.maps.GeocoderStatus.OK) {
           this.latitude = results[0].geometry.location.lat().toString();
           this.longitude = results[0].geometry.location.lng().toString();
-          reslove(1);
+          resolve(1);
         } else {
-          reject(1);
+          console.error('Error from Geocoder API: ', results, status);
+          try {
+            const coordinates = this.locationService.parseCoordinates(this.coordinates);
+            if (coordinates) {
+              this.latitude = coordinates.latitude.toString();
+              this.longitude = coordinates.longitude.toString();
+              resolve(1);
+            } else {
+              reject(1);
+            }
+          } catch (e) {
+            reject(1);
+          }
         }
       });
     });