Paul Wallace / CSE 170 Group Project

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

Exists in master

Showing 2 changed files Side-by-side Diff

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

...	...	@@ -90,7 +90,6 @@
90	90
91	91	<!-- Javascript for the map. -->
92	92	<script>
93		-
94	93	var map, heatmap;
95	94	// Used by the Google Maps Direction API.
96	95	var directionsService;