Skip to content
GitLab
Commit 40a7f279 authored by Rushikesh Padsala's avatar Rushikesh Padsala
Browse files

refactored to ade.energy3 and code clean up

parent fe46eb27
Show whitespace changes
Inline Side-by-side
src/main/java/de/stuttgart/hft/EnergyADEExtension.java → src/main/java/de/stuttgart/hft/EnergyADE3Extension.java
View file @ 40a7f279
package de.stuttgart.hft; package de.stuttgart.hft;
import de.stuttgart.hft.ade.energy2.exporter.ExportManager; import de.stuttgart.hft.ade.energy3.exporter.ExportManager;
import de.stuttgart.hft.ade.energy2.importer.ImportManager; import de.stuttgart.hft.ade.energy3.importer.ImportManager;
import de.stuttgart.hft.ade.energy2.schema.ObjectMapper; import de.stuttgart.hft.ade.energy3.schema.ObjectMapper;
import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; import de.stuttgart.hft.ade.energy3.schema.SchemaMapper;
import org.citydb.core.ade.ADEExtension; import org.citydb.core.ade.ADEExtension;
import org.citydb.core.ade.ADEExtensionException; import org.citydb.core.ade.ADEExtensionException;
import org.citydb.core.ade.ADEObjectMapper; import org.citydb.core.ade.ADEObjectMapper;
...@@ -18,13 +18,13 @@ import java.nio.file.Paths; ...@@ -18,13 +18,13 @@ import java.nio.file.Paths;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
public class EnergyADEExtension extends ADEExtension { public class EnergyADE3Extension extends ADEExtension {
private final ObjectMapper objectMapper = new ObjectMapper(); private final ObjectMapper objectMapper = new ObjectMapper();
private final SchemaMapper schemaMapper = new SchemaMapper(); private final SchemaMapper schemaMapper = new SchemaMapper();
private final EnergyADEContext context = new EnergyADEContext(); private final EnergyADEContext context = new EnergyADEContext();
public static void main(String[] args) { public static void main(String[] args) {
EnergyADEExtension adeExtension = new EnergyADEExtension(); EnergyADE3Extension adeExtension = new EnergyADE3Extension();
adeExtension.setBasePath(Paths.get("resources/database").toAbsolutePath()); adeExtension.setBasePath(Paths.get("resources/database").toAbsolutePath());
new ImpExpLauncher().withArgs(args) new ImpExpLauncher().withArgs(args)
.withADEExtension(adeExtension) .withADEExtension(adeExtension)
......
src/main/java/de/stuttgart/hft/ade/energy2/schema/ADESequence.java deleted 100644 → 0
View file @ fe46eb27
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
}
src/main/java/de/stuttgart/hft/ade/energy2/exporter/AbstractQualifiedAttributeExporter.java → src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java
View file @ 40a7f279
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.ADEExporter;
import org.citydb.core.ade.exporter.CityGMLExportHelper; 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.ComplexType;
import org.citydb.core.database.schema.mapping.SchemaMapping; import org.citydb.core.database.schema.mapping.SchemaMapping;
import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.operation.exporter.CityGMLExportException;
import org.citydb.core.query.filter.projection.ProjectionFilter;
import org.citydb.core.registry.ObjectRegistry; import org.citydb.core.registry.ObjectRegistry;
import org.citygml4j.ade.energy.model.core.*; import org.citygml4j.ade.energy.model.core.*;
import org.citygml4j.ade.energy.model.module.EnergyADEModule; import org.citygml4j.ade.energy.model.module.EnergyADEModule;
...@@ -31,8 +29,8 @@ public class AbstractQualifiedAttributeExporter implements ADEExporter { ...@@ -31,8 +29,8 @@ public class AbstractQualifiedAttributeExporter implements ADEExporter {
private final CityGMLExportHelper helper; private final CityGMLExportHelper helper;
private final ExportManager manager; private final ExportManager manager;
private final Connection connection; private final Connection connection;
private WeatherDataExporter weatherDataExporter; //private WeatherDataExporter weatherDataExporter;
private ResourceExporter resourceExporter; //private ResourceExporter resourceExporter;
private String module; private String module;
private Map<Integer, Class <? extends AbstractQualifiedAttribute>> attributeClassMap; private Map<Integer, Class <? extends AbstractQualifiedAttribute>> attributeClassMap;
......
src/main/java/de/stuttgart/hft/ade/energy2/exporter/BuildingPropertiesExporter.java → src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java
View file @ 40a7f279
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 net.opengis.gml.CodeType;
import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.ADEExporter;
import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.ade.exporter.CityGMLExportHelper;
......
src/main/java/de/stuttgart/hft/ade/energy2/exporter/CityObjectPropertiesExporter.java → src/main/java/de/stuttgart/hft/ade/energy3/exporter/CityObjectPropertiesExporter.java
View file @ 40a7f279
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.config.geometry.GeometryObject;
import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.ADEExporter;
import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.ade.exporter.CityGMLExportHelper;
......
src/main/java/de/stuttgart/hft/ade/energy2/exporter/ExportManager.java → src/main/java/de/stuttgart/hft/ade/energy3/exporter/ExportManager.java
View file @ 40a7f279
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 de.stuttgart.hft.ade.energy2.schema.ObjectMapper; import de.stuttgart.hft.ade.energy3.schema.ObjectMapper;
import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; import de.stuttgart.hft.ade.energy3.schema.SchemaMapper;
import org.citydb.core.ade.exporter.ADEExportManager; import org.citydb.core.ade.exporter.ADEExportManager;
import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.ADEExporter;
import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.ade.exporter.CityGMLExportHelper;
...@@ -12,7 +12,6 @@ import org.citydb.core.database.schema.mapping.FeatureType; ...@@ -12,7 +12,6 @@ import org.citydb.core.database.schema.mapping.FeatureType;
import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.operation.exporter.CityGMLExportException;
import org.citydb.core.query.filter.projection.ProjectionFilter; import org.citydb.core.query.filter.projection.ProjectionFilter;
import org.citygml4j.ade.energy.model.core.AbstractResource; 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.core.WeatherData;
import org.citygml4j.ade.energy.model.supportingClasses.*; import org.citygml4j.ade.energy.model.supportingClasses.*;
import org.citygml4j.model.citygml.ade.binding.ADEModelObject; import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
......
src/main/java/de/stuttgart/hft/ade/energy2/exporter/RefurbishmentMeasureExporter.java → src/main/java/de/stuttgart/hft/ade/energy3/exporter/RefurbishmentMeasureExporter.java
View file @ 40a7f279
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.ADEExporter;
import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.ade.exporter.CityGMLExportHelper;
import org.citydb.core.database.schema.mapping.AbstractType; import org.citydb.core.database.schema.mapping.AbstractType;
......
src/main/java/de/stuttgart/hft/ade/energy2/exporter/ResourceExporter.java → src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java
View file @ 40a7f279
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.ADEExporter;
import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.ade.exporter.CityGMLExportHelper;
import org.citydb.core.database.schema.mapping.ObjectType; import org.citydb.core.database.schema.mapping.ObjectType;
......
src/main/java/de/stuttgart/hft/ade/energy2/exporter/TimeSeriesExporter.java → src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java
View file @ 40a7f279
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.ADEExporter;
import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.ade.exporter.CityGMLExportHelper;
import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.operation.exporter.CityGMLExportException;
......
src/main/java/de/stuttgart/hft/ade/energy2/exporter/UrbanFunctionAreaExporter.java → src/main/java/de/stuttgart/hft/ade/energy3/exporter/UrbanFunctionAreaExporter.java
View file @ 40a7f279
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.ADEExporter;
import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.ade.exporter.CityGMLExportHelper;
import org.citydb.core.database.schema.mapping.AbstractType; import org.citydb.core.database.schema.mapping.AbstractType;
......
src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherDataExporter.java → src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherDataExporter.java
View file @ 40a7f279
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.config.geometry.GeometryObject;
import org.citydb.core.ade.exporter.ADEExporter; import org.citydb.core.ade.exporter.ADEExporter;
import org.citydb.core.ade.exporter.CityGMLExportHelper; 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.database.schema.mapping.ObjectType;
import org.citydb.core.operation.exporter.CityGMLExportException; import org.citydb.core.operation.exporter.CityGMLExportException;
import org.citydb.core.operation.exporter.database.content.GMLConverter; import org.citydb.core.operation.exporter.database.content.GMLConverter;
......
src/main/java/de/stuttgart/hft/ade/energy2/exporter/WeatherStationExporter.java → src/main/java/de/stuttgart/hft/ade/energy3/exporter/WeatherStationExporter.java
View file @ 40a7f279
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.ADEExporter;
import org.citydb.core.ade.exporter.CityGMLExportHelper; import org.citydb.core.ade.exporter.CityGMLExportHelper;
import org.citydb.core.database.schema.mapping.AbstractType; import org.citydb.core.database.schema.mapping.AbstractType;
......
src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractBuildingImporter.java → src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractBuildingImporter.java
View file @ 40a7f279
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 de.stuttgart.hft.ade.energy2.schema.SchemaMapper; import de.stuttgart.hft.ade.energy3.schema.SchemaMapper;
import org.citydb.config.geometry.GeometryObject; import org.citydb.config.geometry.GeometryObject;
import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.ADEImporter;
import org.citydb.core.ade.importer.ADEPropertyCollection; import org.citydb.core.ade.importer.ADEPropertyCollection;
......
src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractDeviceImporter.java → src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractDeviceImporter.java
View file @ 40a7f279
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 de.stuttgart.hft.ade.energy2.schema.SchemaMapper; import de.stuttgart.hft.ade.energy3.schema.SchemaMapper;
import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.ADEImporter;
import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.CityGMLImportHelper;
import org.citydb.core.ade.importer.ForeignKeys; import org.citydb.core.ade.importer.ForeignKeys;
......
src/main/java/de/stuttgart/hft/ade/energy2/importer/AbstractQualifiedAttributeImporter.java → src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractQualifiedAttributeImporter.java
View file @ 40a7f279
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.energy3.schema.ADESequence;
import de.stuttgart.hft.ade.energy2.schema.ADETable; import de.stuttgart.hft.ade.energy3.schema.ADETable;
import de.stuttgart.hft.ade.energy2.schema.SchemaMapper; import de.stuttgart.hft.ade.energy3.schema.SchemaMapper;
import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.ADEImporter;
import org.citydb.core.ade.importer.CityGMLImportHelper; 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.ComplexType;
import org.citydb.core.database.schema.mapping.ObjectType;
import org.citydb.core.database.schema.mapping.SchemaMapping; import org.citydb.core.database.schema.mapping.SchemaMapping;
import org.citydb.core.operation.importer.CityGMLImportException; import org.citydb.core.operation.importer.CityGMLImportException;
import org.citydb.core.operation.importer.util.GeometryConverter; import org.citydb.core.operation.importer.util.GeometryConverter;
import org.citydb.core.registry.ObjectRegistry; 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.AbstractQualifiedAttributeType;
import org.sig3d.citygml.energyADE2beta7.QualifiedAreaType; import org.sig3d.citygml.energyADE2beta7.QualifiedAreaType;
import org.sig3d.citygml.energyADE2beta7.QualifiedHeightType; import org.sig3d.citygml.energyADE2beta7.QualifiedHeightType;
......
src/main/java/de/stuttgart/hft/ade/energy2/importer/BuildingPropertiesImporter.java → src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java
View file @ 40a7f279
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 de.stuttgart.hft.ade.energy2.schema.SchemaMapper; import de.stuttgart.hft.ade.energy3.schema.SchemaMapper;
import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.ADEImporter;
import org.citydb.core.ade.importer.ADEPropertyCollection; import org.citydb.core.ade.importer.ADEPropertyCollection;
import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.CityGMLImportHelper;
......
src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectPropertiesImporter.java → src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java
View file @ 40a7f279
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 de.stuttgart.hft.ade.energy2.schema.SchemaMapper; import de.stuttgart.hft.ade.energy3.schema.SchemaMapper;
import org.citydb.config.geometry.GeometryObject; import org.citydb.config.geometry.GeometryObject;
import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.ADEImporter;
import org.citydb.core.ade.importer.ADEPropertyCollection; import org.citydb.core.ade.importer.ADEPropertyCollection;
......
src/main/java/de/stuttgart/hft/ade/energy2/importer/CityObjectRelationImporter.java → src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectRelationImporter.java
View file @ 40a7f279
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.ADEImporter;
import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.CityGMLImportHelper;
import org.citydb.core.ade.importer.ForeignKeys; import org.citydb.core.ade.importer.ForeignKeys;
......
src/main/java/de/stuttgart/hft/ade/energy2/importer/DeviceOperationImporter.java → src/main/java/de/stuttgart/hft/ade/energy3/importer/DeviceOperationImporter.java
View file @ 40a7f279
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 de.stuttgart.hft.ade.energy2.schema.SchemaMapper; import de.stuttgart.hft.ade.energy3.schema.SchemaMapper;
import org.citydb.core.ade.importer.ADEImporter; import org.citydb.core.ade.importer.ADEImporter;
import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.CityGMLImportHelper;
import org.citydb.core.ade.importer.ForeignKeys; import org.citydb.core.ade.importer.ForeignKeys;
......
src/main/java/de/stuttgart/hft/ade/energy2/importer/EnergyPerformanceCertificateImporter.java → src/main/java/de/stuttgart/hft/ade/energy3/importer/EnergyPerformanceCertificateImporter.java
View file @ 40a7f279
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.ADEImporter;
import org.citydb.core.ade.importer.CityGMLImportHelper; import org.citydb.core.ade.importer.CityGMLImportHelper;
import org.citydb.core.ade.importer.ForeignKeys; import org.citydb.core.ade.importer.ForeignKeys;
......
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal