-
Notifications
You must be signed in to change notification settings - Fork 35
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
04 assignment_final #19
Open
mehak-sachdeva
wants to merge
8
commits into
data-mining-the-city:master
Choose a base branch
from
mehak-sachdeva:04-assignment
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e5327c7
update
danilnagy 2c7ff58
update
danilnagy 4eec123
update
danilnagy 9186948
update
danilnagy 9d1b379
update
danilnagy a196b7d
update
danilnagy cc1ff1e
Assignment
mehak-sachdeva b191b8e
Assignment_week_5
mehak-sachdeva File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,7 @@ | |
import time | ||
import sys | ||
import random | ||
import math | ||
|
||
import pyorient | ||
|
||
|
@@ -16,6 +17,29 @@ | |
|
||
q = Queue() | ||
|
||
def point_distance(x1, y1, x2, y2): | ||
return ((x1-x2)**2.0 + (y1-y2)**2.0)**(0.5) | ||
|
||
def remap(value, min1, max1, min2, max2): | ||
return float(min2) + (float(value) - float(min1)) * (float(max2) - float(min2)) / (float(max1) - float(min1)) | ||
|
||
def normalizeArray(inputArray): | ||
maxVal = 0 | ||
minVal = 100000000000 | ||
|
||
for j in range(len(inputArray)): | ||
for i in range(len(inputArray[j])): | ||
if inputArray[j][i] > maxVal: | ||
maxVal = inputArray[j][i] | ||
if inputArray[j][i] < minVal: | ||
minVal = inputArray[j][i] | ||
|
||
for j in range(len(inputArray)): | ||
for i in range(len(inputArray[j])): | ||
inputArray[j][i] = remap(inputArray[j][i], minVal, maxVal, 0, 1) | ||
|
||
return inputArray | ||
|
||
def event_stream(): | ||
while True: | ||
result = q.get() | ||
|
@@ -41,11 +65,17 @@ def getData(): | |
lat2 = str(request.args.get('lat2')) | ||
lng2 = str(request.args.get('lng2')) | ||
|
||
w = float(request.args.get('w')) | ||
h = float(request.args.get('h')) | ||
cell_size = float(request.args.get('cell_size')) | ||
|
||
analysis = request.args.get('analysis') | ||
|
||
print "received coordinates: [" + lat1 + ", " + lat2 + "], [" + lng1 + ", " + lng2 + "]" | ||
|
||
client = pyorient.OrientDB("localhost", 2424) | ||
session_id = client.connect("root", "password") | ||
db_name = "property_test" | ||
session_id = client.connect("root", "http://localhost:2480/") | ||
db_name = "sofun" | ||
db_username = "admin" | ||
db_password = "admin" | ||
|
||
|
@@ -68,17 +98,80 @@ def getData(): | |
|
||
client.db_close() | ||
|
||
#ITERATE THROUGH THE DATA SET TO FIND THE MINIMUM AND MAXIMUM PRICE (YOU DID THIS IN A PREVIOUS ASSIGNMENT) | ||
|
||
max_price=0 | ||
min_price=1000000000000 | ||
for record in records: | ||
print record.maxmin | ||
if record.maxmin<min_price: | ||
min_price=record.maxmin | ||
if record.maxmin>max_price: | ||
max_price=record.maxmin | ||
|
||
output = {"type":"FeatureCollection","features":[]} | ||
|
||
for record in records: | ||
feature = {"type":"Feature","properties":{},"geometry":{"type":"Point"}} | ||
feature["id"] = record._rid | ||
feature["properties"]["name"] = record.title | ||
feature["properties"]["price"] = record.price | ||
#ADD THE NORMALIZED PRICE AS A PROPERTY TO THE DATA COMING BACK FROM THE SERVER | ||
#REMEMBER TO USE THE REMAP() HELPER FUNCTION WE DEFINED EARLIER | ||
feature["properties"]["normprice"] = remap(record.price, min_price, max_price, 0, 1) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This code is correct. |
||
feature["properties"]["normalized"]=record.normalized | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Where is the 'record.normalized' data coming from? |
||
|
||
feature["geometry"]["coordinates"] = [record.latitude, record.longitude] | ||
|
||
output["features"].append(feature) | ||
|
||
if analysis == "false": | ||
q.put('idle') | ||
return json.dumps(output) | ||
|
||
q.put('starting analysis...') | ||
|
||
output["analysis"] = [] | ||
|
||
numW = int(math.floor(w/cell_size)) | ||
numH = int(math.floor(h/cell_size)) | ||
|
||
grid = [] | ||
|
||
for j in range(numH): | ||
grid.append([]) | ||
for i in range(numW): | ||
grid[j].append(0) | ||
|
||
for record in records: | ||
|
||
pos_x = int(remap(record.longitude, lng1, lng2, 0, numW)) | ||
pos_y = int(remap(record.latitude, lat1, lat2, numH, 0)) | ||
|
||
#TRY TESTING DIFFERENT VALUES FOR THE SPREAD FACTOR TO SEE HOW THE HEAT MAP VISUALIZATION CHANGES | ||
spread = 15 | ||
|
||
for j in range(max(0, (pos_y-spread)), min(numH, (pos_y+spread))): | ||
for i in range(max(0, (pos_x-spread)), min(numW, (pos_x+spread))): | ||
grid[j][i] += 2 * math.exp((-point_distance(i,j,pos_x,pos_y)**2)/(2*(spread/2)**2)) | ||
|
||
grid = normalizeArray(grid) | ||
|
||
offsetLeft = (w - numW * cell_size) / 2.0 | ||
offsetTop = (h - numH * cell_size) / 2.0 | ||
|
||
for j in range(numH): | ||
for i in range(numW): | ||
newItem = {} | ||
|
||
newItem['x'] = offsetLeft + i*cell_size | ||
newItem['y'] = offsetTop + j*cell_size | ||
newItem['width'] = cell_size-1 | ||
newItem['height'] = cell_size-1 | ||
newItem['value'] = grid[j][i] | ||
|
||
output["analysis"].append(newItem) | ||
|
||
q.put('idle') | ||
|
||
return json.dumps(output) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,162 @@ | ||
| ||
|
||
var eventOutputContainer = document.getElementById("message"); | ||
var eventSrc = new EventSource("/eventSource"); | ||
|
||
eventSrc.onmessage = function(e) { | ||
console.log(e); | ||
eventOutputContainer.innerHTML = e.data; | ||
}; | ||
|
||
var tooltip = d3.select("div.tooltip"); | ||
var tooltip_title = d3.select("#title"); | ||
var tooltip_price = d3.select("#price"); | ||
|
||
|
||
var map = L.map('map').setView([22.539029, 114.062076], 16); | ||
|
||
//this is the OpenStreetMap tile implementation | ||
|
||
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { | ||
attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors' | ||
}).addTo(map); | ||
|
||
//uncomment for Mapbox implementation, and supply your own access token | ||
|
||
// L.tileLayer('https://api.tiles.mapbox.com/v4/{mapid}/{z}/{x}/{y}.png?access_token={accessToken}', { | ||
// attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>', | ||
// mapid: 'mapbox.light', | ||
// accessToken: [INSERT YOUR TOKEN HERE!] | ||
// }).addTo(map); | ||
|
||
//create variables to store a reference to svg and g elements | ||
|
||
|
||
|
||
var svg_overlay = d3.select(map.getPanes().overlayPane).append("svg"); | ||
var g_overlay = svg_overlay.append("g").attr("class", "leaflet-zoom-hide"); | ||
|
||
var svg = d3.select(map.getPanes().overlayPane).append("svg"); | ||
var g = svg.append("g").attr("class", "leaflet-zoom-hide"); | ||
|
||
function projectPoint(lat, lng) { | ||
return map.latLngToLayerPoint(new L.LatLng(lat, lng)); | ||
} | ||
|
||
function projectStream(lat, lng) { | ||
var point = projectPoint(lat,lng); | ||
this.stream.point(point.x, point.y); | ||
} | ||
|
||
var transform = d3.geo.transform({point: projectStream}); | ||
var path = d3.geo.path().projection(transform); | ||
|
||
function updateData(){ | ||
|
||
var mapBounds = map.getBounds(); | ||
var lat1 = mapBounds["_southWest"]["lat"]; | ||
var lat2 = mapBounds["_northEast"]["lat"]; | ||
var lng1 = mapBounds["_southWest"]["lng"]; | ||
var lng2 = mapBounds["_northEast"]["lng"]; | ||
|
||
// TEST VARIATIONS OF CELL SIZES TO CHANGE THE RESOLUTION OF THE ANALYSIS OVERLAY | ||
var cell_size = 10; | ||
var w = window.innerWidth; | ||
var h = window.innerHeight; | ||
|
||
var checked = document.getElementById("heatmap").checked | ||
|
||
request = "/getData?lat1=" + lat1 + "&lat2=" + lat2 + "&lng1=" + lng1 + "&lng2=" + lng2 + "&w=" + w + "&h=" + h + "&cell_size=" + cell_size + "&analysis=" + checked | ||
|
||
console.log(request); | ||
|
||
d3.json(request, function(data) { | ||
|
||
//create placeholder circle geometry and bind it to data | ||
var circles = g.selectAll("circle").data(data.features); | ||
|
||
circles.enter() | ||
.append("circle") | ||
.on("mouseover", function(d){ | ||
tooltip.style("visibility", "visible"); | ||
tooltip_title.text(d.properties.name); | ||
tooltip_price.text("Price: " + d.properties.price); | ||
}) | ||
.on("mousemove", function(){ | ||
tooltip.style("top", (d3.event.pageY-10)+"px") | ||
tooltip.style("left",(d3.event.pageX+10)+"px"); | ||
}) | ||
.on("mouseout", function(){ | ||
tooltip.style("visibility", "hidden"); | ||
}) | ||
// USING .attr("fill", ), ADD A PROPERTY FOR THE CIRCLES TO DEFINE THEIR COLOR BASED ON THE NORMALIZED PRICE | ||
// IMPLEMENT THE PRICE NORMALIZATION ON THE SERVER AND SEND WITH THE REST OF THE DATA BACK TO THE CLIENT | ||
// REMEMBER TO REMOVE THE FILL STYLING FOR THE CIRCLES FROM THE style.css FILE OR THIS WILL OVERRIDE THE NEW COLOR | ||
|
||
.attr("fill", function(d){ | ||
-+ return "hsl(" + Math.floor(d.properties.normprice*100+150) + ", 100%, 70%)"; | ||
- }) | ||
- .attr("fill-opacity", function(d){ | ||
- tooltip_price.style("fill-opacity",".5") | ||
- }) | ||
; | ||
|
||
|
||
// call function to update geometry | ||
update(); | ||
map.on("viewreset", update); | ||
|
||
if (checked == true){ | ||
|
||
var topleft = projectPoint(lat2, lng1); | ||
|
||
svg_overlay.attr("width", w) | ||
.attr("height", h) | ||
.style("left", topleft.x + "px") | ||
.style("top", topleft.y + "px"); | ||
|
||
//create placeholder rect geometry and bind it to data | ||
var rectangles = g_overlay.selectAll("rect").data(data.analysis); | ||
rectangles.enter().append("rect"); | ||
|
||
rectangles | ||
.attr("x", function(d) { return d.x; }) | ||
.attr("y", function(d) { return d.y; }) | ||
.attr("width", function(d) { return d.width; }) | ||
.attr("height", function(d) { return d.height; }) | ||
.attr("fill-opacity", ".2") | ||
.attr("fill", function(d) { return "hsl(" + Math.floor((1-d.value)*250) + ", 100%, 50%)"; }); | ||
|
||
}; | ||
|
||
// function to update the data | ||
function update() { | ||
|
||
g_overlay.selectAll("rect").remove() | ||
|
||
// get bounding box of data | ||
var bounds = path.bounds(data), | ||
topLeft = bounds[0], | ||
bottomRight = bounds[1]; | ||
|
||
var buffer = 50; | ||
|
||
// reposition the SVG to cover the features. | ||
svg .attr("width", bottomRight[0] - topLeft[0] + (buffer * 2)) | ||
.attr("height", bottomRight[1] - topLeft[1] + (buffer * 2)) | ||
.style("left", (topLeft[0] - buffer) + "px") | ||
.style("top", (topLeft[1] - buffer) + "px"); | ||
|
||
g .attr("transform", "translate(" + (-topLeft[0] + buffer) + "," + (-topLeft[1] + buffer) + ")"); | ||
|
||
// update circle position and size | ||
circles | ||
.attr("cx", function(d) { return projectPoint(d.geometry.coordinates[0], d.geometry.coordinates[1]).x; }) | ||
.attr("cy", function(d) { return projectPoint(d.geometry.coordinates[0], d.geometry.coordinates[1]).y; }) | ||
.attr("r", function(d) { return Math.pow(d.properties.price,.3); }); | ||
}; | ||
}); | ||
|
||
}; | ||
|
||
updateData(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
body { | ||
padding: 0; | ||
margin: 0; | ||
font-family: Helvetica, Arial, sans-serif; | ||
font-size: 12px; | ||
line-height: 18px; | ||
} | ||
html, body, #map { | ||
height: 100%; | ||
} | ||
|
||
circle:hover { | ||
stroke: black; | ||
stroke-width: 2px; | ||
cursor: crosshair; | ||
} | ||
|
||
div.tooltip{ | ||
padding: 6px; | ||
background: white; | ||
visibility: hidden; | ||
position: absolute; | ||
z-index: 10; | ||
} | ||
p.tooltip-text{ | ||
margin: 0px; | ||
padding: 0px; | ||
} | ||
|
||
div.menu{ | ||
position: fixed; | ||
margin: 0px; | ||
padding: 10px; | ||
top: 0px; | ||
right: 0px; | ||
width: 250px; | ||
height: 500px; | ||
background: rgba(255,255,255,.8); | ||
} | ||
|
||
em{ | ||
color: red; | ||
font-weight: bold; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a feature called 'maxmin' in the records?