Commit 162d91e3 authored by Riegel's avatar Riegel
Browse files

Add BridgeRoom Furniture to datastructure

2 merge requests!28Version 3.17.0 Release,!26Add ZIP-archive support
Showing with 52 additions and 0 deletions
+52 -0
...@@ -52,6 +52,7 @@ public class BridgeObject extends CityObject { ...@@ -52,6 +52,7 @@ public class BridgeObject extends CityObject {
private final List<BridgeConstructiveElement> elements = new ArrayList<>(2); private final List<BridgeConstructiveElement> elements = new ArrayList<>(2);
private final List<BoundarySurface> boundarySurfaces = new ArrayList<>(2); private final List<BoundarySurface> boundarySurfaces = new ArrayList<>(2);
private final List<Installation> bridgeInstallations = new ArrayList<>(2); private final List<Installation> bridgeInstallations = new ArrayList<>(2);
private final List<BridgeRoomFurniture> bridgeFurniture = new ArrayList<>(2);
private final List<BridgeRoom> bridgeRooms = new ArrayList<>(2); private final List<BridgeRoom> bridgeRooms = new ArrayList<>(2);
private AbstractBridge ab; private AbstractBridge ab;
private BridgeType type; private BridgeType type;
...@@ -78,6 +79,10 @@ public class BridgeObject extends CityObject { ...@@ -78,6 +79,10 @@ public class BridgeObject extends CityObject {
return bridgeRooms; return bridgeRooms;
} }
public List<BridgeRoomFurniture> getBridgeFurniture() {
return bridgeFurniture;
}
@Override @Override
public void reCreateGeometries(GeometryFactory factory, ParserConfiguration config) { public void reCreateGeometries(GeometryFactory factory, ParserConfiguration config) {
for (Geometry geom : getGeometries()) { for (Geometry geom : getGeometries()) {
...@@ -107,6 +112,9 @@ public class BridgeObject extends CityObject { ...@@ -107,6 +112,9 @@ public class BridgeObject extends CityObject {
for (BridgeRoom br : bridgeRooms) { for (BridgeRoom br : bridgeRooms) {
br.reCreateGeometries(factory, config); br.reCreateGeometries(factory, config);
} }
for (BridgeRoomFurniture bri : bridgeFurniture) {
bri.reCreateGeometries(factory, config);
}
} }
...@@ -157,6 +165,11 @@ public class BridgeObject extends CityObject { ...@@ -157,6 +165,11 @@ public class BridgeObject extends CityObject {
bridgeRooms.add(room); bridgeRooms.add(room);
} }
public void addBridgeFurniture(BridgeRoomFurniture furniture){
bridgeFurniture.add(furniture);
furniture.setParent(this);
}
@Override @Override
public void clearAllContainedCheckResults() { public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults(); super.clearAllContainedCheckResults();
...@@ -175,6 +188,9 @@ public class BridgeObject extends CityObject { ...@@ -175,6 +188,9 @@ public class BridgeObject extends CityObject {
for (BridgeRoom br : bridgeRooms) { for (BridgeRoom br : bridgeRooms) {
br.clearAllContainedCheckResults(); br.clearAllContainedCheckResults();
} }
for (BridgeRoomFurniture bri : bridgeFurniture) {
bri.clearAllContainedCheckResults();
}
} }
@Override @Override
...@@ -195,6 +211,9 @@ public class BridgeObject extends CityObject { ...@@ -195,6 +211,9 @@ public class BridgeObject extends CityObject {
for (BridgeRoom br : bridgeRooms) { for (BridgeRoom br : bridgeRooms) {
br.collectContainedErrors(errors); br.collectContainedErrors(errors);
} }
for (BridgeRoomFurniture bri : bridgeFurniture) {
bri.collectContainedErrors(errors);
}
} }
...@@ -227,6 +246,11 @@ public class BridgeObject extends CityObject { ...@@ -227,6 +246,11 @@ public class BridgeObject extends CityObject {
return true; return true;
} }
} }
for (BridgeRoomFurniture bri : bridgeFurniture) {
if (bri.containsAnyError()) {
return true;
}
}
return false; return false;
} }
...@@ -269,6 +293,11 @@ public class BridgeObject extends CityObject { ...@@ -269,6 +293,11 @@ public class BridgeObject extends CityObject {
return true; return true;
} }
} }
for (BridgeRoomFurniture bri : bridgeFurniture) {
if (bri.containsError(checkIdentifier)) {
return true;
}
}
return false; return false;
} }
...@@ -303,6 +332,9 @@ public class BridgeObject extends CityObject { ...@@ -303,6 +332,9 @@ public class BridgeObject extends CityObject {
for (BridgeRoom br : bridgeRooms) { for (BridgeRoom br : bridgeRooms) {
br.accept(c); br.accept(c);
} }
for (BridgeRoomFurniture bri : bridgeFurniture) {
bri.accept(c);
}
} }
...@@ -363,6 +395,9 @@ public class BridgeObject extends CityObject { ...@@ -363,6 +395,9 @@ public class BridgeObject extends CityObject {
for (BridgeRoom br : bridgeRooms) { for (BridgeRoom br : bridgeRooms) {
br.unsetGmlGeometries(); br.unsetGmlGeometries();
} }
for (BridgeRoomFurniture bri : bridgeFurniture) {
bri.unsetGmlGeometries();
}
} }
...@@ -390,6 +425,12 @@ public class BridgeObject extends CityObject { ...@@ -390,6 +425,12 @@ public class BridgeObject extends CityObject {
for (BridgeObject part : parts) { for (BridgeObject part : parts) {
part.prepareForChecking(); part.prepareForChecking();
} }
for (BridgeRoom br : bridgeRooms) {
br.prepareForChecking();
}
for (BridgeRoomFurniture bri : bridgeFurniture) {
bri.prepareForChecking();
}
} }
@Override @Override
...@@ -414,6 +455,9 @@ public class BridgeObject extends CityObject { ...@@ -414,6 +455,9 @@ public class BridgeObject extends CityObject {
for (BridgeRoom br : bridgeRooms) { for (BridgeRoom br : bridgeRooms) {
br.clearMetaInformation(); br.clearMetaInformation();
} }
for (BridgeRoomFurniture bri : bridgeFurniture) {
bri.clearMetaInformation();
}
} }
...@@ -440,6 +484,10 @@ public class BridgeObject extends CityObject { ...@@ -440,6 +484,10 @@ public class BridgeObject extends CityObject {
handler.addInstance(br); handler.addInstance(br);
} }
for (BridgeRoomFurniture bri : bridgeFurniture) {
handler.addInstance(bri);
}
} }
public void anonymize() { public void anonymize() {
...@@ -483,6 +531,10 @@ public class BridgeObject extends CityObject { ...@@ -483,6 +531,10 @@ public class BridgeObject extends CityObject {
getBridgeRooms().add(handler.getCopyInstance(br)); getBridgeRooms().add(handler.getCopyInstance(br));
} }
for (BridgeRoomFurniture bri : originalBo.bridgeFurniture) {
getBridgeFurniture().add(handler.getCopyInstance(bri));
}
} }
public List<BoundarySurface> getBoundarySurfaces() { public List<BoundarySurface> getBoundarySurfaces() {
......
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