Merge branch 'fix-38-trend-diagram-decade-labels' into dev-v9

* fix-38-trend-diagram-decade-labels: Fix spraakbanken#38: Correct trend diagram labels for decades <1900 styles cleanup
CSCfi · May 26, 2021 · 2a4414a · 2a4414a
2 parents 78d15aa + b20a23b
commit 2a4414a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/app/scripts/results.js b/app/scripts/results.js
@@ -2156,13 +2156,22 @@ view.GraphResults = class GraphResults extends BaseResults {
         const toDate = (sec) => moment(sec * 1000).toDate()
 
         const time = new Rickshaw.Fixtures.Time()
+        // Fix time.ceil for decades: Rickshaw.Fixtures.Time.ceil
+        // returns one decade too small values before 1900. (The root
+        // cause may be Rickshaw's approximate handling of leap years:
+        // 1900 was not a leap year.)
         const old_ceil = time.ceil
         time.ceil = (time, unit) => {
             if (unit.name === "decade") {
                 const out = Math.ceil(time / unit.seconds) * unit.seconds
                 const mom = moment(out * 1000)
-                if (mom.date() === 31) {
-                    mom.add("day", 1)
+                const monthDay = mom.date()
+                // If the day of the month is not 1, it is within the
+                // previous month (December), so add enough days to
+                // move the date to the expected month (January).
+                // (Should we check the month, too?)
+                if (monthDay !== 1) {
+                    mom.add(32 - monthDay, "day")
                 }
                 return mom.unix()
             } else {
@@ -2172,9 +2181,10 @@ view.GraphResults = class GraphResults extends BaseResults {
 
         const xAxis = new Rickshaw.Graph.Axis.Time({
             graph,
+            // Use the fixed .ceil for decades
+            timeFixture: time,
+            // timeUnit: time.unit("month") # TODO: bring back decade
         })
-        // timeUnit: time.unit("month") # TODO: bring back decade
-        // timeFixture: new Rickshaw.Fixtures.Time()
 
         this.preview = new Rickshaw.Graph.RangeSlider.Preview({
             graph,

diff --git a/app/styles/styles.scss b/app/styles/styles.scss
@@ -1351,11 +1351,6 @@ label[for=lemgram_select]:before {
   transition: left 400ms ease;
 }
 
-#showLineDiagram {
-  position: relative;
-  top: 3px;
-}
-
 .right_col {
   padding-right: 2px;
 }
@@ -1520,14 +1515,6 @@ label[for=lemgram_select]:before {
   opacity: 0.7;
 }
 
-#showLineDiagram {
-  display: none;
-}
-
-.lab #showLineDiagram {
-  display: inline;
-}
-
 #labs_logo {
   display: none;
   svg {