Merge branch 'feature/create_file_structure' of https://github.com/cloudcomputingproject/main_repo into feature/create_file_structure

Author: dennyd

Diff for: application/api/external_api.py

@@ -23,6 +23,7 @@
 from servers import worldbank
 from servers import geocoding
 from servers import foodstandartsagency
+from servers import police
 
 # Flask-Cache (configured to use App Engine Memcache API)
 cache = Cache(app)
@@ -41,7 +42,8 @@
 servers = {
 'worldbank' : 1,
 'geocoding' : 2,
-'foodstandartsagency' : 3
+'foodstandartsagency' : 3,
+'police' : 4
 }
 
 @external_api.route('/api/'+str(servers['worldbank'])+'/<dataType>/<date>/<format>')
@@ -65,13 +67,36 @@ def getFoodStandartsAgencyData(name, location, format):
 	result = foodstandartsagency.getData(name, location, format)
 	return jsonify(result)
 
+#Gets the crime categories from the police api
+@external_api.route('/api/'+str(servers['police']))
+def getCrimeCategories():
+        result = police.getCategories()
+        return jsonify(result)
 
+# Gets the neighbourhoods in a county from the police api
+@external_api.route('/api/'+str(servers['police'])+'/<county>')
+def getNeighbourhoods(county):
+	result = police.getNeighbourhoodsData(county)
+	return jsonify(result)
 
+# Gets the boundary coordinates for a neighbourhood in a county
+@external_api.route('/api/'+str(servers['police'])+'/<county>/<nhood>')
+def getBoundary(county, nhood):
+	result = police.getBoundaryData(county, nhood)
+	return jsonify(result)
 
+# Gets the crimes done in this location during that month from the police api
+# The date must be a string in the format 'yyyy-mm'
+@external_api.route('/api/'+str(servers['police'])+'/<category>/<lat>/<lng>/<date>')
+def getCrimes(category, lat, lng, date):
+	result = police.getCrimesData(category, lat, lng, date)
+	return jsonify(result)
 
-
-
-
-
+# Gets the crimes done in this area during that month from the police api
+# The date must be a string in the format 'yyyy-mm'
+@external_api.route('/api/'+str(servers['police'])+'/<category>/<latArr>/<lngArr>/<date>')
+def getCrimesInArea(category, latArr, lngArr, date):
+	result = police.getCrimesInAreaData(category, latArr, lngArr, date)
+	return jsonify(result)
 
 

Diff for: application/api/servers/police.py

@@ -0,0 +1,77 @@
+
+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, json, jsonify
+
+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://data.police.uk/api/'
+
+def getData():
+    global url
+    #json object
+    data = urllib2.urlopen(url)
+    
+    #for testing purposes
+    #print json.load(data)
+    
+    url = 'http://data.police.uk/api/'
+    return data
+
+def getCategories():
+    global url
+    url += 'crime-categories?date=2011-08'
+    return getData()
+
+#Neighbourhoods must be lower case and the white spaces replaced with '-'
+def getNeighbourhoodsData(county):
+    global url
+    url += county + '/neighbourhoods'
+    return getData()
+
+def getBoundaryData(county, nhood):
+    global url
+    url += county + '/' + getNeighbourhoodID(county, nhood) + '/boundary'
+    return getData()
+
+def getNeighbourhoodID(county, nhood):
+    global url
+    url+= county + '/neighbourhoods'
+    data = json.load(urllib2.urlopen(url))
+    
+    for j in xrange(0, len(data)):
+        if data[j]["name"] == nhood:
+            return data[j]["id"]
+#date must be in the format yyyy-mm
+def getCrimesData(category, lat, lng, date):
+    global url
+    url+='crimes-street/' + category + '?lat=' + str(lat) + '&lng=' + str(lng) + '&date=' + date
+    return getData()
+
+def getCrimesInAreaData(category, latArr, lngArr, date):
+    global url
+    url+='crimes-street/' + category + '?poly='
+    for j in xrange(0, len(latArr)):
+        url+=str(latArr[j]) + ',' + str(lngArr[j]) + ':'
+    url = url[:-1]
+    url+='&date=' + date
+    return getData()
+
+
+#getCategories()
+#getNeighbourhoods('hampshire')
+#getBoundary('hampshire', 'Fair Oak')
+#getCrimes('all-crimes', 52.629729, -1.131592, '2014-09')
+#getCrimesInArea('all-crimes', [52.268, 52.794, 52.130], [0.543, 0.238, 0.478], '2014-09')

Diff for: index.yaml

@@ -9,4 +9,3 @@ indexes:
 # manually, move them above the marker line.  The index.yaml file is
 # automatically uploaded to the admin console when you next deploy
 # your application using appcfg.py.
-# test