diff --git a/src/main/java/de/stuttgart/hft/EnergyADEExtension.java b/src/main/java/de/stuttgart/hft/EnergyADE3Extension.java similarity index 83% rename from src/main/java/de/stuttgart/hft/EnergyADEExtension.java rename to src/main/java/de/stuttgart/hft/EnergyADE3Extension.java index 3d7fcab7c7ebfc04a505b0a8d68392f70b998c0f..ca32e45889684fa9b284cd0574ea0eed426313ac 100644 --- a/src/main/java/de/stuttgart/hft/EnergyADEExtension.java +++ b/src/main/java/de/stuttgart/hft/EnergyADE3Extension.java @@ -1,9 +1,9 @@ package de.stuttgart.hft; -import de.stuttgart.hft.ade.energy2.exporter.ExportManager; -import de.stuttgart.hft.ade.energy2.importer.ImportManager; -import de.stuttgart.hft.ade.energy2.schema.ObjectMapper; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.exporter.ExportManager; +import de.stuttgart.hft.ade.energy3.importer.ImportManager; +import de.stuttgart.hft.ade.energy3.schema.ObjectMapper; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.core.ade.ADEExtension; import org.citydb.core.ade.ADEExtensionException; import org.citydb.core.ade.ADEObjectMapper; @@ -18,13 +18,13 @@ import java.nio.file.Paths; import java.util.Collections; import java.util.List; -public class EnergyADEExtension extends ADEExtension { +public class EnergyADE3Extension extends ADEExtension { private final ObjectMapper objectMapper = new ObjectMapper(); private final SchemaMapper schemaMapper = new SchemaMapper(); private final EnergyADEContext context = new EnergyADEContext(); public static void main(String[] args) { - EnergyADEExtension adeExtension = new EnergyADEExtension(); + EnergyADE3Extension adeExtension = new EnergyADE3Extension(); adeExtension.setBasePath(Paths.get("resources/database").toAbsolutePath()); new ImpExpLauncher().withArgs(args) .withADEExtension(adeExtension) diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ADESequence.java b/src/main/java/de/stuttgart/hft/ade/energy2/schema/ADESequence.java deleted file mode 100644 index 5ce8290407c699aee324cf4540923c2260c50ee7..0000000000000000000000000000000000000000 --- a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ADESequence.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.stuttgart.hft.ade.energy2.schema; - -public enum ADESequence { - VOLUMETYPE_SEQ, - FLOORAREA_SEQ, - QUALIFIED_ATTRIBUTE_SEQ, - HEATEXCHANGETYPE_SEQ, - TRANSMITTANCE_SEQ, - OPTICALPROPERTIES_SEQ, - REFLECTANCE_SEQ, - TIMEVALUESPROPERTI_SEQ, - PERIODOFYEAR_SEQ, - DAILYSCHEDULE_SEQ, - REFURBISHMENT_MEASURE_SEQ -} diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/AbstractQualifiedAttributeExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java similarity index 94% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/AbstractQualifiedAttributeExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java index db9a778a121435b3a16d5c8f9a060e4681847f14..b8331b7534fe39412ef88ea4f7c2966979a5a343 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/AbstractQualifiedAttributeExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java @@ -1,13 +1,11 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; -import org.citydb.core.database.schema.mapping.AbstractType; import org.citydb.core.database.schema.mapping.ComplexType; import org.citydb.core.database.schema.mapping.SchemaMapping; import org.citydb.core.operation.exporter.CityGMLExportException; -import org.citydb.core.query.filter.projection.ProjectionFilter; import org.citydb.core.registry.ObjectRegistry; import org.citygml4j.ade.energy.model.core.*; import org.citygml4j.ade.energy.model.module.EnergyADEModule; @@ -31,8 +29,8 @@ public class AbstractQualifiedAttributeExporter implements ADEExporter { private final CityGMLExportHelper helper; private final ExportManager manager; private final Connection connection; - private WeatherDataExporter weatherDataExporter; - private ResourceExporter resourceExporter; + //private WeatherDataExporter weatherDataExporter; + //private ResourceExporter resourceExporter; private String module; private Map> attributeClassMap; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/BuildingPropertiesExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java similarity index 98% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/BuildingPropertiesExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java index 3c33d6425f3cd955f1a2726938f678b23138615e..bbcf76f309a6289c0809a185a950b58b6159b922 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/BuildingPropertiesExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import net.opengis.gml.CodeType; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/CityObjectPropertiesExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/CityObjectPropertiesExporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/CityObjectPropertiesExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/CityObjectPropertiesExporter.java index 5809304811b478c49b1998d0a0448af5d7d5274b..982dc11e35ef3b64b049bdbf3e359d2c84074b37 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/CityObjectPropertiesExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/CityObjectPropertiesExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.config.geometry.GeometryObject; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/ExportManager.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ExportManager.java similarity index 95% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/ExportManager.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/ExportManager.java index 2bdf3871923fd9a0b66c0ae4a009d77964f3b7f1..e2c6c1e1325be0cd31d0db08698c71b7711b8480 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/ExportManager.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ExportManager.java @@ -1,9 +1,9 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import de.stuttgart.hft.ade.energy2.schema.ObjectMapper; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ObjectMapper; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.core.ade.exporter.ADEExportManager; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; @@ -12,7 +12,6 @@ import org.citydb.core.database.schema.mapping.FeatureType; import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.query.filter.projection.ProjectionFilter; import org.citygml4j.ade.energy.model.core.AbstractResource; -import org.citygml4j.ade.energy.model.core.QualifiedHeight; import org.citygml4j.ade.energy.model.core.WeatherData; import org.citygml4j.ade.energy.model.supportingClasses.*; import org.citygml4j.model.citygml.ade.binding.ADEModelObject; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/RefurbishmentMeasureExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/RefurbishmentMeasureExporter.java similarity index 98% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/RefurbishmentMeasureExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/RefurbishmentMeasureExporter.java index b1306ce9c07dd17090d9a5e98be50f6e1093c5ef..cce9512f23812d8948ac34a8572682d17a99589f 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/RefurbishmentMeasureExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/RefurbishmentMeasureExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.AbstractType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/ResourceExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java similarity index 99% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/ResourceExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java index 2a8d8387df936201d802a3cde3b1ff227407013d..877ee25f2a59b53fd10448c6c0817b9611e66c3c 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/ResourceExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.ObjectType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/TimeSeriesExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java similarity index 99% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/TimeSeriesExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java index 3d79a6c83b36ef3545cc427d36256a7d30c10302..768a8bad307033855ef076b7b428d054826a86d2 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/TimeSeriesExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.operation.exporter.CityGMLExportException; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/UrbanFunctionAreaExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/UrbanFunctionAreaExporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/UrbanFunctionAreaExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/UrbanFunctionAreaExporter.java index 3853f7d5067d5df2f966472e87c74f98b2bebe16..be8c2214c4fa26026ec2826c7701ab52950c654d 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/UrbanFunctionAreaExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/UrbanFunctionAreaExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.AbstractType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherDataExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherDataExporter.java similarity index 98% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherDataExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherDataExporter.java index 7e4dbac1ce5213790c8f2e76ee30315d854f00da..c4bfa4f6e1b4b50dc12e96e18b2c1fa2633d6249 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherDataExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherDataExporter.java @@ -1,10 +1,9 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.config.geometry.GeometryObject; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; -import org.citydb.core.database.schema.mapping.AbstractType; import org.citydb.core.database.schema.mapping.ObjectType; import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.operation.exporter.database.content.GMLConverter; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherStationExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherStationExporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherStationExporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherStationExporter.java index 9d29db384339dbbc5d9340b183c503e8b9bcf69d..ce18c92cfe023f5b3e0ecf73ecacc5d73335c099 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherStationExporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherStationExporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.exporter; +package de.stuttgart.hft.ade.energy3.exporter; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.database.schema.mapping.AbstractType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractBuildingImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractBuildingImporter.java similarity index 95% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractBuildingImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractBuildingImporter.java index 5233a49567c198f6da2d56008b947b0e282d357d..54b4772de4d21228c60500c44cc27428b91e680c 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractBuildingImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractBuildingImporter.java @@ -1,7 +1,7 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.config.geometry.GeometryObject; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.ADEPropertyCollection; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractDeviceImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractDeviceImporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractDeviceImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractDeviceImporter.java index 0d6af2824fe6d7dbcd19c4bd8c33a2bbc7ba79a4..d21fdd82a4044c7010175a043928a6827655d286 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractDeviceImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractDeviceImporter.java @@ -1,7 +1,7 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractQualifiedAttributeImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractQualifiedAttributeImporter.java similarity index 89% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractQualifiedAttributeImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractQualifiedAttributeImporter.java index 6091a2267129dc9730925669e5f5c90c3a669b43..30a684f8e98f0b4587ac3ae17b8fe439c8b204f3 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractQualifiedAttributeImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractQualifiedAttributeImporter.java @@ -1,23 +1,15 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADESequence; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.schema.ADESequence; +import de.stuttgart.hft.ade.energy3.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; -import org.citydb.core.ade.importer.ForeignKeys; -import org.citydb.core.database.schema.mapping.AbstractObjectType; import org.citydb.core.database.schema.mapping.ComplexType; -import org.citydb.core.database.schema.mapping.ObjectType; import org.citydb.core.database.schema.mapping.SchemaMapping; import org.citydb.core.operation.importer.CityGMLImportException; import org.citydb.core.operation.importer.util.GeometryConverter; import org.citydb.core.registry.ObjectRegistry; -import org.citydb.core.util.Util; -import org.citygml4j.ade.energy.model.core.AbstractQualifiedAttribute; -import org.citygml4j.ade.energy.model.core.QualifiedArea; -import org.citygml4j.ade.energy.model.core.QualifiedHeight; -import org.citygml4j.ade.energy.model.core.QualifiedVolume; import org.sig3d.citygml.energyADE2beta7.AbstractQualifiedAttributeType; import org.sig3d.citygml.energyADE2beta7.QualifiedAreaType; import org.sig3d.citygml.energyADE2beta7.QualifiedHeightType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/BuildingPropertiesImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java similarity index 98% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/BuildingPropertiesImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java index b29b7f7407bb0e7137afb2d371d7a58df388362a..69cff680c9d32a7a2afeb4d772111dac95338ab5 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/BuildingPropertiesImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java @@ -1,7 +1,7 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.ADEPropertyCollection; import org.citydb.core.ade.importer.CityGMLImportHelper; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectPropertiesImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectPropertiesImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java index 82198ca59b4de55bf50fd7f7e964bfee9d43fd88..1be4a09bb5d07303b909c8a255417ad4767d0bed 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectPropertiesImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java @@ -1,7 +1,7 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.config.geometry.GeometryObject; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.ADEPropertyCollection; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectRelationImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectRelationImporter.java similarity index 96% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectRelationImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectRelationImporter.java index 0d1945bcd7e88f62d23bda330268174dd33f06bb..0903bf27eafdc543aa6b0dabc8412b9a78eabfa5 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectRelationImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectRelationImporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/DeviceOperationImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/DeviceOperationImporter.java similarity index 93% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/DeviceOperationImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/DeviceOperationImporter.java index cc0aca461afd949d2a261a7587f244fc0ca4510f..bbf801649ed7d9dbffddb6d72e7a07f911b684ff 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/DeviceOperationImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/DeviceOperationImporter.java @@ -1,7 +1,7 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/EnergyPerformanceCertificateImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/EnergyPerformanceCertificateImporter.java similarity index 96% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/EnergyPerformanceCertificateImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/EnergyPerformanceCertificateImporter.java index 015f5724b4701f44caba54a97591d04990307f14..10203aa3eb3bdaa28bfa78bce5582edf38805905 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/EnergyPerformanceCertificateImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/EnergyPerformanceCertificateImporter.java @@ -1,7 +1,6 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import org.citydb.config.geometry.GeometryObject; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/ImportManager.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/ImportManager.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java index 0df005344d50462c6f0932f939b6a3a4cc7623cb..297d748d40724165e416c9aff8c0c63707653366 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/ImportManager.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java @@ -1,8 +1,8 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.core.ade.ADEExtension; import org.citydb.core.ade.importer.*; import org.citydb.core.database.schema.mapping.AbstractObjectType; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/RefurbishmentMeasureImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/RefurbishmentMeasureImporter.java similarity index 94% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/RefurbishmentMeasureImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/RefurbishmentMeasureImporter.java index 45564cbe4c2f141e7f70e02c7bbc77845d9c76a4..0bf8296ec86d07e16cb06b37f93c3014060e4784 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/RefurbishmentMeasureImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/RefurbishmentMeasureImporter.java @@ -1,8 +1,7 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADESequence; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; +import de.stuttgart.hft.ade.energy3.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.SchemaMapper; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/ResourceImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ResourceImporter.java similarity index 99% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/ResourceImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/ResourceImporter.java index 4661db3261afb1b952e418fbdc2ba87cb8f85901..59908cae2b14cb7ef57c35b7ba0e6ae57e301064 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/ResourceImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ResourceImporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/TimeSeriesImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java similarity index 99% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/TimeSeriesImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java index 120ac5972349af9f12b2f11e9f76e02a4ba3c95c..ed5ef6265262b667ce523d4df924c817ff304de0 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/TimeSeriesImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/UrbanFunctionAreaImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/UrbanFunctionAreaImporter.java similarity index 94% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/UrbanFunctionAreaImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/UrbanFunctionAreaImporter.java index 571a0b71125d2516a53a0974df155d8cf423b3d9..4d10b5befec07cf8cbc213362872909c8237b3c8 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/UrbanFunctionAreaImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/UrbanFunctionAreaImporter.java @@ -1,7 +1,6 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; -import org.citydb.config.geometry.GeometryObject; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/UtilityNetworkConnectionImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/UtilityNetworkConnectionImporter.java similarity index 97% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/UtilityNetworkConnectionImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/UtilityNetworkConnectionImporter.java index aeff0488c2833e12aae15024b2f6a6dc4b8dec98..51451986bd21ff067e85542f63df4d47354e6f6b 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/UtilityNetworkConnectionImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/UtilityNetworkConnectionImporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.ForeignKeys; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherDataImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java similarity index 94% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherDataImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java index ddf69cd7d2e144794d42d152fe24722e803f6ace..d5978b159e74a627f28647171e63292515c10a91 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherDataImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.config.geometry.GeometryObject; import org.citydb.core.ade.importer.ADEImporter; @@ -11,8 +11,6 @@ import org.citydb.core.operation.importer.CityGMLImportException; import org.citydb.core.operation.importer.util.GeometryConverter; import org.citygml4j.ade.energy.model.core.ReferencePointProperty; import org.citygml4j.ade.energy.model.core.WeatherData; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractTimeSeries; -import org.citygml4j.ade.energy.model.supportingClasses.AbstractTimeSeriesProperty; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherStationImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherStationImporter.java similarity index 96% rename from src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherStationImporter.java rename to src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherStationImporter.java index 0ac97798d27993950090d871f6e5b9423dca36de..8e25ed7a85c52a25c586e2d4ef89bf6fcf1ff258 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/importer/WeatherStationImporter.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherStationImporter.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.importer; +package de.stuttgart.hft.ade.energy3.importer; -import de.stuttgart.hft.ade.energy2.schema.ADETable; +import de.stuttgart.hft.ade.energy3.schema.ADETable; import org.citydb.config.geometry.GeometryObject; import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.CityGMLImportHelper; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADESequence.java b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADESequence.java new file mode 100644 index 0000000000000000000000000000000000000000..5249bd3fce7e63af555c30258e6dc0b65c6e948b --- /dev/null +++ b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADESequence.java @@ -0,0 +1,15 @@ +package de.stuttgart.hft.ade.energy3.schema; + +public enum ADESequence { + //VOLUMETYPE_SEQ, + //FLOORAREA_SEQ, + QUALIFIED_ATTRIBUTE_SEQ, + //HEATEXCHANGETYPE_SEQ, + //TRANSMITTANCE_SEQ, + //OPTICALPROPERTIES_SEQ, + //REFLECTANCE_SEQ, + //TIMEVALUESPROPERTI_SEQ, + //PERIODOFYEAR_SEQ, + //DAILYSCHEDULE_SEQ, + //REFURBISHMENT_MEASURE_SEQ +} diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ADETable.java b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java similarity index 73% rename from src/main/java/de/stuttgart/hft/ade/energy2/schema/ADETable.java rename to src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java index 86fa28636d40b4a367dfe392b21f77cb376b5bf1..5bcd84c2d22a8e92b9869d2ae94c0cb08692301e 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ADETable.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java @@ -1,8 +1,7 @@ -package de.stuttgart.hft.ade.energy2.schema; +package de.stuttgart.hft.ade.energy3.schema; -import de.stuttgart.hft.ade.energy2.importer.*; +import de.stuttgart.hft.ade.energy3.importer.*; import org.citydb.core.ade.importer.ADEImporter; -import org.citygml4j.ade.energy.model.core.AbstractQualifiedAttribute; public enum ADETable { ADDRESS_TO_BUILDING_UNIT(null), @@ -13,38 +12,38 @@ public enum ADETable { DEVICE(AbstractDeviceImporter.class), DEVICE_OPERATION(DeviceOperationImporter.class), ENERGY_PERF_CERT(EnergyPerformanceCertificateImporter.class), - FACILITIES(null), - HEAT_EXCHANGE_TYPE(null), - IMAGE_TEXTURE(null), + //FACILITIES(null), + //HEAT_EXCHANGE_TYPE(null), + //IMAGE_TEXTURE(null), LAYERED_CONSTRUCTION(null), - LAYER_COMPONENT(null), + //LAYER_COMPONENT(null), LAYER(null), LIBRARY(null), MATERIAL(null), OCCUPANTS(null), OPENING(null), OPTICAL_PROPERTY(null), - PERIOD_OF_YEAR(null), + //PERIOD_OF_YEAR(null), QUALIFIED_ATTRIBUTE(AbstractQualifiedAttributeImporter.class), RESOURCE(ResourceImporter.class), REFURBISHMENT_MEASURE(RefurbishmentMeasureImporter.class), SCHEDULE(null), - SYSTEM_OPERATION(null), + SCHEDULE_COMPONENT(null), + //SYSTEM_OPERATION(null), SOLAR_COLLECTOR(null), - STORAGE_SYSTEM(null), + //STORAGE_SYSTEM(null), STORAGE_DEVICE(null), - SENSOR_CONNECTION(null), - SOLAR_ENERGY_SYSTEM(null), + //SENSOR_CONNECTION(null), + //SOLAR_ENERGY_SYSTEM(null), SUITABILITY(null), - SCHEDULE_COMPONENT(null), - THERMAL_BOUNDARY(null), - THERMAL_OPENING(null), + //THERMAL_BOUNDARY(null), + //THERMAL_OPENING(null), THEM_SURF_TO_THERMAL_ZONE(null), THEMATIC_SURFACE(null), - THERMAL_ZONE(null), + //THERMAL_ZONE(null), TIME_SERIES(TimeSeriesImporter.class), URBAN_FUNCTION_AREA(UrbanFunctionAreaImporter.class), - USAGE_ZONE(null), + //USAGE_ZONE(null), UTL_NTW_CONNECTION(UtilityNetworkConnectionImporter.class), WEATHER_DATA(WeatherDataImporter.class); diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ObjectMapper.java b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ObjectMapper.java similarity index 99% rename from src/main/java/de/stuttgart/hft/ade/energy2/schema/ObjectMapper.java rename to src/main/java/de/stuttgart/hft/ade/energy3/schema/ObjectMapper.java index 8cc39c7542376456dab4d81aa67ed1c074aa2b23..dc34d1ea94e2ef740b3093dcf409edeeb39ab2f2 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/schema/ObjectMapper.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/schema/ObjectMapper.java @@ -1,6 +1,6 @@ -package de.stuttgart.hft.ade.energy2.schema; +package de.stuttgart.hft.ade.energy3.schema; import org.citydb.core.ade.ADEExtensionException; import org.citydb.core.ade.ADEObjectMapper; diff --git a/src/main/java/de/stuttgart/hft/ade/energy2/schema/SchemaMapper.java b/src/main/java/de/stuttgart/hft/ade/energy3/schema/SchemaMapper.java similarity index 96% rename from src/main/java/de/stuttgart/hft/ade/energy2/schema/SchemaMapper.java rename to src/main/java/de/stuttgart/hft/ade/energy3/schema/SchemaMapper.java index 6af9fffdbdefd60945ac5c864ba1a01e0ae54ada..f37604367f40ad9643e7181a70df5a1d5cbf3eca 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy2/schema/SchemaMapper.java +++ b/src/main/java/de/stuttgart/hft/ade/energy3/schema/SchemaMapper.java @@ -1,4 +1,4 @@ -package de.stuttgart.hft.ade.energy2.schema; +package de.stuttgart.hft.ade.energy3.schema; import java.util.EnumMap; import java.util.Map; diff --git a/src/main/resources/META-INF/services/org.citydb.core.ade.ADEExtension b/src/main/resources/META-INF/services/org.citydb.core.ade.ADEExtension index 70ec67016b232da19eaa9c7cb1d824c9fff995ab..829ecbada97d00b172d60612912fb3aac9ba5486 100644 --- a/src/main/resources/META-INF/services/org.citydb.core.ade.ADEExtension +++ b/src/main/resources/META-INF/services/org.citydb.core.ade.ADEExtension @@ -1 +1 @@ -de.stuttgart.hft.EnergyADEExtension \ No newline at end of file +de.stuttgart.hft.EnergyADE3Extension \ No newline at end of file