-
this.mapContainer = el} className="absolute top right left bottom" />
+
);
}
}
+ShowMap.propTypes = {
+ geojson: PropTypes.object.isRequired,
+};
+
export default ShowMap;
diff --git a/src/js/components/parser.js b/src/js/components/parser.js
index 95eb3b6..bf7e730 100644
--- a/src/js/components/parser.js
+++ b/src/js/components/parser.js
@@ -1,5 +1,8 @@
import $ from 'jquery';
+import Venues from '../../data/venues.json';
+import getEditDistance from './Util';
+
export default class Parser {
constructor() {
this.yql = Parser.makeYQL();
@@ -11,7 +14,8 @@ export default class Parser {
const results = Parser.parseHTMLtoDOM(success);
const dates = Parser.getDates(results);
const organized = Parser.sortByDate(results, dates);
- return { organized, dates };
+ const geojson = Parser.geojsonify(organized);
+ return { organized, geojson, dates };
})
.catch(e => Error((e)));
}
@@ -68,4 +72,64 @@ export default class Parser {
return organized;
}
+
+ static geojsonify(data) {
+ const features = [];
+ const dateKeys = Object.keys(data);
+
+ // loop through dates
+ for (let i = 0; i < dateKeys.length; i += 1) {
+ // loop through shows
+ for (let j = 0; j < data[dateKeys[i]].length; j += 1) {
+ const showData = data[dateKeys[i]][j];
+ const venueList = Object.keys(Venues);
+
+ // check for misspellings
+ if (!Venues[showData.venue]) {
+ try {
+ for (let v = 0; v < venueList.length; v += 1) {
+ const misspelled = showData.venue.replace(/\W/g, '');
+ const spelledCorrect = venueList[v].replace(/\W/g, '');
+ const editDistance = getEditDistance(misspelled, spelledCorrect);
+ if (editDistance <= 3) {
+ console.log(`"${showData.venue}" has been replaced with "${venueList[v]}"`);
+ showData.venue = venueList[v];
+ }
+ }
+ } catch (e) {
+ console.log('Missing Venue?', e);
+ }
+ }
+
+ const showString = `${dateKeys[i]} - ${showData.venue} | ${showData.bands.join(' |')} | ${showData.details}`;
+ const showHTML = `
${showData.venue}
${dateKeys[i]}
${showData.bands.join(' |')}
${showData.details}`;
+
+ const show = {
+ type: 'Feature',
+ geometry: {
+ type: 'Point',
+ coordinates: [showData.venue] || [-122.422960, 37.826524],
+ },
+ properties: {
+ date: dateKeys[i],
+ venue: showData.venue,
+ bands: showData.bands,
+ details: showData.details.replace(/ ,/g, ''), // fucking commas
+ showString,
+ showHTML,
+ },
+ };
+
+ // add show to features array
+ features.push(show);
+ }
+ }
+
+ // format for valid geojson
+ const geojson = {
+ type: 'FeatureCollection',
+ features,
+ };
+ return geojson;
+ }
}
diff --git a/src/js/components/util.js b/src/js/components/util.js
index 2cf1c3c..9dc180c 100644
--- a/src/js/components/util.js
+++ b/src/js/components/util.js
@@ -1,13 +1,38 @@
-export default class Util {
- static populateDates(dates) {
- const form = document.getElementById('date-selector');
- form.innerHTML = '
';
- for (let d = 0; d < dates.length; d += 1) {
- const radio = ` ${dates[d]}`;
- form.innerHTML += radio;
+// Compute the edit distance between the two given strings
+export default function getEditDistance(a, b) {
+ if (a.length === 0) return b.length;
+ if (b.length === 0) return a.length;
+
+ const matrix = [];
+
+ // increment along the first column of each row
+ let i;
+ for (i = 0; i <= b.length; i += 1) {
+ matrix[i] = [i];
+ }
+
+ // increment each column in the first row
+ let j;
+ for (j = 0; j <= a.length; j += 1) {
+ matrix[0][j] = j;
+ }
+
+ // Fill in the rest of the matrix
+ for (i = 1; i <= b.length; i += 1) {
+ for (j = 1; j <= a.length; j += 1) {
+ if (b.charAt(i - 1) === a.charAt(j - 1)) {
+ matrix[i][j] = matrix[i - 1][j - 1];
+ } else {
+ matrix[i][j] = Math.min(
+ matrix[i - 1][j - 1] + 1, // substitution
+ Math.min(
+ matrix[i][j - 1] + 1, // insertion
+ matrix[i - 1][j] + 1,
+ ),
+ ); // deletion
+ }
}
- form.innerHTML += '
';
- // TODO: handle filters
- // filters = document.getElementById('date-selector').filters;
}
+
+ return matrix[b.length][a.length];
}