Paul Wallace / CSE 170 Group Project

Authored by Paul Wallace 2016-11-10 17:34:39 -0800

Exists in master

Showing 1 changed file with 0 additions and 11 deletions Side-by-side Diff

...	...	@@ -78,14 +78,10 @@
78	78	var place = autoOrigin.getPlace();
79	79	// Testing.
80	80	console.log(place);
81		-<<<<<<< HEAD
82	81	//localStorage.setItem("from", place.formatted_address);
83	82	localStorage.setItem("fromIn", temp.value);
84	83	localStorage.setItem("originLat", place.geometry.location.lat());
85	84	localStorage.setItem("originLng", place.geometry.location.lng());
86		-=======
87		- localStorage.setItem("from", place.formatted_address);
88		->>>>>>> 044c2fcc67b88e2e59ea2720d1eb8ababb014660
89	85	});
90	86	}
91	87
...	...	@@ -98,7 +94,6 @@
98	94	var place = autoDest.getPlace();
99	95	// Testing.
100	96	console.log(place);
101		-<<<<<<< HEAD
102	97	//localStorage.setItem("to", place.formatted_address);
103	98	localStorage.setItem("toIn", temp.value);
104	99	localStorage.setItem("destLat", place.geometry.location.lat());
105	100
106	101
...	...	@@ -127,19 +122,13 @@
127	122	};
128	123	}
129	124	});
130		-=======
131		- localStorage.setItem("to", place.formatted_address);
132		->>>>>>> 044c2fcc67b88e2e59ea2720d1eb8ababb014660
133	125	});
134	126	}
135	127
136	128	function saveFrom() {
137	129	var fromInput = document.getElementById("origin").value;
138	130	localStorage.setItem("from", fromInput);
139		-<<<<<<< HEAD
140	131	localStorage.setItem("fromIn", fromInput);
141		-=======
142		->>>>>>> 044c2fcc67b88e2e59ea2720d1eb8ababb014660
143	132	}
144	133	function saveTo() {
145	134	var toInput = document.getElementById("dest").value;