Merge pull request #627 from nextstrain/negative_dates

make calendarToNumeric parse negative dates
nextstrain · Aug 17, 2018 · 2bb17f0 · 2bb17f0
2 parents e24cde9 + 16c0650
commit 2bb17f0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/components/info/info.js b/src/components/info/info.js
@@ -20,9 +20,13 @@ const pluralise = (word, n) => {
 };
 
 const styliseDateRange = (dateStr) => {
-  // 2012-01-22
   const fields = dateStr.split('-');
-  return `${months[fields[1]]} ${fields[0]}`;
+  // 2012-01-22
+  if (fields.length==3){
+    return `${months[fields[1]]} ${fields[0]}`;
+  }else{ // other cases like negative numbers
+    return dateStr;
+  }
 };
 
 const getNumSelectedTips = (nodes, visibility) => {

diff --git a/src/util/dateHelpers.js b/src/util/dateHelpers.js
@@ -8,15 +8,23 @@ const dateScale = scaleTime()
   .range([2000, 2100]);
 
 export const numericToCalendar = (numDate) => {
+  if (numDate<0){
+    return Math.round(numDate).toString();
+  }
   const d3Date = dateScale.invert(numDate);
   const calDate = dateFormatter(d3Date);
   return calDate;
 };
 
 export const calendarToNumeric = (calDate) => {
-  const d3Date = dateParser(calDate);
-  const numDate = dateScale(d3Date);
-  return numDate;
+  if (calDate[0]==='-'){
+    const pieces = calDate.substring(1).split('-');
+    return -parseFloat(pieces[0]);
+  }else{
+    const d3Date = dateParser(calDate);
+    const numDate = dateScale(d3Date);
+    return numDate;
+  }
 };
 
 export const currentNumDate = () => {