added geojson d3 map of nyc boroughs
Merge branch 'master' into d3_map
added all markets on d3
working on code to pull full JSON object, all changes reverted to original
working on code to pull full JSON object, all changes reverted to original
reconciled merge conflict in map.js, added routes to file using annotate, reorganized elements on show page, created style classes for new elements on show page
reconciled merge conflict in map.js
removed debugger from map2, finished organizing detailed info in markets/show page, worked with css to properly align labels and data in box on markets/show page
refactored code for
displaying detailed market info on show page, reorered elements, chnaged css
messing with the d4 map
fixed merge issues
resolved merge conflicts