Replace a few more legacy names (there are many of these)

bhousel · bhousel · commit 5a2882dca3b2 · 2023-03-09T14:57:06.000-05:00
RapiD / iD -&gt; Rapid
Facebook -&gt; Meta
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,4 +1,4 @@
 # Code of Conduct
 
-Facebook has adopted a Code of Conduct that we expect project participants to adhere to.
-Please read the [full text](https://code.fb.com/codeofconduct/) so that you can understand what actions will and will not be tolerated.
+Meta has adopted a Code of Conduct that we expect project participants to adhere to.
+Please read the [full text](https://opensource.fb.com/code-of-conduct/) so that you can understand what actions will and will not be tolerated.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,10 +1,4 @@
-# Contributing to RapiD
-We want to make contributing to this project as easy and transparent as possible.
-
-First of all, a big shoutout to the **iD developers** for building an awesome foundation that RapiD is extended from.
-
-If your fix or feature is generally applicable to all iD users, consider [contributing to iD](https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md) directly.
-
+# Contributing to Rapid
 
 ## Pull Requests
 We actively welcome your pull requests.
@@ -26,4 +20,4 @@ Complete your CLA here: <https://code.facebook.com/cla>
 We use GitHub issues to track bugs and feature requests. In case of bug reports, please ensure your description is clear and has sufficient instructions for reproducing the bugs.
 
 ## License
-By contributing to RapiD, you agree that your contributions will be licensed under the [LICENSE file](LICENSE.md).
+By contributing to Rapid, you agree that your contributions will be licensed under the [LICENSE file](LICENSE.md).
diff --git a/COUNTRY_REQUESTS.md b/COUNTRY_REQUESTS.md
@@ -1,8 +1,8 @@
 ## Map With AI Country Requests
 
-This page tracks country requests for RapiD support from the OSM community. Crossed items correspond to countries that we have already rolled out.
+This page tracks country requests for Rapid support from the OSM community. Crossed items correspond to countries that we have already rolled out.
 
-If you would like to get RapiD support for a new country, please [create an issue](https://github.com/facebook/RapiD/issues) in our repo. That will help us prioritize our rollout plan. Happy mapping!
+If you would like to get Rapid support for a new country, please [create an issue](https://github.com/facebook/RapiD/issues) in our repo. That will help us prioritize our rollout plan. Happy mapping!
 
 ### Countries Requested
 
diff --git a/FAQ.md b/FAQ.md
@@ -1,3 +1 @@
-For FAQs about iD in general, please refer to <https://github.com/openstreetmap/iD/blob/develop/FAQ.md>.
-
-For FAQs about RapiD usage and Facebook Map With AI service, please go to [Map With AI FAQ page](https://github.com/facebookmicrosites/Open-Mapping-At-Facebook/wiki/FAQ).
+For FAQs about Rapid usage and Facebook Map With AI service, please go to [Map With AI FAQ page](https://github.com/facebookmicrosites/Open-Mapping-At-Facebook/wiki/FAQ).
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 ## ISC License
 
-Copyright (c) 2017, iD Contributors
+Copyright (c) 2023, Rapid Contributors
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -12,4 +12,4 @@ AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
 INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/dist/index.html b/dist/index.html
@@ -9,7 +9,6 @@
     <meta name='apple-mobile-web-app-capable' content='yes'/>
     <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
     <style type='text/css'>
-      /* apply document-level styling to standalone iD only */
       html, body {
         width: 100%;
         height: 100%;
diff --git a/index.html b/index.html
@@ -2,14 +2,13 @@
 <html>
   <head>
     <meta charset='utf-8'>
-    <title>RapiD</title>
+    <title>Rapid</title>
     <link rel='stylesheet' href='dist/iD.css'>
     <link rel='icon' type='image/png' href='data:image/png;base64,iVBORw0KGgo='>
     <meta name='viewport' content='width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no'/>
     <meta name='apple-mobile-web-app-capable' content='yes'/>
     <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
     <style type='text/css'>
-      /* apply document-level styling to standalone iD only */
       html, body {
         width: 100%;
         height: 100%;
diff --git a/modules/actions/join.js b/modules/actions/join.js
@@ -10,7 +10,7 @@ import { prefs } from '../core/preferences';
 
 // Join ways at the end node they share.
 //
-// This is the inverse of `iD.actionSplit`.
+// This is the inverse of `actionSplit`.
 //
 // Reference:
 //   https://github.com/systemed/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/MergeWaysAction.as
diff --git a/modules/ui/fields/wikipedia.js b/modules/ui/fields/wikipedia.js
@@ -149,7 +149,7 @@ export function uiFieldWikipedia(field, context) {
 
     for (let i in _dataWikipedia) {
       let d = _dataWikipedia[i];
-      // default to the language of iD's current locale
+      // default to the language of Rapid's current locale
       if (d[2] === langCode) return d;
     }
 
diff --git a/modules/ui/init.js b/modules/ui/init.js
@@ -448,7 +448,7 @@ export function uiInit(context) {
 
   ui.shortcuts = uiShortcuts(context);
 
-  // renders the iD interface into the container node
+  // renders the Rapid interface into the container node
   let _loadPromise;
   ui.ensureLoaded = () => {
     if (_loadPromise) return _loadPromise;
@@ -467,8 +467,8 @@ export function uiInit(context) {
   };
 
 
-  // `ui.restart()` will destroy and rebuild the entire iD interface,
-  // for example to switch the locale while iD is running.
+  // `ui.restart()` will destroy and rebuild the entire Rapid interface,
+  // for example to switch the locale while Rapid is running.
   ui.restart = function() {
     context.keybinding().clear();
     _loadPromise = null;
diff --git a/modules/validations/mismatched_geometry.js b/modules/validations/mismatched_geometry.js
@@ -236,7 +236,7 @@ export function validationMismatchedGeometry() {
 
             var primaryKey = Object.keys(asTarget.tags)[0];
 
-            // special case: buildings-as-points are discouraged by iD, but common in OSM, so ignore them
+            // special case: buildings-as-points not suggested by presets, but common in OSM, so ignore them
             if (primaryKey === 'building') return false;
 
             if (asTarget.tags[primaryKey] === '*') return false;
diff --git a/scripts/aws_deploy.py b/scripts/aws_deploy.py
@@ -12,7 +12,7 @@
 1a) This can be anything specified here: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html
 1b) For github actions, you should have AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY set as secrets, with AWS_DEFAULT_REGION in the environment
 2) You have installed python 3.
-3) You are running from within the iD directory.
+3) You are running from within the Rapid project directory.
 4) Environment variable RAPID_S3_BUCKET_NAME is defined (default: world.ai.rapid)
 5) Environment variable RAPID_WEB_ROOT is defined (default: https://mapwith.ai/)
 6) Environment variable NODE_VERSION is defined
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -1,26 +1,23 @@
 #!/bin/bash
 
 # This is an example script that shows how to pull the latest version
-# of iD and replace the version string with a git short hash.
-#
-# We use this script to maintain the iD mirror at: http://preview.ideditor.com/master
-# It runs via cron job every 10 minutes.
+# of Rapid and replace the version string with a git short hash.
 #
 # To use this on your own site, you'll want to change the `cp` and `chgrp`
 # lines at the end to match your web server's documentroot folder and security group.
 
-git checkout -q develop
+git checkout -q main
 git remote update > /dev/null
 
 rev=`git rev-parse --short HEAD`
-orig=`git rev-parse --short origin/develop`
+orig=`git rev-parse --short origin/main`
 
 # pull latest code
 if [[ "${rev}" != "${orig}" ]] ; then
   # avoid issues with local untracked locale files
   rm -f dist/locales/*.json
   git reset --hard HEAD
-  git pull origin develop
+  git pull origin main
 
   rev=`git rev-parse --short HEAD`
   sed -i "s/context.version = .*;/context.version = '${rev}';/" modules/core/context.js
@@ -43,5 +40,5 @@ if [[ -f transifex.auth ]] ; then
   npm run translations
 fi
 
-cp -Rf dist/* /var/www/openstreetmap.us/iD/master/
-chgrp -R www-data /var/www/openstreetmap.us/iD/master/
+cp -Rf dist/* /var/www/path/to/rapid/
+chgrp -R www-data /var/www/path/to/rapid/
diff --git a/scripts/language_names.js b/scripts/language_names.js
@@ -59,7 +59,7 @@ export function langNamesInNativeLang() {
     unordered[code] = info;
   });
 
-  // CLDR locales don't cover all the languages people might want to use for iD tags,
+  // CLDR locales don't cover all the languages people might want to use for OSM tags,
   // so also add the language names that we have English translations for
   let englishNamesByCode = JSON.parse(fs.readFileSync(`${cldrMainDir}en/languages.json`, 'utf8')).main.en.localeDisplayNames.languages;
   Object.keys(englishNamesByCode).forEach(code => {
diff --git a/svg/iD-sprite/README.md b/svg/iD-sprite/README.md
@@ -1,11 +1,11 @@
-These folders contain graphics used by iD.
+These folders contain graphics used by Rapid.
 
 ### Overview
 
 To add a graphic, create a `.svg` file and save it anywhere under here.
 
 Some guidelines:
-* `icons/`:       20x20px solid fill-only, used throughout iD
+* `icons/`:       20x20px solid fill-only, used throughout Rapid
 * `operations/`:  20x20px solid fill-only, used as commands
 * `presets/`:     60x60px large preset icons
 * `turns/`:       various sizes, graphics for turn restrictions
@@ -40,6 +40,6 @@ Elsewhere, in CSS:
 }
 ```
 
-This gives iD a lot of flexibility to control the runtime styling of the graphics.
+This gives Rapid a lot of flexibility to control the runtime styling of the graphics.
 
-The above example means that classing a button as `.disabled` will automatically grey out the colors (you don't need to make separate grey versions of every button).
+The above example means that classing a button as `.disabled` will automatically grey out the colors (you don't need to make separate grey versions of every button).
diff --git a/test/.eslintrc b/test/.eslintrc
@@ -8,6 +8,7 @@
         "fakeFetch": true,
         "happen": false,
         "iD": false,
+        "Rapid": false,
         "sdk": false,
         "sinon": false,
         "fetchMock": true
diff --git a/test/benchmark/bench.html b/test/benchmark/bench.html
@@ -7,8 +7,6 @@
 </head>
 
 <body>
-
-
     <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/benchmark@2.1.4/benchmark.min.js"></script>
     <!-- <script src="bench.js"></script> -->
@@ -34,7 +32,7 @@
     // Second Script:  Always run benchmark helpers
     scripts.unshift('bench_helpers.js');
 
-    // First script: Choose either modern or legacy iD build..
+    // First script: Choose either modern or legacy bundle..
     scripts.unshift('../../dist/iD.js');
 
 
diff --git a/test/benchmark/bench_helpers.js b/test/benchmark/bench_helpers.js
@@ -2,14 +2,14 @@
 /* eslint no-extend-native:off */
 
 // Disable things that use the network
-for (var k in iD.services) { delete iD.services[k]; }
+for (var k in Rapid.services) { delete Rapid.services[k]; }
 
 // Try not to load imagery
 window.location.hash = '#background=none';
 
 // Run without data for speed (tests which need data can set it up themselves)
-iD.fileFetcher.assetPath('../../dist/');
-var cached = iD.fileFetcher.cache();
+Rapid.fileFetcher.assetPath('../../dist/');
+var cached = Rapid.fileFetcher.cache();
 
 // Initializing `coreContext` will try loading the locale data and English locale strings:
 cached.locales = { en: { rtl: false, pct: 1 } };
@@ -18,7 +18,7 @@ cached.locales_index_tagging = { en: { rtl: false, pct: 1 } };
 
 
 // Load the actual data from `dist/locales/` for the 'general' scope
-iD.localizer.loadLocale('en', 'general', 'locales');
+Rapid.localizer.loadLocale('en', 'general', 'locales');
 
 
 // Initializing `coreContext` initializes `_background`, which tries loading:
@@ -34,9 +34,8 @@ cached.deprecated = [];
 cached.discarded = {};
 
 
-
-window.d3 = iD.d3;   // Remove this if we can avoid exporting all of d3.js
-window.sdk = iD.sdk;
+window.d3 = Rapid.d3;   // Remove this if we can avoid exporting all of d3.js
+window.sdk = Rapid.sdk;
 delete window.PointerEvent;  // force the brower to use mouse events
 
 // // some sticky fallbacks
diff --git a/test/index.html b/test/index.html
@@ -7,7 +7,6 @@
   <link rel='stylesheet' href='../node_modules/mocha/mocha.css'>
   <link rel='stylesheet' href='../dist/iD.css'>
   <style type='text/css'>
-    /* apply standalone iD styling when testing */
     html, body {
       width: 100%;
       height: 100%;
@@ -152,7 +151,7 @@
     // Second Script:  Always run spec helpers
     scripts.unshift('spec/spec_helpers.js');
 
-    // First script: iD build
+    // First script: app bundle
     scripts.unshift('../dist/iD.js');
 
     // Create and execute all scripts in specified order..
diff --git a/test/spec/spec_helpers.js b/test/spec/spec_helpers.js
@@ -2,14 +2,14 @@
 /* eslint no-extend-native:off */
 
 // Disable things that use the network
-for (var k in iD.services) { delete iD.services[k]; }
+for (var k in Rapid.services) { delete Rapid.services[k]; }
 
 // Try not to load imagery
 window.location.hash = '#background=none';
 
 // Run without data for speed (tests which need data can set it up themselves)
-iD.fileFetcher.assetPath('../dist/');
-var cached = iD.fileFetcher.cache();
+Rapid.fileFetcher.assetPath('../dist/');
+var cached = Rapid.fileFetcher.cache();
 
 // Initializing `coreContext` will try loading the locale data and English locale strings:
 cached.locales = { en: { rtl: false, pct: 1 } };
@@ -75,9 +75,9 @@ cached.locale_tagging_en = {
 };
 
 // Load the actual data from `dist/locales/` for the 'general' scope
-iD.localizer.loadLocale('en', 'general', 'locales');
+Rapid.localizer.loadLocale('en', 'general', 'locales');
 // Load the fake data seeded above for the 'tagging' scope
-iD.localizer.loadLocale('en', 'tagging');
+Rapid.localizer.loadLocale('en', 'tagging');
 
 
 // Initializing `coreContext` initializes `_background`, which tries loading:
@@ -108,8 +108,8 @@ mocha.setup({
 
 expect = chai.expect;
 
-window.d3 = iD.d3;   // Remove this if we can avoid exporting all of d3.js
-window.sdk = iD.sdk;
+window.d3 = Rapid.d3;   // Remove this if we can avoid exporting all of d3.js
+window.sdk = Rapid.sdk;
 delete window.PointerEvent;  // force the brower to use mouse events
 
 // some sticky fallbacks

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 # Code of Conduct
 -Facebook has adopted a Code of Conduct that we expect project participants to adhere to.
 -Please read the [full text](https://code.fb.com/codeofconduct/) so that you can understand what actions will and will not be tolerated.
 +Meta has adopted a Code of Conduct that we expect project participants to adhere to.
 +Please read the [full text](https://opensource.fb.com/code-of-conduct/) so that you can understand what actions will and will not be tolerated.
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ export function uiFieldWikipedia(field, context) {`
`149`	`149`
`150`	`150`	`for (let i in _dataWikipedia) {`
`151`	`151`	`let d = _dataWikipedia[i];`
`152`		`- // default to the language of iD's current locale`
	`152`	`+ // default to the language of Rapid's current locale`
`153`	`153`	`if (d[2] === langCode) return d;`
`154`	`154`	`}`
`155`	`155`