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

Merge pull request #10523 from openstreetmap/kh/10522-mismatched-geom

Browse Source
This commit is contained in:
Martin Raifer
2024-12-11 15:12:28 +01:00
committed by GitHub
parent 9e2f9e0324 50309005a1
commit 0d8a367c35
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/validations/mismatched_geometry.js
View File

@@ -34,6 +34,12 @@ export function validationMismatchedGeometry() {
return null;
}
if (asLine.isFallback() && asArea.isFallback() && !deepEqual(tagSuggestingArea, { area: 'yes' })) {
// if the entity matches the fallback preset, regardless of the
// geometry, then changing the geometry will not help.
return null;
}
return tagSuggestingArea;
}

18
test/spec/validations/mismatched_geometry.js
View File

@@ -5,6 +5,9 @@ describe('iD.validations.mismatched_geometry', function () {
_savedAreaKeys = iD.osmAreaKeys;
context = iD.coreContext().init();
iD.fileFetcher.cache().preset_presets = {
'Line': { geometry: ['line'], fallback: true, tags: {} },
'Area': { geometry: ['area'], fallback: true, tags: { area: 'yes' } },
'Building': { geometry: ['area'], tags: { building: '*' } },
library: {
tags: { amenity: 'library' },
geometry: ['point', 'vertex', 'line', 'area'],
@@ -98,7 +101,8 @@ describe('iD.validations.mismatched_geometry', function () {
expect(issues).to.have.lengthOf(0);
});
it('flags open way with area tag', function() {
it('flags open way with area tag', async () => {
await iD.presetManager.ensureLoaded(true);
iD.osmSetAreaKeys({ building: {} });
createOpenWay({ building: 'yes' });
var issues = validate();
@@ -123,6 +127,18 @@ describe('iD.validations.mismatched_geometry', function () {
expect(issue.entityIds[0]).to.eql('w-1');
});
it('does not flag cases whether the entity matches the generic preset, regardless of geometry', async () => {
// in this test case, waterway=dam is allowed as an area,
// and there is no preset for waterway=security_lock, so it
// uses to the fallback preset for all geometries.
await iD.presetManager.ensureLoaded(true);
iD.osmSetAreaKeys({ waterway: { dam: true } });
createOpenWay({ 'disused:waterway': 'security_lock' });
const issues = validate();
expect(issues).to.have.lengthOf(0);
});
it('does not error if the best preset is limited to certain regions', async () => {
await iD.presetManager.ensureLoaded(true);