CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-22 16:19:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

For ice rinks, prefer the "sport" values "ice_hockey" and "ice_skating" instead of "hockey" and "skating" since that latter are ambiguous

Browse Source 
Don't remove other values when upgrading a tag value within a semicolon-delimited list
This commit is contained in:
Quincy Morgan
2019-05-23 15:39:15 -04:00
parent 642e651f5d
commit 0dfd0612b1
5 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/actions/upgrade_tags.js
+15 -1
View File
@@ -4,6 +4,7 @@ export function actionUpgradeTags(entityId, oldTags, replaceTags) {
var entity = graph.entity(entityId);
var tags = Object.assign({}, entity.tags); // shallow copy
var transferValue;
var semiIndex;
for (var oldTagKey in oldTags) {
if (oldTags[oldTagKey] === '*') {
@@ -15,6 +16,10 @@ export function actionUpgradeTags(entityId, oldTags, replaceTags) {
if (vals.length === 1 || oldIndex === -1) {
delete tags[oldTagKey];
} else {
if (replaceTags && replaceTags[oldTagKey]) {
// replacing a value within a semicolon-delimited value, note the index
semiIndex = oldIndex;
}
vals.splice(oldIndex, 1);
tags[oldTagKey] = vals.join(';');
}
@@ -36,7 +41,16 @@ export function actionUpgradeTags(entityId, oldTags, replaceTags) {
} else if (replaceValue === '$1') {
tags[replaceKey] = transferValue;
} else {
tags[replaceKey] = replaceValue;
if (tags[replaceKey] && oldTags[replaceKey] && semiIndex !== undefined) {
// don't override preexisting values
var existingVals = tags[replaceKey].split(';').filter(Boolean);
if (existingVals.indexOf(replaceValue) === -1) {
existingVals.splice(semiIndex, 0, replaceValue);
tags[replaceKey] = existingVals.join(';');
}
} else {
tags[replaceKey] = replaceValue;
}
}
}
}