Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/fix geog dimension metadata #66

Merged
merged 4 commits into from
Jan 10, 2023
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions handler/cantabular_metadata_export.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,15 @@ func (h *CantabularMetadataExport) Handle(ctx context.Context, workerID int, msg
}
areaTypeFound := false
var areaTypeLabel string
var areaTypeId string
var areaTypeDescription string
var numberOfOptions int
for _, fd := range filterModel.Dimensions {
if fd.IsAreaType != nil {
if *fd.IsAreaType {
areaTypeLabel = fd.Label
areaTypeId = fd.ID
numberOfOptions = len(fd.Options)
}
for _, area := range areaType.AreaTypes {
if area.Label == fd.Label {
Expand All @@ -143,13 +147,31 @@ func (h *CantabularMetadataExport) Handle(ctx context.Context, workerID int, msg
}
}
}

areaTypeFound = false

for _, d := range m.Version.Dimensions {
if *d.IsAreaType {
d.Label = areaTypeLabel
d.Description = areaTypeDescription
d.ID = areaTypeId
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you 100% sure this is working as expected? I'd half expect this not to update the dimensions of the original struct you're trying to, I might be wrong though.

d.NumberOfOptions = numberOfOptions
areaTypeFound = true
break
}
}

if !areaTypeFound {
areaTypeDimension := []dataset.VersionDimension{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be a slice?

{
Label: areaTypeLabel,
Description: areaTypeDescription,
ID: areaTypeId,
NumberOfOptions: numberOfOptions,
},
}
m.Version.Dimensions = append(m.Version.Dimensions, areaTypeDimension...)
}
}

isPublished, err := h.isVersionPublished(ctx, e)
Expand Down