Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

fix unit tests/linting

Jason Kentd8b620353d06
diff --git a/web/css/dateselector.css b/web/css/dateselector.css
index 7a717de91..d91590274 100644
--- a/web/css/dateselector.css
+++ b/web/css/dateselector.css
@@ -24,14 +24,14 @@
input {
cursor: default;
}
- .date-arrows {
- &:hover {
- background-color: transparent;
- cursor: default;
- }
- svg path {
- visibility: hidden;
- }
+}
+.disabled .wv-date-selector-widget {
+ .date-arrows &:hover {
+ background-color: transparent;
+ cursor: default;
+ }
+ .date-arrows svg path {
+ visibility: hidden;
}
}
@@ -67,7 +67,7 @@
.date-arrows svg path {
fill: #888;
&.disabled {
- fill: trasparent
+ fill: trasparent;
}
}
}
diff --git a/web/js/modules/date/util.js b/web/js/modules/date/util.js
index a68ef8dbf..ffd40d49c 100644
--- a/web/js/modules/date/util.js
+++ b/web/js/modules/date/util.js
@@ -393,7 +393,7 @@ const getMaxDate = function() {
return new Date(Date.UTC(3000, 11, 30, 23, 59));
};
-const roll = function(val, min, max) {
+export const roll = function(val, min, max) {
if (val < min) {
return max - (min - val) + 1;
}
@@ -403,7 +403,7 @@ const roll = function(val, min, max) {
return val;
};
-const getDaysInMonth = function(d) {
+export const getDaysInMonth = function(d) {
let year;
let month;
if (d.getUTCFullYear) {
diff --git a/web/js/modules/date/util.test.js b/web/js/modules/date/util.test.js
index d4ff99333..a67783eeb 100644
--- a/web/js/modules/date/util.test.js
+++ b/web/js/modules/date/util.test.js
@@ -1,4 +1,6 @@
-import { mapLocationToDateState, tryCatchDate } from './util';
+import {
+ mapLocationToDateState, tryCatchDate, rollDate, roll, getDaysInMonth,
+} from './util';
import fixtures from '../../fixtures';
const state = fixtures.getState();
@@ -34,3 +36,176 @@ test('If date is invalid, uses Initial Time', () => {
expect(stateFromLocation.date.selected).toBe(state.date.selected);
});
+
+describe('rollDate', () => {
+ const tests = [{
+ name: 'day up',
+ d: new Date(Date.UTC(2014, 1, 15)),
+ period: { value: 1, unit: 'day' },
+ answer: new Date(Date.UTC(2014, 1, 16)),
+ }, {
+ name: 'day up, roll',
+ d: new Date(Date.UTC(2014, 1, 28)),
+ period: { value: 1, unit: 'day' },
+ answer: new Date(Date.UTC(2014, 1, 1)),
+ }, {
+ name: 'day down',
+ d: new Date(Date.UTC(2014, 1, 15)),
+ period: { value: -1, unit: 'day' },
+ answer: new Date(Date.UTC(2014, 1, 14)),
+ }, {
+ name: 'day down, roll',
+ d: new Date(Date.UTC(2014, 1, 1)),
+ period: { value: -1, unit: 'day' },
+ answer: new Date(Date.UTC(2014, 1, 28)),
+ }, {
+ name: 'day up, roll over max',
+ maxDate: new Date(Date.UTC(2014, 11, 2)),
+ d: new Date(Date.UTC(2014, 11, 2)),
+ period: { value: 1, unit: 'day' },
+ answer: new Date(Date.UTC(2014, 11, 1)),
+ }, {
+ name: 'day down, roll over max',
+ maxDate: new Date(Date.UTC(2014, 11, 2)),
+ d: new Date(Date.UTC(2014, 11, 1)),
+ period: { value: -1, unit: 'day' },
+ answer: new Date(Date.UTC(2014, 11, 2)),
+ }, {
+ name: 'day up, roll over min',
+ minDate: new Date(Date.UTC(2014, 11, 2)),
+ d: new Date(Date.UTC(2014, 11, 31)),
+ period: { value: 1, unit: 'day' },
+ answer: new Date(Date.UTC(2014, 11, 2)),
+ }, {
+ name: 'day down, roll over min',
+ minDate: new Date(Date.UTC(2014, 11, 2)),
+ d: new Date(Date.UTC(2014, 11, 2)),
+ period: { value: -1, unit: 'day' },
+ answer: new Date(Date.UTC(2014, 11, 31)),
+ }, {
+ name: 'month up',
+ d: new Date(Date.UTC(2014, 5, 15)),
+ period: { value: 1, unit: 'month' },
+ answer: new Date(Date.UTC(2014, 6, 15)),
+ }, {
+ name: 'month up, roll',
+ d: new Date(Date.UTC(2014, 11, 15)),
+ period: { value: 1, unit: 'month' },
+ answer: new Date(Date.UTC(2014, 0, 15)),
+ }, {
+ name: 'month down',
+ d: new Date(Date.UTC(2014, 5, 15)),
+ period: { value: -1, unit: 'month' },
+ answer: new Date(Date.UTC(2014, 4, 15)),
+ }, {
+ name: 'month down, roll',
+ d: new Date(Date.UTC(2014, 0, 15)),
+ period: { value: -1, unit: 'month' },
+ answer: new Date(Date.UTC(2014, 11, 15)),
+ }, {
+ name: 'month up, roll over max',
+ maxDate: new Date(Date.UTC(2014, 10, 2)),
+ d: new Date(Date.UTC(2014, 9, 20)),
+ period: { value: 1, unit: 'month' },
+ answer: new Date(Date.UTC(2014, 10, 2)),
+ }, {
+ name: 'month up, roll past max',
+ maxDate: new Date(Date.UTC(2014, 10, 2)),
+ d: new Date(Date.UTC(2014, 10, 1)),
+ period: { value: 1, unit: 'month' },
+ answer: new Date(Date.UTC(2014, 0, 1)),
+ }, {
+ name: 'month down, roll over max',
+ maxDate: new Date(Date.UTC(2014, 10, 2)),
+ d: new Date(Date.UTC(2014, 0, 20)),
+ period: { value: -1, unit: 'month' },
+ answer: new Date(Date.UTC(2014, 10, 2)),
+ }, {
+ name: 'month up, truncate day',
+ d: new Date(Date.UTC(2014, 0, 31)),
+ period: { value: 1, unit: 'month' },
+ answer: new Date(Date.UTC(2014, 1, 28)),
+ }, {
+ name: 'month down, roll over min',
+ minDate: new Date(Date.UTC(2014, 2, 25)),
+ d: new Date(Date.UTC(2014, 3, 1)),
+ period: { value: -1, unit: 'month' },
+ answer: new Date(Date.UTC(2014, 2, 25)),
+ }, {
+ name: 'month up, roll over min',
+ minDate: new Date(Date.UTC(2014, 2, 25)),
+ d: new Date(Date.UTC(2014, 11, 1)),
+ period: { value: 1, unit: 'month' },
+ answer: new Date(Date.UTC(2014, 2, 25)),
+ }, {
+ name: 'month down, roll past min',
+ minDate: new Date(Date.UTC(2014, 2, 25)),
+ d: new Date(Date.UTC(2014, 2, 27)),
+ period: { value: -1, unit: 'month' },
+ answer: new Date(Date.UTC(2014, 11, 27)),
+ }, {
+ name: 'year up',
+ d: new Date(Date.UTC(2014, 5, 15)),
+ period: { value: 1, unit: 'year' },
+ answer: new Date(Date.UTC(2015, 5, 15)),
+ }, {
+ name: 'year down',
+ d: new Date(Date.UTC(2014, 5, 15)),
+ period: { value: -1, unit: 'year' },
+ answer: new Date(Date.UTC(2013, 5, 15)),
+ }, {
+ name: 'year up, roll over max',
+ minDate: new Date(Date.UTC(2000, 3, 12)),
+ maxDate: new Date(Date.UTC(2015, 6, 16)),
+ d: new Date(Date.UTC(2015, 0, 1)),
+ period: { value: 1, unit: 'year' },
+ answer: new Date(Date.UTC(2000, 3, 12)),
+ }, {
+ name: 'year down, roll over min',
+ minDate: new Date(Date.UTC(2000, 3, 12)),
+ maxDate: new Date(Date.UTC(2015, 6, 16)),
+ d: new Date(Date.UTC(2000, 8, 1)),
+ period: { value: -1, unit: 'year' },
+ answer: new Date(Date.UTC(2015, 6, 16)),
+ }];
+
+ tests.forEach((t) => {
+ test(t.name, () => {
+ const result = rollDate(t.d, t.period.unit, t.period.value, t.minDate, t.maxDate);
+ expect(result).toEqual(t.answer);
+ });
+ });
+});
+
+describe('roll', () => {
+ const tests = [
+ {
+ v: 15, min: 10, max: 20, answer: 15, name: 'middle',
+ },
+ {
+ v: 8, min: 10, max: 20, answer: 19, name: 'min',
+ },
+ {
+ v: 22, min: 10, max: 20, answer: 11, name: 'max',
+ },
+ ];
+
+ tests.forEach((t) => {
+ test(t.name, () => {
+ expect(roll(t.v, t.min, t.max)).toBe(t.answer);
+ });
+ });
+});
+
+describe('daysInMonth', () => {
+ test('feb, non-leap', () => {
+ const d = new Date(Date.UTC(2015, 1, 15));
+ expect(getDaysInMonth(d)).toBe(28);
+ });
+
+ test('feb, leap', () => {
+ const d = new Date(Date.UTC(2016, 1, 15));
+ expect(getDaysInMonth(d)).toBe(29);
+ });
+});
+
diff --git a/web/js/util/util.test.js b/web/js/util/util.test.js
index 1c35afa39..6aa023f7a 100644
--- a/web/js/util/util.test.js
+++ b/web/js/util/util.test.js
@@ -116,17 +116,6 @@ describe('dateAdd', () => {
});
});
-describe('daysInMonth', () => {
- test('feb, non-leap', () => {
- const d = new Date(Date.UTC(2015, 1, 15));
- expect(util.daysInMonth(d)).toBe(28);
- });
-
- test('feb, leap', () => {
- const d = new Date(Date.UTC(2016, 1, 15));
- expect(util.daysInMonth(d)).toBe(29);
- });
-});
describe('daysInYear', () => {
const tests = [
@@ -163,166 +152,6 @@ describe('clamp', () => {
});
});
-describe('roll', () => {
- const tests = [
- {
- v: 15, min: 10, max: 20, answer: 15, name: 'middle',
- },
- {
- v: 8, min: 10, max: 20, answer: 19, name: 'min',
- },
- {
- v: 22, min: 10, max: 20, answer: 11, name: 'max',
- },
- ];
-
- tests.forEach((t) => {
- test(t.name, () => {
- expect(util.roll(t.v, t.min, t.max)).toBe(t.answer);
- });
- });
-});
-
-describe('rollDate', () => {
- const tests = [{
- name: 'day up',
- d: new Date(Date.UTC(2014, 1, 15)),
- period: { value: 1, unit: 'day' },
- answer: new Date(Date.UTC(2014, 1, 16)),
- }, {
- name: 'day up, roll',
- d: new Date(Date.UTC(2014, 1, 28)),
- period: { value: 1, unit: 'day' },
- answer: new Date(Date.UTC(2014, 1, 1)),
- }, {
- name: 'day down',
- d: new Date(Date.UTC(2014, 1, 15)),
- period: { value: -1, unit: 'day' },
- answer: new Date(Date.UTC(2014, 1, 14)),
- }, {
- name: 'day down, roll',
- d: new Date(Date.UTC(2014, 1, 1)),
- period: { value: -1, unit: 'day' },
- answer: new Date(Date.UTC(2014, 1, 28)),
- }, {
- name: 'day up, roll over max',
- maxDate: new Date(Date.UTC(2014, 11, 2)),
- d: new Date(Date.UTC(2014, 11, 2)),
- period: { value: 1, unit: 'day' },
- answer: new Date(Date.UTC(2014, 11, 1)),
- }, {
- name: 'day down, roll over max',
- maxDate: new Date(Date.UTC(2014, 11, 2)),
- d: new Date(Date.UTC(2014, 11, 1)),
- period: { value: -1, unit: 'day' },
- answer: new Date(Date.UTC(2014, 11, 2)),
- }, {
- name: 'day up, roll over min',
- minDate: new Date(Date.UTC(2014, 11, 2)),
- d: new Date(Date.UTC(2014, 11, 31)),
- period: { value: 1, unit: 'day' },
- answer: new Date(Date.UTC(2014, 11, 2)),
- }, {
- name: 'day down, roll over min',
- minDate: new Date(Date.UTC(2014, 11, 2)),
- d: new Date(Date.UTC(2014, 11, 2)),
- period: { value: -1, unit: 'day' },
- answer: new Date(Date.UTC(2014, 11, 31)),
- }, {
- name: 'month up',
- d: new Date(Date.UTC(2014, 5, 15)),
- period: { value: 1, unit: 'month' },
- answer: new Date(Date.UTC(2014, 6, 15)),
- }, {
- name: 'month up, roll',
- d: new Date(Date.UTC(2014, 11, 15)),
- period: { value: 1, unit: 'month' },
- answer: new Date(Date.UTC(2014, 0, 15)),
- }, {
- name: 'month down',
- d: new Date(Date.UTC(2014, 5, 15)),
- period: { value: -1, unit: 'month' },
- answer: new Date(Date.UTC(2014, 4, 15)),
- }, {
- name: 'month down, roll',
- d: new Date(Date.UTC(2014, 0, 15)),
- period: { value: -1, unit: 'month' },
- answer: new Date(Date.UTC(2014, 11, 15)),
- }, {
- name: 'month up, roll over max',
- maxDate: new Date(Date.UTC(2014, 10, 2)),
- d: new Date(Date.UTC(2014, 9, 20)),
- period: { value: 1, unit: 'month' },
- answer: new Date(Date.UTC(2014, 10, 2)),
- }, {
- name: 'month up, roll past max',
- maxDate: new Date(Date.UTC(2014, 10, 2)),
- d: new Date(Date.UTC(2014, 10, 1)),
- period: { value: 1, unit: 'month' },
- answer: new Date(Date.UTC(2014, 0, 1)),
- }, {
- name: 'month down, roll over max',
- maxDate: new Date(Date.UTC(2014, 10, 2)),
- d: new Date(Date.UTC(2014, 0, 20)),
- period: { value: -1, unit: 'month' },
- answer: new Date(Date.UTC(2014, 10, 2)),
- }, {
- name: 'month up, truncate day',
- d: new Date(Date.UTC(2014, 0, 31)),
- period: { value: 1, unit: 'month' },
- answer: new Date(Date.UTC(2014, 1, 28)),
- }, {
- name: 'month down, roll over min',
- minDate: new Date(Date.UTC(2014, 2, 25)),
- d: new Date(Date.UTC(2014, 3, 1)),
- period: { value: -1, unit: 'month' },
- answer: new Date(Date.UTC(2014, 2, 25)),
- }, {
- name: 'month up, roll over min',
- minDate: new Date(Date.UTC(2014, 2, 25)),
- d: new Date(Date.UTC(2014, 11, 1)),
- period: { value: 1, unit: 'month' },
- answer: new Date(Date.UTC(2014, 2, 25)),
- }, {
- name: 'month down, roll past min',
- minDate: new Date(Date.UTC(2014, 2, 25)),
- d: new Date(Date.UTC(2014, 2, 27)),
- period: { value: -1, unit: 'month' },
- answer: new Date(Date.UTC(2014, 11, 27)),
- }, {
- name: 'year up',
- d: new Date(Date.UTC(2014, 5, 15)),
- period: { value: 1, unit: 'year' },
- answer: new Date(Date.UTC(2015, 5, 15)),
- }, {
- name: 'year down',
- d: new Date(Date.UTC(2014, 5, 15)),
- period: { value: -1, unit: 'year' },
- answer: new Date(Date.UTC(2013, 5, 15)),
- }, {
- name: 'year up, roll over max',
- minDate: new Date(Date.UTC(2000, 3, 12)),
- maxDate: new Date(Date.UTC(2015, 6, 16)),
- d: new Date(Date.UTC(2015, 0, 1)),
- period: { value: 1, unit: 'year' },
- answer: new Date(Date.UTC(2000, 3, 12)),
- }, {
- name: 'year down, roll over min',
- minDate: new Date(Date.UTC(2000, 3, 12)),
- maxDate: new Date(Date.UTC(2015, 6, 16)),
- d: new Date(Date.UTC(2000, 8, 1)),
- period: { value: -1, unit: 'year' },
- answer: new Date(Date.UTC(2015, 6, 16)),
- }];
-
- tests.forEach((t) => {
- test(t.name, () => {
- const result = util.rollDate(t.d, t.period.unit, t.period.value, t.minDate, t.maxDate);
- expect(result).toEqual(t.answer);
- });
- });
-});
-
describe('formatDMS', () => {
const tests = [{
name: 'zero',