-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #276 from PDOK/support-3d-geoms
feat: support 3D geoms, by switching from geospatial library
- Loading branch information
Showing
28 changed files
with
27,674 additions
and
53 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
251 changes: 251 additions & 0 deletions
251
internal/ogc/features/datasources/geopackage/encoding/geopackage.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,251 @@ | ||
| // Package encoding based on https://github.com/go-spatial/geom/blob/master/encoding/gpkg/binary_header.go | ||
| // | ||
| // Copyright (c) 2017 go-spatial. Modified by PDOK. | ||
| // Licensed under the MIT license. See https://github.com/go-spatial/geom/blob/master/LICENSE for details. | ||
| package encoding | ||
|
|
||
| import ( | ||
| "encoding/binary" | ||
| "errors" | ||
| "fmt" | ||
| "math" | ||
|
|
||
| "github.com/twpayne/go-geom" | ||
| "github.com/twpayne/go-geom/encoding/wkb" | ||
| "github.com/twpayne/go-geom/encoding/wkbcommon" | ||
| ) | ||
|
|
||
| type EnvelopeType uint8 | ||
|
|
||
| // Magic is the magic number encode in the header. It should be 0x4750 | ||
| var Magic = [2]byte{0x47, 0x50} | ||
|
|
||
| // Decipher empty points with NaN as coordinates, in line with Requirement 152 of the spec (http://www.geopackage.org/spec/). | ||
| var gpkgNaNHandling = wkbcommon.WKBOptionEmptyPointHandling(wkbcommon.EmptyPointHandlingNaN) | ||
|
|
||
| const ( | ||
| EnvelopeTypeNone = EnvelopeType(0) | ||
| EnvelopeTypeXY = EnvelopeType(1) | ||
| EnvelopeTypeXYZ = EnvelopeType(2) | ||
| EnvelopeTypeXYM = EnvelopeType(3) | ||
| EnvelopeTypeXYZM = EnvelopeType(4) | ||
| EnvelopeTypeInvalid = EnvelopeType(5) | ||
| ) | ||
|
|
||
| // NumberOfElements that the particular Envelope Type will have. | ||
| func (et EnvelopeType) NumberOfElements() int { | ||
| switch et { //nolint:exhaustive | ||
| case EnvelopeTypeNone: | ||
| return 0 | ||
| case EnvelopeTypeXY: | ||
| return 4 | ||
| case EnvelopeTypeXYZ: | ||
| return 6 | ||
| case EnvelopeTypeXYM: | ||
| return 6 | ||
| case EnvelopeTypeXYZM: | ||
| return 8 | ||
| default: | ||
| return -1 | ||
| } | ||
| } | ||
|
|
||
| func (et EnvelopeType) String() string { | ||
| str := "NONEXYZMXYMINVALID" | ||
| switch et { //nolint:exhaustive | ||
| case EnvelopeTypeNone: | ||
| return str[0:4] | ||
| case EnvelopeTypeXY: | ||
| return str[4 : 4+2] | ||
| case EnvelopeTypeXYZ: | ||
| return str[4 : 4+3] | ||
| case EnvelopeTypeXYM: | ||
| return str[8 : 8+3] | ||
| case EnvelopeTypeXYZM: | ||
| return str[4 : 4+4] | ||
| default: | ||
| return str[11:] | ||
| } | ||
| } | ||
|
|
||
| // HEADER FLAG LAYOUT | ||
| // 7 6 5 4 3 2 1 0 | ||
| // R R X Y E E E B | ||
| // R Reserved for future use. (should be set to 0) | ||
| // X GeoPackageBinary type // Normal or extented | ||
| // Y empty geometry | ||
| // E Envelope type | ||
| // B ByteOrder | ||
| // http://www.geopackage.org/spec/#flags_layout | ||
| const ( | ||
| maskByteOrder = 1 << 0 | ||
| maskEnvelopeType = 1<<3 | 1<<2 | 1<<1 | ||
| maskEmptyGeometry = 1 << 4 | ||
| maskGeoPackageBinary = 1 << 5 | ||
| ) | ||
|
|
||
| type headerFlags byte | ||
|
|
||
| func (hf headerFlags) String() string { return fmt.Sprintf("0x%02x", uint8(hf)) } | ||
|
|
||
| // Endian will return the encoded Endianess | ||
| func (hf headerFlags) Endian() binary.ByteOrder { | ||
| if hf&maskByteOrder == 0 { | ||
| return binary.BigEndian | ||
| } | ||
| return binary.LittleEndian | ||
| } | ||
|
|
||
| // Envelope returns the type of the envelope. | ||
| func (hf headerFlags) Envelope() EnvelopeType { | ||
| et := uint8((hf & maskEnvelopeType) >> 1) | ||
| if et >= uint8(EnvelopeTypeInvalid) { | ||
| return EnvelopeTypeInvalid | ||
| } | ||
| return EnvelopeType(et) | ||
| } | ||
|
|
||
| // IsEmpty returns whether or not the geometry is empty. | ||
| func (hf headerFlags) IsEmpty() bool { return ((hf & maskEmptyGeometry) >> 4) == 1 } | ||
|
|
||
| // IsStandard returns weather or not the geometry is a standard GeoPackage geometry type. | ||
| func (hf headerFlags) IsStandard() bool { return ((hf & maskGeoPackageBinary) >> 5) == 0 } | ||
|
|
||
| // BinaryHeader is the gpkg header that accompainies every feature. | ||
| type BinaryHeader struct { | ||
| // See: http://www.geopackage.org/spec/ | ||
| magic [2]byte // should be 0x47 0x50 (GP in ASCII) | ||
| version uint8 // should be 0 | ||
| flags headerFlags | ||
| srsid int32 | ||
| envelope []float64 | ||
| } | ||
|
|
||
| // decodeBinaryHeader decodes the data into the BinaryHeader | ||
| func decodeBinaryHeader(data []byte) (*BinaryHeader, error) { | ||
| if len(data) < 8 { | ||
| return nil, errors.New("not enough bytes") | ||
| } | ||
|
|
||
| var bh BinaryHeader | ||
| bh.magic[0] = data[0] | ||
| bh.magic[1] = data[1] | ||
| bh.version = data[2] | ||
| bh.flags = headerFlags(data[3]) | ||
| en := bh.flags.Endian() | ||
| bh.srsid = int32(en.Uint32(data[4 : 4+4])) //nolint:gosec | ||
|
|
||
| bytes := data[8:] | ||
| et := bh.flags.Envelope() | ||
| if et == EnvelopeTypeInvalid { | ||
| return nil, errors.New("invalid envelope type") | ||
| } | ||
| if et == EnvelopeTypeNone { | ||
| return &bh, nil | ||
| } | ||
| num := et.NumberOfElements() | ||
| // there are 8 bytes per float64 value and we need num of them. | ||
| if len(bytes) < (num * 8) { | ||
| return nil, errors.New("not enough bytes") | ||
| } | ||
|
|
||
| bh.envelope = make([]float64, 0, num) | ||
| for i := 0; i < num; i++ { | ||
| bits := en.Uint64(bytes[i*8 : (i*8)+8]) | ||
| bh.envelope = append(bh.envelope, math.Float64frombits(bits)) | ||
| } | ||
| if bh.magic[0] != Magic[0] || bh.magic[1] != Magic[1] { | ||
| return &bh, errors.New("invalid magic number") | ||
| } | ||
| return &bh, nil | ||
|
|
||
| } | ||
|
|
||
| // Magic is the magic number encode in the header. It should be 0x4750 | ||
| func (h *BinaryHeader) Magic() [2]byte { | ||
| if h == nil { | ||
| return Magic | ||
| } | ||
| return h.magic | ||
| } | ||
|
|
||
| // Version is the version number encode in the header. | ||
| func (h *BinaryHeader) Version() uint8 { | ||
| if h == nil { | ||
| return 0 | ||
| } | ||
| return h.version | ||
| } | ||
|
|
||
| // EnvelopeType is the type of the envelope that is provided. | ||
| func (h *BinaryHeader) EnvelopeType() EnvelopeType { | ||
| if h == nil { | ||
| return EnvelopeTypeInvalid | ||
| } | ||
| return h.flags.Envelope() | ||
| } | ||
|
|
||
| // SRSID is the SRS id of the feature. | ||
| func (h *BinaryHeader) SRSID() int32 { | ||
| if h == nil { | ||
| return 0 | ||
| } | ||
| return h.srsid | ||
| } | ||
|
|
||
| // Envelope is the bounding box of the feature, used for searching. If the EnvelopeType is EvelopeTypeNone, then there isn't a envelope encoded | ||
| // and a search without an index will need to be preformed. This is to save space. | ||
| func (h *BinaryHeader) Envelope() []float64 { | ||
| if h == nil { | ||
| return nil | ||
| } | ||
| return h.envelope | ||
| } | ||
|
|
||
| // IsGeometryEmpty tells us if the geometry should be considered empty. | ||
| func (h *BinaryHeader) IsGeometryEmpty() bool { | ||
| if h == nil { | ||
| return true | ||
| } | ||
| return h.flags.IsEmpty() | ||
| } | ||
|
|
||
| // IsStandardGeometry is the geometry a core/extended geometry type, or a user defined geometry type. | ||
| func (h *BinaryHeader) IsStandardGeometry() bool { | ||
| if h == nil { | ||
| return true | ||
| } | ||
| return h.flags.IsStandard() | ||
| } | ||
|
|
||
| // Size is the size of the header in bytes. | ||
| func (h *BinaryHeader) Size() int { | ||
| if h == nil { | ||
| return 0 | ||
| } | ||
| return (len(h.envelope) * 8) + 8 | ||
| } | ||
|
|
||
| // StandardBinary is the binary encoding plus some metadata | ||
| // should be stored as a blob | ||
| type StandardBinary struct { | ||
| Header *BinaryHeader | ||
| SRSID int32 | ||
| Geometry geom.T | ||
| } | ||
|
|
||
| func DecodeGeometry(bytes []byte) (*StandardBinary, error) { | ||
| h, err := decodeBinaryHeader(bytes) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| geo, err := wkb.Unmarshal(bytes[h.Size():], gpkgNaNHandling) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &StandardBinary{ | ||
| Header: h, | ||
| SRSID: h.SRSID(), | ||
| Geometry: geo, | ||
| }, nil | ||
| } |
Oops, something went wrong.