diff --git a/API.md b/API.md index 30d3ea7c2..f879bed05 100644 --- a/API.md +++ b/API.md @@ -108,7 +108,7 @@ Environment variables or a dotenv file can be used to configure certain aspects * __`ID_API_CONNECTION_URL`__, __`ID_API_CONNECTION_CLIENT_ID`__, __`ID_API_CONNECTION_CLIENT_SECRET`__ - Custom [Oauth2](https://wiki.openstreetmap.org/wiki/OAuth#OAuth_2.0_2) connection details to an OSM API server. * __`ID_API_CONNECTION`__ - Either `live` or `dev`, if only either one should be made offered for editing. -* __`ID_PRESETS_CDN_URL`__ - The URL where iD should fetch it's tagging presets from. Needs to point to a CORS enabled web server which is serving the `package.json` and `dist` folder of a repository built on [`@ideditor/schema-builder`](https://github.com/ideditor/schema-builder). +* __`ID_PRESETS_CDN_URL`__ - The URL where iD should fetch it's tagging presets from. Needs to point to a CORS enabled web server which is serving the `package.json` and `dist` folder of a repository built on [`@rapideditor/schema-builder`](https://github.com/rapideditor/schema-builder). * __`ENV__ID_OCI_CDN_URL`__ - URL to a hosted version of the [osm-community-index](https://github.com/osmlab/osm-community-index) * __`ENV__ID_NSI_CDN_URL`__ - URL to a hosted version of the [name-suggestion-index](https://github.com/osmlab/name-suggestion-index) * __`ENV__ID_WMF_SITEMATRIX_CDN_URL`__ - URL to a hosted version of the [wmf-sitematrix](https://github.com/osmlab/wmf-sitematrix) diff --git a/modules/core/LocationManager.js b/modules/core/LocationManager.js index 08984208c..9fabc2590 100644 --- a/modules/core/LocationManager.js +++ b/modules/core/LocationManager.js @@ -1,4 +1,4 @@ -import LocationConflation from '@ideditor/location-conflation'; +import LocationConflation from '@rapideditor/location-conflation'; import whichPolygon from 'which-polygon'; import calcArea from '@mapbox/geojson-area'; @@ -16,8 +16,8 @@ const _loco = new LocationConflation(); // instance of a location-conflation * }; * * For more info see the location-conflation and country-coder projects, see: - * https://github.com/ideditor/location-conflation - * https://github.com/ideditor/country-coder + * https://github.com/rapideditor/location-conflation + * https://github.com/rapideditor/country-coder */ export class LocationManager { diff --git a/modules/ui/fields/address.js b/modules/ui/fields/address.js index 377fb8ab3..005e8d624 100644 --- a/modules/ui/fields/address.js +++ b/modules/ui/fields/address.js @@ -1,6 +1,6 @@ import { dispatch as d3_dispatch } from 'd3-dispatch'; import { select as d3_select } from 'd3-selection'; -import * as countryCoder from '@ideditor/country-coder'; +import * as countryCoder from '@rapideditor/country-coder'; import { presetManager } from '../../presets'; import { fileFetcher } from '../../core/file_fetcher'; diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js index 4992aa304..1c601dc4a 100644 --- a/modules/ui/fields/combo.js +++ b/modules/ui/fields/combo.js @@ -1,7 +1,7 @@ import { dispatch as d3_dispatch } from 'd3-dispatch'; import { select as d3_select } from 'd3-selection'; import { drag as d3_drag } from 'd3-drag'; -import * as countryCoder from '@ideditor/country-coder'; +import * as countryCoder from '@rapideditor/country-coder'; import { fileFetcher } from '../../core/file_fetcher'; import { osmEntity } from '../../osm/entity'; diff --git a/modules/ui/fields/input.js b/modules/ui/fields/input.js index 0ae46234c..5ad862ba7 100644 --- a/modules/ui/fields/input.js +++ b/modules/ui/fields/input.js @@ -1,7 +1,7 @@ import { dispatch as d3_dispatch } from 'd3-dispatch'; import { select as d3_select } from 'd3-selection'; import _debounce from 'lodash-es/debounce'; -import * as countryCoder from '@ideditor/country-coder'; +import * as countryCoder from '@rapideditor/country-coder'; import { presetManager } from '../../presets'; import { fileFetcher } from '../../core/file_fetcher'; diff --git a/modules/ui/fields/localized.js b/modules/ui/fields/localized.js index 1a040f152..631475823 100644 --- a/modules/ui/fields/localized.js +++ b/modules/ui/fields/localized.js @@ -1,6 +1,6 @@ import { dispatch as d3_dispatch } from 'd3-dispatch'; import { select as d3_select } from 'd3-selection'; -import * as countryCoder from '@ideditor/country-coder'; +import * as countryCoder from '@rapideditor/country-coder'; import { presetManager } from '../../presets'; import { fileFetcher } from '../../core/file_fetcher'; diff --git a/modules/ui/fields/roadheight.js b/modules/ui/fields/roadheight.js index 023219db4..dfe7cd0d1 100644 --- a/modules/ui/fields/roadheight.js +++ b/modules/ui/fields/roadheight.js @@ -1,6 +1,6 @@ import { dispatch as d3_dispatch } from 'd3-dispatch'; import { select as d3_select } from 'd3-selection'; -import * as countryCoder from '@ideditor/country-coder'; +import * as countryCoder from '@rapideditor/country-coder'; import { uiCombobox } from '../combobox'; import { t } from '../../core/localizer'; diff --git a/modules/ui/fields/roadspeed.js b/modules/ui/fields/roadspeed.js index b4c277f3a..151468c35 100644 --- a/modules/ui/fields/roadspeed.js +++ b/modules/ui/fields/roadspeed.js @@ -1,6 +1,6 @@ import { dispatch as d3_dispatch } from 'd3-dispatch'; import { select as d3_select } from 'd3-selection'; -import * as countryCoder from '@ideditor/country-coder'; +import * as countryCoder from '@rapideditor/country-coder'; import { uiCombobox } from '../combobox'; import { t } from '../../core/localizer'; diff --git a/package-lock.json b/package-lock.json index f891d30f5..7f50f9d3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,11 @@ "version": "2.26.0-dev", "license": "ISC", "dependencies": { - "@ideditor/country-coder": "~5.1.0", - "@ideditor/location-conflation": "~1.1.0", "@mapbox/geojson-area": "^0.2.2", "@mapbox/sexagesimal": "1.2.0", "@mapbox/vector-tile": "^1.3.1", + "@rapideditor/country-coder": "~5.2.0", + "@rapideditor/location-conflation": "~1.2.0", "@tmcw/togeojson": "^5.2.1", "@turf/bbox": "^6.0.0", "@turf/bbox-clip": "^6.0.0", @@ -625,31 +625,6 @@ "dev": true, "license": "BSD-3-Clause" }, - "node_modules/@ideditor/country-coder": { - "version": "5.1.0", - "license": "ISC", - "dependencies": { - "which-polygon": "^2.2.0" - }, - "engines": { - "node": ">=16.14.0" - } - }, - "node_modules/@ideditor/location-conflation": { - "version": "1.1.0", - "license": "ISC", - "dependencies": { - "@aitodotai/json-stringify-pretty-compact": "^1.3.0", - "@ideditor/country-coder": "^5.1.0", - "@mapbox/geojson-area": "^0.2.2", - "circle-to-polygon": "^2.0.2", - "geojson-precision": "^1.0.0", - "polygon-clipping": "~0.15.3" - }, - "engines": { - "node": ">=16.14.0" - } - }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", "dev": true, @@ -771,6 +746,33 @@ "integrity": "sha512-/G7HoAQkNjqyDQy2Fb+Zg1fyWqFGGALhPEydk3yU3khnuqX0ORJC8Bsx8/U2ZIHZebba5VHoYFeouxyy3rOZRg==", "dev": true }, + "node_modules/@rapideditor/country-coder": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@rapideditor/country-coder/-/country-coder-5.2.0.tgz", + "integrity": "sha512-6BupvfTV/cEFLrzi9kzVabry+d4ZawUQoCtjiLiA8F3op7nBJ8MMpHqaebgNNLCyAPZbVT4RP73o7RbTF1IlkA==", + "dependencies": { + "which-polygon": "^2.2.1" + }, + "engines": { + "node": ">=16.14.0" + } + }, + "node_modules/@rapideditor/location-conflation": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@rapideditor/location-conflation/-/location-conflation-1.2.0.tgz", + "integrity": "sha512-ro2uHvDmvDXjX0/SPg60gWUkjTHmZFGrkgoQHoY0nn8ZTHKH8DYaHrbiA7vQ0nTbV+vtYXXc+VPXXZ2k8YEgbw==", + "dependencies": { + "@aitodotai/json-stringify-pretty-compact": "^1.3.0", + "@mapbox/geojson-area": "^0.2.2", + "@rapideditor/country-coder": "^5.2.0", + "circle-to-polygon": "^2.2.0", + "geojson-precision": "^1.0.0", + "polygon-clipping": "~0.15.3" + }, + "engines": { + "node": ">=16.14.0" + } + }, "node_modules/@rapideditor/temaki": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@rapideditor/temaki/-/temaki-5.3.0.tgz", @@ -9879,23 +9881,6 @@ "version": "1.2.1", "dev": true }, - "@ideditor/country-coder": { - "version": "5.1.0", - "requires": { - "which-polygon": "^2.2.0" - } - }, - "@ideditor/location-conflation": { - "version": "1.1.0", - "requires": { - "@aitodotai/json-stringify-pretty-compact": "^1.3.0", - "@ideditor/country-coder": "^5.1.0", - "@mapbox/geojson-area": "^0.2.2", - "circle-to-polygon": "^2.0.2", - "geojson-precision": "^1.0.0", - "polygon-clipping": "~0.15.3" - } - }, "@istanbuljs/schema": { "version": "0.1.3", "dev": true @@ -9976,6 +9961,27 @@ "integrity": "sha512-/G7HoAQkNjqyDQy2Fb+Zg1fyWqFGGALhPEydk3yU3khnuqX0ORJC8Bsx8/U2ZIHZebba5VHoYFeouxyy3rOZRg==", "dev": true }, + "@rapideditor/country-coder": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@rapideditor/country-coder/-/country-coder-5.2.0.tgz", + "integrity": "sha512-6BupvfTV/cEFLrzi9kzVabry+d4ZawUQoCtjiLiA8F3op7nBJ8MMpHqaebgNNLCyAPZbVT4RP73o7RbTF1IlkA==", + "requires": { + "which-polygon": "^2.2.1" + } + }, + "@rapideditor/location-conflation": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@rapideditor/location-conflation/-/location-conflation-1.2.0.tgz", + "integrity": "sha512-ro2uHvDmvDXjX0/SPg60gWUkjTHmZFGrkgoQHoY0nn8ZTHKH8DYaHrbiA7vQ0nTbV+vtYXXc+VPXXZ2k8YEgbw==", + "requires": { + "@aitodotai/json-stringify-pretty-compact": "^1.3.0", + "@mapbox/geojson-area": "^0.2.2", + "@rapideditor/country-coder": "^5.2.0", + "circle-to-polygon": "^2.2.0", + "geojson-precision": "^1.0.0", + "polygon-clipping": "~0.15.3" + } + }, "@rapideditor/temaki": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@rapideditor/temaki/-/temaki-5.3.0.tgz", diff --git a/package.json b/package.json index 351ecc698..a33a4b3c0 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,8 @@ "translations": "node scripts/update_locales.js" }, "dependencies": { - "@ideditor/country-coder": "~5.1.0", - "@ideditor/location-conflation": "~1.1.0", + "@rapideditor/country-coder": "~5.2.0", + "@rapideditor/location-conflation": "~1.2.0", "@mapbox/geojson-area": "^0.2.2", "@mapbox/sexagesimal": "1.2.0", "@mapbox/vector-tile": "^1.3.1",