Skip to content

Commit

Permalink
Update dependencies country-coder and location-conflation (#9546)
Browse files Browse the repository at this point in the history
  • Loading branch information
arch0345 committed Mar 30, 2023
1 parent 1428d1a commit e466ad4
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 56 deletions.
2 changes: 1 addition & 1 deletion API.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

This comment has been minimized.

Copy link
@riQQ

riQQ Apr 3, 2023

Contributor

This was mistakenly changed, see #9567 for the fix.

* __`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)
Expand Down
6 changes: 3 additions & 3 deletions modules/core/LocationManager.js
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion modules/ui/fields/address.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion modules/ui/fields/combo.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion modules/ui/fields/input.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion modules/ui/fields/localized.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion modules/ui/fields/roadheight.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion modules/ui/fields/roadspeed.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
94 changes: 50 additions & 44 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit e466ad4

Please sign in to comment.