Changes on service to know the last position of the device

src/pages/main/main.html

@@ -1,4 +1,4 @@
-<ion-menu [content]="vespotMenu" menuType="push">
+<ion-menu [content]="vespotMenu" >
   <ion-header>
     <ion-toolbar>
       <ion-title>Menu</ion-title>

src/pages/main/main.ts

@@ -53,32 +53,19 @@ export class Main {
 
   getRootDevicePosition() {
     let auth = this.shareService.getAuthToken();
-    this.vespotService.getDeviceById(auth, this.shareService.getRootDevice().id)
+    this.vespotService.getPositionByDeviceId(auth, this.shareService.getRootDevice().id)
   	.subscribe(
         (data) => { // Success
-          this.vespotService.getPositionById(auth, data[0].positionId)
-        	.subscribe(
-              (dataPos) => { // Success
-                this.rootPosition = dataPos[0];
-                this.loadMap();
-              },
-              (errorPos) =>{
-                let alert = this.alertCtrl.create({
+			this.rootPosition = data[0];
+            this.loadMap();
+        },
+        (error) =>{
+			let alert = this.alertCtrl.create({
               title: 'Error servicio',
-              subTitle: errorPos,
+              subTitle: error,
               buttons: ['OK']
             });
             alert.present();
-              }
-            );
-        },
-        (error) =>{
-          /*let alert = this.alertCtrl.create({
-        title: 'Advertencia',
-        subTitle: 'Error al acceder al servicio',
-        buttons: ['OK']
-      });
-      alert.present();*/
         }
       );
   }

src/providers/vespot-service/vespot-service.ts

@@ -11,19 +11,25 @@ import { Injectable } from '@angular/core';
 @Injectable()
 export class VespotServiceProvider {
 
+	URL: string;
+
   constructor(public http: HttpClient) {
+	this.URL = 'http://api.vespot.com';
   }
 
   getDevices(auth) {
-    return this.http.get('http://api.vespot.com/devices', {headers: new HttpHeaders().set('Authorization', 'Basic ' + btoa(auth))});
+    return this.http.get(this.URL + '/devices', {headers: new HttpHeaders().set('Authorization', 'Basic ' + btoa(auth))});
   }
 
   getDeviceById(auth, deviceId) {
-    return this.http.get('http://api.vespot.com/devices?id=' + deviceId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + btoa(auth))});
+    return this.http.get(this.URL + '/devices?id=' + deviceId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + btoa(auth))});
   }
 
   getPositionById(auth, positionId) {
-    return this.http.get('http://api.vespot.com/positions?positionId=' + positionId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + btoa(auth))});
+    return this.http.get(this.URL + '/positions?positionId=' + positionId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + btoa(auth))});
   }
 
+  getPositionByDeviceId(auth, deviceId) {
+    return this.http.get(this.URL + '/positions/lastdeviceposition?deviceId=' + deviceId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + btoa(auth))});
+  }
 }