Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Yufei Yuan-Assignment 4 #15

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions lab/lab1/part1.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ to true.
===================== */

var query1;

query1 = _.isFunction(printMenu);
console.log('printMenu is a function:', query1);

/* =====================
Expand All @@ -73,7 +73,7 @@ to true.
===================== */

var query2;

query2 = _.isArray(bakedGoods);
console.log('bakedGoods is an array:', query2);

/* =====================
Expand All @@ -82,39 +82,39 @@ underscore. Should evaluate to true.
===================== */

var query3;

query3 = _isObject(_.first(bakedGoods));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dont forget that . with underscore

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed

console.log('The first element in bakedGoods is an object:', query3);

/* =====================
Use _.where to return all cakes. Or bread. Whichever is your favorite.
===================== */

var query4;

query4 = _.where(bakedGoods, {type:'Cake'});
console.log('All bread. Or cakes:', query4);

/* =====================
Use _.filter to return all baked goods that cost more than $4.
===================== */

var query5;

query5 = ._filter(bakedGoods, function(obj) {return obj.price>4;});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

order is important with the .. and _

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed

console.log('More than $4:', query5);

/* =====================
Use _.sortBy to order the list by inventory (from lowest to highest).
===================== */

var query6;

query6 = _.sortBy(bakedGoods, bakedGoods, 'inventory');
console.log('Sorted by inventory (lowest to highest):', query6);

/* =====================
Use _.groupBy to organize the baked goods by type.
===================== */

var query7;

query7 = _.groupBy(bakedGoods, 'type');
console.log('Grouped by type:', query7);

/* =====================
Expand Down
14 changes: 8 additions & 6 deletions lab/lab2/js/part1-ajax-calls.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
This recipe, can be used by underscore's _.filter. It will return only words with
>=5 characters.
===================== */
var isLengthOfFiveOrMore = function(str) {};
var isLengthOfFiveOrMore = function(str) {return str.length >= 5;};

console.log("isLengthOfFiveOrMore success:",
_.isEqual(_.filter(['this', 'is','a', 'test', 'testing'], isLengthOfFiveOrMore), ['testing']));
Expand All @@ -30,15 +30,15 @@ console.log("isLengthOfFiveOrMore success:",
function you write along with underscore's _.each to log the double of every
number in the provided array.
===================== */
var logDouble = function(num) {};
var logDouble = function(num) {return (num * 2);};
var theArray = [1, 5, 20, 100];

console.log(_.each(theArray, logDouble)

/* =====================
Given this already defined function, define fizzbuzzArray so that, when mapped
over, it will equal ['fizz', 'buzz', 'fizzbuzz'];
===================== */
var fizzbuzzArray = [];
var fizzbuzzArray = [3, 5, 15];
var fizzbuzzFunc = function(num) {
var str = '';
if (num % 3 === 0) { str = 'fizz'; }
Expand Down Expand Up @@ -103,13 +103,15 @@ var phillyBikeCrashesDataUrl = "https://raw.githubusercontent.com/CPLN692-MUSA61
Remember to call all code within the function body. Use console.log to make sure
that this step is completed before moving on!
===================== */

$.ajax(phillySolarInstallationDataUrl).done(function(a){
var solarInstallation=JSON.parse(a);
console.log(solarInstallation);

/* =====================
Now that you've properly parsed your data, use _.each to plot the
dataset you've pulled down.
===================== */

_.each(solarInstallation, function(i){L.marker([i.Lat, i.Lng]).addTo(map);});

/* =====================
Leaflet setup - feel free to ignore this
Expand Down
24 changes: 16 additions & 8 deletions lab/lab2/js/part2-app-state.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* =====================
/* =====================
Lab 2, part 2 - application state

Spatial applications aren't typically as simple as putting data on a map. In
Expand Down Expand Up @@ -34,10 +34,17 @@
===================== */

// We set this to HTTP to prevent 'CORS' issues
var downloadData = $.ajax("http://");
var parseData = function() {};
var makeMarkers = function() {};
var plotMarkers = function() {};
var downloadData = $.ajax("datasets/geojson/HousingCounselingAgencies.geojson");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where and what is this dataset?

Does it work for you? i get an error.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should work now.

var parseData = function(data) {
return JSON.parse(data);
};
var makeAMarker = function(list) {
var listOfMarkers=[];
_.each(list, function(obj){listOfMarkers.push(L.marker([obj.Lat, obj.Lng]));});
return listOfMarkers;
};
var plotMarkers = function(list) {_.each(list, function(obj){obj.addTo(map);});
};


/* =====================
Expand All @@ -53,7 +60,7 @@ var plotMarkers = function() {};
user's input.
===================== */

var removeMarkers = function() {};
var removeMarkers = function(list) {_.each(list, function(obj){map.removeLayer(obj);});};

/* =====================
Optional, stretch goal
Expand Down Expand Up @@ -85,7 +92,8 @@ var Stamen_TonerLite = L.tileLayer('http://stamen-tiles-{s}.a.ssl.fastly.net/ton

downloadData.done(function(data) {
var parsed = parseData(data);
var markers = makeMarkers(parsed);
var markers = makeAMarker(parsed);
var markersFilter = function(listNotFiltered){_.filter(listNotFiltered, function(a){return a.HOUSE<2000;});};
plotMarkers(markers);
removeMarkers(markers);
removeMarkers(markersFilter(markers));
});
14 changes: 9 additions & 5 deletions lab/lab2/js/part3-application.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,29 @@ var resetMap = function() {
/* =====================
Fill out this function definition
===================== */
resetMap();
};

/* =====================
Define a getAndParseData function to grab our dataset through a jQuery.ajax call ($.ajax). It
will be called as soon as the application starts. Be sure to parse your data once you've pulled
it down!
===================== */
var getAndParseData = function() {
var downloadData = $.ajax("datasets/geojson/philadelphia-crime-points.geojson");
var getParseData = function(data) {return JSON.parse(data);};
/* =====================
Fill out this function definition
===================== */
var makeAMarker = function(data) {
var listOfMarkers=[];
_.each(list, function(obj){listOfMarkers.push(L.marker([obj.Lat, obj.Lng]));});
return listOfMarkers;
};

var markersFiltered = function(b){_.filter(listOfMarkers, function(b){return b.text_general_code === "Theft from Vehicle";});};
_.each(markersFiltered, function(d){L.marker([d.Lat, d.Lng]).addTo(map.bindPopup("Theft from Vehicle:" + String(c.location_block)));})
/* =====================
Call our plotData function. It should plot all the markers that meet our criteria (whatever that
criteria happens to be — that's entirely up to you)
===================== */
var plotData = function() {
/* =====================
Fill out this function definition
===================== */
};