CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-01 12:41:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

don't preserve preset's field tags if presets are sub-presets of each other

Browse Source 
fixes #0372
This commit is contained in:
Martin Raifer
2022-11-14 18:03:00 +01:00
parent ec7e884ae9
commit 21e54f956d
3 changed files with 85 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/actions/change_preset.js
+73
View File
@@ -22,4 +22,77 @@ describe('iD.actionChangePreset', function() {
var action = iD.actionChangePreset(entity.id, oldPreset, null);
expect(action(graph).entity(entity.id).tags).to.eql({});
});
// https://github.com/openstreetmap/iD/issues/8159
it('preserves the tags of a new preset\'s addTags', function() {
var entity = iD.osmNode({tags: {
'power': 'plant',
'plant:source': 'coal',
'plant:method': 'combustion',
'plant:output:electricity': '10 MW'
}});
var graph = iD.coreGraph([entity]);
var oldPreset = iD.presetPreset('old', {tags: {
'power': 'plant',
'plant:source': 'coal'
}, addTags: {
'power': 'plant',
'plant:source': 'coal',
'plant:method': 'combustion',
'plant:output:electricity': '*'
}});
var newPreset = iD.presetPreset('new', {tags: {
'power': 'plant',
'plant:source': 'solar',
'plant:method': 'photovoltaic'
}, addTags: {
'power': 'plant',
'plant:source': 'solar',
'plant:method': 'photovoltaic',
'plant:output:electricity': '*'
}});
var action = iD.actionChangePreset(entity.id, oldPreset, newPreset);
expect(action(graph).entity(entity.id).tags).to.eql({
'power': 'plant',
'plant:source': 'solar',
'plant:method': 'photovoltaic',
'plant:output:electricity': '10 MW'
});
});
// https://github.com/openstreetmap/iD/issues/9341
// https://github.com/openstreetmap/iD/issues/9104
it('preserves the tags when there is a matching field in the new preset', function() {
var entity = iD.osmNode({tags: {building: 'yes'}});
var graph = iD.coreGraph([entity]);
var oldPreset = iD.presetPreset('old', {tags: {building: 'yes'}});
var newPreset = iD.presetPreset('new', {tags: {amenity: 'school'}, fields: ['field']}, undefined, {
field: iD.presetField('field', {key: 'building'})
});
var action = iD.actionChangePreset(entity.id, oldPreset, newPreset);
expect(action(graph).entity(entity.id).tags).to.eql({amenity: 'school', building: 'yes'});
});
it('does not preserves the tags of a non-matching field in the new preset', function() {
var entity = iD.osmNode({tags: {building: 'yes'}, loc: [0, 0]});
var graph = iD.coreGraph([entity]);
var oldPreset = iD.presetPreset('old', {tags: {building: 'yes'}});
var newPreset = iD.presetPreset('new', {tags: {amenity: 'school'}, fields: ['field']}, undefined, {
field: iD.presetField('field', {key: 'building', geometry: 'area'})
});
var action = iD.actionChangePreset(entity.id, oldPreset, newPreset);
expect(action(graph).entity(entity.id).tags).to.eql({amenity: 'school'});
});
// https://github.com/openstreetmap/iD/issues/9372
it('does not preserve field tags when changing from a subpreset to its parent', function() {
var entity = iD.osmNode({tags: {highway: 'service', service: 'driveway'}});
var graph = iD.coreGraph([entity]);
var oldPreset = iD.presetPreset('highway/service/driveway', {tags: {highway: 'service', service: 'driveway'}});
var newPreset = iD.presetPreset('highway/service', {tags: {highway: 'service'}, fields: ['field']}, undefined, {
field: iD.presetField('field', {key: 'service'})
});
var action = iD.actionChangePreset(entity.id, oldPreset, newPreset);
expect(action(graph).entity(entity.id).tags).to.eql({highway: 'service'});
});
});