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.

Sign up for GitHub

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

Jump to bottom

Feature/fix geog dimension metadata #66

Merged
merged 4 commits into from
Jan 10, 2023
Merged

Feature/fix geog dimension metadata #66

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1006aa
add logs for debugging
andre-urbani Dec 22, 2022
a97611d
amend description log
andre-urbani Dec 22, 2022
e02bcb3
update to fix geography dimension not pulling through on filtered dat…
andre-urbani Jan 5, 2023
c0cca67
address comments
andre-urbani Jan 10, 2023
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
26 changes: 23 additions & 3 deletions handler/cantabular_metadata_export.go
View file
Open in desktop
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,29 @@ func (h *CantabularMetadataExport) Handle(ctx context.Context, workerID int, msg
}
}
}
for _, d := range m.Version.Dimensions {

areaTypeFound = false

for i, d := range m.Version.Dimensions {
if *d.IsAreaType {
d.Label = areaTypeLabel
d.Description = areaTypeDescription
m.Version.Dimensions[i].Label = areaTypeLabel
m.Version.Dimensions[i].Description = areaTypeDescription
m.Version.Dimensions[i].ID = areaTypeId
m.Version.Dimensions[i].NumberOfOptions = numberOfOptions
areaTypeFound = true
break
}
}

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

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