Skip to content

Commit

Permalink
Merge pull request #348 from mehtadev17/master
Browse files Browse the repository at this point in the history
removing unused endpoint
  • Loading branch information
sephcoster committed Jul 20, 2015
2 parents ac6ce31 + ad49c45 commit 419ace4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 52 deletions.
11 changes: 1 addition & 10 deletions mapusaurus/api/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from mock import Mock

from utils import use_GET_in
from api.views import msa, msas, tables
from api.views import msas, tables

class ConversionTest(TestCase):
def test_use_GET_in(self):
Expand Down Expand Up @@ -83,15 +83,6 @@ def test_api_msas_endpoint(self):
self.assertTrue(isinstance(result_list, list))
self.assertContains(resp, '49180')

def test_api_msa_endpoint(self):
"""should return tract-level geojson for a lender/MSA pair"""
params = {'lender': '90000451965', 'metro': '49180'}
url = reverse(msa)
resp = self.client.get(url, params)
result_dict = json.loads(resp.content)
self.assertTrue(isinstance(result_dict, dict))
self.assertContains(resp, 'features')

def test_api_tables_endpoint(self):
"""should return table_data json for a lender/MSA pair"""
params = {'lender': '90000451965', 'metro': '49180'}
Expand Down
1 change: 0 additions & 1 deletion mapusaurus/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
url(r'^hmda/', 'api.views.hmda', name='hmda'),
url(r'^census/', 'api.views.census', name='census'),
url(r'^tables/', 'api.views.tables', name='tables'),
url(r'^msa/', 'api.views.msa', name='msa'),
url(r'^msas/', 'api.views.msas', name='msas'),
url(r'^tractCentroids/', 'api.views.tractCentroids', name='tractCentroids'),
url(r'^branchLocations/', 'api.views.branch_locations', name='branchLocations'),
Expand Down
41 changes: 0 additions & 41 deletions mapusaurus/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,47 +37,6 @@ def msas(request):
except:
return HttpResponseNotFound("Invalid lat/lon bounding coordinates")

def msa(request):
"""returns simplified tract shapes for dot-density mapping, with loan volume"""
try:
metro = request.GET.get('metro')
tracts = Geo.objects.filter(geo_type=Geo.TRACT_TYPE, cbsa=metro)
tract_loans = loan_originations_as_json(request)
except:
return HttpResponseNotFound("request failed; details: %s" % request)
else:
try:
with open("/var/www/static/tracts/%s.json" % metro, 'r') as f:
local_tracts = json.loads(f.read())
except:
local_tracts = None
tracts_out = {
"type": "FeatureCollection",
"features": []
}
if local_tracts:
for tract_id in local_tracts:
volume = 0
if tract_id in tract_loans and tract_loans[tract_id]['volume']:
volume += tract_loans[tract_id]['volume']
tracts_out['features'].append({
"type": "Feature",
"geometry": {"type": "Polygon", "coordinates": local_tracts[tract_id]},
"properties": {"tract_id": tract_id, "volume": volume}
})
else:
for tract in tracts:
volume = 0
if tract.geoid in tract_loans and isinstance(tract_loans[tract.geoid]['volume'], int):
volume += tract_loans[tract.geoid]['volume']
tracts_out['features'].append({
"type": "Feature",
"geometry": {"type": "Polygon", "coordinates": tract.geom.simplify(0.001).coords},
"properties": {"tract_id": tract.geoid, "volume": volume}
})
context = {'tracts': tracts_out}
return HttpResponse(json.dumps(context), content_type='application/json')

def hmda(request):
"""This endpoint returns hmda data using params from the request"""
return HttpResponse(json.dumps(loan_originations_as_json(request)), content_type='application/json')
Expand Down

0 comments on commit 419ace4

Please sign in to comment.