Merge pull request #360 from mapbox/develop

0.58.0 release

Author: willemarcel

package.json

@@ -1,6 +1,6 @@
 {
   "name": "osmcha-frontend",
-  "version": "0.56.3",
+  "version": "0.58.0",
   "license": "ISC",
   "engines": {
     "node": ">=7.0"
@@ -17,7 +17,7 @@
     "@turf/bbox": "^5.1.5",
     "@turf/simplify": "^5.1.5",
     "animate.css": "^3.5.2",
-    "changeset-map": "^1.3.4",
+    "changeset-map": "^1.3.6",
     "date-input-polyfill": "^2.14.0",
     "history": "^4.6.3",
     "immutable": "^3.8.1",

src/components/filters/multi_select.js

@@ -130,7 +130,7 @@ export class MultiSelect extends React.PureComponent {
 export class MappingTeamMultiSelect extends MultiSelect {
   getAsyncOptions = () => {
     if (!this.props.dataURL) return;
-    return fetch(`${API_URL}/${this.props.dataURL}/?trusted=true`, {
+    return fetch(`${API_URL}/${this.props.dataURL}/`, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -141,7 +141,17 @@ export class MappingTeamMultiSelect extends MultiSelect {
         return response.json();
       })
       .then(json => {
-        const data = json.map(d => ({ ...d, label: d.name, value: d.name }));
+        const data = json.map(d => {
+          if (d.trusted) {
+            return { ...d, label: `${d.name} (verified)`, value: d.name };
+          } else {
+            return {
+              ...d,
+              label: d.name.replace('(verified)', ''),
+              value: d.name
+            };
+          }
+        });
         return { options: data };
       });
   };

src/config/constants.js

@@ -2,7 +2,7 @@
 import { API_URL } from './';
 
 export const PAGE_SIZE = 75;
-export const overpassBase = '//overpass-api.de/api/interpreter';
+export const overpassBase = '//overpass.maptime.in/api/interpreter';
 export const osmBase = '//www.openstreetmap.org/api/0.6/';
 export const mapboxAccessToken =
   'pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJjam10OXpmc2YwMXI5M3BqeTRiMDBqMHVyIn0.LIcIDe3TZLSDdTWDoojzNg';
@@ -20,3 +20,8 @@ export const whosThat =
 export const nominatimUrl = 'https://nominatim.openstreetmap.org/search.php';
 
 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;

src/config/filters.json

@@ -250,7 +250,7 @@
     "icontains": false,
     "range": false,
     "all": false,
-    "display": "Hide trusted mapping teams",
+    "display": "Hide verified mapping teams",
     "type": "radio",
     "options": [
       {
@@ -262,8 +262,8 @@
         "value": "False"
       }
     ],
-    "description": "If Yes, it will exclude the changesets created by users that are part of trusted mapping teams",
-    "placeholder": "Exclude changesets created by users from trusted teams"
+    "description": "If Yes, it will exclude the changesets created by users that are part of verified mapping teams",
+    "placeholder": "Exclude changesets created by users from verified teams"
   },
   {
     "name": "create",

src/store/auth_actions.js

@@ -110,10 +110,11 @@ export function* watchAuth(): any {
       if (status.get('status') !== 'success') {
         yield put(
           modal({
-            title: 'Status alert',
+            title: 'OSMCha Status',
             description: status.get('message'),
             kind: status.get('status'),
-            autoDismiss: 20
+            autoDismiss: 20,
+            position: 'br'
           })
         );
       }

src/store/changesets_page_actions.js

@@ -2,12 +2,14 @@
 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';
 
@@ -107,6 +109,11 @@ 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),