diff --git a/processor/drill_grpc.go b/processor/drill_grpc.go index 8e7dc984..56976cf8 100644 --- a/processor/drill_grpc.go +++ b/processor/drill_grpc.go @@ -29,7 +29,7 @@ func NewDrillGRPC(ctx context.Context, serverAddress []string, errChan chan erro } } -func (gi *GeoDrillGRPC) Run(bandStrides int, decileCount int, verbose bool) { +func (gi *GeoDrillGRPC) Run(bandStrides int, decileCount int, pixelCount int, verbose bool) { defer close(gi.Out) start := time.Now() @@ -141,7 +141,7 @@ func (gi *GeoDrillGRPC) Run(bandStrides int, decileCount int, verbose bool) { c := pb.NewGDALClient(conns[(iTile+workerStart)%len(conns)]) bands, err := getBands(g.TimeStamps) - granule := &pb.GeoRPCGranule{Operation: "drill", Path: g.Path, Geometry: g.Geometry, Bands: bands, BandStrides: int32(bandStrides), DrillDecileCount: int32(decileCount), ClipUpper: gran.ClipUpper, ClipLower: gran.ClipLower} + granule := &pb.GeoRPCGranule{Operation: "drill", Path: g.Path, Geometry: g.Geometry, Bands: bands, BandStrides: int32(bandStrides), DrillDecileCount: int32(decileCount), ClipUpper: gran.ClipUpper, ClipLower: gran.ClipLower, PixelCount: int32(pixelCount)} r, err := c.Process(gi.Context, granule) if err != nil { gi.Error <- err diff --git a/processor/drill_pipeline.go b/processor/drill_pipeline.go index 1d0d8716..b97c3c14 100644 --- a/processor/drill_pipeline.go +++ b/processor/drill_pipeline.go @@ -31,6 +31,7 @@ func InitDrillPipeline(ctx context.Context, apiAddr string, rpcAddrs []string, i func (dp *DrillPipeline) Process(geoReq GeoDrillRequest, suffix string, templateFileName string, bandStrides int, approx bool, drillAlgorithm string, verbose bool) chan string { const DefaultDecileAnchorPoints = 9 decileCount := 0 + pixelCount := 0 if len(drillAlgorithm) > 0 { drillAlgos := strings.Split(drillAlgorithm, ",") for _, algo := range drillAlgos { @@ -42,6 +43,10 @@ func (dp *DrillPipeline) Process(geoReq GeoDrillRequest, suffix string, template if algo == "deciles" { decileCount = DefaultDecileAnchorPoints } + + if algo == "pixel_count" { + pixelCount = 1 + } } } @@ -62,7 +67,7 @@ func (dp *DrillPipeline) Process(geoReq GeoDrillRequest, suffix string, template dm.In = grpcDriller.Out go i.Run(verbose) - go grpcDriller.Run(bandStrides, decileCount, verbose) + go grpcDriller.Run(bandStrides, decileCount, pixelCount, verbose) nCols := decileCount + 1 var namespaces []string diff --git a/templates/WPS_Outputs/geometryDrill/geoglam_pixel_fraction.tpl b/templates/WPS_Outputs/geometryDrill/geoglam_pixel_fraction.tpl new file mode 100644 index 00000000..1beea4a1 --- /dev/null +++ b/templates/WPS_Outputs/geometryDrill/geoglam_pixel_fraction.tpl @@ -0,0 +1,10 @@ + +veg_cover +Vegetation Cover +Time series data for Geoglam Fractional Cover. + + + + + + diff --git a/worker/gdalprocess/drill.go b/worker/gdalprocess/drill.go index 04dd4f1e..a3391f07 100644 --- a/worker/gdalprocess/drill.go +++ b/worker/gdalprocess/drill.go @@ -73,12 +73,12 @@ func DrillDataset(in *pb.GeoRPCGranule) *pb.Result { C.OGR_G_AssignSpatialReference(geom, selSRS) - res := readData(ds, in.Bands, geom, int(in.BandStrides), int(in.DrillDecileCount), in.ClipUpper, in.ClipLower) + res := readData(ds, in.Bands, geom, int(in.BandStrides), int(in.DrillDecileCount), int(in.PixelCount), in.ClipUpper, in.ClipLower) C.OGR_G_DestroyGeometry(geom) return res } -func readData(ds C.GDALDatasetH, bands []int32, geom C.OGRGeometryH, bandStrides int, decileCount int, clipUpper float32, clipLower float32) *pb.Result { +func readData(ds C.GDALDatasetH, bands []int32, geom C.OGRGeometryH, bandStrides int, decileCount int, pixelCount int, clipUpper float32, clipLower float32) *pb.Result { nCols := 1 + decileCount avgs := []*pb.TimeSeries{} @@ -141,11 +141,19 @@ func readData(ds C.GDALDatasetH, bands []int32, geom C.OGRGeometryH, bandStrides for i := 0; i < bandSize; i++ { if dsDscr.Mask.Pix[i] == 255 && dataBuf[i+bandOffset] != nodata { val := dataBuf[i+bandOffset] + if pixelCount != 0 { + total++ + } + if val < clipLower || val > clipUpper { continue } - sum += val - total++ + if pixelCount == 0 { + sum += val + total++ + } else { + sum += 1.0 + } } } diff --git a/worker/gdalservice/gdalservice.pb.go b/worker/gdalservice/gdalservice.pb.go index 3c890669..e7e9ecdf 100644 --- a/worker/gdalservice/gdalservice.pb.go +++ b/worker/gdalservice/gdalservice.pb.go @@ -58,6 +58,7 @@ type GeoRPCGranule struct { ClipUpper float32 `protobuf:"fixed32,14,opt,name=clipUpper" json:"clipUpper,omitempty"` ClipLower float32 `protobuf:"fixed32,15,opt,name=clipLower" json:"clipLower,omitempty"` SRSCf int32 `protobuf:"varint,16,opt,name=sRSCf" json:"sRSCf,omitempty"` + PixelCount int32 `protobuf:"varint,17,opt,name=pixelCount" json:"pixelCount,omitempty"` } func (m *GeoRPCGranule) Reset() { *m = GeoRPCGranule{} } @@ -177,6 +178,13 @@ func (m *GeoRPCGranule) GetSRSCf() int32 { return 0 } +func (m *GeoRPCGranule) GetPixelCount() int32 { + if m != nil { + return m.PixelCount + } + return 0 +} + type Raster struct { Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` NoData float64 `protobuf:"fixed64,2,opt,name=noData" json:"noData,omitempty"` @@ -608,59 +616,60 @@ var _GDAL_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gdalservice.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 860 bytes of a gzipped FileDescriptorProto + // 872 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x55, 0x6d, 0x8f, 0xe3, 0x34, - 0x10, 0x56, 0x37, 0x7d, 0x8b, 0xbb, 0x0b, 0x87, 0x39, 0xc0, 0xaa, 0x10, 0x44, 0xf9, 0x14, 0x81, - 0xd4, 0x93, 0xf6, 0x56, 0x80, 0xee, 0x1b, 0xec, 0x8a, 0x0a, 0xb1, 0xc7, 0x9d, 0x9c, 0xa2, 0xfb, - 0x9c, 0x26, 0xd3, 0x36, 0x90, 0xc6, 0x91, 0xed, 0xee, 0x5e, 0xf9, 0x41, 0xfc, 0x01, 0x7e, 0x03, - 0xff, 0x0b, 0xcd, 0xd8, 0x69, 0xb2, 0x3d, 0xbe, 0xe5, 0x79, 0x3c, 0x63, 0x7b, 0x9e, 0x79, 0xc6, - 0x61, 0x9f, 0x6c, 0x8b, 0xac, 0x32, 0xa0, 0x1f, 0xca, 0x1c, 0x16, 0x8d, 0x56, 0x56, 0xf1, 0x59, - 0x8f, 0x9a, 0x7f, 0xbd, 0x55, 0x6a, 0x5b, 0xc1, 0x0b, 0x5a, 0x5a, 0x1f, 0x36, 0x2f, 0x6c, 0xb9, - 0x07, 0x63, 0xb3, 0x7d, 0xe3, 0xa2, 0xe3, 0x7f, 0x03, 0x76, 0xb5, 0x04, 0x25, 0xdf, 0xde, 0x2e, - 0x75, 0x56, 0x1f, 0x2a, 0xe0, 0x5f, 0xb2, 0x50, 0x35, 0xa0, 0x33, 0x5b, 0xaa, 0x5a, 0x0c, 0xa2, - 0x41, 0x12, 0xca, 0x8e, 0xe0, 0x9c, 0x0d, 0x9b, 0xcc, 0xee, 0xc4, 0x05, 0x2d, 0xd0, 0x37, 0x9f, - 0xb3, 0xe9, 0x16, 0xd4, 0x1e, 0xac, 0x3e, 0x8a, 0x80, 0xf8, 0x13, 0xe6, 0xcf, 0xd9, 0x68, 0x9d, - 0xd5, 0x85, 0x11, 0xc3, 0x28, 0x48, 0x46, 0xd2, 0x01, 0xfe, 0x39, 0x1b, 0xef, 0xa0, 0xdc, 0xee, - 0xac, 0x18, 0x45, 0x83, 0x64, 0x24, 0x3d, 0xc2, 0xe8, 0xc7, 0xb2, 0xb0, 0x3b, 0x31, 0x26, 0xda, - 0x01, 0x8c, 0x36, 0x3a, 0x4f, 0x65, 0x2a, 0x26, 0xb4, 0xbb, 0x47, 0x5c, 0xb0, 0x89, 0xd1, 0xf9, - 0x12, 0x94, 0x15, 0xd3, 0x28, 0x48, 0x06, 0xb2, 0x85, 0x98, 0x51, 0x18, 0x8b, 0x19, 0xa1, 0xcb, - 0x70, 0x08, 0x33, 0x0a, 0x63, 0x29, 0x83, 0xb9, 0x0c, 0x0f, 0x79, 0xc4, 0x66, 0x78, 0xb5, 0xd4, - 0xea, 0xb2, 0x00, 0x23, 0x66, 0x74, 0x7e, 0x9f, 0xe2, 0x5f, 0x31, 0xb6, 0x05, 0x75, 0xaf, 0xf2, - 0x37, 0x8d, 0x35, 0xe2, 0x32, 0x0a, 0x92, 0x50, 0xf6, 0x18, 0xfe, 0x0d, 0x7b, 0x56, 0xe8, 0xb2, - 0xaa, 0xee, 0x20, 0x2f, 0x2b, 0xb8, 0x55, 0x87, 0xda, 0x8a, 0x2b, 0xda, 0xe6, 0x03, 0x1e, 0x35, - 0xce, 0xab, 0xb2, 0xf9, 0xbd, 0x69, 0x40, 0x8b, 0x8f, 0xa2, 0x41, 0x72, 0x21, 0x3b, 0xa2, 0x5d, - 0xbd, 0x57, 0x8f, 0xa0, 0xc5, 0xc7, 0xdd, 0x2a, 0x11, 0xa8, 0x91, 0x91, 0xe9, 0xed, 0x46, 0x3c, - 0x73, 0x1a, 0x11, 0x88, 0x77, 0x6c, 0x2c, 0x33, 0x63, 0x41, 0x63, 0x87, 0x8a, 0xcc, 0x66, 0xd4, - 0xba, 0x4b, 0x49, 0xdf, 0xa8, 0x47, 0xad, 0xee, 0x90, 0xc5, 0xbe, 0x0d, 0xa4, 0x47, 0x58, 0x93, - 0xa6, 0xac, 0xd5, 0xb1, 0x01, 0xdf, 0xbb, 0x1e, 0x83, 0x7b, 0xad, 0xd7, 0xea, 0xbd, 0x6f, 0x1e, - 0x7d, 0xc7, 0x3f, 0x30, 0xb6, 0x2a, 0xf7, 0x90, 0x82, 0x2e, 0xc1, 0xe0, 0x6d, 0x1e, 0xb2, 0xea, - 0x00, 0x74, 0xdc, 0x40, 0x3a, 0x80, 0x6c, 0x4e, 0x02, 0x5c, 0xb8, 0x3b, 0x12, 0x88, 0xbf, 0x63, - 0xd3, 0x37, 0x0f, 0x68, 0x4c, 0x78, 0xc4, 0x88, 0xf7, 0x69, 0xf9, 0x97, 0xcb, 0x1b, 0x49, 0x07, - 0x90, 0x3d, 0x12, 0xeb, 0xf3, 0x08, 0xc4, 0x7f, 0x07, 0x6c, 0xb6, 0x04, 0xf5, 0x1a, 0x6c, 0x46, - 0xb7, 0x8e, 0xd8, 0x0c, 0xab, 0x32, 0x60, 0x7f, 0xcb, 0xf6, 0xe0, 0x3d, 0xda, 0xa7, 0x50, 0xc1, - 0x3a, 0xdb, 0x43, 0xda, 0x64, 0x39, 0x78, 0xab, 0x76, 0x04, 0x56, 0x65, 0xbb, 0x7a, 0xe9, 0x1b, - 0xf7, 0x74, 0x75, 0xbb, 0xc6, 0x0d, 0x5d, 0xff, 0x7b, 0x14, 0x7f, 0xc5, 0x18, 0x0e, 0x4f, 0x8a, - 0xc3, 0x63, 0xc4, 0x28, 0x0a, 0x92, 0xd9, 0xf5, 0x7c, 0xe1, 0xe6, 0x6b, 0xd1, 0xce, 0xd7, 0x62, - 0xd5, 0xce, 0x97, 0xec, 0x45, 0xf7, 0xfc, 0x3e, 0x26, 0xdb, 0xb5, 0x7e, 0x7f, 0xc9, 0x42, 0xe5, - 0x15, 0x31, 0x62, 0x42, 0x5b, 0x7e, 0xb6, 0xe8, 0x8f, 0x74, 0xab, 0x97, 0xec, 0xe2, 0x3a, 0xe9, - 0xa6, 0xff, 0x2b, 0x5d, 0xd8, 0x93, 0x8e, 0xc7, 0xec, 0x72, 0x0b, 0x6a, 0xa5, 0xb3, 0xda, 0x6c, - 0x94, 0xde, 0x7b, 0xd7, 0x3f, 0xe1, 0x70, 0x28, 0x1a, 0x55, 0x1d, 0xb7, 0xaa, 0x26, 0xdb, 0x87, - 0xb2, 0x85, 0xb4, 0xa2, 0xd5, 0x1f, 0xef, 0x7e, 0x5d, 0x89, 0x4b, 0xbf, 0xe2, 0x20, 0x9e, 0x86, - 0x9f, 0x37, 0xe4, 0xf0, 0x50, 0x3a, 0x10, 0x1b, 0x36, 0x59, 0x82, 0xfa, 0xb9, 0xac, 0x00, 0xdf, - 0x84, 0x4d, 0x59, 0x41, 0xaf, 0x41, 0x27, 0x4c, 0xd3, 0xa9, 0xcb, 0x07, 0xd0, 0xbe, 0x35, 0x1e, - 0xf1, 0x1b, 0x36, 0xc5, 0x26, 0xa6, 0x60, 0x8d, 0x08, 0x48, 0x0c, 0xf1, 0x44, 0x8c, 0x9e, 0x07, - 0xe4, 0x29, 0x32, 0x4e, 0x18, 0x7b, 0xa7, 0xf4, 0x9f, 0xa0, 0x7f, 0xa9, 0x37, 0x0a, 0xcf, 0x6d, - 0x94, 0xaa, 0x7a, 0xd6, 0x3a, 0xe1, 0x38, 0x67, 0x57, 0x2e, 0xf2, 0x35, 0x58, 0x5d, 0xe6, 0x06, - 0x6d, 0xb2, 0x3e, 0x5a, 0x30, 0x12, 0xb2, 0x82, 0xa2, 0x03, 0xd9, 0x11, 0xb8, 0xd5, 0xc1, 0x80, - 0xc6, 0x8e, 0xd2, 0x45, 0x03, 0x79, 0xc2, 0xf4, 0xf4, 0x1c, 0x0d, 0x2d, 0x05, 0xb4, 0xd4, 0xc2, - 0xf8, 0x9f, 0x0b, 0x36, 0x96, 0x60, 0x0e, 0x95, 0xe5, 0xdf, 0x7b, 0xc7, 0xd0, 0xa4, 0x88, 0x01, - 0x55, 0xf4, 0xc5, 0x93, 0x8a, 0xba, 0x41, 0x92, 0xbd, 0x50, 0xfe, 0x2d, 0x1b, 0x3b, 0xe7, 0xd1, - 0xb9, 0xb3, 0xeb, 0x4f, 0x9f, 0x24, 0xb9, 0x39, 0x97, 0x3e, 0x84, 0x27, 0x6c, 0x58, 0xd6, 0x1b, - 0x45, 0xf7, 0x98, 0x5d, 0x3f, 0x3f, 0x57, 0x0c, 0xbb, 0x21, 0x29, 0x02, 0x9b, 0x06, 0x5a, 0x2b, - 0x4d, 0xee, 0x0e, 0xa5, 0x03, 0xf4, 0x9e, 0xec, 0xb2, 0x06, 0xc8, 0xd2, 0xf8, 0x9e, 0x20, 0xc0, - 0xbb, 0x3f, 0x9e, 0x54, 0xa5, 0xe7, 0xf8, 0xfc, 0xee, 0x9d, 0xe8, 0xb2, 0x17, 0xca, 0x6f, 0xd8, - 0x64, 0xef, 0xe4, 0xa5, 0xd7, 0x9a, 0x66, 0xe4, 0x83, 0x2c, 0xdf, 0x00, 0xd9, 0x86, 0x5e, 0xff, - 0xc4, 0x86, 0xcb, 0xbb, 0x1f, 0xef, 0xf9, 0x2b, 0x36, 0x79, 0xab, 0x55, 0x0e, 0xc6, 0xf0, 0xf9, - 0x79, 0x25, 0xdd, 0x3f, 0x6a, 0x7e, 0x26, 0x08, 0xc9, 0xbd, 0x1e, 0xd3, 0x10, 0xbe, 0xfc, 0x2f, - 0x00, 0x00, 0xff, 0xff, 0x09, 0xc3, 0x0a, 0x52, 0x14, 0x07, 0x00, 0x00, + 0x10, 0x56, 0x37, 0x7d, 0x8b, 0xbb, 0x0b, 0x77, 0xe6, 0x00, 0xab, 0x42, 0x10, 0xe5, 0x53, 0x04, + 0x52, 0x4f, 0xda, 0x5b, 0x01, 0xba, 0x6f, 0xb0, 0x2b, 0x2a, 0xc4, 0x1e, 0x77, 0x72, 0x8a, 0xee, + 0x73, 0x9a, 0x4c, 0x5b, 0x43, 0x1a, 0x47, 0xb6, 0xbb, 0xbb, 0xe5, 0x07, 0xf1, 0x07, 0xf8, 0x4d, + 0xfc, 0x0f, 0x34, 0xe3, 0xa4, 0xc9, 0xee, 0xdd, 0xb7, 0x3c, 0x8f, 0x67, 0xec, 0xf1, 0x33, 0xf3, + 0x38, 0xec, 0xf9, 0xb6, 0xc8, 0x4a, 0x0b, 0xe6, 0x4e, 0xe5, 0xb0, 0xa8, 0x8d, 0x76, 0x9a, 0xcf, + 0x7a, 0xd4, 0xfc, 0x9b, 0xad, 0xd6, 0xdb, 0x12, 0x5e, 0xd2, 0xd2, 0xfa, 0xb0, 0x79, 0xe9, 0xd4, + 0x1e, 0xac, 0xcb, 0xf6, 0xb5, 0x8f, 0x8e, 0xff, 0x0b, 0xd8, 0xc5, 0x12, 0xb4, 0x7c, 0x77, 0xbd, + 0x34, 0x59, 0x75, 0x28, 0x81, 0x7f, 0xc5, 0x42, 0x5d, 0x83, 0xc9, 0x9c, 0xd2, 0x95, 0x18, 0x44, + 0x83, 0x24, 0x94, 0x1d, 0xc1, 0x39, 0x1b, 0xd6, 0x99, 0xdb, 0x89, 0x33, 0x5a, 0xa0, 0x6f, 0x3e, + 0x67, 0xd3, 0x2d, 0xe8, 0x3d, 0x38, 0x73, 0x14, 0x01, 0xf1, 0x27, 0xcc, 0x5f, 0xb0, 0xd1, 0x3a, + 0xab, 0x0a, 0x2b, 0x86, 0x51, 0x90, 0x8c, 0xa4, 0x07, 0xfc, 0x0b, 0x36, 0xde, 0x81, 0xda, 0xee, + 0x9c, 0x18, 0x45, 0x83, 0x64, 0x24, 0x1b, 0x84, 0xd1, 0xf7, 0xaa, 0x70, 0x3b, 0x31, 0x26, 0xda, + 0x03, 0x8c, 0xb6, 0x26, 0x4f, 0x65, 0x2a, 0x26, 0xb4, 0x7b, 0x83, 0xb8, 0x60, 0x13, 0x6b, 0xf2, + 0x25, 0x68, 0x27, 0xa6, 0x51, 0x90, 0x0c, 0x64, 0x0b, 0x31, 0xa3, 0xb0, 0x0e, 0x33, 0x42, 0x9f, + 0xe1, 0x11, 0x66, 0x14, 0xd6, 0x51, 0x06, 0xf3, 0x19, 0x0d, 0xe4, 0x11, 0x9b, 0x61, 0x69, 0xa9, + 0x33, 0xaa, 0x00, 0x2b, 0x66, 0x74, 0x7e, 0x9f, 0xe2, 0x5f, 0x33, 0xb6, 0x05, 0x7d, 0xab, 0xf3, + 0xb7, 0xb5, 0xb3, 0xe2, 0x3c, 0x0a, 0x92, 0x50, 0xf6, 0x18, 0xfe, 0x2d, 0x7b, 0x56, 0x18, 0x55, + 0x96, 0x37, 0x90, 0xab, 0x12, 0xae, 0xf5, 0xa1, 0x72, 0xe2, 0x82, 0xb6, 0xf9, 0x80, 0x47, 0x8d, + 0xf3, 0x52, 0xd5, 0x7f, 0xd4, 0x35, 0x18, 0xf1, 0x49, 0x34, 0x48, 0xce, 0x64, 0x47, 0xb4, 0xab, + 0xb7, 0xfa, 0x1e, 0x8c, 0xf8, 0xb4, 0x5b, 0x25, 0x02, 0x35, 0xb2, 0x32, 0xbd, 0xde, 0x88, 0x67, + 0x5e, 0x23, 0x02, 0x58, 0x5d, 0xad, 0x1e, 0xa0, 0xf4, 0xe7, 0x3e, 0xa7, 0xa5, 0x1e, 0x13, 0xef, + 0xd8, 0x58, 0x66, 0xd6, 0x81, 0xc1, 0x0e, 0x16, 0x99, 0xcb, 0xa8, 0xb5, 0xe7, 0x92, 0xbe, 0x51, + 0xaf, 0x4a, 0xdf, 0x20, 0x8b, 0x7d, 0x1d, 0xc8, 0x06, 0xe1, 0xae, 0x86, 0xb2, 0x56, 0xc7, 0x1a, + 0x9a, 0xde, 0xf6, 0x18, 0xdc, 0x6b, 0xbd, 0xd6, 0x0f, 0x4d, 0x73, 0xe9, 0x3b, 0xfe, 0x91, 0xb1, + 0x95, 0xda, 0x43, 0x0a, 0x46, 0x81, 0xc5, 0x6a, 0xef, 0xb2, 0xf2, 0x00, 0x74, 0xdc, 0x40, 0x7a, + 0x80, 0x6c, 0x4e, 0x85, 0x9e, 0xf9, 0x3b, 0x10, 0x88, 0xbf, 0x67, 0xd3, 0xb7, 0x77, 0x38, 0xb8, + 0x70, 0x8f, 0x11, 0x0f, 0xa9, 0xfa, 0xdb, 0xe7, 0x8d, 0xa4, 0x07, 0xc8, 0x1e, 0x89, 0x6d, 0xf2, + 0x08, 0xc4, 0xff, 0x04, 0x6c, 0xb6, 0x04, 0xfd, 0x06, 0x5c, 0x46, 0x55, 0x47, 0x6c, 0x86, 0xb7, + 0xb2, 0xe0, 0x7e, 0xcf, 0xf6, 0xd0, 0xcc, 0x70, 0x9f, 0x42, 0x85, 0xab, 0x6c, 0x0f, 0x69, 0x9d, + 0xe5, 0xd0, 0x8c, 0x72, 0x47, 0xe0, 0xad, 0x5c, 0x77, 0x5f, 0xfa, 0xc6, 0x3d, 0xfd, 0xbd, 0xbd, + 0xc0, 0x43, 0x3f, 0x1f, 0x3d, 0x8a, 0xbf, 0x66, 0x0c, 0xcd, 0x95, 0xa2, 0xb9, 0xac, 0x18, 0x45, + 0x41, 0x32, 0xbb, 0x9c, 0x2f, 0xbc, 0xff, 0x16, 0xad, 0xff, 0x16, 0xab, 0xd6, 0x7f, 0xb2, 0x17, + 0xdd, 0xf3, 0xc3, 0x98, 0xc6, 0xb2, 0xf5, 0xc3, 0x2b, 0x16, 0xea, 0x46, 0x11, 0x2b, 0x26, 0xb4, + 0xe5, 0xe7, 0x8b, 0xbe, 0xe5, 0x5b, 0xbd, 0x64, 0x17, 0xd7, 0x49, 0x37, 0xfd, 0xa8, 0x74, 0x61, + 0x4f, 0x3a, 0x1e, 0xb3, 0xf3, 0x2d, 0xe8, 0x95, 0xc9, 0x2a, 0xbb, 0xd1, 0x66, 0xdf, 0xb8, 0xe2, + 0x11, 0x87, 0xa6, 0xa9, 0x75, 0x79, 0xdc, 0xea, 0x8a, 0x6c, 0x11, 0xca, 0x16, 0xd2, 0x8a, 0xd1, + 0x7f, 0xbe, 0xff, 0x6d, 0x25, 0xce, 0x9b, 0x15, 0x0f, 0xf1, 0x34, 0xfc, 0xbc, 0x22, 0x07, 0x84, + 0xd2, 0x83, 0xd8, 0xb2, 0xc9, 0x12, 0xf4, 0x2f, 0xaa, 0x04, 0x7c, 0x33, 0x36, 0xaa, 0x84, 0x5e, + 0x83, 0x4e, 0x98, 0xdc, 0x6b, 0xd4, 0x1d, 0x98, 0xa6, 0x35, 0x0d, 0xe2, 0x57, 0x6c, 0x8a, 0x4d, + 0x4c, 0xc1, 0x59, 0x11, 0x90, 0x18, 0xe2, 0x91, 0x18, 0xbd, 0x19, 0x90, 0xa7, 0xc8, 0x38, 0x61, + 0xec, 0xbd, 0x36, 0x7f, 0x81, 0xf9, 0xb5, 0xda, 0x68, 0x3c, 0xb7, 0xd6, 0xba, 0xec, 0x8d, 0xd6, + 0x09, 0xc7, 0x39, 0xbb, 0xf0, 0x91, 0x6f, 0xc0, 0x19, 0x95, 0x5b, 0x1c, 0x93, 0xf5, 0xd1, 0x81, + 0x95, 0x90, 0x15, 0x14, 0x1d, 0xc8, 0x8e, 0xc0, 0xad, 0x0e, 0x16, 0x0c, 0x76, 0x94, 0x0a, 0x0d, + 0xe4, 0x09, 0xd3, 0xd3, 0x74, 0xb4, 0xb4, 0x14, 0xd0, 0x52, 0x0b, 0xe3, 0x7f, 0xcf, 0xd8, 0x58, + 0x82, 0x3d, 0x94, 0x8e, 0xff, 0xd0, 0x4c, 0x0c, 0x39, 0x45, 0x0c, 0xe8, 0x46, 0x5f, 0x3e, 0xba, + 0x51, 0x67, 0x24, 0xd9, 0x0b, 0xe5, 0xdf, 0xb1, 0xb1, 0x9f, 0x3c, 0x3a, 0x77, 0x76, 0xf9, 0xd9, + 0xa3, 0x24, 0xef, 0x73, 0xd9, 0x84, 0xf0, 0x84, 0x0d, 0x55, 0xb5, 0xd1, 0x54, 0xc7, 0xec, 0xf2, + 0xc5, 0x53, 0xc5, 0xb0, 0x1b, 0x92, 0x22, 0xb0, 0x69, 0x60, 0x8c, 0x36, 0x34, 0xdd, 0xa1, 0xf4, + 0x80, 0xde, 0x9b, 0x5d, 0x56, 0x03, 0x8d, 0x34, 0xbe, 0x37, 0x08, 0xb0, 0xf6, 0xfb, 0x93, 0xaa, + 0xf4, 0x5c, 0x3f, 0xad, 0xbd, 0x13, 0x5d, 0xf6, 0x42, 0xf9, 0x15, 0x9b, 0xec, 0xbd, 0xbc, 0xf4, + 0x9a, 0x93, 0x47, 0x3e, 0xc8, 0x6a, 0x1a, 0x20, 0xdb, 0xd0, 0xcb, 0x9f, 0xd9, 0x70, 0x79, 0xf3, + 0xd3, 0x2d, 0x7f, 0xcd, 0x26, 0xef, 0x8c, 0xce, 0xc1, 0x5a, 0x3e, 0x7f, 0x7a, 0x93, 0xee, 0x1f, + 0x36, 0x7f, 0x22, 0x08, 0xc9, 0xbd, 0x1e, 0x93, 0x09, 0x5f, 0xfd, 0x1f, 0x00, 0x00, 0xff, 0xff, + 0x86, 0x17, 0xdb, 0x12, 0x34, 0x07, 0x00, 0x00, } diff --git a/worker/gdalservice/gdalservice.proto b/worker/gdalservice/gdalservice.proto index 86e40a6f..dc72787a 100644 --- a/worker/gdalservice/gdalservice.proto +++ b/worker/gdalservice/gdalservice.proto @@ -21,6 +21,7 @@ message GeoRPCGranule { float clipUpper = 14; float clipLower = 15; int32 sRSCf = 16; + int32 pixelCount = 17; } message Raster {