Update URLs + add Donate link

OSMCha · Feb 9, 2024 · c7cbe9d · c7cbe9d
1 parent 3d2b25c
commit c7cbe9d
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 53 deletions.
diff --git a/ABOUT.md b/ABOUT.md
@@ -2,58 +2,58 @@
 
 <!-- toc -->
 
-* [Introduction to OSMCha](#introduction-to-osmcha)
-    * [Why use OSMCha?](#why-use-osmcha)
-    * [What is vandalism?](#what-is-vandalism)
-    * [What are flagged changesets and how are they automatically flagged?](#what-are-flagged-changesets-and-how-are-they-automatically-flagged)
-    * [Why to review a changeset as Good/Bad 👍 / 👎 ?](#why-to-review-a-changeset-as-goodbad----)
-    * [Future of OSMCha and validation using OSM-Compare](#future-of-osmcha-and-validation-using-osm-compare)
-* [Usage](#usage)
-    * [How to review a changeset?](#how-to-review-a-changeset)
-        * [Changeset and Mapper details](#changeset-and-mapper-details)
-        * [Using Changeset-map](#using-changeset-map)
-        * [Reviewing changesets in OSMCha from OpenStreetMap](#reviewing-changesets-in-osmcha-from-openstreetmap)
-    * [Filters](#filters)
-        * [Basic filters](#basic-filters)
-        * [Applications for edit based search](#applications-for-edit-based-search)
-        * [Saving and sharing custom filters](#saving-and-sharing-custom-filters)
-        * [Setting up RSS feed - Area of Interest](#setting-up-rss-feed---area-of-interest)
-    * [User page](#user-page)
-* [FAQ](#faq)
-    * [How are the changesets presented?](#how-are-the-changesets-presented)
-    * [How can I sign-in into OSMCha?](#how-can-i-sign-in-into-osmcha)
-    * [Can I view the changesets and use filters without logging into OSMCha?](#can-i-view-the-changesets-and-use-filters-without-logging-into-osmcha)
-    * [How do I logout of OSMCha?](#how-do-i-logout-of-osmcha)
-    * [My changeset has been flagged by a reason, am I doing something wrong?](#my-changeset-has-been-flagged-by-a-reason-am-i-doing-something-wrong)
-    * [Are there keyboard shortcuts in OSMCha?](#are-there-keyboard-shortcuts-in-osmcha)
-    * [What are tags on OSMCha?](#what-are-tags-on-osmcha)
-    * [What if I want to change my review for a changeset?](#what-if-i-want-to-change-my-review-for-a-changeset)
-    * [Can I review my own changesets?](#can-i-review-my-own-changesets)
-* [Frequent error messages](#frequent-error-messages)
-    * [Changeset views error messages](#changeset-views-error-messages)
-        * [Changeset was already checked.](#changeset-was-already-checked)
-        * [User can not check their own changeset.](#user-can-not-check-their-own-changeset)
-        * [Changeset is not checked.](#changeset-is-not-checked)
-        * [User does not have permission to uncheck this changeset.](#user-does-not-have-permission-to-uncheck-this-changeset)
-        * [User can not add tags to their own changeset.](#user-can-not-add-tags-to-their-own-changeset)
-        * [User can not add tags to a changeset checked by another user.](#user-can-not-add-tags-to-a-changeset-checked-by-another-user)
-        * [User can not remove tags from their own changeset.](#user-can-not-remove-tags-from-their-own-changeset)
-        * [User can not remove tags from a changeset checked by another user.](#user-can-not-remove-tags-from-a-changeset-checked-by-another-user)
-* [References](#references)
-* [Other tools for validation](#other-tools-for-validation)
-* [Feedback](#feedback)
-* [Trademark notice](#trademark-notice)
+- [Introduction to OSMCha](#introduction-to-osmcha)
+    - [Why use OSMCha?](#why-use-osmcha)
+    - [What is vandalism?](#what-is-vandalism)
+    - [What are flagged changesets and how are they automatically flagged?](#what-are-flagged-changesets-and-how-are-they-automatically-flagged)
+    - [Why to review a changeset as Good/Bad 👍 / 👎 ?](#why-to-review-a-changeset-as-goodbad----)
+    - [Future of OSMCha and validation using OSM-Compare](#future-of-osmcha-and-validation-using-osm-compare)
+- [Usage](#usage)
+  - [How to review a changeset?](#how-to-review-a-changeset)
+    - [Changeset and Mapper details](#changeset-and-mapper-details)
+    - [Using Changeset-map](#using-changeset-map)
+    - [Reviewing changesets in OSMCha from OpenStreetMap](#reviewing-changesets-in-osmcha-from-openstreetmap)
+  - [Filters](#filters)
+    - [Basic filters](#basic-filters)
+    - [Applications for edit based search](#applications-for-edit-based-search)
+    - [Saving and sharing custom filters](#saving-and-sharing-custom-filters)
+    - [Setting up RSS feed - Area of Interest](#setting-up-rss-feed---area-of-interest)
+  - [User page](#user-page)
+- [FAQ](#faq)
+    - [How are the changesets presented?](#how-are-the-changesets-presented)
+    - [How can I sign-in into OSMCha?](#how-can-i-sign-in-into-osmcha)
+    - [Can I view the changesets and use filters without logging into OSMCha?](#can-i-view-the-changesets-and-use-filters-without-logging-into-osmcha)
+    - [How do I logout of OSMCha?](#how-do-i-logout-of-osmcha)
+    - [My changeset has been flagged by a reason, am I doing something wrong?](#my-changeset-has-been-flagged-by-a-reason-am-i-doing-something-wrong)
+    - [Are there keyboard shortcuts in OSMCha?](#are-there-keyboard-shortcuts-in-osmcha)
+    - [What are tags on OSMCha?](#what-are-tags-on-osmcha)
+    - [What if I want to change my review for a changeset?](#what-if-i-want-to-change-my-review-for-a-changeset)
+    - [Can I review my own changesets?](#can-i-review-my-own-changesets)
+- [Frequent error messages](#frequent-error-messages)
+  - [Changeset views error messages](#changeset-views-error-messages)
+    - [Changeset was already checked.](#changeset-was-already-checked)
+    - [User can not check their own changeset.](#user-can-not-check-their-own-changeset)
+    - [Changeset is not checked.](#changeset-is-not-checked)
+    - [User does not have permission to uncheck this changeset.](#user-does-not-have-permission-to-uncheck-this-changeset)
+    - [User can not add tags to their own changeset.](#user-can-not-add-tags-to-their-own-changeset)
+    - [User can not add tags to a changeset checked by another user.](#user-can-not-add-tags-to-a-changeset-checked-by-another-user)
+    - [User can not remove tags from their own changeset.](#user-can-not-remove-tags-from-their-own-changeset)
+    - [User can not remove tags from a changeset checked by another user.](#user-can-not-remove-tags-from-a-changeset-checked-by-another-user)
+- [References](#references)
+- [Other tools for validation](#other-tools-for-validation)
+- [Feedback](#feedback)
+- [Donate](#donate)
+- [Trademark notice](#trademark-notice)
 
 <!-- tocstop -->
 
 # Introduction to OSMCha
 
-OSMCha is short for OpenStreetMap Changeset Analyser. OSMCha is a web tool to
+OSMCha is short for OpenStreetMap Changeset Analyser. It is a web tool to
 help visualise and analyse edits made by mappers on OpenStreetMap (OSM). OSMCha
 was originally written by
 [Wille Marcel](https://www.openstreetmap.org/user/wille) in 2015 to validate
-changesets. In collaboration with Wille, this global instance is hosted by
-Mapbox as an additional data Quality Analysis tool for the community.
+changesets. After almost 10 years being supported by Mapbox, OSMCha became an [OpenStreetMap US](https://openstreetmap.us/) charter project in 2023.
 
 ### Why use OSMCha?
 
@@ -461,10 +461,14 @@ This is raised when someone tries to remove tags in a changeset that are added b
 # Feedback
 
 * To file bugs, feature requests on OSMCha - please file issues at
-  https://github.com/mapbox/osmcha-frontend/issues
+  https://github.com/osmcha/osmcha-frontend/issues
 * To file bugs, feature requests on Changeset map - please file issues at
   https://github.com/osmlab/changeset-map/issues
 
+# Donate
+
+Support OSMCha's hosting and development by making a donation: [https://openstreetmap.app.neoncrm.com/forms/osmcha](https://openstreetmap.app.neoncrm.com/forms/osmcha).
+
 # Trademark notice
 
 [OpenStreetMap (OSM)](https://osm.org) is a trademark of the [OpenStreetMap Foundation](https://osmfoundation.org), and is used with their permission. OSMCha is not endorsed by or affiliated with the OpenStreetMap Foundation.
diff --git a/package.json b/package.json
@@ -1,16 +1,16 @@
 {
   "name": "osmcha-frontend",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "license": "ISC",
   "engines": {
     "node": ">=7.0"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/mapbox/osmcha-frontend.git"
+    "url": "https://github.com/osmcha/osmcha-frontend.git"
   },
   "bugs": {
-    "url": "https://github.com/mapbox/osmcha-frontend/issues"
+    "url": "https://github.com/osmcha/osmcha-frontend/issues"
   },
   "dependencies": {
     "@mapbox/mapbox-gl-draw": "^1.3.0",

diff --git a/src/config/constants.js b/src/config/constants.js
@@ -9,7 +9,7 @@ export const mapboxAccessToken =
   process.env.REACT_APP_MAPBOX_ACCESS_TOKEN ||
   'pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJjam10OXpmc2YwMXI5M3BqeTRiMDBqMHVyIn0.LIcIDe3TZLSDdTWDoojzNg';
 export const statusUrl =
-  'https://raw.githubusercontent.com/mapbox/osmcha-frontend/status/status.json';
+  'https://raw.githubusercontent.com/osmcha/osmcha-frontend/status/status.json';
 export const enableRealChangesets = !process.env
   .REACT_APP_DISABLE_REAL_CHANGESETS;
 

diff --git a/src/views/about.js b/src/views/about.js
@@ -69,7 +69,7 @@ export class About extends React.PureComponent {
   componentDidMount() {
     this.cancellablePromise = cancelablePromise(
       fetch(
-        'https://raw.githubusercontent.com/mapbox/osmcha-frontend/master/ABOUT.md'
+        'https://raw.githubusercontent.com/osmcha/osmcha-frontend/master/ABOUT.md'
       ).then(r => r.text())
     );
     this.cancellablePromise.promise

diff --git a/src/views/home.js b/src/views/home.js
@@ -40,7 +40,7 @@ export function Home() {
           <a
             target="__blank"
             className="link link--gray  flex-parent flex-parent--row flex-parent--center-cross mx6"
-            href="https://github.com/mapbox/osmcha-frontend/blob/master/CONTRIBUTING.md"
+            href="https://github.com/osmcha/osmcha-frontend/blob/master/CONTRIBUTING.md"
           >
             <svg className="icon">
               <use xlinkHref="#icon-github" />
@@ -51,7 +51,18 @@ export function Home() {
           <a
             target="__blank"
             className="link link--gray  flex-parent flex-parent--row flex-parent--center-cross mx6"
-            href="https://github.com/mapbox/osmcha-frontend/issues"
+            href="https://openstreetmap.app.neoncrm.com/forms/osmcha"
+          >
+            <svg className="icon">
+              <use xlinkHref="#icon-creditcard" />
+            </svg>{' '}
+            <span>Donate</span>
+          </a>
+          |{' '}
+          <a
+            target="__blank"
+            className="link link--gray  flex-parent flex-parent--row flex-parent--center-cross mx6"
+            href="https://github.com/osmcha/osmcha-frontend/issues"
           >
             <svg className="icon">
               <use xlinkHref="#icon-bug" />

diff --git a/src/views/navbar_sidebar.js b/src/views/navbar_sidebar.js
@@ -1,7 +1,6 @@
 // @flow
 import React from 'react';
 import { connect } from 'react-redux';
-import { Map } from 'immutable';
 import { Link } from 'react-router-dom';
 import { push } from 'react-router-redux';