Skip to content

Check count members with role=outline #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Beakerboy merged 1 commit into from
Dec 29, 2025
+150 −1
Merged

Check count members with role=outline #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/building.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,14 @@ class Building {
} else if (this.type === 'multipolygon') {
this.outerElement = new MultiBuildingPart(id, this.fullXmlData, this.nodelist);
} else {
const outlineRef = outerElementXml.querySelector('member[role="outline"]').getAttribute('ref');
const outlines = outerElementXml.querySelectorAll('member[role="outline"]');
if (outlines.length > 1) {
throw new Error(`Found multiple outline members in relation ${this.id}`);
}
if (outlines.length === 0) {
throw new Error(`The relation ${this.id} does not contain a member with the outline role`);
}
const outlineRef = outlines[0].getAttribute('ref');
const outline = this.fullXmlData.getElementById(outlineRef);
const outlineType = outline.tagName.toLowerCase();
if (outlineType === 'way') {
Expand Down
142 changes: 142 additions & 0 deletions test/building.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,148 @@ test('Test downloading type=building with multipolygon outline and multiple inne
expect(global.fetch.mock.calls[2][0]).toBe(urlBase + 'map?bbox=30.4980057,59.9380365,30.4993839,59.9385087');
});

const typeBuildingWithoutOutlineMember = `<?xml version='1.0' encoding='UTF-8'?>
<osm version="0.6">
<node id="1" lat="59.938127" lon="30.4980057"/>
<node id="2" lat="59.9380365" lon="30.4992843"/>
<node id="3" lat="59.9384134" lon="30.4993839"/>
<node id="4" lat="59.9385087" lon="30.4981066"/>
<node id="5" lat="59.9381203" lon="30.4989364"/>
<node id="6" lat="59.93838" lon="30.499005"/>
<node id="7" lat="59.9384221" lon="30.498439"/>
<node id="8" lat="59.9381551" lon="30.4983684"/>
<way id="20">
<nd ref="4"/>
<nd ref="3"/>
<nd ref="2"/>
<nd ref="1"/>
</way>
<way id="21">
<nd ref="1"/>
<nd ref="4"/>
</way>
<way id="22">
<nd ref="6"/>
<nd ref="7"/>
</way>
<way id="23">
<nd ref="5"/>
<nd ref="6"/>
</way>
<way id="24">
<nd ref="8"/>
<nd ref="5"/>
</way>
<way id="25">
<nd ref="7"/>
<nd ref="8"/>
</way>
<relation id="40">
<member type="way" ref="20" role="outer"/>
<member type="way" ref="21" role="outer"/>
<member type="way" ref="22" role="inner"/>
<member type="way" ref="23" role="inner"/>
<member type="way" ref="24" role="inner"/>
<member type="way" ref="25" role="inner"/>
<tag k="building" v="school"/>
<tag k="building:levels" v="3"/>
<tag k="roof:shape" v="flat"/>
<tag k="type" v="multipolygon"/>
</relation>
<relation id="42">
<member type="relation" ref="40" role="part"/>
<tag k="type" v="building"/>
</relation>
</osm>
`;

test('Test outline member exist', async() => {
fetch.mockResponses(
[typeBuildingRelationFullResponse], // /relation/42/full
[outlineRelationFullResponse], // /relation/40/full
[typeBuildingWithoutOutlineMember], // /map call
);
const innerData = await Building.downloadDataAroundBuilding('relation', '42');
expect(() => new Building('42', innerData))
.toThrow(new Error('The relation 42 does not contain a member with the outline role'));
const urlBase = 'https://api.openstreetmap.org/api/0.6/';
expect(global.fetch.mock.calls[0][0]).toBe(urlBase + 'relation/42/full');
expect(global.fetch.mock.calls[1][0]).toBe(urlBase + 'relation/40/full');
expect(global.fetch.mock.calls[2][0]).toBe(urlBase + 'map?bbox=30.4980057,59.9380365,30.4993839,59.9385087');
});

const typeBuildingWithMultipleOutlineMembers = `<?xml version='1.0' encoding='UTF-8'?>
<osm version="0.6">
<node id="1" lat="59.938127" lon="30.4980057"/>
<node id="2" lat="59.9380365" lon="30.4992843"/>
<node id="3" lat="59.9384134" lon="30.4993839"/>
<node id="4" lat="59.9385087" lon="30.4981066"/>
<node id="5" lat="59.9381203" lon="30.4989364"/>
<node id="6" lat="59.93838" lon="30.499005"/>
<node id="7" lat="59.9384221" lon="30.498439"/>
<node id="8" lat="59.9381551" lon="30.4983684"/>
<way id="20">
<nd ref="4"/>
<nd ref="3"/>
<nd ref="2"/>
<nd ref="1"/>
</way>
<way id="21">
<nd ref="1"/>
<nd ref="4"/>
</way>
<way id="22">
<nd ref="6"/>
<nd ref="7"/>
</way>
<way id="23">
<nd ref="5"/>
<nd ref="6"/>
</way>
<way id="24">
<nd ref="8"/>
<nd ref="5"/>
</way>
<way id="25">
<nd ref="7"/>
<nd ref="8"/>
</way>
<relation id="40">
<member type="way" ref="20" role="outer"/>
<member type="way" ref="21" role="outer"/>
<member type="way" ref="22" role="inner"/>
<member type="way" ref="23" role="inner"/>
<member type="way" ref="24" role="inner"/>
<member type="way" ref="25" role="inner"/>
<tag k="building" v="school"/>
<tag k="building:levels" v="3"/>
<tag k="roof:shape" v="flat"/>
<tag k="type" v="multipolygon"/>
</relation>
<relation id="42">
<member type="relation" ref="40" role="outline"/>
<member type="relation" ref="50" role="outline"/>
<tag k="type" v="building"/>
</relation>
</osm>
`;

test('Test that it is checked that there is only one member with outline role', async() => {
fetch.mockResponses(
[typeBuildingRelationFullResponse], // /relation/42/full
[outlineRelationFullResponse], // /relation/40/full
[typeBuildingWithMultipleOutlineMembers], // /map call
);
const innerData = await Building.downloadDataAroundBuilding('relation', '42');
expect(() => new Building('42', innerData))
.toThrow(new Error('Found multiple outline members in relation 42'));
const urlBase = 'https://api.openstreetmap.org/api/0.6/';
expect(global.fetch.mock.calls[0][0]).toBe(urlBase + 'relation/42/full');
expect(global.fetch.mock.calls[1][0]).toBe(urlBase + 'relation/40/full');
expect(global.fetch.mock.calls[2][0]).toBe(urlBase + 'map?bbox=30.4980057,59.9380365,30.4993839,59.9385087');
});


test('Part must be within outline', () => {
const data = `<?xml version="1.0" encoding="UTF-8"?>
<osm>
Expand Down
⚡