diff --git a/.gitignore b/.gitignore
index 9ddd905a..66471a97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ tmp/
src/downloads
data
deploy.sh
+yarn.lock
diff --git a/src/images/source/data.svg b/src/images/source/data.svg
index 55996e32..0ba9c522 100644
--- a/src/images/source/data.svg
+++ b/src/images/source/data.svg
@@ -10,11 +10,11 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="716.55255"
- height="479.72726"
+ width="623.83069"
+ height="480.51828"
id="svg2"
version="1.1"
- inkscape:version="0.48.5 r10040"
+ inkscape:version="0.91 r13725"
sodipodi:docname="data.svg"
inkscape:export-filename="C:\Users\Tobin\Desktop\qol-data.png"
inkscape:export-xdpi="90"
@@ -46,7 +46,7 @@
inkscape:isstock="true">
@@ -61,7 +61,7 @@
inkscape:isstock="true">
@@ -75,7 +75,7 @@
style="overflow:visible">
@@ -89,7 +89,7 @@
style="overflow:visible">
@@ -183,7 +183,7 @@
+ style="color-interpolation-filters:sRGB">
+ id="filter4065-2"
+ style="color-interpolation-filters:sRGB">
+ id="filter4065-0"
+ style="color-interpolation-filters:sRGB">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ transform="translate(-83.898068,4.820715)">
+ id="g5066">
@@ -1649,7 +1359,7 @@
id="g4083-7">
m1.md
@@ -1794,7 +1504,7 @@
transform="translate(256.57875,-180.81731)">
r1.csv
+ Sum
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CSV
- CSV
-
-
- accuracym1-accuracy.csv
-
-
- Sum
-
-
+ id="g4629"
+ transform="translate(-206.14709,244.96836)">
@@ -2039,7 +1599,7 @@
style="fill:url(#linearGradient4703);fill-rule:evenodd;stroke-width:1pt"
inkscape:connector-curvature="0"
id="path4647"
- d="m 301.31,174.91 -2.04,453.99 443.82,0 0.25,-112.22 C 733.42,520.5 633.15,378.49 506.93,384.6 380.59,390.71 413.28,193.23 301.31,174.91 z"
+ d="m 301.31,174.91 -2.04,453.99 443.82,0 0.25,-112.22 C 733.42,520.5 633.15,378.49 506.93,384.6 380.59,390.71 413.28,193.23 301.31,174.91 Z"
transform="matrix(0.29669,0,0,0.29669,-71.196,-34.058)" />
MD
m1.md
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CSV
- CSV
-
-
- rawr1.csv
-
-
CSV
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CSV
- CSV
-
-
- accuracym1-accuracy.csv
-
Mean
-
-
+ x="450.91306"
+ y="192.7739"
+ style="font-weight:bold;font-size:16px;-inkscape-font-specification:'Sans Bold'">Mean
CSV
@@ -2844,7 +2108,7 @@
id="g4999">
+ transform="translate(-112.64117,273.61539)">
@@ -2927,7 +2191,7 @@
style="fill:url(#linearGradient5089);fill-rule:evenodd;stroke-width:1pt"
inkscape:connector-curvature="0"
id="path5047"
- d="m 301.31,174.91 -2.04,453.99 443.82,0 0.25,-112.22 C 733.42,520.5 633.15,378.49 506.93,384.6 380.59,390.71 413.28,193.23 301.31,174.91 z"
+ d="m 301.31,174.91 -2.04,453.99 443.82,0 0.25,-112.22 C 733.42,520.5 633.15,378.49 506.93,384.6 380.59,390.71 413.28,193.23 301.31,174.91 Z"
transform="matrix(0.29669,0,0,0.29669,-71.196,-34.058)" />
CSV
r1.csv
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CSV
- CSV
-
-
- accuracym1-accuracy.csv
-
Weighted
+ style="font-weight:bold;font-size:16px;-inkscape-font-specification:'Sans Bold'">Weighted
Geographygeograpy.topo.json
+ sodipodi:role="line">geograpy.geojson.json
@@ -3680,7 +2798,7 @@
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.70359337;stroke-opacity:1" />
geography
id
Metric
diff --git a/src/scripts/functions/search.js b/src/scripts/functions/search.js
index 2532a091..543fe9b7 100644
--- a/src/scripts/functions/search.js
+++ b/src/scripts/functions/search.js
@@ -27,7 +27,7 @@ function initTypeahead() {
{
name: 'Address',
remote: {
- url: 'http://maps.co.mecklenburg.nc.us/rest/v4/ws_geo_ubersearch.php?searchtypes=address&query=%QUERY',
+ url: 'https://mcmap.org/rest/v4/ws_geo_ubersearch.php?searchtypes=address&query=%QUERY',
dataType: 'jsonp',
filter: function (data) {
var dataset = [];
@@ -53,7 +53,7 @@ function initTypeahead() {
{
name: 'NSA',
remote: {
- url: 'http://maps.co.mecklenburg.nc.us/rest/v4/ws_geo_ubersearch.php?searchtypes=nsa&query=%QUERY',
+ url: 'https://mcmap.org/rest/v4/ws_geo_ubersearch.php?searchtypes=nsa&query=%QUERY',
dataType: 'jsonp',
filter: function (data) {
var dataset = [];
@@ -75,7 +75,7 @@ function initTypeahead() {
}, {
name: 'PID',
remote: {
- url: 'http://maps.co.mecklenburg.nc.us/rest/v4/ws_geo_ubersearch.php?searchtypes=pid&query=%QUERY',
+ url: 'https://mcmap.org/rest/v4/ws_geo_ubersearch.php?searchtypes=pid&query=%QUERY',
dataType: 'jsonp',
filter: function (data) {
var dataset = [];
@@ -101,7 +101,7 @@ function initTypeahead() {
}, {
name: 'POI',
remote: {
- url: 'http://maps.co.mecklenburg.nc.us/rest/v4/ws_geo_ubersearch.php?searchtypes=park,library,school&query=%QUERY',
+ url: 'https://mcmap.org/rest/v4/ws_geo_ubersearch.php?searchtypes=park,library,school&query=%QUERY',
dataType: 'jsonp',
filter: function (data) {
var dataset = [];
@@ -123,7 +123,7 @@ function initTypeahead() {
}, {
name: 'business',
remote: {
- url: 'http://maps.co.mecklenburg.nc.us/rest/v4/ws_geo_ubersearch.php?searchtypes=business&query=%QUERY',
+ url: 'https://mcmap.org/rest/v4/ws_geo_ubersearch.php?searchtypes=business&query=%QUERY',
dataType: 'jsonp',
filter: function (data) {
var dataset = [];
@@ -146,7 +146,7 @@ function initTypeahead() {
name: 'zipcode',
remote: {
//url: "http://maps.co.mecklenburg.nc.us:80/api/query/v1/zipcodes?columns=zip&filter=zip=%27%QUERY%27",
- url: "http://maps.co.mecklenburg.nc.us/rest/v3/ws_geo_attributequery.php?table=zipcodes&fields=zip¶meters=zip=%27%QUERY%27",
+ url: "https://mcmap.org/rest/v3/ws_geo_attributequery.php?table=zipcodes&fields=zip¶meters=zip=%27%QUERY%27",
dataType: 'jsonp',
filter: function (data) {
var dataset = [];
@@ -168,7 +168,7 @@ function initTypeahead() {
]).on('typeahead:selected', function (obj, datum, theType) {
if (datum.lat) {
$.ajax({
- url: 'http://maps.co.mecklenburg.nc.us/rest/v2/ws_geo_pointoverlay.php',
+ url: 'https://mcmap.org/rest/v2/ws_geo_pointoverlay.php',
type: 'GET',
dataType: 'jsonp',
data: {
@@ -190,7 +190,7 @@ function initTypeahead() {
$.ajax({
type: "GET",
dataType: 'jsonp',
- url: "http://maps.co.mecklenburg.nc.us/rest/v3/ws_geo_attributequery.php",
+ url: "https://mcmap.org/rest/v3/ws_geo_attributequery.php",
data: {
table: "neighborhoods npa, neighborhood_statistical_areas nsa",
fields: "npa.id",
@@ -212,7 +212,7 @@ function initTypeahead() {
$.ajax({
type: "GET",
dataType: 'jsonp',
- url: "http://maps.co.mecklenburg.nc.us/rest/v3/ws_geo_attributequery.php",
+ url: "https://mcmap.org/rest/v3/ws_geo_attributequery.php",
data: {
table: "neighborhoods npa, zipcodes",
fields: "npa.id",