Skip to content

Support building:part=no #154

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

Open
deevroman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support building:part=no #154

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
4 changes: 2 additions & 2 deletions src/building.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ class Building {
// Filter to all ways
var parts = this.fullXmlData.getElementsByTagName('way');
for (const xmlPart of parts) {
if (xmlPart.querySelector('[k="building:part"]')) {
if (xmlPart.querySelector('[k="building:part"]:not([v="no"])')) {
const id = xmlPart.getAttribute('id');
const part = new BuildingPart(id, this.fullXmlData, this.nodelist, this.outerElement.options);
if (this.partIsInside(part)) {
Expand All @@ -225,7 +225,7 @@ class Building {
// Filter all relations
parts = this.fullXmlData.getElementsByTagName('relation');
for (let i = 0; i < parts.length; i++) {
if (parts[i].querySelector('[k="building:part"]')) {
if (parts[i].querySelector('[k="building:part"]:not([v="no"])')) {
const id = parts[i].getAttribute('id');
try {
this.parts.push(new MultiBuildingPart(id, this.fullXmlData, this.nodelist, this.outerElement.options));
Expand Down
4 changes: 2 additions & 2 deletions src/buildingpart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@ class BuildingPart {
} else if (this.way.querySelector('[k="building:levels"]') !== null) {
// if not, use building:levels and 3 meters per level.
height = 3 * this.way.querySelector('[k="building:levels"]').getAttribute('v') + this.options.roof.height;
} else if (this.way.querySelector('[k="building:part"]') !== null) {
if (this.way.querySelector('[k="building:part"]').getAttribute('v') === 'roof') {
} else if (this.way.querySelector('[k="building:part"]:not([v="no"])') !== null) {
if (this.way.querySelector('[k="building:part"]:not([v="no"])').getAttribute('v') === 'roof') {
// a roof has no building part by default.
height = this.options.roof.height;
}
Expand Down
58 changes: 58 additions & 0 deletions test/building.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,64 @@ test('Part must be within outline', () => {
expect(new Building('11', data).parts.length).toBe(0);
});

test('Outline with building:part=no is not added to parts', () => {
const data = `<?xml version="1.0" encoding="UTF-8"?>
<osm>
<node id="1" lat="0.001" lon="0.001"/>
<node id="2" lat="0.001" lon="0"/>
<node id="3" lat="0" lon="0"/>
<way id="11">
<nd ref="1"/>
<nd ref="2"/>
<nd ref="3"/>
<nd ref="1"/>
<tag k="building" v="apartments"/>
<tag k="building:part" v="no"/>
</way>
<way id="22">
<nd ref="1"/>
<nd ref="2"/>
<nd ref="3"/>
<nd ref="1"/>
<tag k="building:part" v="yes"/>
</way>
</osm>
`;
const building = new Building('11', data);
expect(building.parts.map((part) => part.id)).toStrictEqual(['22']);
});

test('Outline with building:part=no is not added to parts (multipolygon)', () => {
const data = `<?xml version="1.0" encoding="UTF-8"?>
<osm>
<node id="1" lat="0.001" lon="0.001"/>
<node id="2" lat="0.001" lon="0"/>
<node id="3" lat="0" lon="0"/>
<way id="11">
<nd ref="1"/>
<nd ref="2"/>
<nd ref="3"/>
<nd ref="1"/>
</way>
<way id="22">
<nd ref="1"/>
<nd ref="2"/>
<nd ref="3"/>
<nd ref="1"/>
<tag k="building:part" v="yes"/>
</way>
<relation id="42">
<member type="way" ref="22" role="outer"/>
<tag k="type" v="multipolygon"/>
<tag k="building" v="apartments"/>
<tag k="building:part" v="no"/>
</relation>
</osm>
`;
const building = new Building('42', data);
expect(building.parts.map((part) => part.id)).toStrictEqual(['22']);
});

window.printError = printError;

var errors = [];
Expand Down
Loading