From 412a8fe9054cd6c5af565de0e99671447d18e8e7 Mon Sep 17 00:00:00 2001
From: fpumir <fpumir@terredeweb.fr>
Date: Thu, 23 Oct 2014 14:44:48 +0200
Subject: [PATCH] promise + async + GMap MVC

Signed-off-by: fpumir <fpumir@terredeweb.fr>
---
 board/js/UI.js    | 21 +++++++++++++++++++++
 board/js/cards.js | 31 ++++++++-----------------------
 board/js/model.js | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
 board/js/pos.json |  1 +
 4 files changed, 76 insertions(+), 24 deletions(-)
 create mode 100644 board/js/pos.json

diff --git a/board/js/UI.js b/board/js/UI.js
index a1c1036..48801d0 100644
--- a/board/js/UI.js
+++ b/board/js/UI.js
@@ -32,6 +32,27 @@ var UI={
 	
 	delete:function(elmt){
 		elmt.parentNode.remove();
+	},
+	
+	drawMap : function(userPos,callback){
+		var centered=new google.maps.LatLng(userPos.lat,userPos.lng);
+		var settings={
+			zoom:17,
+			mapTypeId: google.maps.MapTypeId.ROADMAP,
+			center:centered
+		}
+		new google.maps.Map(document.querySelector('#map > div'),settings);
+		callback.call(this);
+	},
+	
+	toggleMap : function(){
+		document.getElementById('map').classList.toggle('on');
+		return this;
+	},
+	
+	toggleLoader : function(){
+		document.querySelector('.loader').classList.toggle('on');
+		return this;
 	}
 	
 }
diff --git a/board/js/cards.js b/board/js/cards.js
index 772f71d..5be9df3 100644
--- a/board/js/cards.js
+++ b/board/js/cards.js
@@ -10,6 +10,8 @@ model.init(function(card){
 	UI.render(card);
 });
 
+
+
 function getCard (e) {
 	e.preventDefault();
   var name=document.querySelector("input[name='name']").value;
@@ -38,29 +40,12 @@ function deleteCard (e) {
 
 function addLocation(e){
 	e.preventDefault();
-	navigator.geolocation.getCurrentPosition(
-		function(pos){
-			var userPos={lat:pos.coords.latitude,lng:pos.coords.longitude};
-			drawMap(userPos);
-			console.log(userPos); 
-		},
-		function(){
-			var userPos={lat:48.857713,lng:2.347271};
-			drawMap(userPos);
-		},
-		{enableHighAccuracy:true}
-	);
-	
-}
-function drawMap(userPos){
-	var centered=new google.maps.LatLng(userPos.lat,userPos.lng);
-	var settings={
-		zoom:17,
-		mapTypeId: google.maps.MapTypeId.ROADMAP,
-		center:centered
-	}
-	new google.maps.Map(document.querySelector('#map > div'),settings);
-	document.getElementById('map').classList.toggle('on');
+	UI.toggleLoader();
+	model.getUserLocation(function(userPos){
+		UI.drawMap(userPos,function(){
+			UI.toggleMap().toggleLoader();
+		});
+	});
 }
 
 
diff --git a/board/js/model.js b/board/js/model.js
index 9e1064c..e3a3a29 100644
--- a/board/js/model.js
+++ b/board/js/model.js
@@ -2,6 +2,26 @@
 
 var model={
 	
+	load : function(params){
+		return new Promise(function(resolve,reject){
+			var xhr = new XMLHttpRequest();
+			xhr.onreadystatechange = ensureReadiness;
+			function ensureReadiness() {
+					if(xhr.readyState === 4) { 
+						if(xhr.status==200){
+							resolve(xhr);
+						}
+						else{
+							reject();
+						}
+					}
+			}
+			xhr.open('GET', params.url, true);
+			xhr.responseType = params.type||'text';
+			xhr.send('');
+		});
+	},
+	
 	init : function(callback){
 		for (var i in localStorage){
 			callback.call(this,JSON.parse(localStorage.getItem(i)));
@@ -20,7 +40,32 @@ var model={
 		if(!localStorage.getItem(key)){
 			callback.call(this);
 		}
-	}
+	},
+	
+	getUserLocation : function(callback){
+		var self=this;
+		navigator.geolocation.getCurrentPosition(
+			function(pos){
+				var userPos={lat:pos.coords.latitude,lng:pos.coords.longitude};
+				callback.call(this,userPos); 
+			},
+			function(){
+				self.load({url:'js/pos.json',type:'json'}).then(
+					function(xhr){
+						var userPos={
+							lat:xhr.response.coords.latitude,
+							lng:xhr.response.coords.longitude};
+						callback.call(this,userPos);
+					},
+					function(){
+						// traitement de l'erreur xhr;
+					}
+				);
+			},
+			{enableHighAccuracy:true}
+		);
+	},
+	
 	
 		
 }
diff --git a/board/js/pos.json b/board/js/pos.json
new file mode 100644
index 0000000..f795e73
--- /dev/null
+++ b/board/js/pos.json
@@ -0,0 +1 @@
+{"coords":{"latitude":48.857713,"longitude":2.347271}}
\ No newline at end of file