CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-25 23:13:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the keepRight data extrnal

Browse Source
This commit is contained in:
Bryan Housel
2020-02-07 09:16:34 -05:00
parent f8a4a0b3ad
commit fe00a40e9a
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/data.js
View File

@@ -14,6 +14,7 @@ export function coreData(context) {
'discarded': 'data/discarded.min.json',
'imagery': 'data/imagery.min.json',
'intro_graph': 'data/intro_graph.min.json',
'keepRight': 'data/keepRight.min.json',
'languages': 'data/languages.min.json',
'locales': 'data/locales.min.json',
'nsi_brands': 'https://cdn.jsdelivr.net/npm/name-suggestion-index@4/dist/brands.min.json',

21
modules/services/keepRight.js
View File

@@ -8,12 +8,12 @@ import { QAItem } from '../osm';
import { t } from '../util/locale';
import { utilRebind, utilTiler, utilQsString } from '../util';
import { errorTypes, localizeStrings } from '../../data/keepRight.json';
const tiler = utilTiler();
const dispatch = d3_dispatch('loaded');
const _tileZoom = 14;
const _krUrlRoot = 'https://www.keepright.at';
let _krData = { errorTypes: {}, localizeStrings: {} };
// This gets reassigned if reset
let _cache;
@@ -67,7 +67,7 @@ function tokenReplacements(d) {
const htmlRegex = new RegExp(/<\/[a-z][\s\S]*>/);
const replacements = {};
const issueTemplate = errorTypes[d.whichType];
const issueTemplate = _krData.errorTypes[d.whichType];
if (!issueTemplate) {
/* eslint-disable no-console */
console.log('No Template: ', d.whichType);
@@ -102,8 +102,8 @@ function tokenReplacements(d) {
capture = '\\' + capture + '\\';
} else {
const compare = capture.toLowerCase();
if (localizeStrings[compare]) { // some replacement strings can be localized
capture = t('QA.keepRight.error_parts.' + localizeStrings[compare]);
if (_krData.localizeStrings[compare]) { // some replacement strings can be localized
capture = t('QA.keepRight.error_parts.' + _krData.localizeStrings[compare]);
}
}
@@ -116,8 +116,8 @@ function tokenReplacements(d) {
function parseError(capture, idType) {
const compare = capture.toLowerCase();
if (localizeStrings[compare]) { // some replacement strings can be localized
capture = t('QA.keepRight.error_parts.' + localizeStrings[compare]);
if (_krData.localizeStrings[compare]) { // some replacement strings can be localized
capture = t('QA.keepRight.error_parts.' + _krData.localizeStrings[compare]);
}
switch (idType) {
@@ -255,7 +255,10 @@ function parseError(capture, idType) {
export default {
init() {
init(context) {
context.data().get('keepRight')
.then(d => _krData = d);
if (!_cache) {
this.reset();
}
@@ -333,12 +336,12 @@ export default {
// if there is a parent, save its error type e.g.:
// Error 191 = "highway-highway"
// Error 190 = "intersections without junctions" (parent)
const issueTemplate = errorTypes[itemType];
const issueTemplate = _krData.errorTypes[itemType];
const parentIssueType = (Math.floor(itemType / 10) * 10).toString();
// try to handle error type directly, fallback to parent error type.
const whichType = issueTemplate ? itemType : parentIssueType;
const whichTemplate = errorTypes[whichType];
const whichTemplate = _krData.errorTypes[whichType];
// Rewrite a few of the errors at this point..
// This is done to make them easier to linkify and translate.