Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Energy ADE
Energy ADE 3 3DCityDB
Commits
55064798
Commit
55064798
authored
Feb 27, 2026
by
PrabithaPrabhakaran
Browse files
remove include from settings.gradle, add todo comments
parent
d06b334b
Changes
3
Show whitespace changes
Inline
Side-by-side
src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java
View file @
55064798
...
@@ -43,8 +43,6 @@ public class ResourceExporter implements ADEExporter {
...
@@ -43,8 +43,6 @@ public class ResourceExporter implements ADEExporter {
long
objectId
=
rs
.
getLong
(
1
);
long
objectId
=
rs
.
getLong
(
1
);
int
objectClassId
=
rs
.
getInt
(
2
);
int
objectClassId
=
rs
.
getInt
(
2
);
if
(
rs
.
wasNull
())
continue
;
AbstractResource
resource
=
AbstractResource
resource
=
helper
.
createObject
(
objectId
,
objectClassId
,
AbstractResource
.
class
);
helper
.
createObject
(
objectId
,
objectClassId
,
AbstractResource
.
class
);
...
...
src/main/java/de/stuttgart/hft/ade/energy3/importer/CityObjectPropertiesImporter.java
View file @
55064798
...
@@ -32,6 +32,7 @@ public class CityObjectPropertiesImporter implements ADEImporter {
...
@@ -32,6 +32,7 @@ public class CityObjectPropertiesImporter implements ADEImporter {
this
.
manager
=
manager
;
this
.
manager
=
manager
;
this
.
connection
=
connection
;
this
.
connection
=
connection
;
// ps needs to be fixed.
ps
=
connection
.
prepareStatement
(
"INSERT INTO "
+
helper
.
getTableNameWithSchema
(
schemaMapper
.
getTableName
(
ADETable
.
CITYOBJECT
))
+
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 (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
);
" (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 {
...
@@ -41,6 +42,8 @@ public class CityObjectPropertiesImporter implements ADEImporter {
ps
.
setLong
(
1
,
parentId
);
ps
.
setLong
(
1
,
parentId
);
GeometryObject
geometryObject
=
null
;
GeometryObject
geometryObject
=
null
;
ReferencePointProperty
referencePoint
=
properties
.
getFirst
(
ReferencePointProperty
.
class
);
ReferencePointProperty
referencePoint
=
properties
.
getFirst
(
ReferencePointProperty
.
class
);
// Assigment is wrong, refactor according to new table structure.
if
(
referencePoint
!=
null
&&
referencePoint
.
isSetValue
())
if
(
referencePoint
!=
null
&&
referencePoint
.
isSetValue
())
geometryObject
=
helper
.
getGeometryConverter
().
getPoint
(
referencePoint
.
getValue
());
geometryObject
=
helper
.
getGeometryConverter
().
getPoint
(
referencePoint
.
getValue
());
if
(
geometryObject
!=
null
)
if
(
geometryObject
!=
null
)
...
...
src/main/java/de/stuttgart/hft/ade/energy3/schema/ADETable.java
View file @
55064798
...
@@ -6,24 +6,18 @@ import org.citydb.core.ade.importer.ADEImporter;
...
@@ -6,24 +6,18 @@ import org.citydb.core.ade.importer.ADEImporter;
public
enum
ADETable
{
public
enum
ADETable
{
ADDRESS_TO_BUILDING_UNIT
(
null
),
ADDRESS_TO_BUILDING_UNIT
(
null
),
BUILDING
(
BuildingPropertiesImporter
.
class
),
BUILDING
(
BuildingPropertiesImporter
.
class
),
//BUILDING_PARTITION(null),
CITYOBJECT
(
CityObjectPropertiesImporter
.
class
),
CITYOBJECT
(
CityObjectPropertiesImporter
.
class
),
CTYOBJ_RELATION
(
null
),
CTYOBJ_RELATION
(
null
),
DEVICE
(
AbstractDeviceImporter
.
class
),
DEVICE
(
AbstractDeviceImporter
.
class
),
DEVICE_OPERATION
(
DeviceOperationImporter
.
class
),
DEVICE_OPERATION
(
DeviceOperationImporter
.
class
),
ENERGY_PERF_CERT
(
EnergyPerformanceCertificateImporter
.
class
),
ENERGY_PERF_CERT
(
EnergyPerformanceCertificateImporter
.
class
),
//FACILITIES(null),
//HEAT_EXCHANGE_TYPE(null),
//IMAGE_TEXTURE(null),
LAYER
(
null
),
LAYER
(
null
),
LAYERED_CONSTRUCTION
(
null
),
LAYERED_CONSTRUCTION
(
null
),
//LAYER_COMPONENT(null),
LIBRARY
(
null
),
LIBRARY
(
null
),
MATERIAL
(
null
),
MATERIAL
(
null
),
OCCUPANTS
(
null
),
OCCUPANTS
(
null
),
OPENING
(
null
),
OPENING
(
null
),
OPTICAL_PROPERTY
(
null
),
OPTICAL_PROPERTY
(
null
),
//PERIOD_OF_YEAR(null),
QUALIFIED_ATTRIBUTE
(
AbstractQualifiedAttributeImporter
.
class
),
QUALIFIED_ATTRIBUTE
(
AbstractQualifiedAttributeImporter
.
class
),
REFURBISHMENT_MEASURE
(
RefurbishmentMeasureImporter
.
class
),
REFURBISHMENT_MEASURE
(
RefurbishmentMeasureImporter
.
class
),
RESOURCE
(
ResourceImporter
.
class
),
RESOURCE
(
ResourceImporter
.
class
),
...
@@ -31,24 +25,14 @@ public enum ADETable {
...
@@ -31,24 +25,14 @@ public enum ADETable {
SCHEDULE
(
null
),
SCHEDULE
(
null
),
SCHEDULE_COMPONENT
(
null
),
SCHEDULE_COMPONENT
(
null
),
SENSOR_DATA
(
null
),
SENSOR_DATA
(
null
),
//SYSTEM_OPERATION(null),
SOLAR_COLLECTOR
(
null
),
SOLAR_COLLECTOR
(
null
),
SPACE
(
null
),
SPACE
(
null
),
//STORAGE_SYSTEM(null),
STORAGE_DEVICE
(
null
),
STORAGE_DEVICE
(
null
),
//SENSOR_CONNECTION(null),
//SOLAR_ENERGY_SYSTEM(null),
SUITABILITY
(
null
),
SUITABILITY
(
null
),
//THERMAL_BOUNDARY(null),
//THERMAL_OPENING(null),
//THEM_SURF_TO_THERMAL_ZONE(null),
THEMATIC_SURFACE
(
null
),
THEMATIC_SURFACE
(
null
),
//THERMAL_ZONE(null),
TIME_SERIES
(
TimeSeriesImporter
.
class
),
TIME_SERIES
(
TimeSeriesImporter
.
class
),
URBAN_FUNCTION_AREA
(
UrbanFunctionAreaImporter
.
class
),
URBAN_FUNCTION_AREA
(
UrbanFunctionAreaImporter
.
class
),
//USAGE_ZONE(null),
UTL_NTW_CONNECTION
(
UtilityNetworkConnectionImporter
.
class
),
UTL_NTW_CONNECTION
(
UtilityNetworkConnectionImporter
.
class
),
//WEATHER_DATA(WeatherDataImporter.class);
ZONE_OPENING
(
null
),
ZONE_OPENING
(
null
),
ZONE_THEMATIC_SURFACE
(
null
);
ZONE_THEMATIC_SURFACE
(
null
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment