.pre-commit-config.yaml

@@ -8,15 +8,15 @@ repos:
       entry: trailing-whitespace-fixer
       language: python
       types: [text]
-      stages: [Nonepre-commitNone, Nonepre-pushNone, manual]
+      stages: [pre-commit, pre-push, manual]
 
     - id: end-of-file-fixer
       name: fix end of files
       description: ensures that a file is either empty, or ends with one newline.
       entry: end-of-file-fixer
       language: python
       types: [text]
-      stages: [Nonepre-commitNone, Nonepre-pushNone, manual]
+      stages: [pre-commit, pre-push, manual]
 
     - id: detect-aws-credentials
       name: detect aws credentials
@@ -60,7 +60,7 @@ repos:
       description: prevents giant files from being committed.
       entry: check-added-large-files
       language: python
-      stages: [Nonepre-commitNone, Nonepre-pushNone, manual]
+      stages: [pre-commit, pre-push, manual]
       args: ['--maxkb=10240']
 
   # Versioning: Commit messages & changelog

frontend/package.json

@@ -11,7 +11,7 @@
     "@mapbox/mapbox-gl-geocoder": "^5.0.2",
     "@mapbox/mapbox-gl-language": "^0.10.1",
     "@placemarkio/geo-viewport": "^1.0.2",
-    "@rapideditor/rapid": "^2.3.1",
+    "@rapideditor/rapid": "^2.4.2",
     "@sentry/react": "^7.102.0",
     "@tanstack/react-query": "^4.29.7",
     "@tanstack/react-query-devtools": "^4.29.7",

frontend/src/components/projectEdit/messages.js

@@ -402,11 +402,11 @@ export default defineMessages({
   },
   rapidPowerUser: {
     id: 'projects.formInputs.rapid_power_user',
-    defaultMessage: 'Enable RapiD Power User Features',
+    defaultMessage: 'Enable Rapid Power User Features',
   },
   rapidPowerUserDescription: {
     id: 'projects.formInputs.rapid_power_user.description',
-    defaultMessage: 'If checked, RapiD will load with the power user dialog enabled.',
+    defaultMessage: 'If checked, Rapid will load with the power user dialog enabled.',
   },
   imagery: {
     id: 'projects.formInputs.imagery',

frontend/src/components/taskSelection/action.js

@@ -37,7 +37,7 @@ import { MappingTypes } from '../mappingTypes';
 import { usePriorityAreasQuery, useTaskDetail } from '../../api/projects';
 
 const Editor = lazy(() => import('../editor'));
-const RapiDEditor = lazy(() => import('../rapidEditor'));
+const RapidEditor = lazy(() => import('../rapidEditor'));
 
 const MINUTES_BEFORE_DIALOG = 5;
 
@@ -228,7 +228,7 @@ export function TaskMapAction({ project, tasks, activeTasks, getTasks, action, e
                     gpxUrl={getTaskGpxUrlCallback(project.projectId, tasksIds)}
                   />
                 ) : (
-                  <RapiDEditor
+                  <RapidEditor
                     setDisable={setDisable}
                     comment={project.changesetComment}
                     presets={project.idPresets}

frontend/src/locales/en.json

@@ -520,8 +520,8 @@
   "projects.formInputs.random_task_selection": "Enforce random task selection",
   "projects.formInputs.random_task_selection.mapping": "Enforce random task selection on mapping",
   "projects.formInputs.random_task_selection.description": "If checked, users must edit tasks at random for the initial editing stage (managers and admins are exempt).",
-  "projects.formInputs.rapid_power_user": "Enable RapiD Power User Features",
-  "projects.formInputs.rapid_power_user.description": "If checked, RapiD will load with the power user dialog enabled.",
+  "projects.formInputs.rapid_power_user": "Enable Rapid Power User Features",
+  "projects.formInputs.rapid_power_user.description": "If checked, Rapid will load with the power user dialog enabled.",
   "projects.formInputs.imagery": "Imagery",
   "projects.formInputs.imagery.note": "Follow this format for TMS URLs: {exampleUrl}",
   "projects.formInputs.priority_areas.options.polygon": "Draw polygon",

frontend/src/utils/editorsList.js

@@ -3,7 +3,7 @@ import { ID_EDITOR_URL, POTLATCH2_EDITOR_URL, RAPID_EDITOR_URL } from '../config
 export function getEditors(filterList, customEditor) {
   let editors = [
     {
-      label: 'RapiD',
+      label: 'Rapid',
       value: 'RAPID',
       url: RAPID_EDITOR_URL,
     },

frontend/src/utils/tests/editorsList.test.js

@@ -4,7 +4,7 @@ describe('test getEditors', () => {
   it('without filterList and without customEditor', () => {
     expect(getEditors()).toStrictEqual([
       {
-        label: 'RapiD',
+        label: 'Rapid',
         value: 'RAPID',
         url: 'https://mapwith.ai/rapid',
       },
@@ -48,7 +48,7 @@ describe('test getEditors', () => {
 
   it('with customEditor and filterList including the CUSTOM value', () => {
     const customEditor = {
-      name: 'RapiD',
+      name: 'Rapid',
       description: null,
       url: 'https://mapwith.ai/rapid',
     };
@@ -64,7 +64,7 @@ describe('test getEditors', () => {
         url: 'http://127.0.0.1:8111',
       },
       {
-        label: 'RapiD',
+        label: 'Rapid',
         value: 'CUSTOM',
         url: 'https://mapwith.ai/rapid',
       },

frontend/yarn.lock

@@ -2644,7 +2644,7 @@
     "@pixi/core" "7.4.0"
     "@pixi/math" "7.4.0"
 
-"@rapideditor/rapid@^2.3.1":
+"@rapideditor/rapid@^2.4.2":
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/@rapideditor/rapid/-/rapid-2.4.2.tgz#fe8584525b28fb64cd6b411d588a9dbf22439e04"
   integrity sha512-GfjawLgO6CdzQFfeBhkuNPW5VcDKZ9FjGuLEo/6WwPU/qR3DMKAriE1LQW7jqzMv6UJeBh9QgsAQrUUe5uNWXQ==