Fixed logic for upgrading nonexistent filter to expression

OpenHistoricalMap · Aug 10, 2024 · d6b6da1 · d6b6da1
1 parent 4c7e742
commit d6b6da1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -137,7 +137,7 @@ function decimalYearFromDate(date) {
  *	that require the feature to overlap with the date range.
  */
 function constrainFilterByDateRange(filter, dateRange) {
-  if (typeof filter !== 'undefined' || isLegacyFilter(filter)) {
+  if (typeof filter !== 'undefined' && isLegacyFilter(filter)) {
     return constrainLegacyFilterByDateRange(filter, dateRange);
   } else {
     return constrainExpressionFilterByDateRange(filter, dateRange);

diff --git a/index.spec.mjs b/index.spec.mjs
@@ -6,6 +6,7 @@ import {
   dateRangeFromISODate,
   decimalYearFromDate,
   dateRangeFromDate,
+  constrainFilterByDateRange,
   constrainLegacyFilterByDateRange,
   constrainExpressionFilterByDateRange,
   isLegacyFilter,
@@ -172,6 +173,14 @@ describe('isLegacyFilter', () => {
   });
 });
 
+describe('constrainFilterByDateRange', () => {
+  it('should upgrade nonexistent filter to expression-based filter', () => {
+    let upgraded = constrainFilterByDateRange(undefined, { startDecimalYear: 2013 });
+    assert.equal(upgraded.length, 10);
+    assert.equal(upgraded[0], 'let');
+  });
+});
+
 describe('constrainLegacyFilterByDateRange', () => {
   it('should upgrade top-level non-combining filter', () => {
     let original = ['in', 'class', 'primary', 'secondary', 'tertiary'];