-
{{s.Title}}
-
-
{{w.Title}}
-
{{w.Notes}}
-
-
- -
- {{p.AddressInfo.Title}} -
-
- Images
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{journey.Title}}
+
+
+
+
+
+ {{journey.Notes}}
+
+
+
+ {{s.Title}} -
+ 35 Miles
+ 32 Minutes
+ 24kWh
+
+
+
+
+
+
+
+ {{w.Title}}
+
+ {{w.Note}}
+
+
+
+
+
+
{{p.Poi.AddressInfo.AddressLine1}}
+
{{p.Poi.AddressInfo.AddressLine2}}
+
{{p.Poi.AddressInfo.Town}}
+
{{p.Poi.AddressInfo.StateOrProvince}}
+
{{p.Poi.AddressInfo.Postcode}}
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/App/Ionic2/ocm-app/app/pages/journeys/journeys.ts b/App/Ionic2/ocm-app/app/pages/journeys/journeys.ts
index 8a62170..72c6686 100644
--- a/App/Ionic2/ocm-app/app/pages/journeys/journeys.ts
+++ b/App/Ionic2/ocm-app/app/pages/journeys/journeys.ts
@@ -1,7 +1,8 @@
-import {Page, Modal, NavController} from 'ionic-angular';
+import {Page, Modal, NavController, Alert} from 'ionic-angular';
import {AppManager} from '../../core/ocm/services/AppManager';
import {Journey, WayPoint, GeoLatLng} from '../../core/ocm/model/AppModels';
import {JourneyManager} from '../../core/ocm/services/JourneyManager';
+import {APIClient} from '../../core/ocm/services/APIClient';
import {POIDetailsPage} from '../poi-details/poi-details';
@Page({
@@ -13,13 +14,32 @@ import {POIDetailsPage} from '../poi-details/poi-details';
*/
export class JourneysPage {
- constructor(private appManager: AppManager, private nav: NavController, private journeyManager:JourneyManager) {
+ constructor(private appManager: AppManager, private nav: NavController, private journeyManager: JourneyManager, private api: APIClient) {
+ this.discoverImages();
+ console.log(JSON.stringify(this.journeyManager.journeys, null, 4));
}
- test() {
- console.log(JSON.stringify(this.journeyManager.journeys, null, 4));
+ discoverImages() {
+ //popoulate panormaio for each point
+ this.journeyManager.journeys.forEach(j => {
+ j.Stages.forEach(s => {
+ s.WayPoints.forEach(w => {
+ if (w.PoiList != null) {
+ w.PoiList.forEach(p => {
+
+ if (p.Poi) {
+ this.api.getPanoramioLocationPhotos(new GeoLatLng(p.Poi.AddressInfo.Latitude, p.Poi.AddressInfo.Longitude)).then((photos) => {
+ p.Photos = photos;
+ });
+ }
+ });
+ }
+ });
+ });
+ });
+
}
getJson(p): string {
@@ -30,6 +50,42 @@ export class JourneysPage {
var poiDetailsModal = Modal.create(POIDetailsPage, { item: poi });
this.nav.present(poiDetailsModal);
}
+
+ get staticMapSize(): string {
+
+ return "60x60";
+
+ }
+
+ getStaticMapURL(poi): string {
+
+ //scale=2 for retina
+ return "https://maps.googleapis.com/maps/api/staticmap?center="
+ + poi.AddressInfo.Latitude + "," + poi.AddressInfo.Longitude + "&zoom=13&scale=2&size="
+ + this.staticMapSize + "&maptype=roadmap&format=jpg&visual_refresh=true&markers=size:small%7Ccolor:0xff0000%7Clabel:%7C"
+ + poi.AddressInfo.Latitude + "," + poi.AddressInfo.Longitude;
+ }
-
+ deleteJourney(journeyId){
+ let confirm = Alert.create({
+ title: 'Delete this Journey?',
+ message: 'Are you sure you want to delete this Journey?',
+ buttons: [
+ {
+ text: 'No',
+ handler: () => {
+ //nope
+ }
+ },
+ {
+ text: 'Delete',
+ handler: () => {
+ this.journeyManager.deleteJourney(journeyId);
+ }
+ }
+ ]
+ });
+
+ this.nav.present(confirm);
+ }
}