Skip to content
This repository has been archived by the owner on Aug 16, 2022. It is now read-only.

fix: dataset layers are not exported correctly #36

Merged
merged 3 commits into from
Aug 6, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
17 changes: 15 additions & 2 deletions pkg/layer/encoding/czml.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,26 @@ func (e *CZMLEncoder) encodeSingleLayer(li *merging.SealedLayerItem) (*czml.Feat
if li.Property.Field("location") != nil {
mimoham24 marked this conversation as resolved.
Show resolved Hide resolved
latlng, ok = li.Property.Field("location").PropertyValue.ValueLatLng()
mimoham24 marked this conversation as resolved.
Show resolved Hide resolved
if !ok {
return nil, errors.New("invalid value type")
dsll := li.Property.Field("location").DatasetValue.ValueLatLng()
mimoham24 marked this conversation as resolved.
Show resolved Hide resolved
if dsll != nil {
latlng = property.LatLng{
Lat: dsll.Lat,
Lng: dsll.Lng,
}
} else {
return nil, errors.New("invalid value type")
}
}

if li.Property.Field("height") != nil {
height, ok = li.Property.Field("height").PropertyValue.ValueNumber()
if !ok {
return nil, errors.New("invalid value type")
dsHeight := li.Property.Field("height").DatasetValue.ValueNumber()
if dsHeight != nil {
height = *dsHeight
} else {
return nil, errors.New("invalid value type")
}
}
position := czml.Position{
CartographicDegrees: []float64{latlng.Lng, latlng.Lat, height},
Expand Down
17 changes: 15 additions & 2 deletions pkg/layer/encoding/geojson.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,25 @@ func (e *GeoJSONEncoder) encodeSingleLayer(li *merging.SealedLayerItem) (*geojso
if li.Property.Field("location") != nil {
latlng, ok = li.Property.Field("location").PropertyValue.ValueLatLng()
if !ok {
return nil, errors.New("invalid value type")
dsll := li.Property.Field("location").DatasetValue.ValueLatLng()
if dsll != nil {
latlng = property.LatLng{
Lat: dsll.Lat,
Lng: dsll.Lng,
}
} else {
return nil, errors.New("invalid value type")
}
}
if li.Property.Field("height") != nil {
height, ok = li.Property.Field("height").PropertyValue.ValueNumber()
if !ok {
return nil, errors.New("invalid value type")
dsHeight := li.Property.Field("height").DatasetValue.ValueNumber()
if dsHeight != nil {
height = *dsHeight
} else {
return nil, errors.New("invalid value type")
}
}
geo = geojson.NewPointGeometry([]float64{latlng.Lng, latlng.Lat, height})
} else {
Expand Down
17 changes: 15 additions & 2 deletions pkg/layer/encoding/kml.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,26 @@ func (e *KMLEncoder) encodeLayerTag(li *merging.SealedLayerItem) (*kml.CompoundE
if li.Property.Field("location") != nil {
latlng, ok = li.Property.Field("location").PropertyValue.ValueLatLng()
if !ok {
return nil, errors.New("invalid value type")
dsll := li.Property.Field("location").DatasetValue.ValueLatLng()
if dsll != nil {
latlng = property.LatLng{
Lat: dsll.Lat,
Lng: dsll.Lng,
}
} else {
return nil, errors.New("invalid value type")
}
}
}
if li.Property.Field("height") != nil {
height, ok = li.Property.Field("height").PropertyValue.ValueNumber()
if !ok {
return nil, errors.New("invalid value type")
dsHeight := li.Property.Field("height").DatasetValue.ValueNumber()
if dsHeight != nil {
height = *dsHeight
} else {
return nil, errors.New("invalid value type")
}
}
}
layerTag = layerTag.Add(
Expand Down
10 changes: 9 additions & 1 deletion pkg/layer/encoding/shp.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,15 @@ func (e *SHPEncoder) encodeLayer(li *merging.SealedLayerItem) (shp.Shape, shp.Sh
if li.Property.Field("location") != nil {
latlng, ok = li.Property.Field("location").PropertyValue.ValueLatLng()
if !ok {
return nil, 0, errors.New("invalid value type")
dsll := li.Property.Field("location").DatasetValue.ValueLatLng()
if dsll != nil {
latlng = property.LatLng{
Lat: dsll.Lat,
Lng: dsll.Lng,
}
} else {
return nil, 0, errors.New("invalid value type")
}
}
sh = &shp.Point{
X: latlng.Lng,
Expand Down