Commit accc496a authored by Riegel's avatar Riegel
Browse files

Add BuildingFurniture checking

parent 9e65baa7
...@@ -99,6 +99,9 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -99,6 +99,9 @@ public abstract class AbstractBuilding extends CityObject {
for (BuildingRoom br : buildingRooms) { for (BuildingRoom br : buildingRooms) {
br.unsetGmlGeometries(); br.unsetGmlGeometries();
} }
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
bfr.unsetGmlGeometries();
}
} }
@Override @Override
...@@ -121,6 +124,9 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -121,6 +124,9 @@ public abstract class AbstractBuilding extends CityObject {
for (BuildingRoom br : buildingRooms) { for (BuildingRoom br : buildingRooms) {
br.reCreateGeometries(factory, config); br.reCreateGeometries(factory, config);
} }
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
bfr.reCreateGeometries(factory, config);
}
} }
private void reCreateBoundarySurface(GeometryFactory factory, ParserConfiguration config, BoundarySurface bs) { private void reCreateBoundarySurface(GeometryFactory factory, ParserConfiguration config, BoundarySurface bs) {
...@@ -193,6 +199,9 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -193,6 +199,9 @@ public abstract class AbstractBuilding extends CityObject {
for (BuildingRoom br : buildingRooms) { for (BuildingRoom br : buildingRooms) {
br.accept(c); br.accept(c);
} }
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
bfr.accept(c);
}
} }
@Override @Override
...@@ -207,6 +216,9 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -207,6 +216,9 @@ public abstract class AbstractBuilding extends CityObject {
for (BuildingRoom br : buildingRooms) { for (BuildingRoom br : buildingRooms) {
br.collectContainedErrors(errors); br.collectContainedErrors(errors);
} }
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
bfr.collectContainedErrors(errors);
}
} }
@Override @Override
...@@ -221,6 +233,9 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -221,6 +233,9 @@ public abstract class AbstractBuilding extends CityObject {
for (BuildingRoom br : buildingRooms) { for (BuildingRoom br : buildingRooms) {
br.clearAllContainedCheckResults(); br.clearAllContainedCheckResults();
} }
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
bfr.clearAllContainedCheckResults();
}
} }
@Override @Override
...@@ -244,6 +259,11 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -244,6 +259,11 @@ public abstract class AbstractBuilding extends CityObject {
return true; return true;
} }
} }
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
if (bfr.containsError(checkIdentifier)) {
return true;
}
}
return false; return false;
} }
...@@ -268,6 +288,11 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -268,6 +288,11 @@ public abstract class AbstractBuilding extends CityObject {
return true; return true;
} }
} }
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
if (bfr.containsAnyError()) {
return true;
}
}
return false; return false;
} }
...@@ -325,6 +350,9 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -325,6 +350,9 @@ public abstract class AbstractBuilding extends CityObject {
for (BuildingRoom br : buildingRooms) { for (BuildingRoom br : buildingRooms) {
br.prepareForChecking(); br.prepareForChecking();
} }
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
bfr.prepareForChecking();
}
} }
@Override @Override
...@@ -339,6 +367,9 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -339,6 +367,9 @@ public abstract class AbstractBuilding extends CityObject {
for (BuildingRoom br : buildingRooms) { for (BuildingRoom br : buildingRooms) {
br.clearMetaInformation(); br.clearMetaInformation();
} }
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
bfr.clearMetaInformation();
}
} }
@Override @Override
...@@ -347,6 +378,7 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -347,6 +378,7 @@ public abstract class AbstractBuilding extends CityObject {
handler.addInstance(boundarySurfaceList); handler.addInstance(boundarySurfaceList);
handler.addInstance(buildingInstallations); handler.addInstance(buildingInstallations);
handler.addInstance(buildingRooms); handler.addInstance(buildingRooms);
handler.addInstance(buildingRoomFurnitureList);
} }
@Override @Override
...@@ -362,6 +394,9 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -362,6 +394,9 @@ public abstract class AbstractBuilding extends CityObject {
for (BuildingRoom originalBr : originalAb.buildingRooms) { for (BuildingRoom originalBr : originalAb.buildingRooms) {
buildingRooms.add(handler.getCopyInstance(originalBr)); buildingRooms.add(handler.getCopyInstance(originalBr));
} }
for (BuildingRoomFurniture originalBFR : originalAb.buildingRoomFurnitureList) {
buildingRoomFurnitureList.add(handler.getCopyInstance(originalBFR));
}
ab = originalAb.ab; ab = originalAb.ab;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment