organicmaps/name-suggestion-index
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Update dependencies, move some projects from ideditor -> rapideditor

Browse source
This commit is contained in:
Bryan Housel 2023-03-13 10:27:59 -04:00
parent 2409a42ea1
commit 4244de00f3
18 changed files with 495 additions and 465 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/Header.jsx
View file

@ -34,9 +34,9 @@ function Title(props) {
} else if (t === 'flags') {
fallbackIcon = 'https://cdn.jsdelivr.net/npm/@mapbox/maki@6/icons/embassy-15.svg';
} else if (t === 'operators') {
fallbackIcon = 'https://cdn.jsdelivr.net/npm/@ideditor/temaki@5/icons/briefcase.svg';
fallbackIcon = 'https://cdn.jsdelivr.net/npm/@rapideditor/temaki@5/icons/briefcase.svg';
} else if (t === 'transit') {
fallbackIcon = 'https://cdn.jsdelivr.net/npm/@ideditor/temaki@5/icons/board_transit.svg';
fallbackIcon = 'https://cdn.jsdelivr.net/npm/@rapideditor/temaki@5/icons/board_transit.svg';
}
const kv = `${k}/${v}`;
@ -46,9 +46,9 @@ function Title(props) {
// exceptions:
if (kv === 'power/minor_line') { // iD's power pole icon has a fill
iconURL = 'https://cdn.jsdelivr.net/npm/@ideditor/temaki@5/icons/power_pole.svg';
iconURL = 'https://cdn.jsdelivr.net/npm/@rapideditor/temaki@5/icons/power_pole.svg';
} else if (kv === 'route/power') {
iconURL = 'https://cdn.jsdelivr.net/npm/@ideditor/temaki@5/icons/power_tower.svg';
iconURL = 'https://cdn.jsdelivr.net/npm/@rapideditor/temaki@5/icons/power_tower.svg';
}
}

8
app/src/Overview.jsx
View file

@ -25,10 +25,10 @@ export default function Overview(props) {
fallbackIcon = 'https://cdn.jsdelivr.net/npm/@mapbox/maki@6/icons/embassy-15.svg';
wikidataTag = 'flag:wikidata';
} else if (t === 'operators') {
fallbackIcon = 'https://cdn.jsdelivr.net/npm/@ideditor/temaki@5/icons/briefcase.svg';
fallbackIcon = 'https://cdn.jsdelivr.net/npm/@rapideditor/temaki@5/icons/briefcase.svg';
wikidataTag = 'operator:wikidata';
} else if (t === 'transit') {
fallbackIcon = 'https://cdn.jsdelivr.net/npm/@ideditor/temaki@5/icons/board_transit.svg';
fallbackIcon = 'https://cdn.jsdelivr.net/npm/@rapideditor/temaki@5/icons/board_transit.svg';
wikidataTag = 'network:wikidata';
}
@ -74,9 +74,9 @@ export default function Overview(props) {
// exceptions:
if (kv === 'power/minor_line') { // iD's power pole icon has a fill
iconURL = 'https://cdn.jsdelivr.net/npm/@ideditor/temaki@5/icons/power_pole.svg';
iconURL = 'https://cdn.jsdelivr.net/npm/@rapideditor/temaki@5/icons/power_pole.svg';
} else if (kv === 'route/power') {
iconURL = 'https://cdn.jsdelivr.net/npm/@ideditor/temaki@5/icons/power_tower.svg';
iconURL = 'https://cdn.jsdelivr.net/npm/@rapideditor/temaki@5/icons/power_tower.svg';
}
const items = index.path[tkv];

18
data/brands/shop/variety_store.json
View file

@ -735,23 +735,23 @@
},
{
"displayName": "TEDi",
"id": "tedi-588ea3",
"id": "tedi-8a061e",
"locationSet": {
"include": [
"at",
"bg",
"cz",
"de",
"es",
"hr",
"it",
"si",
"sk",
"gb",
"pl",
"cz",
"hr",
"hu",
"ro",
"it",
"pl",
"pt",
"bg"
"ro",
"si",
"sk"
]
},
"matchNames": ["t€di"],

8
dist/nsi.json vendored
View file

@ -1,9 +1,9 @@
{
"_meta": {
"version": "6.0.20230313",
"generated": "2023-03-13T03:12:13.089Z",
"generated": "2023-03-13T14:26:43.187Z",
"url": "https://raw.githubusercontent.com/osmlab/name-suggestion-index/main/dist/nsi.json",
"hash": "8bd4a3e0a1d0c60556621ad1557bfcfc"
"hash": "ad2e0f553fc39748c3eb6886498e40ed"
},
"nsi": {
"brands/amenity/animal_boarding": {
@ -7983,7 +7983,7 @@
{"displayName": "Rimac", "id": "rimac-0f1e04", "locationSet": {"include": ["ae", "ca", "cn", "de", "es", "gb", "jp", "mx", "sg", "us"]}, "tags": {"brand": "Rimac", "brand:wikidata": "Q7334368", "name": "Rimac", "shop": "car"}},
{"displayName": "Seat", "id": "seat-13eeb7", "locationSet": {"include": ["001"]}, "tags": {"brand": "Seat", "brand:wikidata": "Q188217", "name": "Seat", "shop": "car"}},
{"displayName": "Škoda", "id": "skoda-13eeb7", "locationSet": {"include": ["001"]}, "matchNames": ["škoda auto"], "tags": {"brand": "Škoda", "brand:wikidata": "Q29637", "name": "Škoda", "shop": "car"}},
{"displayName": "Smart", "id": "smart-f30ed8", "locationSet": {"include": ["150"]}, "tags": {"brand": "Smart", "brand:wikidata": "Q156490", "name": "Smart", "shop": "car"}},
{"displayName": "Smart", "id": "smart-b77732", "locationSet": {"include": ["150", "cn"]}, "tags": {"brand": "Smart", "brand:wikidata": "Q156490", "name": "Smart", "shop": "car"}},
{"displayName": "Subaru", "id": "subaru-13eeb7", "locationSet": {"include": ["001"]}, "tags": {"brand": "Subaru", "brand:wikidata": "Q172741", "name": "Subaru", "shop": "car"}},
{"displayName": "Suzuki", "id": "suzuki-59b739", "locationSet": {"include": ["001"], "exclude": ["in"]}, "tags": {"brand": "Suzuki", "brand:wikidata": "Q181642", "name": "Suzuki", "shop": "car"}},
{"displayName": "Tata", "id": "tata-aa55a2", "locationSet": {"include": ["in"]}, "matchNames": ["tata motors"], "tags": {"brand": "Tata", "brand:wikidata": "Q188514", "name": "Tata", "shop": "car"}},
@ -13617,7 +13617,7 @@
{"displayName": "Rusta", "id": "rusta-7f2f16", "locationSet": {"include": ["de", "fi", "sv"]}, "tags": {"brand": "Rusta", "brand:wikidata": "Q10658096", "name": "Rusta", "shop": "variety_store"}},
{"displayName": "Shiploads", "id": "shiploads-c7d002", "locationSet": {"include": ["au"]}, "tags": {"brand": "Shiploads", "brand:wikidata": "Q105883436", "name": "Shiploads", "shop": "variety_store"}},
{"displayName": "Stokomani", "id": "stokomani-4bad18", "locationSet": {"include": ["fr"]}, "tags": {"brand": "Stokomani", "brand:wikidata": "Q22249328", "name": "Stokomani", "shop": "variety_store"}},
{"displayName": "TEDi", "id": "tedi-588ea3", "locationSet": {"include": ["at", "de", "es", "hr", "it", "si", "sk"]}, "matchNames": ["t€di"], "tags": {"brand": "TEDi", "brand:wikidata": "Q1364603", "name": "TEDi", "shop": "variety_store"}},
{"displayName": "TEDi", "id": "tedi-8a061e", "locationSet": {"include": ["at", "bg", "cz", "de", "es", "gb", "hr", "hu", "it", "pl", "pt", "ro", "si", "sk"]}, "matchNames": ["t€di"], "tags": {"brand": "TEDi", "brand:wikidata": "Q1364603", "name": "TEDi", "shop": "variety_store"}},
{"displayName": "THANK YOU MART", "id": "thankyoumart-e1b193", "locationSet": {"include": ["jp"]}, "tags": {"alt_name:en": "390 Yen Shop", "brand": "THANK YOU MART", "brand:en": "THANK YOU MART", "brand:ja": "サンキューマート", "brand:wikidata": "Q11305509", "name": "THANK YOU MART", "name:en": "THANK YOU MART", "name:ja": "サンキューマート", "shop": "variety_store"}},
{"displayName": "The Crazy Store", "id": "thecrazystore-5c81c2", "locationSet": {"include": ["na", "za"]}, "matchTags": ["shop/toys"], "tags": {"brand": "The Crazy Store", "brand:wikidata": "Q116620808", "name": "The Crazy Store", "shop": "variety_store"}},
{"displayName": "The Original Factory Shop", "id": "theoriginalfactoryshop-622078", "locationSet": {"include": ["gb"]}, "tags": {"brand": "The Original Factory Shop", "brand:wikidata": "Q7755366", "name": "The Original Factory Shop", "shop": "variety_store"}},

2
dist/nsi.min.json vendored
View file

File diff suppressed because one or more lines are too long

29
dist/presets/nsi-id-presets.json vendored
View file

@ -1,9 +1,9 @@
{
"_meta": {
"version": "6.0.20230313",
"generated": "2023-03-13T03:12:14.530Z",
"generated": "2023-03-13T14:26:44.332Z",
"url": "https://raw.githubusercontent.com/osmlab/name-suggestion-index/main/dist/presets/nsi-id-presets.json",
"hash": "ac67eb8bf57cc6bda1ab69f409fc1785"
"hash": "2b2746202e13f969f0e0576bfc5af3b1"
},
"presets": {
"amenity/animal_boarding/dogtopia-03770a": {
@ -133013,9 +133013,9 @@
"shop": "car"
}
},
"shop/car/smart-f30ed8": {
"shop/car/smart-b77732": {
"name": "Smart",
"locationSet": {"include": ["150"]},
"locationSet": {"include": ["150", "cn"]},
"icon": "maki-car",
"geometry": ["point", "area"],
"matchScore": 2,
@ -211230,9 +211230,26 @@
"shop": "variety_store"
}
},
"shop/variety_store/tedi-588ea3": {
"shop/variety_store/tedi-8a061e": {
"name": "TEDi",
"locationSet": {"include": ["at", "de", "es", "hr", "it", "si", "sk"]},
"locationSet": {
"include": [
"at",
"bg",
"cz",
"de",
"es",
"gb",
"hr",
"hu",
"it",
"pl",
"pt",
"ro",
"si",
"sk"
]
},
"icon": "maki-shop",
"geometry": ["point", "area"],
"matchScore": 2,

2
dist/presets/nsi-id-presets.min.json vendored
View file

File diff suppressed because one or more lines are too long

161
docs/index.js
View file

File diff suppressed because one or more lines are too long

8
docs/index.js.map
View file

File diff suppressed because one or more lines are too long

684
docs/sitemap.xml
View file

File diff suppressed because it is too large Load diff

2
features/au/README.md
View file

@ -1,6 +1,6 @@
# Features targeting Australia
The following area is included as part of [country-coder](https://github.com/ideditor/country-coder) and doesn't need its own feature.
The following area is included as part of [country-coder](https://github.com/rapideditor/country-coder) and doesn't need its own feature.
- [au-tas](https://location-conflation.com/?locationSet=%7B%22include%22%3A%5B%22au-tas%22%5D%7D&referrer=nsi) - Tasmania

2
features/gb/README.md
View file

@ -1,6 +1,6 @@
# Features targeting Great Britain
The following areas are included as part of [country-coder](https://github.com/ideditor/country-coder) and don't need their own feature.
The following areas are included as part of [country-coder](https://github.com/rapideditor/country-coder) and don't need their own feature.
- [gb-eng](https://location-conflation.com/?locationSet=%7B%22include%22%3A%5B%22gb-eng%22%5D%7D&referrer=nsi) - The Country of England
- [gb-nir](https://location-conflation.com/?locationSet=%7B%22include%22%3A%5B%22gb-nir%22%5D%7D&referrer=nsi) - The province of Northern Ireland

12
package.json
View file

@ -107,29 +107,29 @@
"@fortawesome/free-brands-svg-icons": "^6.3.0",
"@fortawesome/free-solid-svg-icons": "^6.3.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@ideditor/location-conflation": "~1.1.0",
"@ideditor/nsi-collector": "^1.0.20230304",
"@mapbox/geojson-area": "^0.2.2",
"@mapbox/geojson-rewind": "^0.5.2",
"@openstreetmap/id-tagging-schema": "~5.2.1",
"@rapideditor/location-conflation": "~1.2.0",
"c8": "^7.13.0",
"chalk": "5.2.0",
"clear": "^0.1.0",
"esbuild": "^0.17.10",
"eslint": "^8.35.0",
"esbuild": "^0.17.11",
"eslint": "^8.36.0",
"fs-extra": "^11.1.0",
"geojson-bounds": "^1.0.2",
"geojson-precision": "^1.0.0",
"glob": "^9.1.2",
"glob": "^9.2.1",
"json5": "^2.2.3",
"jsonschema": "^1.4.1",
"locale-compare": "^2.0.0",
"node-fetch": "^3.3.0",
"node-fetch": "^3.3.1",
"npm-run-all": "^4.1.5",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-router-dom": "^5.2.0",
"regenerator-runtime": "^0.13.5",
"regenerator-runtime": "^0.13.11",
"safe-regex": "^2.1.1",
"shelljs": "^0.8.5",
"tap": "^16.3.4",

6
schema/categories.json
View file

@ -77,7 +77,7 @@
"definitions": {
"locationSet": {
"$comment": "See location-conflation documentation for compatible values: https://github.com/ideditor/location-conflation#readme",
"$comment": "See location-conflation documentation for compatible values: https://github.com/rapideditor/location-conflation#readme",
"type": "object",
"additionalProperties": false,
"required": ["include"],
@ -112,7 +112,7 @@
},
"countryCoder": {
"$comment": "See country-coder documentation for compatible values: https://github.com/ideditor/country-coder#readme",
"$comment": "See country-coder documentation for compatible values: https://github.com/rapideditor/country-coder#readme",
"description": "A country code (ISO 3166-1, United Nations M49, or anything recognized by country-coder)",
"type": "string"
},
@ -183,7 +183,7 @@
},
"locationSet": {
"$comment": "See location-conflation documentation for compatible values: https://github.com/ideditor/location-conflation#readme",
"$comment": "See location-conflation documentation for compatible values: https://github.com/rapideditor/location-conflation#readme",
"description": "(required) included and excluded locations for this item",
"$ref": "#/definitions/locationSet"
},

2
scripts/build_index.js
View file

@ -3,7 +3,7 @@ import chalk from 'chalk';
import fs from 'node:fs';
import JSON5 from 'json5';
import localeCompare from 'locale-compare';
import LocationConflation from '@ideditor/location-conflation';
import LocationConflation from '@rapideditor/location-conflation';
import safeRegex from 'safe-regex';
import stringify from '@aitodotai/json-stringify-pretty-compact';
const withLocale = localeCompare('en-US');

4
scripts/build_wikidata.js
View file

@ -4,10 +4,10 @@ import fs from 'node:fs';
import fetch from 'node-fetch';
import http from 'node:http';
import https from 'node:https';
import { iso1A2Code } from '@ideditor/country-coder';
import { iso1A2Code } from '@rapideditor/country-coder';
import JSON5 from 'json5';
import localeCompare from 'locale-compare';
import LocationConflation from '@ideditor/location-conflation';
import LocationConflation from '@rapideditor/location-conflation';
import shell from 'shelljs';
import stringify from '@aitodotai/json-stringify-pretty-compact';
import Twitter from 'Twitter';

2
scripts/dist_files.js
View file

@ -4,7 +4,7 @@ import fs from 'node:fs';
import { globSync } from 'glob';
import JSON5 from 'json5';
import localeCompare from 'locale-compare';
import LocationConflation from '@ideditor/location-conflation';
import LocationConflation from '@rapideditor/location-conflation';
import shell from 'shelljs';
import stringify from '@aitodotai/json-stringify-pretty-compact';
import xmlbuilder2 from 'xmlbuilder2';

2
tests/matcher.test.js
View file

@ -1,5 +1,5 @@
import { test } from 'tap';
import LocationConflation from '@ideditor/location-conflation';
import LocationConflation from '@rapideditor/location-conflation';
import { Matcher } from '../index.mjs';
import data from './matcher.data.json' assert {type: 'json'};