';
+ for (j = 0; r > j; j++) f.$headerIndexed[j].length && (p = f.$headerIndexed[j] && f.$headerIndexed[j][0].colSpan || 0,
+ t += p > 1 ? ' j; j++) m = !1, k = f.$headerIndexed[j], k && k.length && (h = b.getColumnElm(f, f.$filters, j),
+ o = d.getColumnData(c, g.filter_functions, j), l = g.filter_functions && o && "function" != typeof o || k.hasClass("filter-select"),
+ i = d.getColumnData(c, f.headers, j), m = "false" === d.getData(k[0], i, "filter") || "false" === d.getData(k[0], i, "parser"),
+ l ? t = a("").appendTo(h) : (o = d.getColumnData(c, g.filter_formatter, j),
+ o ? (g.filter_formatterCount++, t = o(h, j), t && 0 === t.length && (t = h.children("input")),
+ t && (0 === t.parent().length || t.parent().length && t.parent()[0] !== h[0]) && h.append(t)) : t = a('' + (q.data("placeholder") || q.attr("data-placeholder") || p.filter_placeholder.select || "") + " ", s = o.$table.find("thead").find("select." + c.filter + '[data-column="' + e + '"]').val();
- if (("undefined" == typeof f || "" === f) && (f = b.filter.getOptionSource(d, e, h)),
- a.isArray(f)) {
- for (i = 0; i < f.length; i++) k = f[i] = ("" + f[i]).replace(/\"/g, """),
- j = k, k.indexOf(p.filter_selectSourceSeparator) >= 0 && (l = k.split(p.filter_selectSourceSeparator),
- j = l[0], k = l[1]), r += "" !== f[i] ? "' + k + " " : "";
- f = [];
+ buildSelect: function(d, f, g, h, i) {
+ if (d = a(d)[0], f = parseInt(f, 10), d.config.cache && !a.isEmptyObject(d.config.cache)) {
+ var j, k, l, m, n, o, p, q = d.config, r = q.widgetOptions, s = q.$headerIndexed[f], t = '' + (s.data("placeholder") || s.attr("data-placeholder") || r.filter_placeholder.select || "") + " ", u = q.$table.find("thead").find("select." + e.filter + '[data-column="' + f + '"]').val();
+ if (("undefined" == typeof g || "" === g) && (g = b.getOptionSource(d, f, i)), a.isArray(g)) {
+ for (j = 0; j < g.length; j++) if (p = g[j], p.text) {
+ p["data-function-name"] = "undefined" == typeof p.value ? p.text : p.value, t += "";
+ } else "" + p != "[object Object]" && (l = p = ("" + p).replace(c.quote, """),
+ k = l, l.indexOf(r.filter_selectSourceSeparator) >= 0 && (m = l.split(r.filter_selectSourceSeparator),
+ k = m[0], l = m[1]), t += "" !== p ? "' + l + " " : "");
+ g = [];
}
- m = (o.$filters ? o.$filters : o.$table.children("thead")).find("." + c.filter),
- p.filter_$externalFilters && (m = m && m.length ? m.add(p.filter_$externalFilters) : p.filter_$externalFilters),
- n = m.filter('select[data-column="' + e + '"]'), n.length && (n[g ? "html" : "append"](r),
- a.isArray(f) || n.append(f).val(s), n.val(s));
+ n = (q.$filters ? q.$filters : q.$table.children("thead")).find("." + e.filter),
+ r.filter_$externalFilters && (n = n && n.length ? n.add(r.filter_$externalFilters) : r.filter_$externalFilters),
+ o = n.filter('select[data-column="' + f + '"]'), o.length && (o[h ? "html" : "append"](t),
+ a.isArray(g) || o.append(g).val(u), o.val(u));
}
},
buildDefault: function(a, c) {
- var d, e, f, g = a.config, h = g.widgetOptions, i = g.columns;
- for (d = 0; i > d; d++) e = g.$headerIndexed[d], f = !(e.hasClass("filter-false") || e.hasClass("parser-false")),
- (e.hasClass("filter-select") || b.getColumnData(a, h.filter_functions, d) === !0) && f && b.filter.buildSelect(a, d, "", c, e.hasClass(h.filter_onlyAvail));
+ var e, f, g, h = a.config, i = h.widgetOptions, j = h.columns;
+ for (e = 0; j > e; e++) f = h.$headerIndexed[e], g = !(f.hasClass("filter-false") || f.hasClass("parser-false")),
+ (f.hasClass("filter-select") || d.getColumnData(a, i.filter_functions, e) === !0) && g && b.buildSelect(a, e, "", c, f.hasClass(i.filter_onlyAvail));
}
- }, b.getFilters = function(d, e, f, g) {
- var h, i, j, k, l = !1, m = d ? a(d)[0].config : "", n = m ? m.widgetOptions : "";
- if (e !== !0 && n && !n.filter_columnFilters) return a(d).data("lastSearch");
- if (m && (m.$filters && (i = m.$filters.find("." + c.filter)), n.filter_$externalFilters && (i = i && i.length ? i.add(n.filter_$externalFilters) : n.filter_$externalFilters),
+ }, c = b.regex, d.getFilters = function(c, d, f, g) {
+ var h, i, j, k, l = !1, m = c ? a(c)[0].config : "", n = m ? m.widgetOptions : "";
+ if (d !== !0 && n && !n.filter_columnFilters || a.isArray(f) && f.join("") === m.lastCombinedFilter) return a(c).data("lastSearch");
+ if (m && (m.$filters && (i = m.$filters.find("." + e.filter)), n.filter_$externalFilters && (i = i && i.length ? i.add(n.filter_$externalFilters) : n.filter_$externalFilters),
i && i.length)) for (l = f || [], h = 0; h < m.columns + 1; h++) k = h === m.columns ? n.filter_anyColumnSelector + "," + n.filter_multipleColumnSelector : '[data-column="' + h + '"]',
- j = i.filter(k), j.length && (j = b.filter.getLatestSearch(j), a.isArray(f) ? (g && j.slice(1),
+ j = i.filter(k), j.length && (j = b.getLatestSearch(j), a.isArray(f) ? (g && j.length > 1 && (j = j.slice(1)),
h === m.columns && (k = j.filter(n.filter_anyColumnSelector), j = k.length ? k : j),
- j.val(f[h]).trigger("change.tsfilter")) : (l[h] = j.val() || "", h === m.columns ? j.slice(1).filter('[data-column*="' + j.attr("data-column") + '"]').val(l[h]) : j.slice(1).val(l[h])),
+ j.val(f[h]).trigger("change" + m.namespace)) : (l[h] = j.val() || "", h === m.columns ? j.slice(1).filter('[data-column*="' + j.attr("data-column") + '"]').val(l[h]) : j.slice(1).val(l[h])),
h === m.columns && j.length && (n.filter_$anyMatch = j));
return 0 === l.length && (l = !1), l;
- }, b.setFilters = function(c, d, e, f) {
- var g = c ? a(c)[0].config : "", h = b.getFilters(c, !0, d, f);
- return g && e && (g.lastCombinedFilter = null, g.lastSearch = [], b.filter.searching(g.table, d, f),
- g.$table.trigger("filterFomatterUpdate")), !!h;
+ }, d.setFilters = function(c, e, f, g) {
+ var h = c ? a(c)[0].config : "", i = d.getFilters(c, !0, e, g);
+ return "undefined" == typeof f && (f = !0), h && f && (h.lastCombinedFilter = null,
+ h.lastSearch = [], b.searching(h.table, e, g), h.$table.triggerHandler("filterFomatterUpdate")),
+ !!i;
};
}(jQuery), function(a, b) {
"use strict";
- var c = a.tablesorter = a.tablesorter || {};
+ var c = a.tablesorter || {};
a.extend(c.css, {
sticky: "tablesorter-stickyHeader",
stickyVis: "tablesorter-sticky-visible",
stickyHide: "tablesorter-sticky-hidden",
stickyWrap: "tablesorter-sticky-wrapper"
}), c.addHeaderResizeEvent = function(b, c, d) {
- b = a(b)[0];
- var e, f = {
- timer: 250
- }, g = a.extend({}, f, d), h = b.config, i = h.widgetOptions, j = function(b) {
- i.resize_flag = !0, e = [], h.$headers.each(function() {
- var b = a(this), c = b.data("savedSizes") || [ 0, 0 ], d = this.offsetWidth, f = this.offsetHeight;
- (d !== c[0] || f !== c[1]) && (b.data("savedSizes", [ d, f ]), e.push(this));
- }), e.length && b !== !1 && h.$table.trigger("resize", [ e ]), i.resize_flag = !1;
- };
- return j(!1), clearInterval(i.resize_timer), c ? (i.resize_flag = !1, !1) : void (i.resize_timer = setInterval(function() {
- i.resize_flag || j();
- }, g.timer));
+ if (b = a(b)[0], b.config) {
+ var e = {
+ timer: 250
+ }, f = a.extend({}, e, d), g = b.config, h = g.widgetOptions, i = function(a) {
+ var b, c, d, e, f, i, j = g.$headers.length;
+ for (h.resize_flag = !0, c = [], b = 0; j > b; b++) d = g.$headers.eq(b), e = d.data("savedSizes") || [ 0, 0 ],
+ f = d[0].offsetWidth, i = d[0].offsetHeight, (f !== e[0] || i !== e[1]) && (d.data("savedSizes", [ f, i ]),
+ c.push(d[0]));
+ c.length && a !== !1 && g.$table.triggerHandler("resize", [ c ]), h.resize_flag = !1;
+ };
+ if (clearInterval(h.resize_timer), c) return h.resize_flag = !1, !1;
+ i(!1), h.resize_timer = setInterval(function() {
+ h.resize_flag || i();
+ }, f.timer);
+ }
}, c.addWidget({
id: "stickyHeaders",
priority: 60,
@@ -5949,115 +6286,124 @@
},
format: function(d, e, f) {
if (!(e.$table.hasClass("hasStickyHeaders") || a.inArray("filter", e.widgets) >= 0 && !e.$table.hasClass("hasFilters"))) {
- var g, h = e.$table, i = a(f.stickyHeaders_attachTo), j = e.namespace + "stickyheaders ", k = a(f.stickyHeaders_yScroll || f.stickyHeaders_attachTo || b), l = a(f.stickyHeaders_xScroll || f.stickyHeaders_attachTo || b), m = h.children("thead:first"), n = m.children("tr").not(".sticky-false").children(), o = h.children("tfoot"), p = isNaN(f.stickyHeaders_offset) ? a(f.stickyHeaders_offset) : "", q = p.length ? p.height() || 0 : parseInt(f.stickyHeaders_offset, 10) || 0, r = h.parent().closest("." + c.css.table).hasClass("hasStickyHeaders") ? h.parent().closest("table.tablesorter")[0].config.widgetOptions.$sticky.parent() : [], s = r.length ? r.height() : 0, t = f.$sticky = h.clone().addClass("containsStickyHeaders " + c.css.sticky + " " + f.stickyHeaders + " " + e.namespace.slice(1) + "_extra_table").wrap(''), u = t.parent().addClass(c.css.stickyHide).css({
- position: i.length ? "absolute" : "fixed",
- padding: parseInt(t.parent().parent().css("padding-left"), 10),
- top: q + s,
+ var g, h, i, j, k = e.$table, l = a(f.stickyHeaders_attachTo), m = e.namespace + "stickyheaders ", n = a(f.stickyHeaders_yScroll || f.stickyHeaders_attachTo || b), o = a(f.stickyHeaders_xScroll || f.stickyHeaders_attachTo || b), p = k.children("thead:first"), q = p.children("tr").not(".sticky-false").children(), r = k.children("tfoot"), s = isNaN(f.stickyHeaders_offset) ? a(f.stickyHeaders_offset) : "", t = s.length ? s.height() || 0 : parseInt(f.stickyHeaders_offset, 10) || 0, u = k.parent().closest("." + c.css.table).hasClass("hasStickyHeaders") ? k.parent().closest("table.tablesorter")[0].config.widgetOptions.$sticky.parent() : [], v = u.length ? u.height() : 0, w = f.$sticky = k.clone().addClass("containsStickyHeaders " + c.css.sticky + " " + f.stickyHeaders + " " + e.namespace.slice(1) + "_extra_table").wrap('
'), x = w.parent().addClass(c.css.stickyHide).css({
+ position: l.length ? "absolute" : "fixed",
+ padding: parseInt(w.parent().parent().css("padding-left"), 10),
+ top: t + v,
left: 0,
visibility: "hidden",
zIndex: f.stickyHeaders_zIndex || 2
- }), v = t.children("thead:first"), w = "", x = 0, y = function(c, d) {
- c.filter(":visible").each(function(c) {
- var e, f, g = d.filter(":visible").eq(c), h = a(this);
- "border-box" === h.css("box-sizing") ? e = h.outerWidth() : "collapse" === g.css("border-collapse") ? b.getComputedStyle ? e = parseFloat(b.getComputedStyle(this, null).width) : (f = parseFloat(h.css("border-width")),
- e = h.outerWidth() - parseFloat(h.css("padding-left")) - parseFloat(h.css("padding-right")) - f) : e = h.width(),
- g.css({
- "min-width": e,
- "max-width": e
- });
+ }), y = w.children("thead:first"), z = "", A = 0, B = function(a, c) {
+ var d, e, f, g, h, i = a.filter(":visible"), j = i.length;
+ for (d = 0; j > d; d++) g = c.filter(":visible").eq(d), h = i.eq(d), "border-box" === h.css("box-sizing") ? e = h.outerWidth() : "collapse" === g.css("border-collapse") ? b.getComputedStyle ? e = parseFloat(b.getComputedStyle(h[0], null).width) : (f = parseFloat(h.css("border-width")),
+ e = h.outerWidth() - parseFloat(h.css("padding-left")) - parseFloat(h.css("padding-right")) - f) : e = h.width(),
+ g.css({
+ width: e,
+ "min-width": e,
+ "max-width": e
});
- }, z = function() {
- q = p.length ? p.height() || 0 : parseInt(f.stickyHeaders_offset, 10) || 0, x = 0,
- u.css({
- left: i.length ? parseInt(i.css("padding-left"), 10) || 0 : h.offset().left - parseInt(h.css("margin-left"), 10) - l.scrollLeft() - x,
- width: h.outerWidth()
- }), y(h, t), y(n, g);
+ }, C = function() {
+ t = s.length ? s.height() || 0 : parseInt(f.stickyHeaders_offset, 10) || 0, A = 0,
+ x.css({
+ left: l.length ? parseInt(l.css("padding-left"), 10) || 0 : k.offset().left - parseInt(k.css("margin-left"), 10) - o.scrollLeft() - A,
+ width: k.outerWidth()
+ }), B(k, w), B(q, j);
+ }, D = function(b) {
+ if (k.is(":visible")) {
+ v = u.length ? u.offset().top - n.scrollTop() + u.height() : 0;
+ var d = k.offset(), e = a.isWindow(n[0]), f = a.isWindow(o[0]), g = (l.length ? e ? n.scrollTop() : n.offset().top : n.scrollTop()) + t + v, h = k.height() - (x.height() + (r.height() || 0)), i = g > d.top && g < d.top + h ? "visible" : "hidden", j = {
+ visibility: i
+ };
+ l.length && (j.top = e ? g - l.offset().top : l.scrollTop()), f && (j.left = k.offset().left - parseInt(k.css("margin-left"), 10) - o.scrollLeft() - A),
+ u.length && (j.top = (j.top || 0) + t + v), x.removeClass(c.css.stickyVis + " " + c.css.stickyHide).addClass("visible" === i ? c.css.stickyVis : c.css.stickyHide).css(j),
+ (i !== z || b) && (C(), z = i);
+ }
};
- i.length && !i.css("position") && i.css("position", "relative"), t.attr("id") && (t[0].id += f.stickyHeaders_cloneId),
- t.find("thead:gt(0), tr.sticky-false").hide(), t.find("tbody, tfoot").remove(),
- t.find("caption").toggle(f.stickyHeaders_includeCaption), g = v.children().children(),
- t.css({
+ if (l.length && !l.css("position") && l.css("position", "relative"), w.attr("id") && (w[0].id += f.stickyHeaders_cloneId),
+ w.find("thead:gt(0), tr.sticky-false").hide(), w.find("tbody, tfoot").remove(),
+ w.find("caption").toggle(f.stickyHeaders_includeCaption), j = y.children().children(),
+ w.css({
height: 0,
width: 0,
margin: 0
- }), g.find("." + c.css.resizer).remove(), h.addClass("hasStickyHeaders").bind("pagerComplete" + j, function() {
- z();
- }), c.bindEvents(d, v.children().children("." + c.css.header)), h.after(u), e.onRenderHeader && v.children("tr").children().each(function(b) {
- e.onRenderHeader.apply(a(this), [ b, e, t ]);
- }), l.add(k).unbind("scroll resize ".split(" ").join(j).replace(/\s+/g, " ")).bind("scroll resize ".split(" ").join(j), function(b) {
- if (h.is(":visible")) {
- s = r.length ? r.offset().top - k.scrollTop() + r.height() : 0;
- var d = h.offset(), e = a.isWindow(k[0]), f = a.isWindow(l[0]), g = (i.length ? e ? k.scrollTop() : k.offset().top : k.scrollTop()) + q + s, j = h.height() - (u.height() + (o.height() || 0)), m = g > d.top && g < d.top + j ? "visible" : "hidden", n = {
- visibility: m
- };
- i.length && (n.top = e ? g - i.offset().top : i.scrollTop()), f && (n.left = h.offset().left - parseInt(h.css("margin-left"), 10) - l.scrollLeft() - x),
- r.length && (n.top = (n.top || 0) + q + s), u.removeClass(c.css.stickyVis + " " + c.css.stickyHide).addClass("visible" === m ? c.css.stickyVis : c.css.stickyHide).css(n),
- (m !== w || "resize" === b.type) && (z(), w = m);
- }
- }), f.stickyHeaders_addResizeEvent && c.addHeaderResizeEvent(d), h.hasClass("hasFilters") && f.filter_columnFilters && (h.bind("filterEnd" + j, function() {
+ }), j.find("." + c.css.resizer).remove(), k.addClass("hasStickyHeaders").bind("pagerComplete" + m, function() {
+ C();
+ }), c.bindEvents(d, y.children().children("." + c.css.header)), k.after(x), e.onRenderHeader) for (i = y.children("tr").children(),
+ h = i.length, g = 0; h > g; g++) e.onRenderHeader.apply(i.eq(g), [ g, e, w ]);
+ o.add(n).unbind("scroll resize ".split(" ").join(m).replace(/\s+/g, " ")).bind("scroll resize ".split(" ").join(m), function(a) {
+ D("resize" === a.type);
+ }), e.$table.unbind("stickyHeadersUpdate" + m).bind("stickyHeadersUpdate" + m, function() {
+ D(!0);
+ }), f.stickyHeaders_addResizeEvent && c.addHeaderResizeEvent(d), k.hasClass("hasFilters") && f.filter_columnFilters && (k.bind("filterEnd" + m, function() {
var d = a(document.activeElement).closest("td"), g = d.parent().children().index(d);
- u.hasClass(c.css.stickyVis) && f.stickyHeaders_filteredToTop && (b.scrollTo(0, h.position().top),
+ x.hasClass(c.css.stickyVis) && f.stickyHeaders_filteredToTop && (b.scrollTo(0, k.position().top),
g >= 0 && e.$filters && e.$filters.eq(g).find("a, select, input").filter(":visible").focus());
- }), c.filter.bindSearch(h, g.find("." + c.css.filter)), f.filter_hideFilters && c.filter.hideFilters(t, e)),
- h.trigger("stickyHeadersInit");
+ }), c.filter.bindSearch(k, j.find("." + c.css.filter)), f.filter_hideFilters && c.filter.hideFilters(e, w)),
+ k.triggerHandler("stickyHeadersInit");
}
},
remove: function(d, e, f) {
var g = e.namespace + "stickyheaders ";
- e.$table.removeClass("hasStickyHeaders").unbind("pagerComplete filterEnd ".split(" ").join(g).replace(/\s+/g, " ")).next("." + c.css.stickyWrap).remove(),
+ e.$table.removeClass("hasStickyHeaders").unbind("pagerComplete filterEnd stickyHeadersUpdate ".split(" ").join(g).replace(/\s+/g, " ")).next("." + c.css.stickyWrap).remove(),
f.$sticky && f.$sticky.length && f.$sticky.remove(), a(b).add(f.stickyHeaders_xScroll).add(f.stickyHeaders_yScroll).add(f.stickyHeaders_attachTo).unbind("scroll resize ".split(" ").join(g).replace(/\s+/g, " ")),
- c.addHeaderResizeEvent(d, !1);
+ c.addHeaderResizeEvent(d, !0);
}
});
}(jQuery, window), function(a, b) {
"use strict";
- var c = a.tablesorter = a.tablesorter || {};
+ var c = a.tablesorter || {};
a.extend(c.css, {
resizableContainer: "tablesorter-resizable-container",
resizableHandle: "tablesorter-resizable-handle",
resizableNoSelect: "tablesorter-disableSelection",
resizableStorage: "tablesorter-resizable"
}), a(function() {
- var b = "";
+ var b = "";
a(b).appendTo("body");
}), c.resizable = {
init: function(b, d) {
if (!b.$table.hasClass("hasResizable")) {
- b.$table.addClass("hasResizable"), c.resizableReset(b.table, !0), d.resizable_ = {
- $wrap: b.$table.parent(),
+ b.$table.addClass("hasResizable");
+ var e, f, g, h, i, j = b.$table, k = j.parent(), l = parseInt(j.css("margin-top"), 10), m = d.resizable_vars = {
+ useStorage: c.storage && d.resizable !== !1,
+ $wrap: k,
mouseXPosition: 0,
$target: null,
$next: null,
- overflow: "auto" === b.$table.parent().css("overflow"),
- fullWidth: Math.abs(b.$table.parent().width() - b.$table.width()) < 20,
+ overflow: "auto" === k.css("overflow") || "scroll" === k.css("overflow") || "auto" === k.css("overflow-x") || "scroll" === k.css("overflow-x"),
storedSizes: []
};
- var e, f, g, h, i = parseInt(b.$table.css("margin-top"), 10);
- for (d.resizable_.storedSizes = h = (c.storage && d.resizable !== !1 ? c.storage(b.table, c.css.resizableStorage) : []) || [],
- c.resizable.setWidths(b, d, h), d.$resizable_container = a('
').css({
- top: i
- }).insertBefore(b.$table), g = 0; g < b.columns; g++) f = b.$headerIndexed[g], e = "false" === c.getData(f, c.getColumnData(b.table, b.headers, g), "resizable"),
- e || a('
').appendTo(d.$resizable_container).attr({
+ for (c.resizableReset(b.table, !0), m.tableWidth = j.width(), m.fullWidth = Math.abs(k.width() - m.tableWidth) < 20,
+ m.useStorage && m.overflow && (c.storage(b.table, "tablesorter-table-original-css-width", m.tableWidth),
+ i = c.storage(b.table, "tablesorter-table-resized-width") || "auto", c.resizable.setWidth(j, i, !0)),
+ d.resizable_vars.storedSizes = h = (m.useStorage ? c.storage(b.table, c.css.resizableStorage) : []) || [],
+ c.resizable.setWidths(b, d, h), c.resizable.updateStoredSizes(b, d), d.$resizable_container = a('
').css({
+ top: l
+ }).insertBefore(j), g = 0; g < b.columns; g++) f = b.$headerIndexed[g], i = c.getColumnData(b.table, b.headers, g),
+ e = "false" === c.getData(f, i, "resizable"), e || a('
').appendTo(d.$resizable_container).attr({
"data-column": g,
unselectable: "on"
}).data("header", f).bind("selectstart", !1);
- b.$table.one("tablesorter-initialized", function() {
- c.resizable.setHandlePosition(b, d), c.resizable.bindings(this.config, this.config.widgetOptions);
- });
+ c.resizable.setHandlePosition(b, d), c.resizable.bindings(b, d);
}
},
- setWidth: function(a, b) {
+ updateStoredSizes: function(a, b) {
+ var c, d, e = a.columns, f = b.resizable_vars;
+ for (f.storedSizes = [], c = 0; e > c; c++) d = a.$headerIndexed[c], f.storedSizes[c] = d.is(":visible") ? d.width() : 0;
+ },
+ setWidth: function(a, b, c) {
a.css({
width: b,
- "min-width": "",
- "max-width": ""
+ "min-width": c ? b : "",
+ "max-width": c ? b : ""
});
},
setWidths: function(b, d, e) {
- var f, g = a(b.namespace + "_extra_headers"), h = b.$table.children("colgroup").children("col");
- if (e = e || d.resizable_.storedSizes || [], e.length) {
- for (f = 0; f < b.columns; f++) b.$headerIndexed[f].width(e[f]), g.length && c.resizable.setWidth(g.eq(f).add(h.eq(f)), e[f]);
- a(b.namespace + "_extra_table").length && !c.hasWidget(b.table, "scroller") && c.resizable.setWidth(a(b.namespace + "_extra_table"), b.$table.outerWidth());
+ var f, g, h = d.resizable_vars, i = a(b.namespace + "_extra_headers"), j = b.$table.children("colgroup").children("col");
+ if (e = e || h.storedSizes || [], e.length) {
+ for (f = 0; f < b.columns; f++) c.resizable.setWidth(b.$headerIndexed[f], e[f], h.overflow),
+ i.length && (g = i.eq(f).add(j.eq(f)), c.resizable.setWidth(g, e[f], h.overflow));
+ g = a(b.namespace + "_extra_table"), g.length && !c.hasWidget(b.table, "scroller") && c.resizable.setWidth(g, b.$table.outerWidth(), h.overflow);
}
},
setHandlePosition: function(b, d) {
@@ -6074,56 +6420,58 @@
}) : c.hide());
});
},
- toggleTextSelection: function(b, d) {
- var e = b.namespace + "tsresize";
- b.widgetOptions.resizable_.disabled = d, a("body").toggleClass(c.css.resizableNoSelect, d),
- d ? a("body").attr("unselectable", "on").bind("selectstart" + e, !1) : a("body").removeAttr("unselectable").unbind("selectstart" + e);
+ toggleTextSelection: function(b, d, e) {
+ var f = b.namespace + "tsresize";
+ d.resizable_vars.disabled = e, a("body").toggleClass(c.css.resizableNoSelect, e),
+ e ? a("body").attr("unselectable", "on").bind("selectstart" + f, !1) : a("body").removeAttr("unselectable").unbind("selectstart" + f);
},
bindings: function(d, e) {
var f = d.namespace + "tsresize";
e.$resizable_container.children().bind("mousedown", function(b) {
- var f, g, h = e.resizable_, i = a(d.namespace + "_extra_headers"), j = a(b.target).data("header");
- for (f = parseInt(j.attr("data-column"), 10), h.$target = j = j.add(i.filter('[data-column="' + f + '"]')),
- h.target = f, h.$next = b.shiftKey || e.resizable_targetLast ? j.parent().children().not(".resizable-false").filter(":last") : j.nextAll(":not(.resizable-false)").eq(0),
- f = parseInt(h.$next.attr("data-column"), 10), h.$next = h.$next.add(i.filter('[data-column="' + f + '"]')),
- h.next = f, h.mouseXPosition = b.pageX, h.storedSizes = [], f = 0; f < d.columns; f++) g = d.$headerIndexed[f],
- h.storedSizes[f] = g.is(":visible") ? g.width() : 0;
- c.resizable.toggleTextSelection(d, !0);
+ var f, g = e.resizable_vars, h = a(d.namespace + "_extra_headers"), i = a(b.target).data("header");
+ f = parseInt(i.attr("data-column"), 10), g.$target = i = i.add(h.filter('[data-column="' + f + '"]')),
+ g.target = f, g.$next = b.shiftKey || e.resizable_targetLast ? i.parent().children().not(".resizable-false").filter(":last") : i.nextAll(":not(.resizable-false)").eq(0),
+ f = parseInt(g.$next.attr("data-column"), 10), g.$next = g.$next.add(h.filter('[data-column="' + f + '"]')),
+ g.next = f, g.mouseXPosition = b.pageX, c.resizable.updateStoredSizes(d, e), c.resizable.toggleTextSelection(d, e, !0);
}), a(document).bind("mousemove" + f, function(a) {
- var b = e.resizable_;
+ var b = e.resizable_vars;
b.disabled && 0 !== b.mouseXPosition && b.$target && (e.resizable_throttle ? (clearTimeout(b.timer),
b.timer = setTimeout(function() {
c.resizable.mouseMove(d, e, a);
}, isNaN(e.resizable_throttle) ? 5 : e.resizable_throttle)) : c.resizable.mouseMove(d, e, a));
}).bind("mouseup" + f, function() {
- e.resizable_.disabled && (c.resizable.toggleTextSelection(d, !1), c.resizable.stopResize(d, e),
+ e.resizable_vars.disabled && (c.resizable.toggleTextSelection(d, e, !1), c.resizable.stopResize(d, e),
c.resizable.setHandlePosition(d, e));
}), a(b).bind("resize" + f + " resizeEnd" + f, function() {
c.resizable.setHandlePosition(d, e);
}), d.$table.bind("columnUpdate" + f, function() {
c.resizable.setHandlePosition(d, e);
}).find("thead:first").add(a(d.namespace + "_extra_table").find("thead:first")).bind("contextmenu" + f, function() {
- var a = 0 === e.resizable_.storedSizes.length;
- return c.resizableReset(d.table), c.resizable.setHandlePosition(d, e), e.resizable_.storedSizes = [],
+ var a = 0 === e.resizable_vars.storedSizes.length;
+ return c.resizableReset(d.table), c.resizable.setHandlePosition(d, e), e.resizable_vars.storedSizes = [],
a;
});
},
mouseMove: function(b, d, e) {
- if (0 !== d.resizable_.mouseXPosition && d.resizable_.$target) {
- var f = d.resizable_, g = f.$next, h = e.pageX - f.mouseXPosition;
- f.fullWidth ? (f.storedSizes[f.target] += h, f.storedSizes[f.next] -= h, c.resizable.setWidths(b, d)) : f.overflow ? (b.$table.add(a(b.namespace + "_extra_table")).width(function(a, b) {
- return b + h;
- }), g.length || (f.$wrap[0].scrollLeft = b.$table.width())) : (f.storedSizes[f.target] += h,
- c.resizable.setWidths(b, d)), f.mouseXPosition = e.pageX;
+ if (0 !== d.resizable_vars.mouseXPosition && d.resizable_vars.$target) {
+ var f, g = 0, h = d.resizable_vars, i = h.$next, j = h.storedSizes[h.target], k = e.pageX - h.mouseXPosition;
+ if (h.overflow) {
+ if (j + k > 0) {
+ for (h.storedSizes[h.target] += k, c.resizable.setWidth(h.$target, h.storedSizes[h.target], !0),
+ f = 0; f < b.columns; f++) g += h.storedSizes[f];
+ c.resizable.setWidth(b.$table.add(a(b.namespace + "_extra_table")), g);
+ }
+ i.length || (h.$wrap[0].scrollLeft = b.$table.width());
+ } else h.fullWidth ? (h.storedSizes[h.target] += k, h.storedSizes[h.next] -= k,
+ c.resizable.setWidths(b, d)) : (h.storedSizes[h.target] += k, c.resizable.setWidths(b, d));
+ h.mouseXPosition = e.pageX, b.$table.triggerHandler("stickyHeadersUpdate");
}
},
- stopResize: function(d, e) {
- var f, g, h = e.resizable_;
- if (h.storedSizes = [], c.storage) {
- for (h.storedSizes = [], g = 0; g < d.columns; g++) f = d.$headerIndexed[g], h.storedSizes[g] = f.is(":visible") ? f.width() : 0;
- e.resizable !== !1 && c.storage(d.table, c.css.resizableStorage, h.storedSizes);
- }
- h.mouseXPosition = 0, h.$target = h.$next = null, a(b).trigger("resize");
+ stopResize: function(a, b) {
+ var d = b.resizable_vars;
+ c.resizable.updateStoredSizes(a, b), d.useStorage && (c.storage(a.table, c.css.resizableStorage, d.storedSizes),
+ c.storage(a.table, "tablesorter-table-resized-width", a.$table.width())), d.mouseXPosition = 0,
+ d.$target = d.$next = null, a.$table.triggerHandler("stickyHeadersUpdate");
}
}, c.addWidget({
id: "resizable",
@@ -6133,31 +6481,34 @@
resizable_addLastColumn: !1,
resizable_widths: [],
resizable_throttle: !1,
- resizable_targetLast: !1
+ resizable_targetLast: !1,
+ resizable_fullWidth: null
},
init: function(a, b, d, e) {
c.resizable.init(d, e);
},
- remove: function(b, d, e) {
+ remove: function(b, d, e, f) {
if (e.$resizable_container) {
- var f = d.namespace + "tsresize";
- d.$table.add(a(d.namespace + "_extra_table")).removeClass("hasResizable").children("thead").unbind("contextmenu" + f),
- e.$resizable_container.remove(), c.resizable.toggleTextSelection(d, !1), c.resizableReset(b),
- a(document).unbind("mousemove" + f + " mouseup" + f);
+ var g = d.namespace + "tsresize";
+ d.$table.add(a(d.namespace + "_extra_table")).removeClass("hasResizable").children("thead").unbind("contextmenu" + g),
+ e.$resizable_container.remove(), c.resizable.toggleTextSelection(d, e, !1), c.resizableReset(b, f),
+ a(document).unbind("mousemove" + g + " mouseup" + g);
}
}
- }), c.resizableReset = function(d, e) {
- a(d).each(function() {
- var f, g, h = this.config, i = h && h.widgetOptions;
- if (d && h && h.$headerIndexed.length) {
- for (f = 0; f < h.columns; f++) g = h.$headerIndexed[f], i.resizable_widths && i.resizable_widths[f] ? g.css("width", i.resizable_widths[f]) : g.hasClass("resizable-false") || g.css("width", "");
- a(b).trigger("resize"), c.storage && !e && c.storage(this, c.css.resizableStorage, {});
+ }), c.resizableReset = function(b, d) {
+ a(b).each(function() {
+ var a, e, f = this.config, g = f && f.widgetOptions, h = g.resizable_vars;
+ if (b && f && f.$headerIndexed.length) {
+ for (h.overflow && h.tableWidth && (c.resizable.setWidth(f.$table, h.tableWidth, !0),
+ h.useStorage && c.storage(b, "tablesorter-table-resized-width", "auto")), a = 0; a < f.columns; a++) e = f.$headerIndexed[a],
+ g.resizable_widths && g.resizable_widths[a] ? c.resizable.setWidth(e, g.resizable_widths[a], h.overflow) : e.hasClass("resizable-false") || c.resizable.setWidth(e, "", h.overflow);
+ f.$table.triggerHandler("stickyHeadersUpdate"), c.storage && !d && c.storage(this, c.css.resizableStorage, {});
}
});
};
}(jQuery, window), function(a) {
"use strict";
- var b = a.tablesorter = a.tablesorter || {};
+ var b = a.tablesorter || {};
b.addWidget({
id: "saveSort",
priority: 20,
@@ -6172,15 +6523,17 @@
sortList: d.sortList
};
d.debug && (h = new Date()), i.hasClass("hasSaveSort") ? j && c.hasInitialized && b.storage && (b.storage(c, "tablesorter-savesort", k),
- d.debug && b.benchmark("saveSort widget: Saving last sort: " + d.sortList, h)) : (i.addClass("hasSaveSort"),
+ d.debug && console.log("saveSort widget: Saving last sort: " + d.sortList + b.benchmark(h))) : (i.addClass("hasSaveSort"),
k = "", b.storage && (g = b.storage(c, "tablesorter-savesort"), k = g && g.hasOwnProperty("sortList") && a.isArray(g.sortList) ? g.sortList : "",
- d.debug && b.benchmark('saveSort: Last sort loaded: "' + k + '"', h), i.bind("saveSortReset", function(a) {
+ d.debug && console.log('saveSort: Last sort loaded: "' + k + '"' + b.benchmark(h)),
+ i.bind("saveSortReset", function(a) {
a.stopPropagation(), b.storage(c, "tablesorter-savesort", "");
- })), f && k && k.length > 0 ? d.sortList = k : c.hasInitialized && k && k.length > 0 && i.trigger("sorton", [ k ]));
+ })), f && k && k.length > 0 ? d.sortList = k : c.hasInitialized && k && k.length > 0 && b.sortOn(d, k));
},
remove: function(a, c) {
c.$table.removeClass("hasSaveSort"), b.storage && b.storage(a, "tablesorter-savesort", "");
}
});
}(jQuery), a.tablesorter;
-});
\ No newline at end of file
+});
+//# sourceMappingURL=vendor.min.js.map
\ No newline at end of file
diff --git a/mapusaurus/basestyle/templates/basestyle/common/header.html b/mapusaurus/basestyle/templates/basestyle/common/header.html
index 0f803bd5..0b883fd5 100644
--- a/mapusaurus/basestyle/templates/basestyle/common/header.html
+++ b/mapusaurus/basestyle/templates/basestyle/common/header.html
@@ -2,10 +2,10 @@
-
\ No newline at end of file
+
diff --git a/mapusaurus/basestyle/templates/basestyle/common/header_map.html b/mapusaurus/basestyle/templates/basestyle/common/header_map.html
index 29758a62..9cfccd8f 100644
--- a/mapusaurus/basestyle/templates/basestyle/common/header_map.html
+++ b/mapusaurus/basestyle/templates/basestyle/common/header_map.html
@@ -2,10 +2,10 @@
-
\ No newline at end of file
+
diff --git a/mapusaurus/censusdata/fixtures/dummy_tracts.json b/mapusaurus/censusdata/fixtures/dummy_tracts.json
index 36912397..5d595e36 100644
--- a/mapusaurus/censusdata/fixtures/dummy_tracts.json
+++ b/mapusaurus/censusdata/fixtures/dummy_tracts.json
@@ -15,7 +15,8 @@
"maxlat": 1,
"maxlon": 1,
"centlat": 0.0,
- "centlon": 0.0
+ "centlon": 0.0,
+ "year": 2013
}
},
{
@@ -34,7 +35,8 @@
"maxlat": 1,
"maxlon": 1,
"centlat": 0.0,
- "centlon": 0.0
+ "centlon": 0.0,
+ "year": 2013
}
},
{
@@ -53,7 +55,8 @@
"maxlat": 1,
"maxlon": 1,
"centlat": 0.0,
- "centlon": 0.0
+ "centlon": 0.0,
+ "year": 2013
}
},
{
@@ -72,7 +75,8 @@
"maxlat": 1,
"maxlon": 1,
"centlat": 0.0,
- "centlon": 0.0
+ "centlon": 1.0,
+ "year": 2013
}
},
{
@@ -91,7 +95,8 @@
"maxlat": 2,
"maxlon": 2,
"centlat": 1.0,
- "centlon": 1.0
+ "centlon": 1.0,
+ "year": 2013
}
},
{
@@ -110,7 +115,8 @@
"maxlat": 2,
"maxlon": 2,
"centlat": 1.0,
- "centlon": 1.0
+ "centlon": 1.0,
+ "year": "2013"
}
}
]
diff --git a/mapusaurus/censusdata/fixtures/mock_geo.json b/mapusaurus/censusdata/fixtures/mock_geo.json
index c4d3ff0a..1709b34d 100644
--- a/mapusaurus/censusdata/fixtures/mock_geo.json
+++ b/mapusaurus/censusdata/fixtures/mock_geo.json
@@ -14,7 +14,8 @@
"maxlat": 1,
"maxlon": 1,
"centlat": 0.0,
- "centlon": 0.0
+ "centlon": 0.0,
+ "year": 2013
}
},
{
@@ -32,7 +33,8 @@
"maxlat": 1,
"maxlon": 1,
"centlat": 0.0,
- "centlon": 0.0
+ "centlon": 0.0,
+ "year": 2013
}
}
]
diff --git a/mapusaurus/censusdata/management/commands/load_summary_one.py b/mapusaurus/censusdata/management/commands/load_summary_one.py
index 3aca4350..7bde2ddc 100644
--- a/mapusaurus/censusdata/management/commands/load_summary_one.py
+++ b/mapusaurus/censusdata/management/commands/load_summary_one.py
@@ -12,17 +12,19 @@ class Command(BaseCommand):
"""Loads Summary File 1 data from the decennial census. Official
documentation for fields at
http://www.census.gov/prod/cen2010/doc/sf1.pdf"""
- args = "
"
+ args = " "
help = """
Load Decennial Census data for a state.
Assumes XX#####2010.sf1 files are in the same directory."""
def handle(self, *args, **options):
- if not args:
- raise CommandError("Needs a first argument, "
- + "path/to/XXgeo2010.sf1")
+ if len(args) != 2:
+ raise CommandError("Needs 2 arguments, "
+ + "path/to/XXgeo2010.sf1 year")
geoids_by_record = {}
- geofile = open(args[0], 'r')
+ geofile_name = args[0]
+ geofile = open(geofile_name, 'r')
+ year = args[1]
# As each file covers one state, all geos will have the same state id
state = ""
for line in geofile:
@@ -31,26 +33,25 @@ def handle(self, *args, **options):
censustract = line[27:32] + line[54:60]
censustract = errors.in_2010.get(censustract, censustract)
if censustract is not None:
- geoids_by_record[recordnum] = censustract
+ geoids_by_record[recordnum] = year + censustract
state = line[27:29]
geofile.close()
- self.handle_filethree(args[0], state, geoids_by_record)
- self.handle_filefour(args[0], state, geoids_by_record)
- self.handle_filefive(args[0], state, geoids_by_record)
+ self.handle_filethree(geofile_name, year, state, geoids_by_record)
+ self.handle_filefour(geofile_name, year, state, geoids_by_record)
+ self.handle_filefive(geofile_name, year, state, geoids_by_record)
- def handle_filethree(self, geofile_name, state, geoids_by_record):
+ def handle_filethree(self, geofile_name, year, state, geoids_by_record):
"""File three (XX000032010.sf1) contains race and ethnicity summaries.
Documentation starts at page 6-22."""
file3_name = geofile_name[:-11] + "000032010.sf1"
datafile = open(file3_name, 'r')
- state = geoids_by_record.values()[0][:2]
race, hispanic, stats = [], [], []
skip_race = Census2010Race.objects.filter(
- geoid__state=state).exists()
+ geoid__state=state, geoid__year=year).exists()
skip_hisp = Census2010HispanicOrigin.objects.filter(
- geoid__state=state).exists()
+ geoid__state=state, geoid__year=year).exists()
skip_stats = Census2010RaceStats.objects.filter(
- geoid__state=state).exists()
+ geoid__state=state, geoid__year=year).exists()
if not skip_race or not skip_hisp or not skip_stats:
for row in reader(datafile):
@@ -89,15 +90,15 @@ def handle_filethree(self, geofile_name, state, geoids_by_record):
if not skip_stats:
Census2010RaceStats.objects.bulk_create(stats)
- def handle_filefour(self, geofile_name, state, geoids_by_record):
+ def handle_filefour(self, geofile_name, year, state, geoids_by_record):
"""File four (XX000042010.sf1) contains age demographics and
correlations with race, ethnicity, and sex. Documentation starts at
page 6-30"""
file4_name = geofile_name[:-11] + "000042010.sf1"
datafile = open(file4_name, 'r')
sex, age = [], []
- skip_sex = Census2010Sex.objects.filter(geoid__state=state).exists()
- skip_age = Census2010Age.objects.filter(geoid__state=state).exists()
+ skip_sex = Census2010Sex.objects.filter(geoid__state=state, geoid__year=year).exists()
+ skip_age = Census2010Age.objects.filter(geoid__state=state, geoid__year=year).exists()
if not skip_sex or not skip_age:
for row in reader(datafile):
recordnum = row[4]
@@ -125,7 +126,7 @@ def handle_filefour(self, geofile_name, state, geoids_by_record):
if not skip_age:
Census2010Age.objects.bulk_create(age)
- def handle_filefive(self, geofile_name, state, geoids_by_record):
+ def handle_filefive(self, geofile_name, year, state, geoids_by_record):
"""File five (XX000052010.sf1) contains household metrics, including
divisions by household type, household size, etc. Documentation starts
at page 6-38"""
@@ -133,7 +134,7 @@ def handle_filefive(self, geofile_name, state, geoids_by_record):
datafile = open(file4_name, 'r')
households = []
skip_households = Census2010Households.objects.filter(
- geoid__state=state).exists()
+ geoid__state=state, geoid__year=year).exists()
if not skip_households:
for row in reader(datafile):
recordnum = row[4]
diff --git a/mapusaurus/censusdata/migrations/0001_initial.py b/mapusaurus/censusdata/migrations/0001_initial.py
index 1d325cda..85fd931e 100644
--- a/mapusaurus/censusdata/migrations/0001_initial.py
+++ b/mapusaurus/censusdata/migrations/0001_initial.py
@@ -1,226 +1,124 @@
# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
- def forwards(self, orm):
- # Adding model 'Census2010Race'
- db.create_table(u'censusdata_census2010race', (
- ('geoid', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['geo.Geo'], unique=True, primary_key=True)),
- ('total_pop', self.gf('django.db.models.fields.IntegerField')()),
- ('white_alone', self.gf('django.db.models.fields.IntegerField')()),
- ('black_alone', self.gf('django.db.models.fields.IntegerField')()),
- ('amind_alone', self.gf('django.db.models.fields.IntegerField')()),
- ('asian_alone', self.gf('django.db.models.fields.IntegerField')()),
- ('pacis_alone', self.gf('django.db.models.fields.IntegerField')()),
- ('other_alone', self.gf('django.db.models.fields.IntegerField')()),
- ('two_or_more', self.gf('django.db.models.fields.IntegerField')()),
- ))
- db.send_create_signal(u'censusdata', ['Census2010Race'])
-
- # Adding model 'Census2010HispanicOrigin'
- db.create_table(u'censusdata_census2010hispanicorigin', (
- ('geoid', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['geo.Geo'], unique=True, primary_key=True)),
- ('total_pop', self.gf('django.db.models.fields.IntegerField')()),
- ('non_hispanic', self.gf('django.db.models.fields.IntegerField')()),
- ('hispanic', self.gf('django.db.models.fields.IntegerField')()),
- ))
- db.send_create_signal(u'censusdata', ['Census2010HispanicOrigin'])
-
- # Adding model 'Census2010Sex'
- db.create_table(u'censusdata_census2010sex', (
- ('geoid', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['geo.Geo'], unique=True, primary_key=True)),
- ('total_pop', self.gf('django.db.models.fields.IntegerField')()),
- ('male', self.gf('django.db.models.fields.IntegerField')()),
- ('female', self.gf('django.db.models.fields.IntegerField')()),
- ))
- db.send_create_signal(u'censusdata', ['Census2010Sex'])
-
- # Adding model 'Census2010Age'
- db.create_table(u'censusdata_census2010age', (
- ('geoid', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['geo.Geo'], unique=True, primary_key=True)),
- ('total_pop', self.gf('django.db.models.fields.IntegerField')()),
- ('under_five', self.gf('django.db.models.fields.IntegerField')()),
- ('five_nine', self.gf('django.db.models.fields.IntegerField')()),
- ('ten_fourteen', self.gf('django.db.models.fields.IntegerField')()),
- ('fifteen_seventeen', self.gf('django.db.models.fields.IntegerField')()),
- ('eighteen_nineteen', self.gf('django.db.models.fields.IntegerField')()),
- ('twenty', self.gf('django.db.models.fields.IntegerField')()),
- ('twentyone', self.gf('django.db.models.fields.IntegerField')()),
- ('twentytwo_twentyfour', self.gf('django.db.models.fields.IntegerField')()),
- ('twentyfive_twentynine', self.gf('django.db.models.fields.IntegerField')()),
- ('thirty_thirtyfour', self.gf('django.db.models.fields.IntegerField')()),
- ('thirtyfive_thirtynine', self.gf('django.db.models.fields.IntegerField')()),
- ('forty_fortyfour', self.gf('django.db.models.fields.IntegerField')()),
- ('fortyfive_fortynine', self.gf('django.db.models.fields.IntegerField')()),
- ('fifty_fiftyfour', self.gf('django.db.models.fields.IntegerField')()),
- ('fiftyfive_fiftynine', self.gf('django.db.models.fields.IntegerField')()),
- ('sixty_sixtyone', self.gf('django.db.models.fields.IntegerField')()),
- ('sixtytwo_sixtyfour', self.gf('django.db.models.fields.IntegerField')()),
- ('sixtyfive_sixtysix', self.gf('django.db.models.fields.IntegerField')()),
- ('sixtyseven_sixynine', self.gf('django.db.models.fields.IntegerField')()),
- ('seventy_seventyfour', self.gf('django.db.models.fields.IntegerField')()),
- ('seventyfive_seventynine', self.gf('django.db.models.fields.IntegerField')()),
- ('eighty_eightyfour', self.gf('django.db.models.fields.IntegerField')()),
- ('eightyfive_up', self.gf('django.db.models.fields.IntegerField')()),
- ))
- db.send_create_signal(u'censusdata', ['Census2010Age'])
-
- # Adding model 'Census2010RaceStats'
- db.create_table(u'censusdata_census2010racestats', (
- ('geoid', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['geo.Geo'], unique=True, primary_key=True)),
- ('total_pop', self.gf('django.db.models.fields.IntegerField')()),
- ('hispanic', self.gf('django.db.models.fields.IntegerField')()),
- ('non_hisp_white_only', self.gf('django.db.models.fields.IntegerField')()),
- ('non_hisp_black_only', self.gf('django.db.models.fields.IntegerField')()),
- ('non_hisp_asian_only', self.gf('django.db.models.fields.IntegerField')()),
- ('hispanic_perc', self.gf('django.db.models.fields.FloatField')()),
- ('non_hisp_white_only_perc', self.gf('django.db.models.fields.FloatField')()),
- ('non_hisp_black_only_perc', self.gf('django.db.models.fields.FloatField')()),
- ('non_hisp_asian_only_perc', self.gf('django.db.models.fields.FloatField')()),
- ))
- db.send_create_signal(u'censusdata', ['Census2010RaceStats'])
-
- # Adding model 'Census2010Households'
- db.create_table(u'censusdata_census2010households', (
- ('geoid', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['geo.Geo'], unique=True, primary_key=True)),
- ('total', self.gf('django.db.models.fields.IntegerField')()),
- ('total_family', self.gf('django.db.models.fields.IntegerField')()),
- ('husband_wife', self.gf('django.db.models.fields.IntegerField')()),
- ('total_family_other', self.gf('django.db.models.fields.IntegerField')()),
- ('male_no_wife', self.gf('django.db.models.fields.IntegerField')()),
- ('female_no_husband', self.gf('django.db.models.fields.IntegerField')()),
- ('total_nonfamily', self.gf('django.db.models.fields.IntegerField')()),
- ('living_alone', self.gf('django.db.models.fields.IntegerField')()),
- ('not_living_alone', self.gf('django.db.models.fields.IntegerField')()),
- ))
- db.send_create_signal(u'censusdata', ['Census2010Households'])
-
-
- def backwards(self, orm):
- # Deleting model 'Census2010Race'
- db.delete_table(u'censusdata_census2010race')
-
- # Deleting model 'Census2010HispanicOrigin'
- db.delete_table(u'censusdata_census2010hispanicorigin')
-
- # Deleting model 'Census2010Sex'
- db.delete_table(u'censusdata_census2010sex')
-
- # Deleting model 'Census2010Age'
- db.delete_table(u'censusdata_census2010age')
-
- # Deleting model 'Census2010RaceStats'
- db.delete_table(u'censusdata_census2010racestats')
-
- # Deleting model 'Census2010Households'
- db.delete_table(u'censusdata_census2010households')
-
-
- models = {
- u'censusdata.census2010age': {
- 'Meta': {'object_name': 'Census2010Age'},
- 'eighteen_nineteen': ('django.db.models.fields.IntegerField', [], {}),
- 'eighty_eightyfour': ('django.db.models.fields.IntegerField', [], {}),
- 'eightyfive_up': ('django.db.models.fields.IntegerField', [], {}),
- 'fifteen_seventeen': ('django.db.models.fields.IntegerField', [], {}),
- 'fifty_fiftyfour': ('django.db.models.fields.IntegerField', [], {}),
- 'fiftyfive_fiftynine': ('django.db.models.fields.IntegerField', [], {}),
- 'five_nine': ('django.db.models.fields.IntegerField', [], {}),
- 'forty_fortyfour': ('django.db.models.fields.IntegerField', [], {}),
- 'fortyfive_fortynine': ('django.db.models.fields.IntegerField', [], {}),
- 'geoid': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['geo.Geo']", 'unique': 'True', 'primary_key': 'True'}),
- 'seventy_seventyfour': ('django.db.models.fields.IntegerField', [], {}),
- 'seventyfive_seventynine': ('django.db.models.fields.IntegerField', [], {}),
- 'sixty_sixtyone': ('django.db.models.fields.IntegerField', [], {}),
- 'sixtyfive_sixtysix': ('django.db.models.fields.IntegerField', [], {}),
- 'sixtyseven_sixynine': ('django.db.models.fields.IntegerField', [], {}),
- 'sixtytwo_sixtyfour': ('django.db.models.fields.IntegerField', [], {}),
- 'ten_fourteen': ('django.db.models.fields.IntegerField', [], {}),
- 'thirty_thirtyfour': ('django.db.models.fields.IntegerField', [], {}),
- 'thirtyfive_thirtynine': ('django.db.models.fields.IntegerField', [], {}),
- 'total_pop': ('django.db.models.fields.IntegerField', [], {}),
- 'twenty': ('django.db.models.fields.IntegerField', [], {}),
- 'twentyfive_twentynine': ('django.db.models.fields.IntegerField', [], {}),
- 'twentyone': ('django.db.models.fields.IntegerField', [], {}),
- 'twentytwo_twentyfour': ('django.db.models.fields.IntegerField', [], {}),
- 'under_five': ('django.db.models.fields.IntegerField', [], {})
- },
- u'censusdata.census2010hispanicorigin': {
- 'Meta': {'object_name': 'Census2010HispanicOrigin'},
- 'geoid': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['geo.Geo']", 'unique': 'True', 'primary_key': 'True'}),
- 'hispanic': ('django.db.models.fields.IntegerField', [], {}),
- 'non_hispanic': ('django.db.models.fields.IntegerField', [], {}),
- 'total_pop': ('django.db.models.fields.IntegerField', [], {})
- },
- u'censusdata.census2010households': {
- 'Meta': {'object_name': 'Census2010Households'},
- 'female_no_husband': ('django.db.models.fields.IntegerField', [], {}),
- 'geoid': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['geo.Geo']", 'unique': 'True', 'primary_key': 'True'}),
- 'husband_wife': ('django.db.models.fields.IntegerField', [], {}),
- 'living_alone': ('django.db.models.fields.IntegerField', [], {}),
- 'male_no_wife': ('django.db.models.fields.IntegerField', [], {}),
- 'not_living_alone': ('django.db.models.fields.IntegerField', [], {}),
- 'total': ('django.db.models.fields.IntegerField', [], {}),
- 'total_family': ('django.db.models.fields.IntegerField', [], {}),
- 'total_family_other': ('django.db.models.fields.IntegerField', [], {}),
- 'total_nonfamily': ('django.db.models.fields.IntegerField', [], {})
- },
- u'censusdata.census2010race': {
- 'Meta': {'object_name': 'Census2010Race'},
- 'amind_alone': ('django.db.models.fields.IntegerField', [], {}),
- 'asian_alone': ('django.db.models.fields.IntegerField', [], {}),
- 'black_alone': ('django.db.models.fields.IntegerField', [], {}),
- 'geoid': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['geo.Geo']", 'unique': 'True', 'primary_key': 'True'}),
- 'other_alone': ('django.db.models.fields.IntegerField', [], {}),
- 'pacis_alone': ('django.db.models.fields.IntegerField', [], {}),
- 'total_pop': ('django.db.models.fields.IntegerField', [], {}),
- 'two_or_more': ('django.db.models.fields.IntegerField', [], {}),
- 'white_alone': ('django.db.models.fields.IntegerField', [], {})
- },
- u'censusdata.census2010racestats': {
- 'Meta': {'object_name': 'Census2010RaceStats'},
- 'geoid': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['geo.Geo']", 'unique': 'True', 'primary_key': 'True'}),
- 'hispanic': ('django.db.models.fields.IntegerField', [], {}),
- 'hispanic_perc': ('django.db.models.fields.FloatField', [], {}),
- 'non_hisp_asian_only': ('django.db.models.fields.IntegerField', [], {}),
- 'non_hisp_asian_only_perc': ('django.db.models.fields.FloatField', [], {}),
- 'non_hisp_black_only': ('django.db.models.fields.IntegerField', [], {}),
- 'non_hisp_black_only_perc': ('django.db.models.fields.FloatField', [], {}),
- 'non_hisp_white_only': ('django.db.models.fields.IntegerField', [], {}),
- 'non_hisp_white_only_perc': ('django.db.models.fields.FloatField', [], {}),
- 'total_pop': ('django.db.models.fields.IntegerField', [], {})
- },
- u'censusdata.census2010sex': {
- 'Meta': {'object_name': 'Census2010Sex'},
- 'female': ('django.db.models.fields.IntegerField', [], {}),
- 'geoid': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['geo.Geo']", 'unique': 'True', 'primary_key': 'True'}),
- 'male': ('django.db.models.fields.IntegerField', [], {}),
- 'total_pop': ('django.db.models.fields.IntegerField', [], {})
- },
- u'geo.geo': {
- 'Meta': {'object_name': 'Geo', 'index_together': "[('geo_type', 'minlat', 'minlon'), ('geo_type', 'minlat', 'maxlon'), ('geo_type', 'maxlat', 'minlon'), ('geo_type', 'maxlat', 'maxlon'), ('geo_type', 'centlat', 'centlon'), ('geo_type', 'cbsa')]"},
- 'cbsa': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True'}),
- 'centlat': ('django.db.models.fields.FloatField', [], {}),
- 'centlon': ('django.db.models.fields.FloatField', [], {}),
- 'county': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True'}),
- 'csa': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True'}),
- 'geo_type': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
- 'geoid': ('django.db.models.fields.CharField', [], {'max_length': '20', 'primary_key': 'True'}),
- 'geom': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {'srid': '4269'}),
- 'maxlat': ('django.db.models.fields.FloatField', [], {}),
- 'maxlon': ('django.db.models.fields.FloatField', [], {}),
- 'metdiv': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True'}),
- 'minlat': ('django.db.models.fields.FloatField', [], {}),
- 'minlon': ('django.db.models.fields.FloatField', [], {}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
- 'state': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True'}),
- 'tract': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True'})
- }
- }
-
- complete_apps = ['censusdata']
\ No newline at end of file
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('geo', '__first__'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Census2010Age',
+ fields=[
+ ('geoid', models.OneToOneField(primary_key=True, serialize=False, to='geo.Geo')),
+ ('total_pop', models.IntegerField()),
+ ('under_five', models.IntegerField()),
+ ('five_nine', models.IntegerField()),
+ ('ten_fourteen', models.IntegerField()),
+ ('fifteen_seventeen', models.IntegerField()),
+ ('eighteen_nineteen', models.IntegerField()),
+ ('twenty', models.IntegerField()),
+ ('twentyone', models.IntegerField()),
+ ('twentytwo_twentyfour', models.IntegerField()),
+ ('twentyfive_twentynine', models.IntegerField()),
+ ('thirty_thirtyfour', models.IntegerField()),
+ ('thirtyfive_thirtynine', models.IntegerField()),
+ ('forty_fortyfour', models.IntegerField()),
+ ('fortyfive_fortynine', models.IntegerField()),
+ ('fifty_fiftyfour', models.IntegerField()),
+ ('fiftyfive_fiftynine', models.IntegerField()),
+ ('sixty_sixtyone', models.IntegerField()),
+ ('sixtytwo_sixtyfour', models.IntegerField()),
+ ('sixtyfive_sixtysix', models.IntegerField()),
+ ('sixtyseven_sixynine', models.IntegerField()),
+ ('seventy_seventyfour', models.IntegerField()),
+ ('seventyfive_seventynine', models.IntegerField()),
+ ('eighty_eightyfour', models.IntegerField()),
+ ('eightyfive_up', models.IntegerField()),
+ ],
+ options={
+ },
+ bases=(models.Model,),
+ ),
+ migrations.CreateModel(
+ name='Census2010HispanicOrigin',
+ fields=[
+ ('geoid', models.OneToOneField(primary_key=True, serialize=False, to='geo.Geo')),
+ ('total_pop', models.IntegerField()),
+ ('non_hispanic', models.IntegerField()),
+ ('hispanic', models.IntegerField()),
+ ],
+ options={
+ },
+ bases=(models.Model,),
+ ),
+ migrations.CreateModel(
+ name='Census2010Households',
+ fields=[
+ ('geoid', models.OneToOneField(primary_key=True, serialize=False, to='geo.Geo')),
+ ('total', models.IntegerField(help_text=b'Total number of households in census tract. P0180001')),
+ ('total_family', models.IntegerField(help_text=b'Total number of family households. Combined with total_nonfamily to check total. P0180002')),
+ ('husband_wife', models.IntegerField(help_text=b'Husband-wife family households. Combine with total_family_other to check total_family. P0180003')),
+ ('total_family_other', models.IntegerField(help_text=b"'Other' family households. Combine with husband_wife to check total_family. P0180004")),
+ ('male_no_wife', models.IntegerField(help_text=b'Male householder, no wife present. Combine with female_no_husband to check total_family_other. P0180005')),
+ ('female_no_husband', models.IntegerField(help_text=b'Female householder, no husband present. Combine with male_no_wife to check total_family_other. P0180006')),
+ ('total_nonfamily', models.IntegerField(help_text=b'Total number of nonfamily households. Combine with total_family to check total. P0180007')),
+ ('living_alone', models.IntegerField(help_text=b'Householder living alone. Combine with not_living_alone to check total_nonfamily. P0180008')),
+ ('not_living_alone', models.IntegerField(help_text=b'Householder not living alone. Combine with living_alone to check total_nonfamily. P0180009')),
+ ],
+ options={
+ },
+ bases=(models.Model,),
+ ),
+ migrations.CreateModel(
+ name='Census2010Race',
+ fields=[
+ ('geoid', models.OneToOneField(primary_key=True, serialize=False, to='geo.Geo')),
+ ('total_pop', models.IntegerField()),
+ ('white_alone', models.IntegerField()),
+ ('black_alone', models.IntegerField()),
+ ('amind_alone', models.IntegerField()),
+ ('asian_alone', models.IntegerField()),
+ ('pacis_alone', models.IntegerField()),
+ ('other_alone', models.IntegerField()),
+ ('two_or_more', models.IntegerField()),
+ ],
+ options={
+ },
+ bases=(models.Model,),
+ ),
+ migrations.CreateModel(
+ name='Census2010RaceStats',
+ fields=[
+ ('geoid', models.OneToOneField(primary_key=True, serialize=False, to='geo.Geo')),
+ ('total_pop', models.IntegerField()),
+ ('hispanic', models.IntegerField()),
+ ('non_hisp_white_only', models.IntegerField()),
+ ('non_hisp_black_only', models.IntegerField()),
+ ('non_hisp_asian_only', models.IntegerField()),
+ ('hispanic_perc', models.FloatField()),
+ ('non_hisp_white_only_perc', models.FloatField()),
+ ('non_hisp_black_only_perc', models.FloatField()),
+ ('non_hisp_asian_only_perc', models.FloatField()),
+ ],
+ options={
+ },
+ bases=(models.Model,),
+ ),
+ migrations.CreateModel(
+ name='Census2010Sex',
+ fields=[
+ ('geoid', models.OneToOneField(primary_key=True, serialize=False, to='geo.Geo')),
+ ('total_pop', models.IntegerField()),
+ ('male', models.IntegerField()),
+ ('female', models.IntegerField()),
+ ],
+ options={
+ },
+ bases=(models.Model,),
+ ),
+ ]
diff --git a/mapusaurus/censusdata/tests/test_loader.py b/mapusaurus/censusdata/tests/test_loader.py
index 40029820..0e51ff4e 100644
--- a/mapusaurus/censusdata/tests/test_loader.py
+++ b/mapusaurus/censusdata/tests/test_loader.py
@@ -23,43 +23,46 @@ def tearDown(self):
@patch.object(Command, 'handle_filethree')
def test_handle(self, hf3, hf4, hf5):
# Create Mock GEO file
+ year = '2013'
shutil.copyfile(os.path.join("censusdata", "tests", "mock_geo.txt"),
os.path.join(self.tempdir, "ZZgeo2010.sf1"))
command = Command()
- command.handle(os.path.join(self.tempdir, 'ZZgeo2010.sf1'))
+ command.handle(os.path.join(self.tempdir, 'ZZgeo2010.sf1'), year)
positional_args = hf4.call_args[0]
self.assertEqual(positional_args[0],
os.path.join(self.tempdir, "ZZgeo2010.sf1"))
- self.assertEqual(positional_args[1], '11') # State
- self.assertEqual(len(positional_args[2]), 2)
- self.assertEqual(positional_args[2]['0007159'], '11001000100')
- self.assertEqual(positional_args[2]['0007211'], '11001000902')
+ self.assertEqual(positional_args[1], year)
+ self.assertEqual(positional_args[2], '11') # State
+ self.assertEqual(len(positional_args[3]), 2)
+ self.assertEqual(positional_args[3]['0007159'], year+'11001000100')
+ self.assertEqual(positional_args[3]['0007211'], year+'11001000902')
@patch('censusdata.management.commands.load_summary_one.errors')
@patch.object(Command, 'handle_filefive')
@patch.object(Command, 'handle_filefour')
@patch.object(Command, 'handle_filethree')
def test_handle_errors_dict(self, hf3, hf4, hf5, errors):
+ year = '2001'
errors.in_2010 = {'11001000100': '22002000200', '11001000902': None}
# Create Mock GEO file
shutil.copyfile(os.path.join("censusdata", "tests", "mock_geo.txt"),
os.path.join(self.tempdir, "ZZgeo2010.sf1"))
command = Command()
- command.handle(os.path.join(self.tempdir, 'ZZgeo2010.sf1'))
+ command.handle(os.path.join(self.tempdir, 'ZZgeo2010.sf1'), year)
positional_args = hf4.call_args[0]
# The None causes us to skip 11001000902
- self.assertEqual(len(positional_args[2]), 1)
+ self.assertEqual(len(positional_args[2]), 2)
# This entry was converted
- self.assertEqual(positional_args[2]['0007159'], '22002000200')
+ self.assertEqual(positional_args[3]['0007159'], year+'22002000200')
def test_handle_filethree(self):
shutil.copyfile(os.path.join("censusdata", "tests", "mock_file3.txt"),
os.path.join(self.tempdir, "ZZ000032010.sf1"))
command = Command()
command.handle_filethree(os.path.join(self.tempdir, "ZZgeo2010.sf1"),
- '11', # State
+ '2013', '11', # State
{'0007159': '11001000100',
'0007211': '11001000902'})
model = models.Census2010RaceStats.objects.get(pk='11001000100')
@@ -85,7 +88,7 @@ def test_handle_filethree_no_delete(self):
os.path.join(self.tempdir, "ZZ000032010.sf1"))
command = Command()
command.handle_filethree(os.path.join(self.tempdir, "ZZgeo2010.sf1"),
- '11', # State
+ '2013', '11', # State
{'0007159': '11001000100',
'0007211': '11001000902'})
self.assertEqual(len(models.Census2010RaceStats.objects.all()), 2)
@@ -94,7 +97,7 @@ def test_handle_filethree_no_delete(self):
# Importing again should do nothing
command.handle_filethree(os.path.join(self.tempdir, "ZZgeo2010.sf1"),
- '11', # State
+ '2013', '11', # State
{'0007159': '11001000100',
'0007211': '11001000902'})
self.assertEqual(len(models.Census2010RaceStats.objects.all()), 1)
@@ -105,7 +108,7 @@ def test_handle_filefive(self):
os.path.join(self.tempdir, "ZZ000052010.sf1"))
command = Command()
command.handle_filefive(os.path.join(self.tempdir, "ZZgeo2010.sf1"),
- '11', # State
+ '2013', '11', # State
{'0007159': '11001000100',
'0007211': '11001000902'})
model = models.Census2010Households.objects.get(pk='11001000100')
diff --git a/mapusaurus/censusdata/tests/test_views_utilities.py b/mapusaurus/censusdata/tests/test_views_utilities.py
index ba9d0aba..7fcf15fd 100644
--- a/mapusaurus/censusdata/tests/test_views_utilities.py
+++ b/mapusaurus/censusdata/tests/test_views_utilities.py
@@ -39,19 +39,19 @@ def test_assemble_stats(self):
metro = Geo.objects.get(geo_type=Geo.METRO_TYPE, geoid=request.GET.get('metro'))
peer_request = HttpRequest()
peer_request.GET['lender'] = lender.institution_id
- peer_request.GET['metro']= metro.geoid
+ peer_request.GET['metro'] = metro.geoid
peer_request.GET['peers'] = 'true'
peer_request.GET['action_taken'] = '1,2,3,4,5'
peer_lar_data = loan_originations_as_json(peer_request)
- tracts = Geo.objects.filter(geo_type=Geo.TRACT_TYPE, cbsa=request.GET.get('metro'))
+ tracts = Geo.objects.filter(geo_type=Geo.TRACT_TYPE, cbsa=metro.cbsa)
lender_stats = assemble_stats(*get_minority_area_stats(lar_data, peer_lar_data, tracts))
self.assertEqual(lender_stats['hma_pct'], 0)
self.assertEqual(lender_stats['lma_pct'], 1)
self.assertEqual(lender_stats['mma_pct'], 0)
- self.assertEqual(lender_stats['lma'], 7)
+ self.assertEqual(lender_stats['lma'], 3)
self.assertEqual(lender_stats['mma'], 0)
self.assertEqual(lender_stats['hma'], 0)
- self.assertEqual(lender_stats['lar_total'], 7)
+ self.assertEqual(lender_stats['lar_total'], 3)
def test_odds_ratio(self):
"""
diff --git a/mapusaurus/censusdata/views.py b/mapusaurus/censusdata/views.py
index 136d2504..db7cce2c 100644
--- a/mapusaurus/censusdata/views.py
+++ b/mapusaurus/censusdata/views.py
@@ -160,9 +160,7 @@ def minority_aggregation_as_json(request):
msa_stats = {}
-
lar_data = loan_originations_as_json(request)
-
lender = get_object_or_404(Institution, pk=request.GET.get('lender'))
metro = get_object_or_404(Geo, geo_type=Geo.METRO_TYPE, geoid=request.GET.get('metro'))
peer_request = HttpRequest()
@@ -171,10 +169,10 @@ def minority_aggregation_as_json(request):
peer_request.GET['peers'] = 'true'
peer_lar_data = loan_originations_as_json(peer_request)
- msa_counties = Geo.objects.filter(geo_type=Geo.COUNTY_TYPE, cbsa=metro.geoid)
+ msa_counties = Geo.objects.filter(geo_type=Geo.COUNTY_TYPE, cbsa=metro.cbsa, year=metro.year)
county_stats = {}
for county in msa_counties:
- county_tracts = Geo.objects.filter(geo_type=Geo.TRACT_TYPE, state=county.state, county=county.county)
+ county_tracts = Geo.objects.filter(geo_type=Geo.TRACT_TYPE, state=county.state, county=county.county, year=metro.year)
minority_area_stats = get_minority_area_stats(lar_data, peer_lar_data, county_tracts)
county_stats[county.geoid] = assemble_stats(*minority_area_stats)
county_stats[county.geoid]['name'] = county.name
@@ -229,11 +227,12 @@ def race_summary_http(request):
def race_summary_csv(request):
institution_id = request.GET.get('lender')
metro = request.GET.get('metro')
+ year = request.GET.get('year')
if institution_id and metro:
lar_data = loan_originations_as_json(request)
tracts_in_msa = get_censustract_geos(request)
queryset = Census2010RaceStats.objects.filter(geoid__in=tracts_in_msa)
- file_name = 'HMDA-Census-Tract_2013_Lender%s_MSA%s.csv' % (institution_id, metro)
+ file_name = 'HMDA-Census-Tract_Year%s_Lender%s_MSA%s.csv' % (year, institution_id, metro)
response = HttpResponse(content_type='text/csv')
response['Content-Disposition'] = 'attachment; filename=%s' % file_name
writer = csv.writer(response, csv.excel)
diff --git a/mapusaurus/geo/fixtures/fake_msa.json b/mapusaurus/geo/fixtures/fake_msa.json
index 9bb27b1f..166d85ee 100644
--- a/mapusaurus/geo/fixtures/fake_msa.json
+++ b/mapusaurus/geo/fixtures/fake_msa.json
@@ -7,13 +7,15 @@
"geo_type": 4,
"name": "Dev MSA 1",
"csa": "100",
+ "cbsa": "10000",
"geom": "MULTIPOLYGON (((0 0, 0 1, 1 1, 0 0)))",
"minlat": 0,
"minlon": 0,
"maxlat": 1,
"maxlon": 1,
"centlat": 0.5,
- "centlon": 0.5
+ "centlon": 0.5,
+ "year":2013
}
},
{
@@ -24,13 +26,15 @@
"geo_type": 4,
"name": "Wisalem 1",
"csa": "100",
+ "cbsa": "31740",
"geom": "MULTIPOLYGON (((0 0, 0 1, 1 1, 0 0)))",
"minlat": 38.869704,
"minlon": -96.963688,
"maxlat": 39.566587,
"maxlon": -96.034612,
"centlat": 39.2684241,
- "centlon": -96.5622422
+ "centlon": -96.5622422,
+ "year":2013
}
},
{
@@ -41,13 +45,15 @@
"geo_type": 4,
"name": "Wisalem 2",
"csa": "100",
+ "cbsa": "45820",
"geom": "MULTIPOLYGON (((0 0, 0 1, 1 1, 0 0)))",
"minlat": 38.433544,
"minlon": -96.501722,
"maxlat": 39.65318,
"maxlon": -95.179827,
"centlat": 39.0413888,
- "centlon": -95.8026393
+ "centlon": -95.8026393,
+ "year":2013
}
},
{
@@ -58,13 +64,15 @@
"geo_type": 4,
"name": "Dev MSA 1",
"csa": "100",
+ "cbsa": "10001",
"geom": "MULTIPOLYGON (((0 0, 0 1, 1 1, 0 0)))",
"minlat": 0,
"minlon": 0,
"maxlat": 1,
"maxlon": 1,
"centlat": 0.5,
- "centlon": 0.5
+ "centlon": 0.5,
+ "year":2013
}
},
{
@@ -75,13 +83,15 @@
"geo_type": 4,
"name": "Wichita",
"csa": "556",
+ "cbsa": "48620",
"geom": "MULTIPOLYGON (((-97.808358 36.998546, -97.808358 38.175081, -96.522782 38.175081, -97.808358 36.998546)))",
"minlat": 36.998546,
"minlon": -97.808358,
"maxlat": 38.175081,
"maxlon": -96.522782,
"centlat": 37.6385839,
- "centlon": -97.2460377
+ "centlon": -97.2460377,
+ "year":2013
}
},
{
@@ -92,13 +102,15 @@
"geo_type": 4,
"name": "Winston-Salem",
"csa": "556",
+ "cbsa": "556",
"geom": "MULTIPOLYGON (((-80.88218 35.742811, -80.88218 36.55063, -80.027269 36.55063, -80.88218 35.742811)))",
"minlat": 35.742811,
"minlon": -80.88218,
"maxlat": 36.55063,
"maxlon": -80.027269,
"centlat": 36.1905412,
- "centlon": -80.3969029
+ "centlon": -80.3969029,
+ "year":2013
}
}
]
diff --git a/mapusaurus/geo/fixtures/many_tracts.json b/mapusaurus/geo/fixtures/many_tracts.json
index b981df1d..5f103c0c 100644
--- a/mapusaurus/geo/fixtures/many_tracts.json
+++ b/mapusaurus/geo/fixtures/many_tracts.json
@@ -15,7 +15,8 @@
"maxlat": 1,
"maxlon": 1,
"centlat": 0.5,
- "centlon": 0.5
+ "centlon": 0.5,
+ "year":"2013"
}
},
{
@@ -34,7 +35,8 @@
"maxlat": 1,
"maxlon": 1,
"centlat": 0.5,
- "centlon": 0.5
+ "centlon": 0.5,
+ "year":"2013"
}
},
{
@@ -53,7 +55,8 @@
"maxlat": 1,
"maxlon": 1,
"centlat": 0.5,
- "centlon": 0.5
+ "centlon": 0.5,
+ "year":"2013"
}
},
{
@@ -72,7 +75,8 @@
"maxlat": -4,
"maxlon": -4,
"centlat": -4.5,
- "centlon": -4.5
+ "centlon": -4.5,
+ "year":"2013"
}
}
]
diff --git a/mapusaurus/geo/fixtures/test_counties.json b/mapusaurus/geo/fixtures/test_counties.json
index 71dc3c56..65eef009 100644
--- a/mapusaurus/geo/fixtures/test_counties.json
+++ b/mapusaurus/geo/fixtures/test_counties.json
@@ -13,7 +13,8 @@
"maxlat": 5,
"maxlon": 5,
"centlat": 4.5,
- "centlon": 4.5
+ "centlon": 4.5,
+ "year":"2013"
}
},
{
@@ -30,7 +31,8 @@
"maxlat": -2,
"maxlon": -2,
"centlat": -3,
- "centlon": -3
+ "centlon": -3,
+ "year":"2013"
}
}
]
diff --git a/mapusaurus/geo/management/commands/load_geos_from.py b/mapusaurus/geo/management/commands/load_geos_from.py
index 4319a328..83b3cf7c 100644
--- a/mapusaurus/geo/management/commands/load_geos_from.py
+++ b/mapusaurus/geo/management/commands/load_geos_from.py
@@ -9,7 +9,7 @@
class Command(BaseCommand):
help = "Load shapes (tracts, counties, msas) from a shape file."
- args = ""
+ args = " "
def geo_type(self, row_dict):
"""Inspect the row to determine which type of geometry it represents"""
@@ -24,7 +24,7 @@ def geo_type(self, row_dict):
if row_dict.get('LSAD') == 'M3':
return Geo.METDIV_TYPE
- def process_row(self, row, field_names):
+ def process_row(self, year, row, field_names):
"""Runs for every shape in the shape file. Returns a kw-dict which
will be passed to Geo"""
row_dict = dict((field_name, row[idx])
@@ -39,7 +39,7 @@ def process_row(self, row, field_names):
# Use ".get('field') or None" to convert empty strings into Nones
return {
- 'geoid': row_dict['GEOID'], 'geo_type': self.geo_type(row_dict),
+ 'geoid': year+row_dict['GEOID'], 'geo_type': self.geo_type(row_dict),
'name': row_dict['NAME'], 'state': row_dict.get('STATEFP') or None,
'county': row_dict.get('COUNTYFP') or None,
'tract': row_dict.get('TRACTCE') or None,
@@ -50,7 +50,8 @@ def process_row(self, row, field_names):
'maxlon': max(lons),
'centlat': float(row_dict['INTPTLAT']),
'centlon': float(row_dict['INTPTLON']),
- 'geom': geom}
+ 'geom': geom,
+ 'year': year}
def save_batch(self, batch):
"""We don't want to break any FKs, so we will only update geos if they
@@ -72,7 +73,8 @@ def save_batch(self, batch):
def handle(self, *args, **options):
old_debug = settings.DEBUG
settings.DEBUG = False
- shapefile_name = args[0]
+ year = args[0]
+ shapefile_name = args[1]
ds = DataSource(shapefile_name, encoding='iso-8859-1')
layer = ds[0]
columns = [layer.get_fields(field) for field in layer.fields]
@@ -80,7 +82,7 @@ def handle(self, *args, **options):
rows = itertools.izip(*columns)
batch, batch_count = [], 0
for row in rows:
- batch.append(self.process_row(row, layer.fields))
+ batch.append(self.process_row(year, row, layer.fields))
if len(batch) == 100:
batch_count += 1
self.stdout.write('Saving batch %d' % batch_count)
diff --git a/mapusaurus/geo/management/commands/set_tract_csa_cbsa.py b/mapusaurus/geo/management/commands/set_tract_csa_cbsa.py
index c0825ad7..a3a8f540 100644
--- a/mapusaurus/geo/management/commands/set_tract_csa_cbsa.py
+++ b/mapusaurus/geo/management/commands/set_tract_csa_cbsa.py
@@ -15,7 +15,8 @@ def handle(self, *args, **options):
SET cbsa = (SELECT cbsa FROM geo_geo county
WHERE county.geo_type = %s
AND county.state = geo_geo.state
- AND county.county = geo_geo.county)
+ AND county.county = geo_geo.county
+ AND county.year = geo_geo.year)
WHERE geo_type = %s;
""", (Geo.COUNTY_TYPE, Geo.TRACT_TYPE))
cursor.execute("""
@@ -23,7 +24,8 @@ def handle(self, *args, **options):
SET csa = (SELECT csa FROM geo_geo county
WHERE county.geo_type = %s
AND county.state = geo_geo.state
- AND county.county = geo_geo.county)
+ AND county.county = geo_geo.county
+ AND county.year = geo_geo.year)
WHERE geo_type = %s;
""", (Geo.COUNTY_TYPE, Geo.TRACT_TYPE))
cursor.close()
diff --git a/mapusaurus/geo/migrations/0001_initial.py b/mapusaurus/geo/migrations/0001_initial.py
index 18727952..29034b6f 100644
--- a/mapusaurus/geo/migrations/0001_initial.py
+++ b/mapusaurus/geo/migrations/0001_initial.py
@@ -1,96 +1,43 @@
# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
- def forwards(self, orm):
- # Adding model 'Geo'
- db.create_table(u'geo_geo', (
- ('geoid', self.gf('django.db.models.fields.CharField')(max_length=20, primary_key=True)),
- ('geo_type', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)),
- ('name', self.gf('django.db.models.fields.CharField')(max_length=50)),
- ('state', self.gf('django.db.models.fields.CharField')(max_length=2, null=True)),
- ('county', self.gf('django.db.models.fields.CharField')(max_length=3, null=True)),
- ('tract', self.gf('django.db.models.fields.CharField')(max_length=6, null=True)),
- ('csa', self.gf('django.db.models.fields.CharField')(max_length=3, null=True)),
- ('cbsa', self.gf('django.db.models.fields.CharField')(max_length=5, null=True)),
- ('metdiv', self.gf('django.db.models.fields.CharField')(max_length=5, null=True)),
- ('geom', self.gf('django.contrib.gis.db.models.fields.MultiPolygonField')(srid=4269)),
- ('minlat', self.gf('django.db.models.fields.FloatField')()),
- ('maxlat', self.gf('django.db.models.fields.FloatField')()),
- ('minlon', self.gf('django.db.models.fields.FloatField')()),
- ('maxlon', self.gf('django.db.models.fields.FloatField')()),
- ('centlat', self.gf('django.db.models.fields.FloatField')()),
- ('centlon', self.gf('django.db.models.fields.FloatField')()),
- ))
- db.send_create_signal(u'geo', ['Geo'])
-
- # Adding index on 'Geo', fields ['geo_type', 'minlat', 'minlon']
- db.create_index(u'geo_geo', ['geo_type', 'minlat', 'minlon'])
-
- # Adding index on 'Geo', fields ['geo_type', 'minlat', 'maxlon']
- db.create_index(u'geo_geo', ['geo_type', 'minlat', 'maxlon'])
-
- # Adding index on 'Geo', fields ['geo_type', 'maxlat', 'minlon']
- db.create_index(u'geo_geo', ['geo_type', 'maxlat', 'minlon'])
-
- # Adding index on 'Geo', fields ['geo_type', 'maxlat', 'maxlon']
- db.create_index(u'geo_geo', ['geo_type', 'maxlat', 'maxlon'])
-
- # Adding index on 'Geo', fields ['geo_type', 'centlat', 'centlon']
- db.create_index(u'geo_geo', ['geo_type', 'centlat', 'centlon'])
-
- # Adding index on 'Geo', fields ['geo_type', 'cbsa']
- db.create_index(u'geo_geo', ['geo_type', 'cbsa'])
-
-
- def backwards(self, orm):
- # Removing index on 'Geo', fields ['geo_type', 'cbsa']
- db.delete_index(u'geo_geo', ['geo_type', 'cbsa'])
-
- # Removing index on 'Geo', fields ['geo_type', 'centlat', 'centlon']
- db.delete_index(u'geo_geo', ['geo_type', 'centlat', 'centlon'])
-
- # Removing index on 'Geo', fields ['geo_type', 'maxlat', 'maxlon']
- db.delete_index(u'geo_geo', ['geo_type', 'maxlat', 'maxlon'])
-
- # Removing index on 'Geo', fields ['geo_type', 'maxlat', 'minlon']
- db.delete_index(u'geo_geo', ['geo_type', 'maxlat', 'minlon'])
-
- # Removing index on 'Geo', fields ['geo_type', 'minlat', 'maxlon']
- db.delete_index(u'geo_geo', ['geo_type', 'minlat', 'maxlon'])
-
- # Removing index on 'Geo', fields ['geo_type', 'minlat', 'minlon']
- db.delete_index(u'geo_geo', ['geo_type', 'minlat', 'minlon'])
-
- # Deleting model 'Geo'
- db.delete_table(u'geo_geo')
-
-
- models = {
- u'geo.geo': {
- 'Meta': {'object_name': 'Geo', 'index_together': "[('geo_type', 'minlat', 'minlon'), ('geo_type', 'minlat', 'maxlon'), ('geo_type', 'maxlat', 'minlon'), ('geo_type', 'maxlat', 'maxlon'), ('geo_type', 'centlat', 'centlon'), ('geo_type', 'cbsa')]"},
- 'cbsa': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True'}),
- 'centlat': ('django.db.models.fields.FloatField', [], {}),
- 'centlon': ('django.db.models.fields.FloatField', [], {}),
- 'county': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True'}),
- 'csa': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True'}),
- 'geo_type': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
- 'geoid': ('django.db.models.fields.CharField', [], {'max_length': '20', 'primary_key': 'True'}),
- 'geom': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {'srid': '4269'}),
- 'maxlat': ('django.db.models.fields.FloatField', [], {}),
- 'maxlon': ('django.db.models.fields.FloatField', [], {}),
- 'metdiv': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True'}),
- 'minlat': ('django.db.models.fields.FloatField', [], {}),
- 'minlon': ('django.db.models.fields.FloatField', [], {}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
- 'state': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True'}),
- 'tract': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True'})
- }
- }
-
- complete_apps = ['geo']
\ No newline at end of file
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django.contrib.gis.db.models.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Geo',
+ fields=[
+ ('geoid', models.CharField(max_length=20, serialize=False, primary_key=True)),
+ ('geo_type', models.PositiveIntegerField(db_index=True, choices=[(1, b'State'), (2, b'County'), (3, b'Census Tract'), (4, b'Metropolitan'), (5, b'Micropolitan'), (6, b'Metropolitan Division')])),
+ ('name', models.CharField(max_length=50)),
+ ('state', models.CharField(max_length=2, null=True)),
+ ('county', models.CharField(max_length=3, null=True)),
+ ('tract', models.CharField(max_length=6, null=True)),
+ ('csa', models.CharField(help_text=b'Combined Statistical Area', max_length=3, null=True)),
+ ('cbsa', models.CharField(help_text=b'Core Based Statistical Area', max_length=5, null=True)),
+ ('metdiv', models.CharField(help_text=b'Metro Division', max_length=5, null=True)),
+ ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4269)),
+ ('year', models.SmallIntegerField()),
+ ('minlat', models.FloatField()),
+ ('maxlat', models.FloatField()),
+ ('minlon', models.FloatField()),
+ ('maxlon', models.FloatField()),
+ ('centlat', models.FloatField()),
+ ('centlon', models.FloatField()),
+ ],
+ options={
+ },
+ bases=(models.Model,),
+ ),
+ migrations.AlterIndexTogether(
+ name='geo',
+ index_together=set([('geo_type', 'minlat', 'maxlon', 'year'), ('geo_type', 'centlat', 'centlon', 'year'), ('geo_type', 'maxlat', 'minlon', 'year'), ('geo_type', 'minlat', 'minlon', 'year'), ('geo_type', 'cbsa', 'year'), ('geo_type', 'maxlat', 'maxlon', 'year')]),
+ ),
+ ]
diff --git a/mapusaurus/geo/migrations/0002_auto_20160219_2009.py b/mapusaurus/geo/migrations/0002_auto_20160219_2009.py
new file mode 100644
index 00000000..405a29c9
--- /dev/null
+++ b/mapusaurus/geo/migrations/0002_auto_20160219_2009.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('geo', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='geo',
+ name='year',
+ field=models.SmallIntegerField(db_index=True),
+ ),
+ migrations.AlterIndexTogether(
+ name='geo',
+ index_together=set([('geo_type', 'minlat', 'maxlon', 'year'), ('geo_type', 'maxlat', 'maxlon', 'year'), ('geo_type', 'geoid'), ('geo_type', 'maxlat', 'minlon', 'year'), ('geo_type', 'centlat', 'centlon', 'year'), ('geo_type', 'cbsa', 'year'), ('geo_type', 'minlat', 'minlon', 'year')]),
+ ),
+ ]
diff --git a/mapusaurus/geo/migrations/0003_auto_20160222_1706.py b/mapusaurus/geo/migrations/0003_auto_20160222_1706.py
new file mode 100644
index 00000000..5b250d61
--- /dev/null
+++ b/mapusaurus/geo/migrations/0003_auto_20160222_1706.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('geo', '0002_auto_20160219_2009'),
+ ]
+
+ operations = [
+ migrations.AlterIndexTogether(
+ name='geo',
+ index_together=set([('geo_type', 'minlat', 'maxlon', 'year'), ('geo_type', 'centlat', 'centlon', 'year'), ('geo_type', 'maxlat', 'minlon', 'year'), ('geo_type', 'minlat', 'minlon', 'year'), ('geo_type', 'cbsa', 'year'), ('geo_type', 'maxlat', 'maxlon', 'year')]),
+ ),
+ ]
diff --git a/mapusaurus/geo/migrations/0004_auto_20160222_2155.py b/mapusaurus/geo/migrations/0004_auto_20160222_2155.py
new file mode 100644
index 00000000..637c3108
--- /dev/null
+++ b/mapusaurus/geo/migrations/0004_auto_20160222_2155.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('geo', '0003_auto_20160222_1706'),
+ ]
+
+ operations = [
+ migrations.AlterIndexTogether(
+ name='geo',
+ index_together=set([('state', 'year'), ('geo_type', 'minlat', 'maxlon', 'year'), ('geo_type', 'maxlat', 'maxlon', 'year'), ('geo_type', 'maxlat', 'minlon', 'year'), ('geo_type', 'centlat', 'centlon', 'year'), ('geo_type', 'cbsa', 'year'), ('geo_type', 'minlat', 'minlon', 'year')]),
+ ),
+ ]
diff --git a/mapusaurus/geo/models.py b/mapusaurus/geo/models.py
index c17f65c9..23deab5d 100644
--- a/mapusaurus/geo/models.py
+++ b/mapusaurus/geo/models.py
@@ -27,6 +27,8 @@ class Geo(models.Model):
geom = models.MultiPolygonField(srid=4269)
+ year = models.SmallIntegerField(db_index=True)
+
minlat = models.FloatField()
maxlat = models.FloatField()
minlon = models.FloatField()
@@ -37,12 +39,13 @@ class Geo(models.Model):
objects = models.GeoManager()
class Meta:
- index_together = [("geo_type", "minlat", "minlon"),
- ("geo_type", "minlat", "maxlon"),
- ("geo_type", "maxlat", "minlon"),
- ("geo_type", "maxlat", "maxlon"),
- ("geo_type", "centlat", "centlon"),
- ("geo_type", "cbsa")]
+ index_together = [("geo_type", "minlat", "minlon", "year"),
+ ("geo_type", "minlat", "maxlon", "year"),
+ ("geo_type", "maxlat", "minlon", "year"),
+ ("geo_type", "maxlat", "maxlon", "year"),
+ ("geo_type", "centlat", "centlon", "year"),
+ ("geo_type", "cbsa", "year"),
+ ("state", "year"),]
def tract_centroids_as_geojson(self):
"""Convert this model into a geojson string"""
@@ -77,5 +80,5 @@ def tract_shape_as_geojson(self):
def get_censustract_geos_by_msa(self):
"""returns tracts associated with an MSA"""
- tracts = get_list_or_404(Geo, geo_type=Geo.TRACT_TYPE, cbsa=self.geoid)
+ tracts = get_list_or_404(Geo, geo_type=Geo.TRACT_TYPE, cbsa=self.cbsa, year=self.year)
return tracts
diff --git a/mapusaurus/geo/search_indexes.py b/mapusaurus/geo/search_indexes.py
index e48ea102..a9c898c3 100644
--- a/mapusaurus/geo/search_indexes.py
+++ b/mapusaurus/geo/search_indexes.py
@@ -8,6 +8,7 @@ class MetroIndex(indexes.SearchIndex, indexes.Indexable):
text = indexes.CharField(document=True, model_attr='name')
text_auto = indexes.EdgeNgramField(model_attr='name')
geo_type = indexes.IntegerField(model_attr='geo_type')
+ year = indexes.IntegerField(model_attr='year')
def get_model(self):
return Geo
diff --git a/mapusaurus/geo/tests.py b/mapusaurus/geo/tests.py
index 11b97b73..9a74d14a 100644
--- a/mapusaurus/geo/tests.py
+++ b/mapusaurus/geo/tests.py
@@ -24,8 +24,9 @@ def test_search_name(self, SQS):
result.object.name = 'MSA 1'
result.object.centlat = 45
result.object.centlon = 52
- SQS.filter.return_value = [result]
- resp = self.client.get(reverse('geo:search'), {'q': 'Chicago'})
+ result.object.year = 2013
+ SQS.filter.return_value.filter.return_value = [result]
+ resp = self.client.get(reverse('geo:search'), {'q': 'Chicago', 'year': '2013'})
self.assertTrue('Chicago' in str(SQS.filter.call_args))
self.assertTrue('content' in str(SQS.filter.call_args))
self.assertFalse('text_auto' in str(SQS.filter.call_args))
@@ -41,11 +42,12 @@ def test_search_name(self, SQS):
@patch('geo.views.SearchQuerySet')
def test_search_autocomplete(self, SQS):
SQS = SQS.return_value.models.return_value.load_all.return_value
- SQS.filter.return_value = [Mock()]
- self.client.get(reverse('geo:search'), {'q': 'Chicago', 'auto': '1'})
+ SQS.filter.return_value.filter.return_value = [Mock()]
+ self.client.get(reverse('geo:search'), {'q': 'Chicago', 'auto': '1', 'year': '2013'})
self.assertTrue('Chicago' in str(SQS.filter.call_args))
self.assertFalse('content' in str(SQS.filter.call_args))
self.assertTrue('text_auto' in str(SQS.filter.call_args))
+ self.assertTrue('year' in str(SQS.filter.return_value.filter.call_args))
class UtilsTest(TestCase):
def test_check_bounds(self):
@@ -66,18 +68,18 @@ def setUp(self):
}
self.county1 = Geo.objects.create(
geoid='11222', geo_type=Geo.COUNTY_TYPE, state='11', county='222',
- csa='987', **generic_geo)
+ csa='987', year='2012', **generic_geo)
self.county2 = Geo.objects.create(
geoid='11223', geo_type=Geo.COUNTY_TYPE, state='11', county='223',
- cbsa='88776', **generic_geo)
+ cbsa='88776', year='2012', **generic_geo)
self.metro = Geo.objects.create(
- geoid='88776', geo_type=Geo.METRO_TYPE, cbsa='88776',
+ geoid='88776', geo_type=Geo.METRO_TYPE, cbsa='88776', year='2012',
**generic_geo)
self.tract1 = Geo.objects.create(
- geoid='1122233333', geo_type=Geo.TRACT_TYPE, state='11',
+ geoid='1122233333', geo_type=Geo.TRACT_TYPE, state='11', year='2012',
county='222', tract='33333', **generic_geo)
self.tract2 = Geo.objects.create(
- geoid='1122333333', geo_type=Geo.TRACT_TYPE, state='11',
+ geoid='1122333333', geo_type=Geo.TRACT_TYPE, state='11', year='2012',
county='223', tract='33333', **generic_geo)
def tearDown(self):
@@ -99,14 +101,15 @@ def test_set_fields(self):
class LoadGeosFromTest(TestCase):
def test_census_tract(self):
+ year = "2013"
row = ('1122233333', 'Tract 33333', '11', '222', '33333', '-45',
'45', Polygon(((0, 0), (0, 2), (-1, 2), (0, 0))))
field_names = ('GEOID', 'NAME', 'STATEFP', 'COUNTYFP', 'TRACTCE',
'INTPTLAT', 'INTPTLON')
command = LoadGeos()
- geo = command.process_row(row, field_names)
+ geo = command.process_row(year, row, field_names)
- self.assertEqual('1122233333', geo['geoid'])
+ self.assertEqual('20131122233333', geo['geoid'])
self.assertEqual(Geo.TRACT_TYPE, geo['geo_type'])
self.assertEqual('Tract 33333', geo['name'])
self.assertEqual('11', geo['state'])
@@ -118,8 +121,10 @@ def test_census_tract(self):
self.assertEqual((0, 2), (geo['minlat'], geo['maxlat']))
self.assertEqual(-45, geo['centlat'])
self.assertEqual(45, geo['centlon'])
+ self.assertEqual("2013", geo['year'])
def test_county(self):
+ year = "2010"
poly1 = Polygon(((0, 0), (0, 2), (-1, 2), (0, 0)))
poly2 = Polygon(((-4, -2), (-6, -1), (-2, -2), (-4, -2)))
row = ('11222', 'Some County', '11', '222', '-45', '45',
@@ -127,9 +132,9 @@ def test_county(self):
field_names = ('GEOID', 'NAME', 'STATEFP', 'COUNTYFP', 'INTPTLAT',
'INTPTLON')
command = LoadGeos()
- geo = command.process_row(row, field_names)
+ geo = command.process_row(year, row, field_names)
- self.assertEqual('11222', geo['geoid'])
+ self.assertEqual('201011222', geo['geoid'])
self.assertEqual(Geo.COUNTY_TYPE, geo['geo_type'])
self.assertEqual('Some County', geo['name'])
self.assertEqual('11', geo['state'])
@@ -141,16 +146,18 @@ def test_county(self):
self.assertEqual((-2, 2), (geo['minlat'], geo['maxlat']))
self.assertEqual(-45, geo['centlat'])
self.assertEqual(45, geo['centlon'])
+ self.assertEqual("2010", geo['year'])
def test_metro(self):
+ year = "2010"
row = ('12345', 'Big City', '090', '12345', 'M1', '-45', '45',
Polygon(((0, 0), (0, 2), (-1, 2), (0, 0))))
field_names = ('GEOID', 'NAME', 'CSAFP', 'CBSAFP', 'LSAD', 'INTPTLAT',
'INTPTLON')
command = LoadGeos()
- geo = command.process_row(row, field_names)
+ geo = command.process_row(year, row, field_names)
- self.assertEqual('12345', geo['geoid'])
+ self.assertEqual('201012345', geo['geoid'])
self.assertEqual(Geo.METRO_TYPE, geo['geo_type'])
self.assertEqual('Big City', geo['name'])
self.assertEqual(None, geo['state'])
@@ -158,16 +165,18 @@ def test_metro(self):
self.assertEqual(None, geo['tract'])
self.assertEqual('090', geo['csa'])
self.assertEqual('12345', geo['cbsa'])
+ self.assertEqual("2010", geo['year'])
def test_micro(self):
+ year = '1900'
row = ('12345', 'Small Town', '', '12345', 'M2', '-45', '45',
Polygon(((0, 0), (0, 2), (-1, 2), (0, 0))))
field_names = ('GEOID', 'NAME', 'CSAFP', 'CBSAFP', 'LSAD', 'INTPTLAT',
'INTPTLON')
command = LoadGeos()
- geo = command.process_row(row, field_names)
+ geo = command.process_row(year, row, field_names)
- self.assertEqual('12345', geo['geoid'])
+ self.assertEqual('190012345', geo['geoid'])
self.assertEqual(Geo.MICRO_TYPE, geo['geo_type'])
self.assertEqual('Small Town', geo['name'])
self.assertEqual(None, geo['state'])
@@ -175,12 +184,13 @@ def test_micro(self):
self.assertEqual(None, geo['tract'])
self.assertEqual(None, geo['csa'])
self.assertEqual('12345', geo['cbsa'])
+ self.assertEqual('1900', geo['year'])
def test_replacing(self):
command = LoadGeos()
old_geo = {
'geoid': '1111111111', 'geo_type': Geo.TRACT_TYPE,
- 'name': 'Geo in 1990', 'state': '11', 'county': '111',
+ 'name': 'Geo in 1990', 'year': '1990', 'state': '11', 'county': '111',
'tract': '11111', 'minlat': -1, 'maxlat': 1, 'minlon': -1,
'maxlon': 1, 'centlat': 0, 'centlon': 0,
'geom': MultiPolygon(
diff --git a/mapusaurus/geo/views.py b/mapusaurus/geo/views.py
index 8427f4cd..aaa85255 100644
--- a/mapusaurus/geo/views.py
+++ b/mapusaurus/geo/views.py
@@ -28,26 +28,28 @@ def get_censustract_geos(request):
northEastLon = request.GET.get('neLon')
southWestLat = request.GET.get('swLat')
southWestLon = request.GET.get('swLon')
+ year = request.GET.get('year')
metro = request.GET.get('metro')
geo_type = request.GET.get('geoType')
geos = []
if northEastLat or northEastLon or southWestLat or southWestLon:
bounds = check_bounds(northEastLat, northEastLon, southWestLat, southWestLon)
if bounds:
+ maxlat, minlon, minlat, maxlon = bounds
if geo_type == "msa":
#*bounds expands the set from check_bounds
- msas = get_geos_by_bounds_and_type(*bounds, metro=True)
- geos = Geo.objects.filter(geo_type=Geo.TRACT_TYPE, cbsa__in=msas.values_list('geoid', flat=True))
+ msas = get_geos_by_bounds_and_type(maxlat, minlon, minlat, maxlon, year, metro=True)
+ geos = Geo.objects.filter(geo_type=Geo.TRACT_TYPE, cbsa__in=msas.values_list('cbsa', flat=True))
else:
- geos = get_geos_by_bounds_and_type(*bounds)
+ geos = get_geos_by_bounds_and_type(maxlat, minlon, minlat, maxlon, year)
else:
raise Http404("Invalid bounds")
elif metro:
- msa = get_object_or_404(Geo, geo_type=Geo.METRO_TYPE, geoid=metro)
+ msa = get_object_or_404(Geo, geo_type=Geo.METRO_TYPE, geoid=metro) # metro includes year
geos = msa.get_censustract_geos_by_msa()
return geos
-def get_geos_by_bounds_and_type(maxlat, minlon, minlat, maxlon, metro=False):
+def get_geos_by_bounds_and_type(maxlat, minlon, minlat, maxlon, year, metro=False):
"""handles requests for tract-level ids or MSA ids"""
if metro == False:
geoTypeId = 3
@@ -61,27 +63,28 @@ def get_geos_by_bounds_and_type(maxlat, minlon, minlat, maxlon, metro=False):
#Create a polygon of the entire map screen
poly = Polygon (((point_top_left, point_bottom_left, point_bottom_right, point_top_right, point_top_left)))
#check if geo polygon interects with the screen polygon. no get_object_or_404 since user can drag to alaska, pr, hawaii
- geos = Geo.objects.filter(geo_type = geoTypeId).filter(geom__intersects=poly)
+ geos = Geo.objects.filter(geo_type=geoTypeId, year=year).filter(geom__intersects=poly)
return geos
class GeoSerializer(serializers.ModelSerializer):
"""Used in RESTful endpoints to serialize Geo objects; used in search"""
class Meta:
model = Geo
- fields = ('geoid', 'geo_type', 'name', 'centlat', 'centlon')
+ fields = ('geoid', 'geo_type', 'name', 'centlat', 'centlon', 'year')
@api_view(['GET'])
@renderer_classes((JSONRenderer, )) # until we need HTML
def search(request):
query_str = request.GET.get('q', '').strip()
+ year= request.GET.get('year', '').strip()
query = SearchQuerySet().models(Geo).load_all()
if request.GET.get('auto'):
- query = query.filter(text_auto=AutoQuery(query_str))
+ query = query.filter(text_auto=AutoQuery(query_str)).filter(year=year)
else:
- query = query.filter(content=AutoQuery(query_str))
+ query = query.filter(content=AutoQuery(query_str)).filter(year=year)
query = query[:25]
- results = [result.object for result in query]
+ results = [result.object for result in query if result]
results = GeoSerializer(results, many=True).data
return Response({'geos': results})
diff --git a/mapusaurus/hmda/management/commands/calculate_loan_stats.py b/mapusaurus/hmda/management/commands/calculate_loan_stats.py
index 4b71c2c7..94a1f7f4 100644
--- a/mapusaurus/hmda/management/commands/calculate_loan_stats.py
+++ b/mapusaurus/hmda/management/commands/calculate_loan_stats.py
@@ -6,15 +6,17 @@
class Command(BaseCommand):
help = "Generate loans stats per lender, metro combination"
+ args = ""
def handle(self, *args, **kwargs):
# Remove existing stats; we're going to regenerate them
- LendingStats.objects.all().delete()
+ year = args[0]
+ LendingStats.objects.filter(institution__year=year).delete()
lender_q = HMDARecord.objects.values_list('institution_id', flat=True).distinct('institution')
for metro in Geo.objects.filter(
- geo_type=Geo.METRO_TYPE).order_by('name'):
+ geo_type=Geo.METRO_TYPE, year=year).order_by('name'):
self.stdout.write("Processing " + metro.name)
- query = lender_q.filter(geo__cbsa=metro.geoid)
+ query = lender_q.filter(geo__cbsa=metro.cbsa, geo__year=year)
for lender_str in query.iterator():
median = calculate_median_loans(lender_str, metro) or 0
lar = calculate_lar_count(lender_str, metro)
@@ -25,10 +27,12 @@ def handle(self, *args, **kwargs):
fha_percentage = 0.0
bucket = get_fha_bucket(fha_percentage)
LendingStats.objects.create(
- institution_id=lender_str, geo=metro, lar_median=median, lar_count=lar, fha_count=fha, fha_bucket=bucket)
+ institution_id=lender_str, geo=metro, lar_median=median,
+ lar_count=lar, fha_count=fha, fha_bucket=bucket)
def lar_query(lender_str, metro):
- lar_query = HMDARecord.objects.filter(institution_id=lender_str, geo__cbsa=metro.geoid, geo__geo_type=Geo.TRACT_TYPE, action_taken__in=[1,2,3,4,5])
+ lar_query = HMDARecord.objects.filter(institution_id=lender_str,
+ geo__cbsa=metro.cbsa, geo__geo_type=Geo.TRACT_TYPE, action_taken__in=[1,2,3,4,5])
return lar_query
def calculate_lar_count(lender_str, metro):
@@ -62,9 +66,8 @@ def calculate_median_loans(lender_str, metro):
query = Geo.objects.filter(
geo_type=Geo.TRACT_TYPE, hmdarecord__institution_id=lender_str)
if metro:
- query = query.filter(cbsa=metro.geoid)
+ query = query.filter(cbsa=metro.cbsa, year=metro.year)
num_tracts = query.values('geoid').distinct('geoid').count()
-
cursor = connection.cursor()
# Next, aggregate the # of loans per tract. This query will *not*
# include zeros
@@ -77,7 +80,7 @@ def calculate_median_loans(lender_str, metro):
params = [Geo.TRACT_TYPE, lender_str]
if metro:
query = query + "AND cbsa = %s\n"
- params.append(metro.geoid)
+ params.append(metro.cbsa)
query += """
GROUP BY geo_geo.geoid
ORDER BY loan_count
diff --git a/mapusaurus/hmda/management/commands/load_hmda.py b/mapusaurus/hmda/management/commands/load_hmda.py
index b12585af..83e51f99 100644
--- a/mapusaurus/hmda/management/commands/load_hmda.py
+++ b/mapusaurus/hmda/management/commands/load_hmda.py
@@ -12,13 +12,13 @@
class Command(BaseCommand):
- args = " "
+ args = " "
help = """ Load HMDA data (for all states)."""
def handle(self, *args, **options):
- if not args:
- raise CommandError("Needs a first argument, " + Command.args)
+ if len(args) < 2:
+ raise CommandError("Need args for CSV path and year, " + Command.args)
delete_file = False
filter_hmda = False
@@ -45,11 +45,13 @@ def log_info(message):
### default is False
### if filter_hmda is passed in, setup known_hmda & geo_states
### else load all HMDA records without filtering
- if len(args) > 1:
+ lar_path = args[0]
+ year = args[1]
+ if len(args) > 2:
for arg in args:
if "delete_file:" in arg:
tmp_delete_flag= arg.split(":")
- if tmp_delete_flag[1] == "true":
+ if tmp_delete_flag[1] == "true" or tmp_delete_flag[1] == "True":
delete_file = True
print "************* CSV File(s) WiLL BE REMOVED AFTER PROCESSING ***********"
@@ -60,17 +62,16 @@ def log_info(message):
csv_files = []
-
- if os.path.isfile(args[0]):
- csv_files.append(args[0]);
- elif os.path.isdir(args[0]):
- working_directory = args[0]
+ if os.path.isfile(lar_path):
+ csv_files.append(lar_path);
+ elif os.path.isdir(lar_path):
+ working_directory = lar_path
for file in os.listdir(working_directory):
- if os.path.isfile(os.path.join(working_directory,file)) and 'hmda_csv_' in file:
+ if os.path.isfile(os.path.join(working_directory,file)) and 'hmda_csv_'+year+'_' in file:
csv_files.append(os.path.join(working_directory, file))
else:
- raise Exception("Not a file or Directory! " + args[0])
+ raise Exception("Not a file or Directory! " + lar_path)
@@ -135,10 +136,10 @@ def records(self,csv_file):
number_of_1_to_4_family_units=row[43], application_date_indicator=row[44])
censustract = row[11] + row[12] + row[13].replace('.', '')
+ censustract = errors.in_2010.get(censustract, censustract)
+ record.geo_id = str(record.as_of_year) + censustract
- record.geo_id = errors.in_2010.get(censustract, censustract)
-
- record.institution_id = row[2]+row[1]
+ record.institution_id = str(record.as_of_year) + record.agency_code + record.respondent_id
self.total_lines_read = self.total_lines_read + 1
@@ -162,7 +163,6 @@ def records(self,csv_file):
skipped_counter += 1
-
except:
prevent_delete= True
log_info('*****************************')
@@ -208,14 +208,4 @@ def records(self,csv_file):
log_info("All Lines Read from All Files: " + str(self.total_lines_read))
log_info("All Files Total Skipped: " + str(self.total_skipped))
log_info("All Files Total Skipped for GeoID=NA: " + str(self.na_skipped))
- log_info("All Files Total Skipped for other reason: " + str(self.other_skipped ))
-
-
-
-
-
-
-
-
-
-
+ log_info("All Files Total Skipped for other reason: " + str(self.other_skipped ))
\ No newline at end of file
diff --git a/mapusaurus/hmda/management/commands/load_years.py b/mapusaurus/hmda/management/commands/load_years.py
new file mode 100644
index 00000000..a0192ad6
--- /dev/null
+++ b/mapusaurus/hmda/management/commands/load_years.py
@@ -0,0 +1,13 @@
+from django.core.management.base import BaseCommand, CommandError
+from hmda.models import Year
+
+
+class Command(BaseCommand):
+ args = " "
+ help = """Record year time-stamps for data."""
+
+ def handle(self, *args, **options):
+ if len(args) < 3:
+ raise CommandError("Need three arguments for year record" + Command.args)
+ yobj = Year(hmda_year = int(args[0]),census_year = int(args[1]), geo_year = int(args[2]))
+ yobj.save()
diff --git a/mapusaurus/hmda/migrations/0001_initial.py b/mapusaurus/hmda/migrations/0001_initial.py
index 6b85034e..9675cb17 100644
--- a/mapusaurus/hmda/migrations/0001_initial.py
+++ b/mapusaurus/hmda/migrations/0001_initial.py
@@ -1,226 +1,120 @@
# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
- def forwards(self, orm):
- # Adding model 'HMDARecord'
- db.create_table(u'hmda_hmdarecord', (
- (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
- ('as_of_year', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ('respondent_id', self.gf('django.db.models.fields.CharField')(max_length=10)),
- ('agency_code', self.gf('django.db.models.fields.CharField')(max_length=1)),
- ('loan_type', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ('property_type', self.gf('django.db.models.fields.CharField')(max_length=1)),
- ('loan_purpose', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ('owner_occupancy', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ('loan_amount_000s', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ('preapproval', self.gf('django.db.models.fields.CharField')(max_length=1)),
- ('action_taken', self.gf('django.db.models.fields.PositiveIntegerField')(db_index=True)),
- ('msamd', self.gf('django.db.models.fields.CharField')(max_length=5)),
- ('statefp', self.gf('django.db.models.fields.CharField')(max_length=2, db_index=True)),
- ('countyfp', self.gf('django.db.models.fields.CharField')(max_length=3)),
- ('census_tract_number', self.gf('django.db.models.fields.CharField')(max_length=7)),
- ('applicant_ethnicity', self.gf('django.db.models.fields.CharField')(max_length=1)),
- ('co_applicant_ethnicity', self.gf('django.db.models.fields.CharField')(max_length=1)),
- ('applicant_race_1', self.gf('django.db.models.fields.CharField')(max_length=1)),
- ('applicant_race_2', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('applicant_race_3', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('applicant_race_4', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('applicant_race_5', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('co_applicant_race_1', self.gf('django.db.models.fields.CharField')(max_length=1)),
- ('co_applicant_race_2', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('co_applicant_race_3', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('co_applicant_race_4', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('co_applicant_race_5', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('applicant_sex', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ('co_applicant_sex', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ('applicant_income_000s', self.gf('django.db.models.fields.CharField')(max_length=4)),
- ('purchaser_type', self.gf('django.db.models.fields.CharField')(max_length=1)),
- ('denial_reason_1', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('denial_reason_2', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('denial_reason_3', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('rate_spread', self.gf('django.db.models.fields.CharField')(max_length=5)),
- ('hoepa_status', self.gf('django.db.models.fields.CharField')(max_length=1)),
- ('lien_status', self.gf('django.db.models.fields.CharField')(max_length=1)),
- ('edit_status', self.gf('django.db.models.fields.CharField')(max_length=1, null=True, blank=True)),
- ('sequence_number', self.gf('django.db.models.fields.CharField')(max_length=7)),
- ('population', self.gf('django.db.models.fields.CharField')(max_length=8)),
- ('minority_population', self.gf('django.db.models.fields.CharField')(max_length=6)),
- ('ffieic_median_family_income', self.gf('django.db.models.fields.CharField')(max_length=8)),
- ('tract_to_msamd_income', self.gf('django.db.models.fields.CharField')(max_length=6)),
- ('number_of_owner_occupied_units', self.gf('django.db.models.fields.CharField')(max_length=8)),
- ('number_of_1_to_4_family_units', self.gf('django.db.models.fields.CharField')(max_length=8)),
- ('application_date_indicator', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ('institution', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['respondents.Institution'])),
- ('geo', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['geo.Geo'])),
- ))
- db.send_create_signal(u'hmda', ['HMDARecord'])
-
- # Adding index on 'HMDARecord', fields ['institution', 'geo']
- db.create_index(u'hmda_hmdarecord', ['institution_id', 'geo_id'])
-
- # Adding model 'LendingStats'
- db.create_table(u'hmda_lendingstats', (
- (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
- ('institution', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['respondents.Institution'])),
- ('geo', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['geo.Geo'])),
- ('lar_median', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ('lar_count', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ('fha_count', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ('fha_bucket', self.gf('django.db.models.fields.PositiveIntegerField')()),
- ))
- db.send_create_signal(u'hmda', ['LendingStats'])
-
- # Adding unique constraint on 'LendingStats', fields ['institution', 'geo']
- db.create_unique(u'hmda_lendingstats', ['institution_id', 'geo_id'])
-
- # Adding index on 'LendingStats', fields ['institution', 'geo']
- db.create_index(u'hmda_lendingstats', ['institution_id', 'geo_id'])
-
-
- def backwards(self, orm):
- # Removing index on 'LendingStats', fields ['institution', 'geo']
- db.delete_index(u'hmda_lendingstats', ['institution_id', 'geo_id'])
-
- # Removing unique constraint on 'LendingStats', fields ['institution', 'geo']
- db.delete_unique(u'hmda_lendingstats', ['institution_id', 'geo_id'])
-
- # Removing index on 'HMDARecord', fields ['institution', 'geo']
- db.delete_index(u'hmda_hmdarecord', ['institution_id', 'geo_id'])
-
- # Deleting model 'HMDARecord'
- db.delete_table(u'hmda_hmdarecord')
-
- # Deleting model 'LendingStats'
- db.delete_table(u'hmda_lendingstats')
-
-
- models = {
- u'geo.geo': {
- 'Meta': {'object_name': 'Geo', 'index_together': "[('geo_type', 'minlat', 'minlon'), ('geo_type', 'minlat', 'maxlon'), ('geo_type', 'maxlat', 'minlon'), ('geo_type', 'maxlat', 'maxlon'), ('geo_type', 'centlat', 'centlon'), ('geo_type', 'cbsa')]"},
- 'cbsa': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True'}),
- 'centlat': ('django.db.models.fields.FloatField', [], {}),
- 'centlon': ('django.db.models.fields.FloatField', [], {}),
- 'county': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True'}),
- 'csa': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True'}),
- 'geo_type': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
- 'geoid': ('django.db.models.fields.CharField', [], {'max_length': '20', 'primary_key': 'True'}),
- 'geom': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {'srid': '4269'}),
- 'maxlat': ('django.db.models.fields.FloatField', [], {}),
- 'maxlon': ('django.db.models.fields.FloatField', [], {}),
- 'metdiv': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True'}),
- 'minlat': ('django.db.models.fields.FloatField', [], {}),
- 'minlon': ('django.db.models.fields.FloatField', [], {}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
- 'state': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True'}),
- 'tract': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True'})
- },
- u'hmda.hmdarecord': {
- 'Meta': {'object_name': 'HMDARecord', 'index_together': "[('institution', 'geo')]"},
- 'action_taken': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
- 'agency_code': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
- 'applicant_ethnicity': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
- 'applicant_income_000s': ('django.db.models.fields.CharField', [], {'max_length': '4'}),
- 'applicant_race_1': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
- 'applicant_race_2': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'applicant_race_3': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'applicant_race_4': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'applicant_race_5': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'applicant_sex': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'application_date_indicator': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'as_of_year': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'census_tract_number': ('django.db.models.fields.CharField', [], {'max_length': '7'}),
- 'co_applicant_ethnicity': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
- 'co_applicant_race_1': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
- 'co_applicant_race_2': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'co_applicant_race_3': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'co_applicant_race_4': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'co_applicant_race_5': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'co_applicant_sex': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'countyfp': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
- 'denial_reason_1': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'denial_reason_2': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'denial_reason_3': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'edit_status': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),
- 'ffieic_median_family_income': ('django.db.models.fields.CharField', [], {'max_length': '8'}),
- 'geo': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['geo.Geo']"}),
- 'hoepa_status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
- u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'institution': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['respondents.Institution']"}),
- 'lien_status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
- 'loan_amount_000s': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'loan_purpose': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'loan_type': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'minority_population': ('django.db.models.fields.CharField', [], {'max_length': '6'}),
- 'msamd': ('django.db.models.fields.CharField', [], {'max_length': '5'}),
- 'number_of_1_to_4_family_units': ('django.db.models.fields.CharField', [], {'max_length': '8'}),
- 'number_of_owner_occupied_units': ('django.db.models.fields.CharField', [], {'max_length': '8'}),
- 'owner_occupancy': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'population': ('django.db.models.fields.CharField', [], {'max_length': '8'}),
- 'preapproval': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
- 'property_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
- 'purchaser_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
- 'rate_spread': ('django.db.models.fields.CharField', [], {'max_length': '5'}),
- 'respondent_id': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
- 'sequence_number': ('django.db.models.fields.CharField', [], {'max_length': '7'}),
- 'statefp': ('django.db.models.fields.CharField', [], {'max_length': '2', 'db_index': 'True'}),
- 'tract_to_msamd_income': ('django.db.models.fields.CharField', [], {'max_length': '6'})
- },
- u'hmda.lendingstats': {
- 'Meta': {'unique_together': "[('institution', 'geo')]", 'object_name': 'LendingStats', 'index_together': "[('institution', 'geo')]"},
- 'fha_bucket': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'fha_count': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'geo': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['geo.Geo']"}),
- u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'institution': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['respondents.Institution']"}),
- 'lar_count': ('django.db.models.fields.PositiveIntegerField', [], {}),
- 'lar_median': ('django.db.models.fields.PositiveIntegerField', [], {})
- },
- u'respondents.agency': {
- 'Meta': {'object_name': 'Agency'},
- 'acronym': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
- 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
- 'hmda_id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'})
- },
- u'respondents.institution': {
- 'Meta': {'unique_together': "(('institution_id', 'year'),)", 'object_name': 'Institution', 'index_together': "[['institution_id', 'year']]"},
- 'agency': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['respondents.Agency']"}),
- 'assets': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
- 'institution_id': ('django.db.models.fields.CharField', [], {'max_length': '11', 'primary_key': 'True'}),
- 'mailing_address': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
- 'non_reporting_parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'children'", 'null': 'True', 'to': u"orm['respondents.ParentInstitution']"}),
- 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'children'", 'null': 'True', 'to': u"orm['respondents.Institution']"}),
- 'respondent_id': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
- 'rssd_id': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True'}),
- 'tax_id': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
- 'top_holder': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'descendants'", 'null': 'True', 'to': u"orm['respondents.ParentInstitution']"}),
- 'year': ('django.db.models.fields.SmallIntegerField', [], {}),
- 'zip_code': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['respondents.ZipcodeCityState']"})
- },
- u'respondents.parentinstitution': {
- 'Meta': {'object_name': 'ParentInstitution'},
- 'city': ('django.db.models.fields.CharField', [], {'max_length': '25'}),
- 'country': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
- u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
- 'rssd_id': ('django.db.models.fields.CharField', [], {'max_length': '10', 'unique': 'True', 'null': 'True'}),
- 'state': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True'}),
- 'year': ('django.db.models.fields.SmallIntegerField', [], {})
- },
- u'respondents.zipcodecitystate': {
- 'Meta': {'unique_together': "(('zip_code', 'city'),)", 'object_name': 'ZipcodeCityState'},
- 'city': ('django.db.models.fields.CharField', [], {'max_length': '25'}),
- u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'plus_four': ('django.db.models.fields.IntegerField', [], {'null': 'True'}),
- 'state': ('localflavor.us.models.USStateField', [], {'max_length': '2'}),
- 'zip_code': ('django.db.models.fields.IntegerField', [], {})
- }
- }
-
- complete_apps = ['hmda']
\ No newline at end of file
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('respondents', '__first__'),
+ ('geo', '__first__'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='HMDARecord',
+ fields=[
+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ ('as_of_year', models.PositiveIntegerField(help_text=b'The reporting year of the HMDA record.')),
+ ('respondent_id', models.CharField(help_text=b'A code representing the bank or other financial institution that is reporting the loan or application.', max_length=10)),
+ ('agency_code', models.CharField(help_text=b'A code representing the federal agency to which the HMDA-reporting institution submits its HMDA data.', max_length=1, choices=[(1, b'Office of the Comptroller of the Currency (OCC)'), (2, b'Federal Reserve System (FRS)'), (3, b'Federal Deposit Insurance Corporation (FDIC)'), (5, b'National Credit Union Administration (NCUA)'), (7, b'Department of Housing and Urban Development (HUD)'), (9, b'Consumer Financial Protection Bureau (CFPB)')])),
+ ('loan_type', models.PositiveIntegerField(help_text=b"A code representing the type of loan applied for. Many loans are insured or guaranteed by government programs offered by Federal Housing Administration (FHA), the Department of Veterans Affairs (VA), or the Department of Agriculture's Rural Housing Service (RHS) or Farm Service Agency (FSA). All other loans are classified as conventional.", choices=[(1, b'Conventional (any loan other than FHA, VA, FSA, or RHS loans)'), (2, b'FHA-insured (Federal Housing Administration)'), (3, b'VA-guaranteed (Veterans Administration)'), (4, b'FSA/RHS (Farm Service Agency or Rural Housing Service)')])),
+ ('property_type', models.CharField(help_text=b'A code representing the type of the property.', max_length=1, choices=[(1, b'One to four-family (other than manufactured housing)'), (2, b'Manufactured housing'), (3, b'Multifamily')])),
+ ('loan_purpose', models.PositiveIntegerField(help_text=b'A code representing the purpose of the loan (home purchase, refinance, or home improvement).', choices=[(1, b'Home purchase'), (2, b'Home improvement'), (3, b'Refinancing')])),
+ ('owner_occupancy', models.PositiveIntegerField(help_text=b"A code representing the owner-occupancy status of the property. Second homes, vacation homes, and rental properties are classified as 'not owner-occupied as a principal dwelling'.", choices=[(1, b'Owner-occupied as a principal dwelling'), (2, b'Not owner-occupied'), (3, b'Not applicable')])),
+ ('loan_amount_000s', models.PositiveIntegerField(help_text=b'The amount of the loan applied for, in thousands of dollars.')),
+ ('preapproval', models.CharField(help_text=b'A code representing the pre-approval status of the application.', max_length=1, choices=[(1, b'Preapproval was requested'), (2, b'Preapproval was not requested'), (3, b'Not applicable')])),
+ ('action_taken', models.PositiveIntegerField(help_text=b'A code representing the action taken on the loan or application, such as whether an application was approved or denied. Loan originated means the application resulted in a mortgage. Loan purchased means that the lender bought the loan on the secondary market.', db_index=True, choices=[(1, b'Loan originated'), (2, b'Application approved but not accepted'), (3, b'Application denied by financial institution'), (4, b'Application withdrawn by applicant'), (5, b'File closed for incompleteness'), (6, b'Loan purchased by the institution'), (7, b'Preapproval request denied by financial institution'), (8, b'Preapproval request approved but not accepted (optional reporting)')])),
+ ('msamd', models.CharField(help_text=b'A code representing the Metropolitan Statistical Area/Metropolitian Division (MSA/MD) the property is located in. An MSA is a region with relatively high population density at its core (usually a single large city) and close economic ties throughout. Larger MSAs are divided into MDs.', max_length=5)),
+ ('statefp', models.CharField(help_text=b'A two-digit code representing the state the property is located in.', max_length=2, db_index=True)),
+ ('countyfp', models.CharField(help_text=b'A three-digit code representing the county of the property. This code is only unique when combined with the state code.', max_length=3)),
+ ('census_tract_number', models.CharField(help_text=b'The number of the census tract for the property. This code is only unique when combined with the state and county codes.', max_length=7)),
+ ('applicant_ethnicity', models.CharField(help_text=b'A code representing the ethnicity of the primary applicant.', max_length=1, choices=[(1, b'Hispanic or Latino'), (2, b'Not Hispanic or Latino'), (3, b'Information not provided by applicant in mail, Internet, or telephone application'), (4, b'Not applicable'), (5, b'No co-applicant')])),
+ ('co_applicant_ethnicity', models.CharField(help_text=b'A code representing the ethnicity of the co-applicant.', max_length=1, choices=[(1, b'Hispanic or Latino'), (2, b'Not Hispanic or Latino'), (3, b'Information not provided by applicant in mail, Internet, or telephone application'), (4, b'Not applicable'), (5, b'No co-applicant')])),
+ ('applicant_race_1', models.CharField(help_text=b'A code representing the first listed race for the primary applicant. The applicant can list up to five races.', max_length=1, choices=[(1, b'American Indian or Alaska Native 2 -- Asian'), (3, b'Black or African American'), (4, b'Native Hawaiian or Other Pacific Islander '), (5, b'White'), (6, b'Information not provided by applicant in mail, Internet, or telephone application'), (7, b'Not applicable'), (8, b'No co-applicant')])),
+ ('applicant_race_2', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the second listed race for the primary applicant.', choices=[(1, b'American Indian or Alaska Native 2 -- Asian'), (3, b'Black or African American'), (4, b'Native Hawaiian or Other Pacific Islander '), (5, b'White'), (6, b'Information not provided by applicant in mail, Internet, or telephone application'), (7, b'Not applicable'), (8, b'No co-applicant')])),
+ ('applicant_race_3', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the third listed race for the primary applicant.', choices=[(1, b'American Indian or Alaska Native 2 -- Asian'), (3, b'Black or African American'), (4, b'Native Hawaiian or Other Pacific Islander '), (5, b'White'), (6, b'Information not provided by applicant in mail, Internet, or telephone application'), (7, b'Not applicable'), (8, b'No co-applicant')])),
+ ('applicant_race_4', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the fourth listed race for the primary applicant.', choices=[(1, b'American Indian or Alaska Native 2 -- Asian'), (3, b'Black or African American'), (4, b'Native Hawaiian or Other Pacific Islander '), (5, b'White'), (6, b'Information not provided by applicant in mail, Internet, or telephone application'), (7, b'Not applicable'), (8, b'No co-applicant')])),
+ ('applicant_race_5', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the fifth listed race for the primary applicant.', choices=[(1, b'American Indian or Alaska Native 2 -- Asian'), (3, b'Black or African American'), (4, b'Native Hawaiian or Other Pacific Islander '), (5, b'White'), (6, b'Information not provided by applicant in mail, Internet, or telephone application'), (7, b'Not applicable'), (8, b'No co-applicant')])),
+ ('co_applicant_race_1', models.CharField(help_text=b'A code representing the first listed race for the co-applicant. The co-applicant can list up to five races.', max_length=1, choices=[(1, b'American Indian or Alaska Native 2 -- Asian'), (3, b'Black or African American'), (4, b'Native Hawaiian or Other Pacific Islander '), (5, b'White'), (6, b'Information not provided by applicant in mail, Internet, or telephone application'), (7, b'Not applicable'), (8, b'No co-applicant')])),
+ ('co_applicant_race_2', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the second listed race for the co-applicant.', choices=[(1, b'American Indian or Alaska Native 2 -- Asian'), (3, b'Black or African American'), (4, b'Native Hawaiian or Other Pacific Islander '), (5, b'White'), (6, b'Information not provided by applicant in mail, Internet, or telephone application'), (7, b'Not applicable'), (8, b'No co-applicant')])),
+ ('co_applicant_race_3', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the third listed race for the co-applicant.', choices=[(1, b'American Indian or Alaska Native 2 -- Asian'), (3, b'Black or African American'), (4, b'Native Hawaiian or Other Pacific Islander '), (5, b'White'), (6, b'Information not provided by applicant in mail, Internet, or telephone application'), (7, b'Not applicable'), (8, b'No co-applicant')])),
+ ('co_applicant_race_4', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the fourth listed race for the co-applicant.', choices=[(1, b'American Indian or Alaska Native 2 -- Asian'), (3, b'Black or African American'), (4, b'Native Hawaiian or Other Pacific Islander '), (5, b'White'), (6, b'Information not provided by applicant in mail, Internet, or telephone application'), (7, b'Not applicable'), (8, b'No co-applicant')])),
+ ('co_applicant_race_5', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the fifth listed race for the co-applicant.', choices=[(1, b'American Indian or Alaska Native 2 -- Asian'), (3, b'Black or African American'), (4, b'Native Hawaiian or Other Pacific Islander '), (5, b'White'), (6, b'Information not provided by applicant in mail, Internet, or telephone application'), (7, b'Not applicable'), (8, b'No co-applicant')])),
+ ('applicant_sex', models.PositiveIntegerField(help_text=b'A code representing the sex of the primary applicant.', choices=[(1, b'Male'), (2, b'Female'), (3, b'Information not provided by applicant in mail, Internet, or telephone application'), (4, b'Not applicable'), (5, b'No co-applicant')])),
+ ('co_applicant_sex', models.PositiveIntegerField(help_text=b'A code representing the sex of the co-applicant.', choices=[(1, b'Male'), (2, b'Female'), (3, b'Information not provided by applicant in mail, Internet, or telephone application'), (4, b'Not applicable'), (5, b'No co-applicant')])),
+ ('applicant_income_000s', models.CharField(help_text=b'The gross annual income that the lender relied on when evaluating the creditworthiness of the applicant, rounded to the nearest thousand.', max_length=4)),
+ ('purchaser_type', models.CharField(help_text=b'A code representing the type of institution purchasing the loan.', max_length=1, choices=[(0, b'Loan was not originated or was not sold in calendar year covered by register'), (1, b'Fannie Mae (FNMA)'), (2, b'Ginnie Mae (GNMA)'), (3, b'Freddie Mac (FHLMC)'), (4, b'Farmer Mac (FAMC)'), (5, b'Private securitization'), (6, b'Commercial bank, savings bank or savings association'), (7, b'Life insurance company, credit union, mortgage bank, or finance company'), (8, b'Affiliate institution'), (9, b'Other type of purchaser')])),
+ ('denial_reason_1', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the first reason for denial of the application. Lenders may report up to three denial reasons, but such reporting is optional.', choices=[(1, b'Debt-to-income ratio'), (2, b'Employment history'), (3, b'Credit history'), (4, b'Collateral'), (5, b'Insufficient cash (downpayment, closing costs)'), (6, b'Unverifiable information'), (7, b'Credit application incomplete'), (8, b'Mortgage insurance denied'), (9, b'Other')])),
+ ('denial_reason_2', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the second reason for denial of the application.', choices=[(1, b'Debt-to-income ratio'), (2, b'Employment history'), (3, b'Credit history'), (4, b'Collateral'), (5, b'Insufficient cash (downpayment, closing costs)'), (6, b'Unverifiable information'), (7, b'Credit application incomplete'), (8, b'Mortgage insurance denied'), (9, b'Other')])),
+ ('denial_reason_3', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the third reason for denial of the application.', choices=[(1, b'Debt-to-income ratio'), (2, b'Employment history'), (3, b'Credit history'), (4, b'Collateral'), (5, b'Insufficient cash (downpayment, closing costs)'), (6, b'Unverifiable information'), (7, b'Credit application incomplete'), (8, b'Mortgage insurance denied'), (9, b'Other')])),
+ ('rate_spread', models.CharField(help_text=b"The rate spread for the loan, which is the difference between the loan's annual percentage rate (APR) and the average prime offer rate (APOR).", max_length=5)),
+ ('hoepa_status', models.CharField(help_text=b'A code representing whether a loan is subject to the Home Ownership and Equity Protection Act of 1994 (HOEPA).', max_length=1, choices=[(1, b'HOEPA loan'), (2, b'Not a HOEPA loan')])),
+ ('lien_status', models.CharField(help_text=b'A code representing the lien status. Most mortgages are secured by a lien against the property. In the event of a forced liquidation, first lien holders will generally get paid before subordinate lien holders.', max_length=1, choices=[(1, b'Secured by a first lien'), (2, b'Secured by a subordinate lien'), (3, b'Not secured by a lien'), (4, b'Not applicable (purchased loans)')])),
+ ('edit_status', models.CharField(blank=True, max_length=1, null=True, help_text=b'A code representing the edit failure status of the application.', choices=[(b'', b'No edit failures'), (5, b'Validity edit failure only'), (6, b'Quality edit failure only'), (7, b'Validity and quality edit failures')])),
+ ('sequence_number', models.CharField(help_text=b'A one-up number scheme for each respondent to make each loan unique.', max_length=7)),
+ ('population', models.CharField(help_text=b'The total population in the tract.', max_length=8)),
+ ('minority_population', models.CharField(help_text=b'The percentage of minority population to total population for the census tract, carried to two decimal places.', max_length=6)),
+ ('ffieic_median_family_income', models.CharField(help_text=b'The median family income in dollars for the MSA/MD in which the tract is located. (Note: The HMDA API names this col hud_median_family_income.)', max_length=8)),
+ ('tract_to_msamd_income', models.CharField(help_text=b'The percentage of the median family income for the tract compared to the median family income for the MSA/MD, rounded to two decimal places.', max_length=6)),
+ ('number_of_owner_occupied_units', models.CharField(help_text=b'The number of dwellings in the tract that are lived in by the owner.', max_length=8)),
+ ('number_of_1_to_4_family_units', models.CharField(help_text=b'The number of dwellings in the tract that are built to house fewer than 5 families.', max_length=8)),
+ ('application_date_indicator', models.PositiveIntegerField(help_text=b"A code representing the date of the application. '0' means the application was made on or after 1/1/2004; '1' means the application was made before 1/1/2004; '2' means the application date is not available.", choices=[(0, b'Application Date >= 01-01-2004'), (1, b'Application Date < 01-01-2004'), (2, b'Application Date = NA (Not Available)')])),
+ ],
+ options={
+ },
+ bases=(models.Model,),
+ ),
+ migrations.CreateModel(
+ name='LendingStats',
+ fields=[
+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+ ('lar_median', models.PositiveIntegerField(help_text=b'HMDA LAR median')),
+ ('lar_count', models.PositiveIntegerField(help_text=b'Total HMDA LAR count')),
+ ('fha_count', models.PositiveIntegerField(help_text=b'Total HMDA LAR count where loan_type=2(FHA)')),
+ ('fha_bucket', models.PositiveIntegerField(help_text=b'Predetermined buckets calculated by find fha % of total lar count')),
+ ('geo', models.ForeignKey(to='geo.Geo')),
+ ('institution', models.ForeignKey(to='respondents.Institution')),
+ ],
+ options={
+ },
+ bases=(models.Model,),
+ ),
+ migrations.CreateModel(
+ name='Year',
+ fields=[
+ ('hmda_year', models.PositiveIntegerField(help_text=b'The reporting year of the HMDA record.', serialize=False, primary_key=True)),
+ ('census_year', models.PositiveIntegerField(help_text=b'Year of census data.')),
+ ('geo_year', models.PositiveIntegerField(help_text=b'Year that geographic boundaries were recorded.')),
+ ],
+ options={
+ 'get_latest_by': 'hmda_year',
+ },
+ bases=(models.Model,),
+ ),
+ migrations.AlterUniqueTogether(
+ name='lendingstats',
+ unique_together=set([('institution', 'geo')]),
+ ),
+ migrations.AlterIndexTogether(
+ name='lendingstats',
+ index_together=set([('institution', 'geo')]),
+ ),
+ migrations.AddField(
+ model_name='hmdarecord',
+ name='geo',
+ field=models.ForeignKey(to='geo.Geo'),
+ preserve_default=True,
+ ),
+ migrations.AddField(
+ model_name='hmdarecord',
+ name='institution',
+ field=models.ForeignKey(to='respondents.Institution'),
+ preserve_default=True,
+ ),
+ migrations.AlterIndexTogether(
+ name='hmdarecord',
+ index_together=set([('institution', 'geo')]),
+ ),
+ ]
diff --git a/mapusaurus/hmda/migrations/0002_auto_20160219_1957.py b/mapusaurus/hmda/migrations/0002_auto_20160219_1957.py
new file mode 100644
index 00000000..b9d16b03
--- /dev/null
+++ b/mapusaurus/hmda/migrations/0002_auto_20160219_1957.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('hmda', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='hmdarecord',
+ name='as_of_year',
+ field=models.PositiveIntegerField(help_text=b'The reporting year of the HMDA record.', db_index=True),
+ ),
+ ]
diff --git a/mapusaurus/hmda/models.py b/mapusaurus/hmda/models.py
index 303051de..73e2d8be 100644
--- a/mapusaurus/hmda/models.py
+++ b/mapusaurus/hmda/models.py
@@ -133,7 +133,7 @@ class HMDARecord(models.Model):
HMDA Loan Application Register Format
https://www.ffiec.gov/hmdarawdata/FORMATS/2013HMDALARRecordFormat.pdf
"""
- as_of_year = models.PositiveIntegerField(help_text="The reporting year of the HMDA record.")
+ as_of_year = models.PositiveIntegerField(db_index=True, help_text="The reporting year of the HMDA record.")
respondent_id = models.CharField(max_length=10, help_text="A code representing the bank or other financial institution that is reporting the loan or application.")
agency_code = models.CharField(max_length=1, choices=AGENCY_CHOICES, help_text="A code representing the federal agency to which the HMDA-reporting institution submits its HMDA data.")
loan_type = models.PositiveIntegerField(choices=LOAN_TYPE_CHOICES, help_text="A code representing the type of loan applied for. Many loans are insured or guaranteed by government programs offered by Federal Housing Administration (FHA), the Department of Veterans Affairs (VA), or the Department of Agriculture's Rural Housing Service (RHS) or Farm Service Agency (FSA). All other loans are classified as conventional.")
@@ -189,6 +189,16 @@ class Meta:
def save(self, *args, **kwargs):
super(HMDARecord, self).save(*args, **kwargs)
+class Year(models.Model):
+ """Various year fields in the app data"""
+ YEAR_CHOICES = zip( range(1970,2050), range(1970,2050) )
+ hmda_year = models.PositiveIntegerField(primary_key=True, choices=YEAR_CHOICES, help_text="The reporting year of the HMDA record.")
+ census_year = models.PositiveIntegerField(choices=YEAR_CHOICES, help_text="Year of census data.", null=False)
+ geo_year = models.PositiveIntegerField(choices=YEAR_CHOICES, help_text="Year that geographic boundaries were recorded.", null=False)
+
+ class Meta:
+ get_latest_by = 'hmda_year'
+
class LendingStats(models.Model):
"""For certain lender x geo combinations, we have pre-computed
diff --git a/mapusaurus/hmda/tests/mock_2014.csv b/mapusaurus/hmda/tests/mock_2013.csv
similarity index 100%
rename from mapusaurus/hmda/tests/mock_2014.csv
rename to mapusaurus/hmda/tests/mock_2013.csv
diff --git a/mapusaurus/hmda/tests/mock_hmda_csv_00 b/mapusaurus/hmda/tests/mock_hmda_csv_2013_00
similarity index 100%
rename from mapusaurus/hmda/tests/mock_hmda_csv_00
rename to mapusaurus/hmda/tests/mock_hmda_csv_2013_00
diff --git a/mapusaurus/hmda/tests/mock_hmda_csv_01 b/mapusaurus/hmda/tests/mock_hmda_csv_2013_01
similarity index 100%
rename from mapusaurus/hmda/tests/mock_hmda_csv_01
rename to mapusaurus/hmda/tests/mock_hmda_csv_2013_01
diff --git a/mapusaurus/hmda/tests/mock_hmda_csv_02 b/mapusaurus/hmda/tests/mock_hmda_csv_2013_02
similarity index 100%
rename from mapusaurus/hmda/tests/mock_hmda_csv_02
rename to mapusaurus/hmda/tests/mock_hmda_csv_2013_02
diff --git a/mapusaurus/hmda/tests/mock_hmda_csv_03 b/mapusaurus/hmda/tests/mock_hmda_csv_2013_03
similarity index 100%
rename from mapusaurus/hmda/tests/mock_hmda_csv_03
rename to mapusaurus/hmda/tests/mock_hmda_csv_2013_03
diff --git a/mapusaurus/hmda/tests/mock_hmda_csv_04 b/mapusaurus/hmda/tests/mock_hmda_csv_2013_04
similarity index 100%
rename from mapusaurus/hmda/tests/mock_hmda_csv_04
rename to mapusaurus/hmda/tests/mock_hmda_csv_2013_04
diff --git a/mapusaurus/hmda/tests/test_loader.py b/mapusaurus/hmda/tests/test_loader.py
index f52eef69..c2406207 100644
--- a/mapusaurus/hmda/tests/test_loader.py
+++ b/mapusaurus/hmda/tests/test_loader.py
@@ -13,21 +13,21 @@ class LoadHmdaTest(TestCase):
def test_handle(self):
command = Command()
command.stdout = Mock()
- command.handle(os.path.join("hmda", "tests", "mock_2014.csv"))
+ command.handle(os.path.join("hmda", "tests", "mock_2013.csv"),2013)
# The mock data file contains 10 records, 8 for known states
self.assertEqual(8, HMDARecord.objects.count())
lenders = set(r.institution_id for r in HMDARecord.objects.all())
geos = set(r.geo_id for r in HMDARecord.objects.all())
self.assertEqual(3, len(lenders))
- self.assertTrue(('5' + '0000000319') in lenders)
- self.assertTrue(('5' + '0000000435') in lenders)
- self.assertTrue(('3' + '0000001281') in lenders)
+ self.assertTrue(('2013'+'5' + '0000000319') in lenders)
+ self.assertTrue(('2013'+'5' + '0000000435') in lenders)
+ self.assertTrue(('2013'+'3' + '0000001281') in lenders)
self.assertEqual(4, len(geos))
- self.assertTrue('1122233300' in geos)
- self.assertTrue('1122233400' in geos)
- self.assertTrue('1122333300' in geos)
- self.assertTrue('1222233300' in geos)
+ self.assertTrue('20131122233300' in geos)
+ self.assertTrue('20131122233400' in geos)
+ self.assertTrue('20131122333300' in geos)
+ self.assertTrue('20131222233300' in geos)
HMDARecord.objects.all().delete()
@@ -36,13 +36,13 @@ def test_handle_errors_dict(self, errors):
errors.in_2010 = {'1122233300': '9988877766'}
command = Command()
command.stdout = Mock()
- command.handle(os.path.join("hmda", "tests", "mock_2014.csv"))
+ command.handle(os.path.join("hmda", "tests", "mock_2013.csv"), '2013')
geos = set(r.geo_id for r in HMDARecord.objects.all())
self.assertEqual(4, len(geos))
# 1122233300 got replaced
- self.assertTrue('9988877766' in geos)
- self.assertFalse('1122233300' in geos)
+ self.assertTrue('20139988877766' in geos)
+ self.assertFalse('20131122233300' in geos)
HMDARecord.objects.all().delete()
@@ -55,19 +55,18 @@ def test_multi_files(self):
main_csv_directory = main_csv_directory + "/"
- command.handle(main_csv_directory , "delete_file:false", "filterhmda" )
-
+ command.handle(main_csv_directory, '2013', "delete_file:false", "filterhmda")
lenders = set(r.institution_id for r in HMDARecord.objects.all())
geos = set(r.geo_id for r in HMDARecord.objects.all())
self.assertEqual(3, len(lenders))
- self.assertTrue(('5' + '0000000319') in lenders)
- self.assertTrue(('5' + '0000000435') in lenders)
- self.assertTrue(('3' + '0000001281') in lenders)
+ self.assertTrue(('2013'+'5' + '0000000319') in lenders)
+ self.assertTrue(('2013'+'5' + '0000000435') in lenders)
+ self.assertTrue(('2013'+'3' + '0000001281') in lenders)
self.assertEqual(4, len(geos))
- self.assertTrue('1122233300' in geos)
- self.assertTrue('1122233400' in geos)
- self.assertTrue('1122333300' in geos)
- self.assertTrue('1222233300' in geos)
+ self.assertTrue('20131122233300' in geos)
+ self.assertTrue('20131122233400' in geos)
+ self.assertTrue('20131122333300' in geos)
+ self.assertTrue('20131222233300' in geos)
HMDARecord.objects.all().delete()
diff --git a/mapusaurus/hmda/tests/test_precalc.py b/mapusaurus/hmda/tests/test_precalc.py
index 410d5866..f29a075f 100644
--- a/mapusaurus/hmda/tests/test_precalc.py
+++ b/mapusaurus/hmda/tests/test_precalc.py
@@ -5,7 +5,7 @@
from hmda.management.commands.calculate_loan_stats import (
calculate_median_loans, calculate_lar_count, calculate_fha_count, get_fha_bucket, Command)
from hmda.models import HMDARecord, LendingStats
-from respondents.models import Institution, Agency, ZipcodeCityState
+from respondents.models import Institution, Agency, ZipcodeCityStateYear
class PrecalcTest(TestCase):
@@ -16,7 +16,7 @@ def setUp(self):
tract_params = {
'geo_type': Geo.TRACT_TYPE, 'minlat': 0.11, 'minlon': 0.22,
'maxlat': 1.33, 'maxlon': 1.44, 'centlat': 45.4545,
- 'centlon': 67.67, 'geom': "MULTIPOLYGON (((0 0, 0 1, 1 1, 0 0)))"}
+ 'centlon': 67.67, 'geom': "MULTIPOLYGON (((0 0, 0 1, 1 1, 0 0)))", 'year':2013}
self.city_tract1 = Geo.objects.create(
name='City Tract 1', cbsa='99999', geoid='11111111',
**tract_params)
@@ -37,12 +37,12 @@ def setUp(self):
name='Non-City Tract 6', geoid='11111116', **tract_params)
del tract_params['geo_type']
self.metro = Geo.objects.create(
- name='City', geoid='99999', geo_type=Geo.METRO_TYPE,
+ name='City', geoid='201399999',cbsa='99999', geo_type=Geo.METRO_TYPE,
**tract_params)
hmda_params = {
- 'as_of_year': 2010, 'respondent_id': self.respondent.respondent_id,
+ 'as_of_year': 2013, 'respondent_id': self.respondent.respondent_id,
'agency_code': str(self.respondent.agency_id),
'property_type': 1, 'loan_purpose': 1, 'owner_occupancy': 1,
'loan_amount_000s': 100, 'preapproval': '1', 'action_taken': 1,
@@ -72,10 +72,10 @@ def setUp(self):
geo=self.non_city_tract2, institution=self.respondent, loan_type=2, **hmda_params))
hmda_params['respondent_id'] = 'other'
- self.zipcode = ZipcodeCityState.objects.create(
- zip_code=12345, city='City', state='IL')
+ self.zipcode = ZipcodeCityStateYear.objects.create(
+ zip_code=12345, city='City', state='IL', year=2013)
self.inst1 = Institution.objects.create(
- year=1234, respondent_id='9876543210', agency=Agency.objects.get(pk=9),
+ year=2013, respondent_id='9876543210', agency=Agency.objects.get(pk=9),
institution_id='99876543210', tax_id='1111111111', name='Institution', mailing_address='mail',
zip_code=self.zipcode)
# these should not affect the results, since they are another lender
@@ -146,14 +146,15 @@ def test_calculate_fha_count(self):
self.assertEqual(1, calculate_fha_count(lender_id, self.metro))
def test_saves_stats(self):
+ year = "2013"
lender_id = self.respondent.institution_id
command = Command()
command.stdout = Mock()
- command.handle()
+ command.handle(year)
found = False
for stats in LendingStats.objects.all():
- if stats.geo_id == '99999' and stats.institution_id == lender_id:
+ if stats.geo_id == '201399999' and stats.institution_id == lender_id:
found = True
self.assertEqual(stats.lar_median, 3)
self.assertTrue(found)
diff --git a/mapusaurus/hmda/tests/test_views.py b/mapusaurus/hmda/tests/test_views.py
index 5e754a8f..0905fb70 100644
--- a/mapusaurus/hmda/tests/test_views.py
+++ b/mapusaurus/hmda/tests/test_views.py
@@ -86,7 +86,7 @@ def mkrecord(institution_id, action_taken, countyfp, geoid):
mkrecord("11000000002", 1, '222', '1122233300')
mkrecord("91000000001", 6, '223', '1222233300')
- call_command('calculate_loan_stats')
+ call_command('calculate_loan_stats', '2013')
def tearDown(self):
Census2010Households.objects.all().delete()
@@ -116,19 +116,19 @@ def test_calculate_loan_stats(self):
def test_loan_originations_http_user_errors(self):
#invalid institution_id
- resp = self.client.get(reverse('hmda:volume'), {'metro':'10000',
+ resp = self.client.get(reverse('hmda:volume'), {'metro':'201310000',
'action_taken':'1,2,3,4,5',
'lender':'91000000011'})
self.assertEqual(resp.status_code, 404)
#invalid metro
- resp = self.client.get(reverse('hmda:volume'), {'metro':'10011',
+ resp = self.client.get(reverse('hmda:volume'), {'metro':'201310011',
'action_taken':'1,2,3,4,5',
'lender':'91000000001'})
self.assertEqual(resp.status_code, 404)
#invalid metro and institution_id
- resp = self.client.get(reverse('hmda:volume'), {'metro':'10011',
+ resp = self.client.get(reverse('hmda:volume'), {'metro':'201310011',
'action_taken':'1,2,3,4,5',
'lender':'91000000011'})
self.assertEqual(resp.status_code, 404)
diff --git a/mapusaurus/hmda/views.py b/mapusaurus/hmda/views.py
index f145d3a2..a9657a3d 100644
--- a/mapusaurus/hmda/views.py
+++ b/mapusaurus/hmda/views.py
@@ -19,17 +19,16 @@ def loan_originations(request):
action_taken_param = request.GET.get('action_taken')
lender_hierarchy = request.GET.get('lh')
peers = request.GET.get('peers')
+ year = request.GET.get('year')
census_tracts = get_censustract_geos(request)
- query = HMDARecord.objects.all()
-
- #if lender param key is passed in
+ query = HMDARecord.objects.all()
if institution_id:
institution_selected = get_object_or_404(Institution, pk=institution_id)
if lender_hierarchy == 'true':
- hierarchy_list = institution_selected.get_lender_hierarchy(False, False)
+ hierarchy_list = institution_selected.get_lender_hierarchy(False, False, year)
if len(hierarchy_list) > 0:
- query = query.filter(institution__in=hierarchy_list)
+ query = query.filter(institution__in=hierarchy_list)
else:
query = query.filter(institution=institution_selected)
elif peers == 'true' and metro:
@@ -71,4 +70,4 @@ def loan_originations_as_json(request):
def loan_originations_http(request):
json_data = loan_originations_as_json(request)
if json_data:
- return HttpResponse(json.dumps(json_data))
\ No newline at end of file
+ return HttpResponse(json.dumps(json_data))
diff --git a/mapusaurus/mapping/static/mapping/css/vendor.css b/mapusaurus/mapping/static/mapping/css/vendor.css
index 9f631a6b..64d40fce 100644
--- a/mapusaurus/mapping/static/mapping/css/vendor.css
+++ b/mapusaurus/mapping/static/mapping/css/vendor.css
@@ -114,91 +114,4 @@ a.leaflet-rrose-close-button:hover {
font: 12px/1.4 "Helvetica Neue", Arial, Helvetica, sans-serif;
}
-.leaflet-control-minimap {
- border:solid rgba(255, 255, 255, 1.0) 4px;
- box-shadow: 0 1px 5px rgba(0,0,0,0.65);
- border-radius: 3px;
- background: #f8f8f9;
- transition: all .2s;
-}
-
-.leaflet-control-minimap a {
- background-color: rgba(255, 255, 255, 1.0);
- background-repeat: no-repeat;
- z-index: 99999;
- transition: all .2s;
-}
-
-.leaflet-control-minimap a.minimized-bottomright {
- -webkit-transform: rotate(180deg);
- transform: rotate(180deg);
- border-radius: 0px;
-}
-
-.leaflet-control-minimap a.minimized-topleft {
- -webkit-transform: rotate(0deg);
- transform: rotate(0deg);
- border-radius: 0px;
-}
-
-.leaflet-control-minimap a.minimized-bottomleft {
- -webkit-transform: rotate(270deg);
- transform: rotate(270deg);
- border-radius: 0px;
-}
-
-.leaflet-control-minimap a.minimized-topright {
- -webkit-transform: rotate(90deg);
- transform: rotate(90deg);
- border-radius: 0px;
-}
-
-.leaflet-control-minimap-toggle-display{
- background-image: url("images/toggle.svg");
- background-size: cover;
- position: absolute;
- border-radius: 3px 0px 0px 0px;
-}
-
-.leaflet-oldie .leaflet-control-minimap-toggle-display{
- background-image: url("images/toggle.png");
-}
-
-.leaflet-control-minimap-toggle-display-bottomright {
- bottom: 0;
- right: 0;
-}
-
-.leaflet-control-minimap-toggle-display-topleft{
- top: 0;
- left: 0;
- -webkit-transform: rotate(180deg);
- transform: rotate(180deg);
-}
-
-.leaflet-control-minimap-toggle-display-bottomleft{
- bottom: 0;
- left: 0;
- -webkit-transform: rotate(90deg);
- transform: rotate(90deg);
-}
-
-.leaflet-control-minimap-toggle-display-topright{
- top: 0;
- right: 0;
- -webkit-transform: rotate(270deg);
- transform: rotate(270deg);
-}
-
-/* Old IE */
-.leaflet-oldie .leaflet-control-minimap {
- border: 1px solid #999;
-}
-
-.leaflet-oldie .leaflet-control-minimap a {
- background-color: #fff;
-}
-
-.leaflet-oldie .leaflet-control-minimap a.minimized {
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-}
+.leaflet-control-minimap{border:rgba(255,255,255,1) solid;box-shadow:0 1px 5px rgba(0,0,0,.65);border-radius:3px;background:#f8f8f9;transition:all .2s}.leaflet-control-minimap a{background-color:rgba(255,255,255,1);background-repeat:no-repeat;z-index:99999;transition:all .2s}.leaflet-control-minimap a.minimized-bottomright{-webkit-transform:rotate(180deg);transform:rotate(180deg);border-radius:0}.leaflet-control-minimap a.minimized-topleft{-webkit-transform:rotate(0deg);transform:rotate(0deg);border-radius:0}.leaflet-control-minimap a.minimized-bottomleft{-webkit-transform:rotate(270deg);transform:rotate(270deg);border-radius:0}.leaflet-control-minimap a.minimized-topright{-webkit-transform:rotate(90deg);transform:rotate(90deg);border-radius:0}.leaflet-control-minimap-toggle-display{background-image:url(images/toggle.svg);background-size:cover;position:absolute;border-radius:3px 0 0}.leaflet-oldie .leaflet-control-minimap-toggle-display{background-image:url(images/toggle.png)}.leaflet-control-minimap-toggle-display-bottomright{bottom:0;right:0}.leaflet-control-minimap-toggle-display-topleft{top:0;left:0;-webkit-transform:rotate(180deg);transform:rotate(180deg)}.leaflet-control-minimap-toggle-display-bottomleft{bottom:0;left:0;-webkit-transform:rotate(90deg);transform:rotate(90deg)}.leaflet-control-minimap-toggle-display-topright{top:0;right:0;-webkit-transform:rotate(270deg);transform:rotate(270deg)}.leaflet-oldie .leaflet-control-minimap{border:1px solid #999}.leaflet-oldie .leaflet-control-minimap a{background-color:#fff}.leaflet-oldie .leaflet-control-minimap a.minimized{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2)}
\ No newline at end of file
diff --git a/mapusaurus/mapping/static/mapping/js/map-layout.min.js b/mapusaurus/mapping/static/mapping/js/map-layout.min.js
index 30855703..0194d4eb 100644
--- a/mapusaurus/mapping/static/mapping/js/map-layout.min.js
+++ b/mapusaurus/mapping/static/mapping/js/map-layout.min.js
@@ -35,4 +35,5 @@
}, $(function() {
$(".tabs").mapusaurusTabs();
});
-}(jQuery);
\ No newline at end of file
+}(jQuery);
+//# sourceMappingURL=map-layout.min.js.map
\ No newline at end of file
diff --git a/mapusaurus/mapping/static/mapping/js/map-vendor.min.js b/mapusaurus/mapping/static/mapping/js/map-vendor.min.js
index b13fd1d4..c9d00f28 100644
--- a/mapusaurus/mapping/static/mapping/js/map-vendor.min.js
+++ b/mapusaurus/mapping/static/mapping/js/map-vendor.min.js
@@ -208,11 +208,11 @@ function addParam(paramName, values) {
(predicate(value, key, obj) ? pass : fail).push(value);
}), [ pass, fail ];
}, _.first = _.head = _.take = function(array, n, guard) {
- return null == array ? void 0 : null == n || guard ? array[0] : 0 > n ? [] : slice.call(array, 0, n);
+ return null != array ? null == n || guard ? array[0] : 0 > n ? [] : slice.call(array, 0, n) : void 0;
}, _.initial = function(array, n, guard) {
return slice.call(array, 0, Math.max(0, array.length - (null == n || guard ? 1 : n)));
}, _.last = function(array, n, guard) {
- return null == array ? void 0 : null == n || guard ? array[array.length - 1] : slice.call(array, Math.max(array.length - n, 0));
+ return null != array ? null == n || guard ? array[array.length - 1] : slice.call(array, Math.max(array.length - n, 0)) : void 0;
}, _.rest = _.tail = _.drop = function(array, n, guard) {
return slice.call(array, null == n || guard ? 1 : n);
}, _.compact = function(array) {
@@ -551,9 +551,10 @@ function addParam(paramName, values) {
};
};
_.escape = createEscaper(escapeMap), _.unescape = createEscaper(unescapeMap), _.result = function(object, property) {
- if (null == object) return void 0;
- var value = object[property];
- return _.isFunction(value) ? object[property]() : value;
+ if (null != object) {
+ var value = object[property];
+ return _.isFunction(value) ? object[property]() : value;
+ }
};
var idCounter = 0;
_.uniqueId = function(prefix) {
@@ -4681,168 +4682,195 @@ function addParam(paramName, values) {
}, L.Map.prototype.removeHash = function() {
this._hash.removeFrom();
};
-}(window), L.Util.ajax = function(url, cb) {
- void 0 === window.XMLHttpRequest && (window.XMLHttpRequest = function() {
- try {
- return new ActiveXObject("Microsoft.XMLHTTP");
- } catch (e) {
- throw new Error("XMLHttpRequest is not supported");
- }
- });
- var response, request = new XMLHttpRequest();
- return request.open("GET", url), request.onreadystatechange = function() {
- 4 === request.readyState && 200 === request.status && (response = window.JSON ? JSON.parse(request.responseText) : eval("(" + request.responseText + ")"),
- cb(response));
- }, request.send(), request;
-}, L.UtfGrid = (L.Layer || L.Class).extend({
- includes: L.Mixin.Events,
- options: {
- subdomains: "abc",
- minZoom: 0,
- maxZoom: 18,
- tileSize: 256,
- resolution: 4,
- useJsonP: !0,
- pointerCursor: !0,
- maxRequests: 4,
- requestTimeout: 6e4
- },
- _mouseOn: null,
- _requests: {},
- _request_queue: [],
- _requests_in_process: [],
- initialize: function(url, options) {
- L.Util.setOptions(this, options), this._url = url, this._cache = {};
- for (var i = 0; window["lu" + i]; ) i++;
- this._windowKey = "lu" + i, window[this._windowKey] = {};
- var subdomains = this.options.subdomains;
- "string" == typeof this.options.subdomains && (this.options.subdomains = subdomains.split(""));
- },
- onAdd: function(map) {
- this._map = map, this._container = this._map._container, this._update();
- var zoom = this._map.getZoom();
- zoom > this.options.maxZoom || zoom < this.options.minZoom || (map.on("click", this._click, this),
- map.on("mousemove", this._move, this), map.on("moveend", this._update, this));
- },
- onRemove: function() {
- var map = this._map;
- map.off("click", this._click, this), map.off("mousemove", this._move, this), map.off("moveend", this._update, this),
- this.options.pointerCursor && (this._container.style.cursor = "");
- },
- redraw: function() {
- this._request_queue = [];
- for (var req_key in this._requests) this._requests.hasOwnProperty(req_key) && this._abort_request(req_key);
- this._cache = {}, this._update();
- },
- _click: function(e) {
- this.fire("click", this._objectForEvent(e));
- },
- _move: function(e) {
- var on = this._objectForEvent(e);
- on.data !== this._mouseOn ? (this._mouseOn && (this.fire("mouseout", {
- latlng: e.latlng,
- data: this._mouseOn
- }), this.options.pointerCursor && (this._container.style.cursor = "")), on.data && (this.fire("mouseover", on),
- this.options.pointerCursor && (this._container.style.cursor = "pointer")), this._mouseOn = on.data) : on.data && this.fire("mousemove", on);
- },
- _objectForEvent: function(e) {
- var map = this._map, point = map.project(e.latlng), tileSize = this.options.tileSize, resolution = this.options.resolution, x = Math.floor(point.x / tileSize), y = Math.floor(point.y / tileSize), gridX = Math.floor((point.x - x * tileSize) / resolution), gridY = Math.floor((point.y - y * tileSize) / resolution), max = map.options.crs.scale(map.getZoom()) / tileSize;
- x = (x + max) % max, y = (y + max) % max;
- var data = this._cache[map.getZoom() + "_" + x + "_" + y];
- if (!data || !data.grid) return {
- latlng: e.latlng,
- data: null
- };
- var idx = this._utfDecode(data.grid[gridY].charCodeAt(gridX)), key = data.keys[idx], result = data.data[key];
- return data.data.hasOwnProperty(key) || (result = null), {
- latlng: e.latlng,
- data: result
- };
- },
- _update: function() {
- var bounds = this._map.getPixelBounds(), zoom = this._map.getZoom(), tileSize = this.options.tileSize;
- if (!(zoom > this.options.maxZoom || zoom < this.options.minZoom)) {
- for (var nwTilePoint = new L.Point(Math.floor(bounds.min.x / tileSize), Math.floor(bounds.min.y / tileSize)), seTilePoint = new L.Point(Math.floor(bounds.max.x / tileSize), Math.floor(bounds.max.y / tileSize)), max = this._map.options.crs.scale(zoom) / tileSize, visible_tiles = [], x = nwTilePoint.x; x <= seTilePoint.x; x++) for (var y = nwTilePoint.y; y <= seTilePoint.y; y++) {
- var xw = (x + max) % max, yw = (y + max) % max, key = zoom + "_" + xw + "_" + yw;
- visible_tiles.push(key), this._cache.hasOwnProperty(key) || (this._cache[key] = null,
- this.options.useJsonP ? this._loadTileP(zoom, xw, yw) : this._loadTile(zoom, xw, yw));
+}(window), function(window, undefined) {
+ L.Util.ajax = function(url, success, error) {
+ window.XMLHttpRequest === undefined && (window.XMLHttpRequest = function() {
+ try {
+ return new ActiveXObject("Microsoft.XMLHTTP");
+ } catch (e) {
+ throw Error("XMLHttpRequest is not supported");
}
- for (var req_key in this._requests) visible_tiles.indexOf(req_key) < 0 && this._abort_request(req_key);
- }
- },
- _loadTileP: function(zoom, x, y) {
- var head = document.getElementsByTagName("head")[0], key = zoom + "_" + x + "_" + y, functionName = "lu_" + key, wk = this._windowKey, self = this, url = L.Util.template(this._url, L.Util.extend({
- s: L.TileLayer.prototype._getSubdomain.call(this, {
- x: x,
- y: y
- }),
- z: zoom,
- x: x,
- y: y,
- cb: wk + "." + functionName
- }, this.options)), script = document.createElement("script");
- script.setAttribute("type", "text/javascript"), script.setAttribute("src", url),
- window[wk][functionName] = function(data) {
- self._cache[key] = data, delete window[wk][functionName], head.removeChild(script),
- self._finish_request(key);
- }, this._queue_request(key, function() {
- return head.appendChild(script), {
- abort: function() {
- head.removeChild(script);
- }
- };
});
- },
- _loadTile: function(zoom, x, y) {
- var url = L.Util.template(this._url, L.Util.extend({
- s: L.TileLayer.prototype._getSubdomain.call(this, {
- x: x,
- y: y
- }),
- z: zoom,
- x: x,
- y: y
- }, this.options)), key = zoom + "_" + x + "_" + y, self = this;
- this._queue_request(key, function() {
- return L.Util.ajax(url, function(data) {
- self._cache[key] = data, self._finish_request(key);
+ var response, request = new XMLHttpRequest();
+ return request.open("GET", url), request.onreadystatechange = function() {
+ 4 === request.readyState && (200 === request.status ? (response = window.JSON ? JSON.parse(request.responseText) : eval("(" + request.responseText + ")"),
+ success(response)) : 0 !== request.status && error !== undefined && error(request.status));
+ }, request.ontimeout = function() {
+ error("timeout");
+ }, request.send(), request;
+ }, L.UtfGrid = (L.Layer || L.Class).extend({
+ includes: L.Mixin.Events,
+ options: {
+ subdomains: "abc",
+ minZoom: 0,
+ maxZoom: 18,
+ tileSize: 256,
+ resolution: 4,
+ useJsonP: !0,
+ pointerCursor: !0,
+ maxRequests: 4,
+ requestTimeout: 6e4
+ },
+ _mouseOn: null,
+ initialize: function(e, t) {
+ L.Util.setOptions(this, t), this._requests = {}, this._request_queue = [], this._requests_in_process = [],
+ this._url = e, this._cache = {};
+ for (var n = 0; window["lu" + n]; ) n++;
+ this._windowKey = "lu" + n, window[this._windowKey] = {};
+ var r = this.options.subdomains;
+ "string" == typeof this.options.subdomains && (this.options.subdomains = r.split(""));
+ },
+ onAdd: function(e) {
+ this._map = e, this._container = this._map._container, this._update();
+ var t = this._map.getZoom();
+ t > this.options.maxZoom || t < this.options.minZoom || (e.on("click", this._click, this),
+ e.on("mousemove", this._move, this), e.on("moveend", this._update, this));
+ },
+ onRemove: function() {
+ var e = this._map;
+ e.off("click", this._click, this), e.off("mousemove", this._move, this), e.off("moveend", this._update, this),
+ this.options.pointerCursor && (this._container.style.cursor = "");
+ },
+ setUrl: function(e, t) {
+ return this._url = e, t || this.redraw(), this;
+ },
+ redraw: function() {
+ this._request_queue = [];
+ for (var e in this._requests) this._requests.hasOwnProperty(e) && this._abort_request(e);
+ this._cache = {}, this._update();
+ },
+ _click: function(e) {
+ this.fire("click", this._objectForEvent(e));
+ },
+ _move: function(e) {
+ var t = this._objectForEvent(e);
+ t.data !== this._mouseOn ? (this._mouseOn && (this.fire("mouseout", {
+ latlng: e.latlng,
+ data: this._mouseOn
+ }), this.options.pointerCursor && (this._container.style.cursor = "")), t.data && (this.fire("mouseover", t),
+ this.options.pointerCursor && (this._container.style.cursor = "pointer")), this._mouseOn = t.data) : t.data && this.fire("mousemove", t);
+ },
+ _objectForEvent: function(e) {
+ var t = this._map, n = t.project(e.latlng), r = this.options.tileSize, i = this.options.resolution, s = Math.floor(n.x / r), o = Math.floor(n.y / r), u = Math.floor((n.x - s * r) / i), a = Math.floor((n.y - o * r) / i), f = t.options.crs.scale(t.getZoom()) / r;
+ s = (s + f) % f, o = (o + f) % f;
+ var l = this._cache[t.getZoom() + "_" + s + "_" + o], c = null;
+ if (l && l.grid) {
+ var h = this._utfDecode(l.grid[a].charCodeAt(u)), p = l.keys[h];
+ l.data.hasOwnProperty(p) && (c = l.data[p]);
+ }
+ return L.extend({
+ latlng: e.latlng,
+ data: c
+ }, e);
+ },
+ _update: function() {
+ var e = this._map.getPixelBounds(), t = this._map.getZoom(), n = this.options.tileSize;
+ if (!(t > this.options.maxZoom || t < this.options.minZoom)) {
+ for (var r = new L.Point(Math.floor(e.min.x / n), Math.floor(e.min.y / n)), i = new L.Point(Math.floor(e.max.x / n), Math.floor(e.max.y / n)), s = this._map.options.crs.scale(t) / n, o = [], u = r.x; u <= i.x; u++) for (var a = r.y; a <= i.y; a++) {
+ var f = (u + s) % s, l = (a + s) % s, c = t + "_" + f + "_" + l;
+ o.push(c), this._cache.hasOwnProperty(c) || (this._cache[c] = null, this.options.useJsonP ? this._loadTileP(t, f, l) : this._loadTile(t, f, l));
+ }
+ for (var h in this._requests) o.indexOf(h) < 0 && this._abort_request(h);
+ }
+ },
+ _loadTileP: function(e, t, n) {
+ var r = document.getElementsByTagName("head")[0], i = e + "_" + t + "_" + n, s = "lu_" + i, o = this._windowKey, u = this, a = L.Util.template(this._url, L.Util.extend({
+ s: L.TileLayer.prototype._getSubdomain.call(this, {
+ x: t,
+ y: n
+ }),
+ z: e,
+ x: t,
+ y: n,
+ cb: o + "." + s
+ }, this.options)), f = document.createElement("script");
+ f.setAttribute("type", "text/javascript"), f.setAttribute("src", a), window[o][s] = function(e) {
+ u._cache[i] = e, delete window[o][s], r.removeChild(f), u._finish_request(i);
+ }, this._queue_request(i, a, function() {
+ return r.appendChild(f), {
+ abort: function() {
+ r.removeChild(f);
+ }
+ };
});
- });
- },
- _queue_request: function(key, callback) {
- this._requests[key] = {
- callback: callback,
- timeout: null,
- handler: null
- }, this._request_queue.push(key), this._process_queued_requests();
- },
- _finish_request: function(key) {
- var pos = this._requests_in_process.indexOf(key);
- pos >= 0 && this._requests_in_process.splice(pos, 1), pos = this._request_queue.indexOf(key),
- pos >= 0 && this._request_queue.splice(pos, 1), this._requests[key] && (this._requests[key].timeout && window.clearTimeout(this._requests[key].timeout),
- delete this._requests[key]), this._process_queued_requests();
- },
- _abort_request: function(key) {
- this._requests[key] && this._requests[key].handler && "function" == typeof this._requests[key].handler.abort && this._requests[key].handler.abort(),
- null === this._cache[key] && delete this._cache[key], this._finish_request(key);
- },
- _process_queued_requests: function() {
- for (;this._request_queue.length > 0 && (0 === this.options.maxRequests || this._requests_in_process.length < this.options.maxRequests); ) this._process_request(this._request_queue.pop());
- },
- _process_request: function(key) {
- var self = this;
- this._requests[key].timeout = window.setTimeout(function() {
- self._abort_request(key);
- }, this.options.requestTimeout), this._requests_in_process.push(key);
- var handler = this._requests[key].callback();
- this._requests[key] && (this._requests[key].handler = handler);
- },
- _utfDecode: function(c) {
- return c >= 93 && c--, c >= 35 && c--, c - 32;
- }
-}), L.utfGrid = function(url, options) {
- return new L.UtfGrid(url, options);
-}, L.Rrose = L.Popup.extend({
+ },
+ _loadTile: function(e, t, n) {
+ var r = L.Util.template(this._url, L.Util.extend({
+ s: L.TileLayer.prototype._getSubdomain.call(this, {
+ x: t,
+ y: n
+ }),
+ z: e,
+ x: t,
+ y: n
+ }, this.options)), i = e + "_" + t + "_" + n;
+ this._queue_request(i, r, this._ajaxRequestFactory(i, r));
+ },
+ _ajaxRequestFactory: function(e, t) {
+ var n = this._successCallbackFactory(e), r = this._errorCallbackFactory(t);
+ return function() {
+ var e = L.Util.ajax(t, n, r);
+ return e.timeout = this.options.requestTimeout, e;
+ }.bind(this);
+ },
+ _successCallbackFactory: function(e) {
+ return function(t) {
+ this._cache[e] = t, this._finish_request(e);
+ }.bind(this);
+ },
+ _errorCallbackFactory: function(e) {
+ return function(t) {
+ this.fire("tileerror", {
+ url: e,
+ code: t
+ });
+ }.bind(this);
+ },
+ _queue_request: function(e, t, n) {
+ this._requests[e] = {
+ callback: n,
+ timeout: null,
+ handler: null,
+ url: t
+ }, this._request_queue.push(e), this._process_queued_requests();
+ },
+ _finish_request: function(e) {
+ var t = this._requests_in_process.indexOf(e);
+ t >= 0 && this._requests_in_process.splice(t, 1), t = this._request_queue.indexOf(e),
+ t >= 0 && this._request_queue.splice(t, 1), this._requests[e] && (this._requests[e].timeout && window.clearTimeout(this._requests[e].timeout),
+ delete this._requests[e]), this._process_queued_requests(), 0 === this._requests_in_process.length && this.fire("load");
+ },
+ _abort_request: function(e) {
+ this._requests[e] && this._requests[e].handler && "function" == typeof this._requests[e].handler.abort && this._requests[e].handler.abort(),
+ null === this._cache[e] && delete this._cache[e], this._finish_request(e);
+ },
+ _process_queued_requests: function() {
+ for (;this._request_queue.length > 0 && (0 === this.options.maxRequests || this._requests_in_process.length < this.options.maxRequests); ) this._process_request(this._request_queue.pop());
+ },
+ _process_request: function(e) {
+ this._requests_in_process.push(e);
+ var t = this._requests[e].callback();
+ if (this._requests[e] && (this._requests[e].handler = t, t.timeout === undefined)) {
+ var n = this._timeoutCallbackFactory(e);
+ this._requests[e].timeout = window.setTimeout(n, this.options.requestTimeout);
+ }
+ },
+ _timeoutCallbackFactory: function(e) {
+ var t = this._requests[e].url;
+ return function() {
+ this.fire("tileerror", {
+ url: t,
+ code: "timeout"
+ }), this._abort_request(e);
+ }.bind(this);
+ },
+ _utfDecode: function(e) {
+ return e >= 93 && e--, e >= 35 && e--, e - 32;
+ }
+ }), L.utfGrid = function(e, t) {
+ return new L.UtfGrid(e, t);
+ };
+}(window), L.Rrose = L.Popup.extend({
_initLayout: function() {
var closeButton, wrapper, prefix = "leaflet-rrose", container = this._container = L.DomUtil.create("div", prefix + " " + this.options.className + " leaflet-zoom-animated");
this.options.closeButton && (closeButton = this._closeButton = L.DomUtil.create("a", prefix + "-close-button", container),
@@ -4866,8 +4894,8 @@ function addParam(paramName, values) {
},
_updatePosition: function() {
var pos = this._map.latLngToLayerPoint(this._latlng), is3d = L.Browser.any3d, offset = this.options.offset;
- is3d && L.DomUtil.setPosition(this._container, pos), this._containerBottom = /s/.test(this.options.position) ? -this._container.offsetHeight + offset.y - (is3d ? 0 : pos.y) : -offset.y - (is3d ? 0 : pos.y),
- this._containerLeft = /e/.test(this.options.position) ? offset.x + (is3d ? 0 : pos.x) : /w/.test(this.options.position) ? -Math.round(this._containerWidth) + offset.x + (is3d ? 0 : pos.x) : -Math.round(this._containerWidth / 2) + offset.x + (is3d ? 0 : pos.x),
+ is3d && L.DomUtil.setPosition(this._container, pos), /s/.test(this.options.position) ? this._containerBottom = -this._container.offsetHeight + offset.y - (is3d ? 0 : pos.y) : this._containerBottom = -offset.y - (is3d ? 0 : pos.y),
+ /e/.test(this.options.position) ? this._containerLeft = offset.x + (is3d ? 0 : pos.x) : /w/.test(this.options.position) ? this._containerLeft = -Math.round(this._containerWidth) + offset.x + (is3d ? 0 : pos.x) : this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x + (is3d ? 0 : pos.x),
this._container.style.bottom = this._containerBottom + "px", this._container.style.left = this._containerLeft + "px";
}
}), function() {
@@ -5091,10 +5119,12 @@ function addParam(paramName, values) {
clickable: !1,
opacity: 0,
fillOpacity: 0
+ },
+ strings: {
+ hideText: "Hide MiniMap",
+ showText: "Show MiniMap"
}
},
- hideText: "Hide MiniMap",
- showText: "Show MiniMap",
initialize: function(layer, options) {
L.Util.setOptions(this, options), this.options.aimingRectOptions.clickable = !1,
this.options.shadowRectOptions.clickable = !1, this._layer = layer;
@@ -5108,10 +5138,10 @@ function addParam(paramName, values) {
zoomControl: !1,
zoomAnimation: this.options.zoomAnimation,
autoToggleDisplay: this.options.autoToggleDisplay,
- touchZoom: !this.options.zoomLevelFixed,
- scrollWheelZoom: !this.options.zoomLevelFixed,
- doubleClickZoom: !this.options.zoomLevelFixed,
- boxZoom: !this.options.zoomLevelFixed,
+ touchZoom: !this._isZoomLevelFixed(),
+ scrollWheelZoom: !this._isZoomLevelFixed(),
+ doubleClickZoom: !this._isZoomLevelFixed(),
+ boxZoom: !this._isZoomLevelFixed(),
crs: map.options.crs
}), this._miniMap.addLayer(this._layer), this._mainMapMoving = !1, this._miniMapMoving = !1,
this._userToggledDisplay = !1, this._minimized = !1, this.options.toggleDisplay && this._addToggleButton(),
@@ -5135,7 +5165,7 @@ function addParam(paramName, values) {
this._miniMap.removeLayer(this._layer), this._layer = layer, this._miniMap.addLayer(this._layer);
},
_addToggleButton: function() {
- this._toggleDisplayButton = this.options.toggleDisplay ? this._createButton("", this.hideText, "leaflet-control-minimap-toggle-display leaflet-control-minimap-toggle-display-" + this.options.position, this._container, this._toggleDisplayButtonClicked, this) : void 0,
+ this._toggleDisplayButton = this.options.toggleDisplay ? this._createButton("", this.options.strings.hideText, "leaflet-control-minimap-toggle-display leaflet-control-minimap-toggle-display-" + this.options.position, this._container, this._toggleDisplayButtonClicked, this) : void 0,
this._toggleDisplayButton.style.width = this.options.collapsedWidth + "px", this._toggleDisplayButton.style.height = this.options.collapsedHeight + "px";
},
_createButton: function(html, title, className, container, fn, context) {
@@ -5146,8 +5176,8 @@ function addParam(paramName, values) {
link;
},
_toggleDisplayButtonClicked: function() {
- this._userToggledDisplay = !0, this._minimized ? (this._restore(), this._toggleDisplayButton.title = this.hideText) : (this._minimize(),
- this._toggleDisplayButton.title = this.showText);
+ this._userToggledDisplay = !0, this._minimized ? (this._restore(), this._toggleDisplayButton.title = this.options.strings.hideText) : (this._minimize(),
+ this._toggleDisplayButton.title = this.options.strings.showText);
},
_setDisplay: function(minimize) {
minimize != this._minimized && (this._minimized ? this._restore() : this._minimize());
@@ -5190,8 +5220,12 @@ function addParam(paramName, values) {
fillOpacity: 0
}));
},
+ _isZoomLevelFixed: function() {
+ var zoomLevelFixed = this.options.zoomLevelFixed;
+ return this._isDefined(zoomLevelFixed) && this._isInteger(zoomLevelFixed);
+ },
_decideZoom: function(fromMaintoMini) {
- if (this.options.zoomLevelFixed) return fromMaintoMini ? this.options.zoomLevelFixed : this._mainMap.getZoom();
+ if (this._isZoomLevelFixed()) return fromMaintoMini ? this.options.zoomLevelFixed : this._mainMap.getZoom();
if (fromMaintoMini) return this._mainMap.getZoom() + this.options.zoomLevelOffset;
var toRet, currentDiff = this._miniMap.getZoom() - this._mainMap.getZoom(), proposedZoom = this._miniMap.getZoom() - this.options.zoomLevelOffset;
return currentDiff > this.options.zoomLevelOffset && this._mainMap.getZoom() < this._miniMap.getMinZoom() - this.options.zoomLevelOffset ? this._miniMap.getZoom() > this._lastMiniMapZoom ? (toRet = this._mainMap.getZoom() + 1,
@@ -5200,6 +5234,12 @@ function addParam(paramName, values) {
},
_decideMinimized: function() {
return this._userToggledDisplay ? this._minimized : this.options.autoToggleDisplay ? this._mainMap.getBounds().contains(this._miniMap.getBounds()) ? !0 : !1 : this._minimized;
+ },
+ _isInteger: function(value) {
+ return "number" == typeof value;
+ },
+ _isDefined: function(value) {
+ return "undefined" != typeof value;
}
});
return L.Map.mergeOptions({
@@ -5207,4 +5247,5 @@ function addParam(paramName, values) {
}), L.Map.addInitHook(function() {
this.options.miniMapControl && (this.miniMapControl = new MiniMap().addTo(this));
}), MiniMap;
-}, window);
\ No newline at end of file
+}, window);
+//# sourceMappingURL=map-vendor.min.js.map
\ No newline at end of file
diff --git a/mapusaurus/mapping/static/mapping/js/map.min.js b/mapusaurus/mapping/static/mapping/js/map.min.js
index fc3f6e48..ab009ded 100644
--- a/mapusaurus/mapping/static/mapping/js/map.min.js
+++ b/mapusaurus/mapping/static/mapping/js/map.min.js
@@ -21,7 +21,9 @@ function init(data1) {
function getTractsInBounds(bounds, geoType) {
$("#bubbles_loading").show();
- var endpoint = "/api/tractCentroids/", params = {};
+ var endpoint = "/api/tractCentroids/", params = {
+ year: selectedYear
+ };
return bounds && "object" == typeof bounds && (params.neLat = bounds.neLat, params.neLon = bounds.neLon,
params.swLat = bounds.swLat, params.swLon = bounds.swLon), geoType && (params.geoType = geoType),
urlParam("metro") ? params.metro = urlParam("metro") : console.log("No metro area provided"),
@@ -38,8 +40,8 @@ function getTractsInBounds(bounds, geoType) {
function getTractData(actionTakenVal, bounds, geoType) {
$("#bubbles_loading").show();
- var endpoint = "/api/hmda", params = {
- year: 2013,
+ var endpoint = "/api/hmda/", params = {
+ year: selectedYear,
lh: !1,
peers: !1,
geo_type: geoType
@@ -62,7 +64,9 @@ function getTractData(actionTakenVal, bounds, geoType) {
}
function getMsasInBounds() {
- var endpoint = "/api/msas", params = {}, bounds = getBoundParams();
+ var endpoint = "/api/msas/", params = {
+ year: selectedYear
+ }, bounds = getBoundParams();
return params.neLat = bounds.neLat, params.neLon = bounds.neLon, params.swLat = bounds.swLat,
params.swLon = bounds.swLon, $.ajax({
url: endpoint,
@@ -77,6 +81,7 @@ function getMsasInBounds() {
function getBranchesInBounds(bounds) {
var endpoint = "/api/branchLocations/", params = {
+ year: selectedYear,
neLat: bounds.neLat,
neLon: bounds.neLon,
swLat: bounds.swLat,
@@ -356,14 +361,14 @@ function updatePrintLink() {
function getPeerLinks() {
var peerList = $(".peer-link");
$.each(peerList, function(i, val) {
- var instid = $(val).data("instid"), href = "/map/?metro=" + urlParam("metro") + "&lender=" + instid + window.location.hash.replace("&peers=true", "");
+ var instid = $(val).data("instid"), href = "/map/?metro=" + urlParam("metro") + "&lender=" + instid + "&year=" + selectedYear + window.location.hash.replace("&peers=true", "");
$(val).attr("href", href);
});
}
function updateCensusLink() {
var actions = getHashParams(), actionVar = getActionTaken(actions.action.values);
- $("#downloadCensus").attr("href", "/census/race_summary_csv/?metro=" + urlParam("metro") + "&lender=" + urlParam("lender") + "&action_taken=" + actionVar);
+ $("#downloadCensus").attr("href", "/census/race_summary_csv/?metro=" + urlParam("metro") + "&lender=" + urlParam("lender") + "&action_taken=" + actionVar + "&year=" + selectedYear);
}
function getActionTaken(value) {
@@ -459,11 +464,13 @@ $(document).ready(function() {
var act = $("#action-taken-selector option:selected").val();
addParam("action", act), $("#actionTaken").text(getActionTaken(act)), initCalls(geoQueryType);
}), generateTooltips();
- var keyHide = $(".hide-key"), keyShow = $(".show-key"), keyContents = $(".key-contents");
+ var keyHide = $(".hide-key"), keyShow = $(".show-key"), keyContents = $(".key-contents"), minorityKeyContents = $(".minority-key");
keyHide.on("click", function(e) {
- keyShow.removeClass("hidden"), keyContents.addClass("hidden"), keyHide.addClass("hidden");
+ keyShow.removeClass("hidden"), keyContents.addClass("hidden"), minorityKeyContents.addClass("hidden"),
+ keyHide.addClass("hidden");
}), keyShow.on("click", function(e) {
- keyHide.removeClass("hidden"), keyContents.removeClass("hidden"), keyShow.addClass("hidden");
+ keyHide.removeClass("hidden"), keyContents.removeClass("hidden"), minorityKeyContents.removeClass("hidden"),
+ keyShow.addClass("hidden");
}), "undefined" != typeof loadParams.category ? (assignCat(loadParams.category.values),
layerUpdate(cat), $(catId).addClass("active-layer")) : (assignCat("inv_non_hisp_white_only_perc"),
layerUpdate(cat), $(catId).addClass("active-layer"));
@@ -474,8 +481,6 @@ $(document).ready(function() {
assignCat(selectedOption.attr("id")), selectedOption.addClass("active-layer"), layerUpdate(cat);
}), map.on("moveend", function(e) {
$("#branchSelect").prop("checked") && toggleBranches(!0);
- }), map.on("moveend", function() {
- moveEndAction[geoQueryType]();
}), map.on("zoomend", function() {
buildKeyCircles();
}), map.on("overlayadd", function() {
@@ -520,7 +525,7 @@ moveEndAction.selected = function() {
});
});
-var rawGeo, rawLar, rawMinority, rawData, isUIBlocked = !1, larVolume = [], pctMinority = [], dataStore = {};
+var rawGeo, rawLar, rawMinority, rawData, selectedYear = selectedYear || 2014, isUIBlocked = !1, larVolume = [], pctMinority = [], dataStore = {};
dataStore.tracts = {};
@@ -533,4 +538,5 @@ var baseStyle = {
stroke: !1,
weight: 0,
fill: !1
-};
\ No newline at end of file
+};
+//# sourceMappingURL=map.min.js.map
\ No newline at end of file
diff --git a/mapusaurus/mapping/static/mapping/js/table.min.js b/mapusaurus/mapping/static/mapping/js/table.min.js
index b132946a..a34c76bb 100644
--- a/mapusaurus/mapping/static/mapping/js/table.min.js
+++ b/mapusaurus/mapping/static/mapping/js/table.min.js
@@ -88,7 +88,7 @@ function buildRow(data, rowType, showPeers) {
return templateData = _.extend({
rowType: rowType,
showPeers: showPeers
- }, data), templateData.className = rowType.toLowerCase() + "-row ", templateData.className += data.isPeer ? " peer-row tablesorter-childRow" : " target-row",
+ }, data), templateData.className = rowType.toLowerCase() + "-row ", data.isPeer ? templateData.className += " peer-row tablesorter-childRow" : templateData.className += " target-row",
rowTemplate(templateData);
}
@@ -131,4 +131,5 @@ $(document).ready(function() {
$("#table-container").show(), currentChart = id, toggleDataContainer(!0)) : (currentChart = null,
toggleDataContainer(!1), $(".chart-toggle").removeClass("active-layer"));
});
-});
\ No newline at end of file
+});
+//# sourceMappingURL=table.min.js.map
\ No newline at end of file
diff --git a/mapusaurus/mapping/templates/faq.html b/mapusaurus/mapping/templates/faq.html
index 1808070c..f5fde33c 100644
--- a/mapusaurus/mapping/templates/faq.html
+++ b/mapusaurus/mapping/templates/faq.html
@@ -1,7 +1,7 @@
{% extends "basestyle/one_column_layout.html" %}
{% load static %}
-{% block title %}Fair Lending FAQ / Data Details{% endblock %}
+{% block title %}Redlining Risk Assessment Mapper FAQ / Data Details{% endblock %}
{% block head_styles %}
diff --git a/mapusaurus/mapping/templates/map.html b/mapusaurus/mapping/templates/map.html
index 1e768d08..025045c7 100644
--- a/mapusaurus/mapping/templates/map.html
+++ b/mapusaurus/mapping/templates/map.html
@@ -1,7 +1,7 @@
{% extends "basestyle/map_layout.html" %}
{% load staticfiles %}
-{% block title %}Fair Lending HMDA Visualization Toolkit - {{lender}}{% endblock %}
+{% block title %}Redlining Risk Assessment Mapper - {{lender}}{% endblock %}
{% block head_styles %}