Merge branch 'release/first_release'

Conflicts:
	application/static/img/Thumbs.db
	application/static/js/home.js
	application/static/js/main.js
	application/templates/base.html

Author: Georgi Tenev

.gitignore

@@ -11,3 +11,5 @@ venv
 
 # Don't store secret keys in version control
 secret_keys.py
+application/static/js/Thumbs.db
+application/static/img/Thumbs.db

app.yaml

@@ -1,4 +1,4 @@
-application: cobalt-mantis-732
+application: terra-cognita
 version: 1
 runtime: python27
 api_version: 1

application/api/servers/airquality.py

@@ -0,0 +1,26 @@
+import urllib2
+import json
+import sys
+
+from google.appengine.api import users
+from google.appengine.runtime.apiproxy_errors import CapabilityDisabledError
+from flask import request, render_template, flash, url_for, redirect, Blueprint
+from flask_cache import Cache
+from application.decorators import login_required, admin_required
+from application.forms import ExampleForm
+from application.models import ExampleModel
+from application import app
+from application.api.servers.xmltodict import xmltodict
+
+def getData():
+	url = 'http://uk-air.defra.gov.uk/assets/rss/current_site_levels.xml'
+
+	f = urllib2.urlopen(url)
+	xmldata = f.read()
+	f.close()
+
+	data = xmltodict.parse(xmldata)
+	data = data['rss']['channel']['item']
+	jsondata = json.dumps(data)
+
+	return jsondata

application/api/servers/foodstandartsagency.py

@@ -12,21 +12,70 @@
 
 from flask_cache import Cache
 
-
-
 from application.decorators import login_required, admin_required
 from application.forms import ExampleForm
 from application.models import ExampleModel
 
 from application import app
 
-# Flask-Cache (configured to use App Engine Memcache API)
-cache = Cache(app)
 
-def getData(name, location, format):
-	url = "http://ratings.food.gov.uk/search/" + name + "/" + location + "/" + format
-	data = urllib2.urlopen(url)
+url = 'http://ratings.food.gov.uk/'
+format = 'json'
+
+#private
+def getData():
+	global url, format
+
+	try: 
+	#obtaining the data in order to get the number of entries
+		data = json.load(urllib2.urlopen(url + '/' + format))
+
+		#building the new url setting the parameter PageSize to be equal to the number of entries
+		url += '/1/' + data['FHRSEstablishment']['Header']['ItemCount'] + '/' + format
+
+		data = urllib2.urlopen(url, timeout=20)
+	except Exception as e:
+		url = 'http://ratings.food.gov.uk/'
+		raise
+	#for testing purposes
+	#print url
+	#print json.load(data)
+
+	#reseting the url
+	url = 'http://ratings.food.gov.uk/'
 	#remove the headers, and only get the relevant info
 	result = json.load(data)['FHRSEstablishment']['EstablishmentCollection']['EstablishmentDetail']
+	result = json.dumps(result)
+
+	return result
+
+#IMPORTANT!
+#
+#In order to get data for every location or every restaurant pass 'all' as a value (e.g. searchNameLoc(all, southampton))
+def searchNameLoc(name, location):
+	global url
+	if name == 'all':
+		name = '^'
+	if location =='all':
+		location = '^'
+	url += 'search/' + name + "/" + location
+	return getData()
+
+def searchName(name):
+	global url
+
+	if name == 'all':
+		name = '^'
+	url += 'search-name/' + name
+	return getData()
+
+def searchLoc(location):
+	global url
+	if location =='all':
+		location = '^'
+	url += 'search-address/' + location
+	return getData()	
 
-	return result
+#searchNameLoc('tesco','southampton')
+#searchName('parfait')
+#searchLoc('southampton')

application/api/servers/geocoding.py

@@ -1,7 +1,3 @@
-"""
-handles interaction with the worldbank api
-
-"""
 import urllib2
 import json
 
@@ -36,15 +32,24 @@
 
 components = "components=country:UK"
 def getData(address):
+	address = urllib2.quote(address, safe="%/:=&?~#+!$,;'@()*[]")
 	url = "https://maps.googleapis.com/maps/api/geocode/json?address="+address+"&"+components+"&"+"sensor=false"+"&"+"key="+API_KEY
 	request = urllib2.urlopen(url)	
-	result = json.load(request)
+	#result = json.load(request)
 
+	return request.read()
+
+def getBounds(address):
+	locationData = json.loads(getData(address))
+	try:
+		bounds = locationData["results"][0]["geometry"]["bounds"]
+	except Exception, e:
+		bounds = locationData["results"][0]["geometry"]["viewport"]
+	result = [[bounds["northeast"]["lat"], bounds["northeast"]["lng"]],[bounds["southwest"]["lat"], bounds["southwest"]["lng"]]]
 	return result
 
-
-
-
-
-
-
+def getCoordinates(address):
+	locationData = json.loads(getData(address))
+	location = locationData["results"][0]["geometry"]["location"]
+	result = [location["lat"], location["lng"]]
+	return result

application/api/servers/houses.py

@@ -0,0 +1,80 @@
+import urllib2
+import json
+
+from google.appengine.api import users
+from google.appengine.runtime.apiproxy_errors import CapabilityDisabledError
+from flask import request, render_template, flash, url_for, redirect, Blueprint
+from flask_cache import Cache
+from application.decorators import login_required, admin_required
+from application.forms import ExampleForm
+from application.models import ExampleModel
+from application import app
+
+url = 'http://api.nestoria.co.uk/api?'
+format = 'json'
+country = 'uk'
+pretty = '1'
+
+#private
+def getData():
+	global url
+
+	#for testing purposes
+	# print url
+	# print json.load(data)
+	try: 
+		data = urllib2.urlopen(url+'1')
+		data = json.load(data)
+		total_pages = int(data['response']['total_pages'])
+		if total_pages > 20:
+			total_pages = 20
+
+		result = '['
+
+		for i in range(0, total_pages):
+			data = urllib2.urlopen(url + str(i+1))
+			data = json.load(data)
+
+			result += json.dumps(data['response']['listings'])[1:-1] + ', '
+	except Exception as e:
+		url = 'http://api.nestoria.co.uk/api?'
+		raise
+		
+
+	result = result[:-2] + ']'
+
+	url = 'http://api.nestoria.co.uk/api?'
+
+	return result
+
+#private
+def urlBuild(req):
+	global url
+
+	url += 'pretty=' + pretty + '&'
+
+	if(type(req) is str):
+		url += 'place_name=' + req + '&'
+
+	elif(req and len(req) == 4):
+		if(req[3] == 'km' or req[3] == 'mi'):
+			url += 'centre_point=' + str(req[0]) + ',' + str(req[1]) + ',' + str(req[2]) + req[3] + '&'
+		elif(req[3]):
+			url += 'south_west=' + str(req[0]) + ',' + str(req[1]) + '&north_east=' + str(req[2]) + ',' + str(req[3]) + '&'
+
+
+#req is expected to be a name of a plcae or an array with 4 elements with either
+#	4 numbers indicating the lat,lng of the south west and north east points of the area
+#	OR
+#	3 numbers indicating the lat,lng of a point that is going to be considered a center of the area
+#	followed by the radius and either 'km' or 'mi' as the last 4th element
+def getListing(req,listing_type):
+	global url
+	
+	urlBuild(req)
+
+	url += 'encoding=' + format + '&action=search_listings&country=' + country + "&listing_type=" + listing_type + "&number_of_results=50&page="
+	return getData()
+
+#getListing([51,-3,10,'km'],'rent')
+#getListing('southampton','buy')