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

Don't add field defaults when upgrading tags to a specific replacement

Browse Source
This commit is contained in:
Quincy Morgan
2019-04-03 10:57:42 -07:00
parent d65298f383
commit 34792d7fbf
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/actions/change_preset.js
+2 -2
View File
@@ -1,11 +1,11 @@
export function actionChangePreset(entityID, oldPreset, newPreset) {
export function actionChangePreset(entityID, oldPreset, newPreset, skipFieldDefaults) {
return function action(graph) {
var entity = graph.entity(entityID);
var geometry = entity.geometry(graph);
var tags = entity.tags;
if (oldPreset) tags = oldPreset.unsetTags(tags, geometry);
if (newPreset) tags = newPreset.setTags(tags, geometry);
if (newPreset) tags = newPreset.setTags(tags, geometry, skipFieldDefaults);
return graph.replace(entity.update({tags: tags}));
};
modules/presets/preset.js
+2 -2
View File
@@ -218,7 +218,7 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
preset.addTags = preset.addTags || preset.tags || {};
preset.setTags = function(tags, geometry) {
preset.setTags = function(tags, geometry, skipFieldDefaults) {
var addTags = preset.addTags;
var k;
@@ -253,7 +253,7 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
}
}
}
if (geometry) {
if (geometry && !skipFieldDefaults) {
for (var f in preset.fields) {
var field = preset.fields[f];
if (field.matchGeometry(geometry) && field.key && !tags[field.key] && field.default) {
modules/validations/outdated_tags.js
+1 -1
View File
@@ -54,7 +54,7 @@ export function validationOutdatedTags() {
function(graph) {
if (replacementPreset) {
var oldPreset = context.presets().match(graph.entity(entityID), context.graph());
graph = actionChangePreset(entityID, oldPreset, replacementPreset)(graph);
graph = actionChangePreset(entityID, oldPreset, replacementPreset, true /* skip field defaults */)(graph);
deprecatedTagsArray = graph.entity(entityID).deprecatedTags();
}
deprecatedTagsArray.forEach(function(deprecatedTags) {