Commit 55064798 authored by PrabithaPrabhakaran's avatar PrabithaPrabhakaran
Browse files

remove include from settings.gradle, add todo comments

parent d06b334b
......@@ -43,8 +43,6 @@ public class ResourceExporter implements ADEExporter {
long objectId = rs.getLong(1);
int objectClassId = rs.getInt(2);
if (rs.wasNull())
continue;
AbstractResource resource =
helper.createObject(objectId, objectClassId, AbstractResource.class);
......
......@@ -32,6 +32,7 @@ public class CityObjectPropertiesImporter implements ADEImporter {
this.manager = manager;
this.connection=connection;
// ps needs to be fixed.
ps = connection.prepareStatement("INSERT INTO " + helper.getTableNameWithSchema(schemaMapper.getTableName(ADETable.CITYOBJECT)) +
" (id, objectclass_id, gmlid, gmlid_codespace, name, name_codespace, description, envelope, creation_date, termination_date, relative_to_terrain, relative_to_water, last_modification_date, updating_person, reason_for_update, lineage, xml_source) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
......@@ -41,6 +42,8 @@ public class CityObjectPropertiesImporter implements ADEImporter {
ps.setLong(1, parentId);
GeometryObject geometryObject = null;
ReferencePointProperty referencePoint = properties.getFirst(ReferencePointProperty.class);
// Assigment is wrong, refactor according to new table structure.
if (referencePoint != null && referencePoint.isSetValue())
geometryObject = helper.getGeometryConverter().getPoint(referencePoint.getValue());
if (geometryObject != null)
......
......@@ -6,24 +6,18 @@ import org.citydb.core.ade.importer.ADEImporter;
public enum ADETable {
ADDRESS_TO_BUILDING_UNIT(null),
BUILDING(BuildingPropertiesImporter.class),
//BUILDING_PARTITION(null),
CITYOBJECT(CityObjectPropertiesImporter.class),
CTYOBJ_RELATION(null),
DEVICE(AbstractDeviceImporter.class),
DEVICE_OPERATION(DeviceOperationImporter.class),
ENERGY_PERF_CERT(EnergyPerformanceCertificateImporter.class),
//FACILITIES(null),
//HEAT_EXCHANGE_TYPE(null),
//IMAGE_TEXTURE(null),
LAYER(null),
LAYERED_CONSTRUCTION(null),
//LAYER_COMPONENT(null),
LIBRARY(null),
MATERIAL(null),
OCCUPANTS(null),
OPENING(null),
OPTICAL_PROPERTY(null),
//PERIOD_OF_YEAR(null),
QUALIFIED_ATTRIBUTE(AbstractQualifiedAttributeImporter.class),
REFURBISHMENT_MEASURE(RefurbishmentMeasureImporter.class),
RESOURCE(ResourceImporter.class),
......@@ -31,24 +25,14 @@ public enum ADETable {
SCHEDULE(null),
SCHEDULE_COMPONENT(null),
SENSOR_DATA (null),
//SYSTEM_OPERATION(null),
SOLAR_COLLECTOR(null),
SPACE(null),
//STORAGE_SYSTEM(null),
STORAGE_DEVICE(null),
//SENSOR_CONNECTION(null),
//SOLAR_ENERGY_SYSTEM(null),
SUITABILITY(null),
//THERMAL_BOUNDARY(null),
//THERMAL_OPENING(null),
//THEM_SURF_TO_THERMAL_ZONE(null),
THEMATIC_SURFACE(null),
//THERMAL_ZONE(null),
TIME_SERIES(TimeSeriesImporter.class),
URBAN_FUNCTION_AREA(UrbanFunctionAreaImporter.class),
//USAGE_ZONE(null),
UTL_NTW_CONNECTION(UtilityNetworkConnectionImporter.class),
//WEATHER_DATA(WeatherDataImporter.class);
ZONE_OPENING(null),
ZONE_THEMATIC_SURFACE(null);
......
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