Fix null ref

projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts

@@ -59,9 +59,11 @@ export class GpsLocation  implements OnInit,OnChanges{
   ngOnChanges(changes: SimpleChanges) {
     if (changes.position && this.instance) {
       var p = changes.position.currentValue as Position;
-      this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
+      if(p) {
-      this.locationTolerance = p.coords.accuracy;
+        this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
-      this.recalcLocationTolerance();
+        this.locationTolerance = p.coords.accuracy;
+        this.recalcLocationTolerance();  
+      }
     }
     if(changes.heading && this.instance) {
       this.rotate = "rotate(" +   Math.round(changes.heading.currentValue) + " 500 500)";

projects/common-map/src/fm-map/services/geolocation.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Observer, Observable } from 'rxjs';
+import { Observer, Observable,BehaviorSubject } from 'rxjs';
 
 /**
  * GeolocationService class.
@@ -9,31 +9,26 @@ import { Observer, Observable } from 'rxjs';
 @Injectable()
 export class GeolocationService {
 
-  /**
+  private positionObserver$:BehaviorSubject<Position>  = new BehaviorSubject<Position>(null);
-   * Tries HTML5 geolocation.
+
-   *
+  constructor() {
-   * Wraps the Geolocation API into an observable.
+    navigator.geolocation.watchPosition(
-   *
+      (position: Position) => {
-   * @return An observable of Position
+        this.positionObserver$.next(position);
-   */
+      },
-  getCurrentPosition(): Observable<Position> {
+      (error: PositionError) => {
-    return Observable.create((observer: Observer<Position>) => {
+        console.debug('Geolocation service: ' + error.message);
-      // Invokes getCurrentPosition method of Geolocation API.
+      },
-      navigator.geolocation.watchPosition(
+      {
-        (position: Position) => {
+        enableHighAccuracy: true,
-          observer.next(position);
+        timeout: 5000,
-        },
+        maximumAge: 0
-        (error: PositionError) => {
+      }
-          console.debug('Geolocation service: ' + error.message);
+    );
-          //observer.error(error);
-        },
-        {
-          enableHighAccuracy: true,
-          timeout: 5000,
-          maximumAge: 0
-        }
-      );
-    });
   }
 
+
+  getCurrentPosition(): Observable<Position> {
+    return this.positionObserver$;
+  }
 }