Merge pull request #382 from cfpb/census-tooltips

Remove year from tract tooltips

frontend/src/js/drawCircles.js

@@ -30,8 +30,8 @@
         var circle = L.circle([geo.centlat, geo.centlon],
                               hmdaStat(data), style );
 
-        //  We will use the geoid when redrawing
-        circle.geoid = geo.geoid;
+        //  We will use the tractid when redrawing
+        circle.tractid = geo.tractid || '';
         circle.volume = geo.volume;
         circle.type = "tract-circle";
         circle.keyCircle = 0;
@@ -42,7 +42,7 @@
 
         circle.on('mouseover mousemove', function(e){
             new L.Rrose({ offset: new L.Point(0,0), closeButton: false, autoPan: false, y_bound: 160 })
-                .setContent('<div class="bubble-header">Tract '+ circle.geoid + 
+                .setContent('<div class="bubble-header">Tract '+ circle.tractid + 
                     '</div><div class="lar-count"><span class="circle-hover-data">' +data['volume'] + 
                     '</span><span class="circle-hover-label">LAR</span></div><div class="hh-count"><span class="circle-hover-data">' + data['num_households'] + 
                     '</span><span class="circle-hover-label">Households</span></div></div>')
@@ -84,4 +84,4 @@
 
     /*
         END DRAW CIRCLES AND MARKERS SECTION
-    */
+    */

mapusaurus/hmda/views.py

@@ -50,16 +50,19 @@ def loan_originations(request):
             query = query.filter(action_taken__in=action_taken_selected)
 
     #count on geo_id
-    query = query.values('geo_id', 'geo__census2010households__total', 'geo__centlat', 'geo__centlon').annotate(volume=Count('geo_id'))
+    query = query.values('geo_id', 'geo__census2010households__total', 'geo__centlat', 'geo__centlon',
+                         'geo__state', 'geo__county', 'geo__tract').annotate(volume=Count('geo_id'))
     return query; 
 
 def loan_originations_as_json(request):
     records = loan_originations(request)
     data = {}
     if records:
         for row in records:
+            tract_id = row['geo__state']+row['geo__county']+row['geo__tract']
             data[row['geo_id']] = {
                 'geoid': row['geo_id'],
+                'tractid': tract_id,
                 'volume': row['volume'],
                 'num_households': row['geo__census2010households__total'],
                 'centlat': row['geo__centlat'],