feat: include base element as property

christianbirchler-org · Aug 17, 2024 · faf2699 · faf2699
1 parent 0ff7b18
commit faf2699
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/core.go b/core.go
@@ -65,22 +65,18 @@ type TDataQualityRawData struct {
 
 // TODO: Doc formatting needs to be implemented!
 type THeader struct {
-	GeoReference THeaderGeoReference
-
-	Offset THeaderOffset
-
-	License TLicense
-
+	OpenDriveElement
+	GeoReference       THeaderGeoReference
+	Offset             THeaderOffset
+	License            TLicense
 	DefaultRegulations THeaderDefaultRegulations
 }
 
 // TODO: Doc formatting needs to be implemented!
 type THeaderDefaultRegulations struct {
-	RoadRegulations THeaderRoadRegulation
-
+	OpenDriveElement
+	RoadRegulations   THeaderRoadRegulation
 	SignalRegulations THeaderSignalRegulation
-
-	OpenDriveElement OpenDriveElement
 }
 
 // TODO: Doc formatting needs to be implemented!
@@ -89,19 +85,18 @@ type THeaderGeoReference struct {
 
 // TODO: Doc formatting needs to be implemented!
 type THeaderOffset struct {
+	OpenDriveElement
 }
 
 // TODO: Doc formatting needs to be implemented!
 type THeaderRoadRegulation struct {
-	OpenDriveElement OpenDriveElement
-
+	OpenDriveElement
 	Semantics TSignalsSemantics
 }
 
 // TODO: Doc formatting needs to be implemented!
 type THeaderSignalRegulation struct {
-	OpenDriveElement OpenDriveElement
-
+	OpenDriveElement
 	Semantics TSignalsSemantics
 }
 
@@ -112,6 +107,7 @@ type TInclude struct {
 
 // TODO: Doc formatting needs to be implemented!
 type TLicense struct {
+	OpenDriveElement
 }
 
 // TODO: Doc formatting needs to be implemented!

diff --git a/templates/core.tmpl b/templates/core.tmpl
@@ -10,12 +10,21 @@ package xodr
 {{range .ComplexType}}
     // {{ formatStructDocumentation .Annotation.Documentation.Text }}
     type {{ toCamel .Name }} struct {
+        {{$base := toCamel .ComplexContent.Extension.Base}}
+        {{toCamel $base}}
+
+
         {{- range .Attribute}}
-        {{ toCamel .Name}} {{mapPrimitives .Type}}
+        {{- if ne $base (toCamel .Type)}}
+        {{toCamel .Name}} {{mapPrimitives .Type}}
+        {{- end}}
         {{- end }}
 
-        {{range .ComplexContent.Extension.Sequence.Element}}
-        {{ toCamel .Name}} {{mapPrimitives .Type}}
-        {{end}}
+
+        {{- range .ComplexContent.Extension.Sequence.Element}}
+        {{- if ne $base (toCamel .Type)}}
+        {{toCamel .Name}} {{mapPrimitives .Type}}
+        {{- end}}
+        {{- end}}
     }
 {{end}}