Skip to content

Commit 51ec4d6

Browse files
g33kgrrlg33kgrrl
committed
minor tidying
1 parent 05c4616 commit 51ec4d6

File tree

6 files changed

+23
-285
lines changed

6 files changed

+23
-285
lines changed

‎index.html‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<html xmlns="http://www.w3.org/1999/xhtml">
2-
<!--
3-
4-
.===. . .
5-
| o | |
2+
<!--
3+
4+
.===. . .
5+
| o | |
66
| . .-.| .-. .,-. .-. .-. | .==.
77
| | ( |(.-' | )( )( )| `==.
88
'-' `-`-'`-`=='|`-' `-' `-' `-`==' v0.2
9-
|
10-
'
9+
|
10+
'
1111
Open Technology Institute & jrbaldwin
12-
12+
1313
//-->
1414

1515
<head>
@@ -329,17 +329,17 @@
329329
onclick="secretLandmark()">
330330
<div id="loadingDiv" style=
331331
"background-image:url('images/loading.gif'); position:absolute;"></div><script src=
332-
"js/resources/leaflet.js" type="text/javascript"></script>
333-
<script src="js/resources/jquery.js" type="text/javascript"></script>
334-
<script src="js/resources/jquery_ui.js" type="text/javascript"></script>
335-
<script src="js/resources/jquery_ui_timepicker.js" type="text/javascript"></script>
332+
"js/resources/leaflet.js" type="text/javascript"></script>
333+
<script src="js/resources/jquery.js" type="text/javascript"></script>
334+
<script src="js/resources/jquery_ui.js" type="text/javascript"></script>
335+
<script src="js/resources/jquery_ui_timepicker.js" type="text/javascript"></script>
336336
<!-- <script src="js/tidepoolsframeworks/APIkeys.js"></script> UNCOMMENT TO LOAD YOUR API Keys-->
337-
<script src="js/tidepoolsframeworks/global_functions.js" type="text/javascript"></script>
338-
<script src="js/tidepoolsframeworks/dragdrop.js" type="text/javascript"></script>
339-
<script src="js/tidepoolsframeworks/map_rendering.js" type="text/javascript"></script>
340-
<script src="js/tidepoolsframeworks/API_collect.js" type="text/javascript"></script>
341-
<script src="js/tidepoolsframeworks/landmark_functions.js" type="text/javascript"></script>
337+
<script src="js/tidepoolsframeworks/global_functions.js" type="text/javascript"></script>
338+
<script src="js/tidepoolsframeworks/dragdrop.js" type="text/javascript"></script>
339+
<script src="js/tidepoolsframeworks/map_rendering.js" type="text/javascript"></script>
340+
<script src="js/tidepoolsframeworks/API_collect.js" type="text/javascript"></script>
341+
<script src="js/tidepoolsframeworks/landmark_functions.js" type="text/javascript"></script>
342342
<script src="js/tidepools.js" type="text/javascript"></script>
343343
</div>
344344
</body>
345-
</html>
345+
</html>

‎js/tidepoolsframeworks/map_rendering.js‎

Lines changed: 2 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132

133133
function(landmarks){
134134

135-
135+
136136
// check feed type to specify what data to show in scroller from query
137137
if (feedType == "landmarks"){
138138
$('#nav').load('php/landmark_feed.php',{'data':landmarks}); // also sending along the lat/long where landmark was dropped
@@ -145,7 +145,7 @@
145145
drawLandmarks(landmarks); //render data on map
146146
}
147147

148-
148+
149149
}
150150
);
151151
}
@@ -193,68 +193,6 @@
193193

194194
//-----------------------------------------//
195195

196-
//*****************************************
197-
/*
198-
function reBoundSearch(){
199-
200-
if (APIload == true){
201-
getAPIs(); //reloading APIs after every map change, but this SHOULD be storing values for a time duration, then re-requesting
202-
}
203-
204-
var bounds = map.getBounds(); //geo coordinates of users current window
205-
206-
//--- Should we filter out some landmarks?---//
207-
208-
if (currentFilter !== undefined){
209-
reBoundFilter(currentFilter);
210-
return;
211-
}
212-
213-
if (currentMap !== "combined"){
214-
reBoundFilter(currentFilter);
215-
return;
216-
}
217-
//-----------//
218-
219-
else {
220-
221-
$.postJSON("php/rebound.php", //what data is inside this geo window?
222-
{
223-
'nelat' : bounds._northEast.lat,
224-
'nelng' : bounds._northEast.lng,
225-
'swlat' : bounds._southWest.lat,
226-
'swlng' : bounds._southWest.lng,
227-
'mapIDs' : mapIDArray
228-
},
229-
230-
function(landmarksSearch){
231-
232-
233-
drawLandmarks(searchResult); //render data on map
234-
235-
// check feed type to specify what data to show in scroller from query
236-
if (feedType == "landmarks"){
237-
$('#nav').load('php/landmark_feed.php',{'data':landmarks}); // also sending along the lat/long where landmark was dropped
238-
}
239-
240-
if (feedType == "comments"){
241-
$('#nav').load('php/landmark_feed_shouts.php',{'data':landmarks}); // also sending along the lat/long where landmark was dropped
242-
}
243-
244-
if (feedType == "searchResults"){
245-
// $('#nav').html(searchResult);
246-
$('#nav').load('php/search_results_feed.php',{'data':searchResult});
247-
}
248-
}
249-
);
250-
}
251-
}
252-
253-
254-
//*****************************************
255-
*/
256-
257-
258196

259197
//when map is clicked, filters only this map
260198
function reBoundFilterMap(mapID,divID){

‎php/landmark_feed.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
/**
44
* landmark_feed.php
55
*
6-
* Displays list view of landmarks currently on map.
6+
* Displays list view of appropriate landmarks, either those currently on map or
7+
* those returned from search results.
78
*
89
*
910
*.---. . .

‎php/search.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
break;
9797
case "loc":
9898
// get starting point and radius
99-
// starting point is hard-coded into search.html for now
99+
// starting point is hard-coded into index.html for now
100100
// later, this will be handled by the map interface
101101
$sanTerm = (float) $sanTerm;
102102
$distanceUnits = $_POST['distUnits'];
@@ -136,7 +136,7 @@
136136
}
137137

138138
// query database
139-
139+
140140

141141
$cursor = $collection -> find($query);
142142

‎php/search_results_feed.php‎

Lines changed: 0 additions & 129 deletions
This file was deleted.

‎search.html‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)