Merge pull request #365 from mapbox/develop

0.58.2 release

Author: willemarcel

package.json

@@ -1,6 +1,6 @@
 {
   "name": "osmcha-frontend",
-  "version": "0.58.0",
+  "version": "0.58.2",
   "license": "ISC",
   "engines": {
     "node": ">=7.0"

src/config/constants.js

@@ -19,9 +19,9 @@ export const whosThat =
 
 export const nominatimUrl = 'https://nominatim.openstreetmap.org/search.php';
 
+// set a default from date x days before today
 export const DEFAULT_FROM_DATE = 7;
-
 // exclude changesets newer than x minutes. It's needed because of the difference
 // between the time a changeset is processed by OSMCha and the time its map
 // visualization is available
-export const DELAY_TO_EXCLUDE = 5;
+export const DEFAULT_TO_DATE = 5;

src/store/changesets_page_actions.js

@@ -2,14 +2,12 @@
 import { put, call, takeLatest, select, all } from 'redux-saga/effects';
 import { delay } from 'redux-saga';
 
-import moment from 'moment';
 import { fromJS, List, Map } from 'immutable';
 import { fetchChangesetsPage } from '../network/changesets_page';
 import { filtersSelector } from './filters_actions';
 
 import { modal } from './modal_actions';
 
-import { DELAY_TO_EXCLUDE } from '../config/constants';
 import type { RootStateType } from './';
 import type { filtersType } from '../components/filters';
 
@@ -109,11 +107,6 @@ export function* fetchChangesetsPageSaga({
         nocache
       );
     }
-    const newFeatures = thisPage.features.filter(
-      i => moment().diff(i.properties.date, 'minutes') > DELAY_TO_EXCLUDE
-    );
-    thisPage.count -= thisPage.features.length - newFeatures.length;
-    thisPage.features = newFeatures;
     yield put(
       action(CHANGESETS_PAGE.fetched, {
         data: fromJS(thisPage),

src/utils/filters.js

@@ -2,7 +2,7 @@
 import { List, Map, fromJS } from 'immutable';
 import moment from 'moment';
 
-import { DEFAULT_FROM_DATE } from '../config/constants';
+import { DEFAULT_FROM_DATE, DEFAULT_TO_DATE } from '../config/constants';
 import type { filtersType } from '../components/filters';
 
 export function validateFilters(filters: filtersType): boolean {
@@ -47,9 +47,27 @@ export function getDefaultFromDate(): filtersType {
   });
 }
 
+export function getDefaultToDate(): filtersType {
+  const defaultDate = moment()
+    .subtract(DEFAULT_TO_DATE, 'minutes')
+    .utc()
+    .format('YYYY-MM-DD HH:mm');
+  return fromJS({
+    date__lte: [
+      {
+        label: '',
+        value: defaultDate
+      }
+    ]
+  });
+}
+
 export function appendDefaultDate(filters: filtersType) {
   if (filters && !filters.has('date__gte') && !filters.has('date__lte')) {
     filters = filters.merge(getDefaultFromDate());
   }
+  if (filters && !filters.has('date__lte')) {
+    filters = filters.merge(getDefaultToDate());
+  }
   return filters;
 }