Skip to content

Commit

Permalink
obtained canonical bbox before comparing against IndexResLimit (#389)
Browse files Browse the repository at this point in the history
  • Loading branch information
@edisonguo
edisonguo committed May 2, 2020
1 parent 5aa98bd commit fab8cb9
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 47 deletions.
106 changes: 62 additions & 44 deletions processor/tile_indexer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func (p *TileIndexer) Run(verbose bool) {
if geoReq.MasQueryHint != "non_spatial" {
bboxWkt = BBox2WKT(geoReq.BBox)
}
url = p.getIndexerURL(geoReq, nameSpaces, bboxWkt)
url = p.getIndexerURL(geoReq, nameSpaces, bboxWkt, geoReq.CRS)
if isInit {
if geoReq.MetricsCollector != nil {
defer func() { geoReq.MetricsCollector.Info.Indexer.Duration += time.Since(t0) }()
Expand All @@ -171,7 +171,7 @@ func (p *TileIndexer) Run(verbose bool) {
if len(geoReq.MetricsCollector.Info.Indexer.URL.RawURL) == 0 {
if len(geoReq.OrigBBox) > 0 {
origBboxWkt = BBox2WKT(geoReq.OrigBBox)
origURL = p.getIndexerURL(geoReq, nameSpaces, origBboxWkt)
origURL = p.getIndexerURL(geoReq, nameSpaces, origBboxWkt, geoReq.CRS)
}
geoReq.MetricsCollector.Info.Indexer.URL.RawURL = origURL
}
Expand All @@ -191,52 +191,70 @@ func (p *TileIndexer) Run(verbose bool) {
log.Println(url)
}

resWidth := 256
resHeight := 256
maxXTileSize := int(float64(resWidth) * geoReq.IndexTileXSize)
if maxXTileSize <= 0 {
maxXTileSize = resWidth
}

maxYTileSize := int(float64(resHeight) * geoReq.IndexTileYSize)
if maxYTileSize <= 0 {
maxYTileSize = resHeight
}
hasSubDivision := false
var clippedBBox []float64
var err error

clippedBBox := []float64{geoReq.BBox[0], geoReq.BBox[1], geoReq.BBox[2], geoReq.BBox[3]}
if len(geoReq.SpatialExtent) >= 4 {
clippedBBox[0] = math.Max(clippedBBox[0], geoReq.SpatialExtent[0])
clippedBBox[1] = math.Max(clippedBBox[1], geoReq.SpatialExtent[1])

clippedBBox[2] = math.Min(clippedBBox[2], geoReq.SpatialExtent[2])
clippedBBox[3] = math.Min(clippedBBox[3], geoReq.SpatialExtent[3])
clippedBBox, err = utils.GetCanonicalBbox(geoReq.CRS, geoReq.BBox)
if err == nil {
clippedBBox[0] = math.Max(clippedBBox[0], geoReq.SpatialExtent[0])
clippedBBox[1] = math.Max(clippedBBox[1], geoReq.SpatialExtent[1])

clippedBBox[2] = math.Min(clippedBBox[2], geoReq.SpatialExtent[2])
clippedBBox[3] = math.Min(clippedBBox[3], geoReq.SpatialExtent[3])

if clippedBBox[2] < clippedBBox[0] || clippedBBox[3] < clippedBBox[1] {
p.Out <- &GeoTileGranule{ConfigPayLoad: ConfigPayLoad{NameSpaces: []string{utils.EmptyTileNS}, ScaleParams: geoReq.ScaleParams, Palette: geoReq.Palette}, Path: "NULL", NameSpace: utils.EmptyTileNS, RasterType: "Byte", TimeStamp: 0, BBox: geoReq.BBox, Height: geoReq.Height, Width: geoReq.Width, OffX: geoReq.OffX, OffY: geoReq.OffY, CRS: geoReq.CRS}
if verbose {
log.Printf("Indexer error: invalid bbox: %v", clippedBBox)
}
return
}
hasSubDivision = true
} else if verbose {
log.Printf("Indexer sub-division error: %v", err)
}
}

if clippedBBox[2] < clippedBBox[0] || clippedBBox[3] < clippedBBox[1] {
p.Out <- &GeoTileGranule{ConfigPayLoad: ConfigPayLoad{NameSpaces: []string{utils.EmptyTileNS}, ScaleParams: geoReq.ScaleParams, Palette: geoReq.Palette}, Path: "NULL", NameSpace: utils.EmptyTileNS, RasterType: "Byte", TimeStamp: 0, BBox: geoReq.BBox, Height: geoReq.Height, Width: geoReq.Width, OffX: geoReq.OffX, OffY: geoReq.OffY, CRS: geoReq.CRS}
return
}
if hasSubDivision {
resWidth := 256
resHeight := 256
maxXTileSize := int(float64(resWidth) * geoReq.IndexTileXSize)
if maxXTileSize <= 0 {
maxXTileSize = resWidth
}

xRes := (clippedBBox[2] - clippedBBox[0]) / float64(resWidth)
yRes := (clippedBBox[3] - clippedBBox[1]) / float64(resHeight)
reqRes := math.Max(xRes, yRes)
if geoReq.QueryLimit <= 0 && reqRes > geoReq.IndexResLimit {
for y := 0; y < resHeight; y += maxYTileSize {
for x := 0; x < resWidth; x += maxXTileSize {
yMin := clippedBBox[1] + float64(y)*yRes
yMax := math.Min(clippedBBox[1]+float64(y+maxYTileSize)*yRes, clippedBBox[3])
xMin := clippedBBox[0] + float64(x)*xRes
xMax := math.Min(clippedBBox[0]+float64(x+maxXTileSize)*xRes, clippedBBox[2])

bbox := []float64{xMin, yMin, xMax, yMax}
bboxWkt = BBox2WKT(bbox)
url = p.getIndexerURL(geoReq, nameSpaces, bboxWkt)

wg.Add(1)
go URLIndexGet(p.Context, url, geoReq, p.Error, p.Out, &wg, isEmptyTile, verbose)
maxYTileSize := int(float64(resHeight) * geoReq.IndexTileYSize)
if maxYTileSize <= 0 {
maxYTileSize = resHeight
}

xRes := (clippedBBox[2] - clippedBBox[0]) / float64(resWidth)
yRes := (clippedBBox[3] - clippedBBox[1]) / float64(resHeight)
reqRes := math.Max(xRes, yRes)
if geoReq.QueryLimit <= 0 && reqRes > geoReq.IndexResLimit {
for y := 0; y < resHeight; y += maxYTileSize {
for x := 0; x < resWidth; x += maxXTileSize {
yMin := clippedBBox[1] + float64(y)*yRes
yMax := math.Min(clippedBBox[1]+float64(y+maxYTileSize)*yRes, clippedBBox[3])
xMin := clippedBBox[0] + float64(x)*xRes
xMax := math.Min(clippedBBox[0]+float64(x+maxXTileSize)*xRes, clippedBBox[2])

bbox := []float64{xMin, yMin, xMax, yMax}
bboxWkt = BBox2WKT(bbox)
url = p.getIndexerURL(geoReq, nameSpaces, bboxWkt, "EPSG:3857")

wg.Add(1)
go URLIndexGet(p.Context, url, geoReq, p.Error, p.Out, &wg, isEmptyTile, verbose)
}
}
} else {
hasSubDivision = false
}
} else {
}

if !hasSubDivision {
wg.Add(1)
go URLIndexGet(p.Context, url, geoReq, p.Error, p.Out, &wg, isEmptyTile, verbose)
}
Expand Down Expand Up @@ -266,12 +284,12 @@ func (p *TileIndexer) Run(verbose bool) {
}
}

func (p *TileIndexer) getIndexerURL(geoReq *GeoTileRequest, nameSpaces string, bboxWkt string) string {
func (p *TileIndexer) getIndexerURL(geoReq *GeoTileRequest, nameSpaces string, bboxWkt string, crs string) string {
var url string
if geoReq.EndTime == nil {
url = strings.Replace(fmt.Sprintf("http://%s%s?intersects&metadata=gdal&time=%s&srs=%s&wkt=%s&namespace=%s&nseg=%d&limit=%d", p.APIAddress, geoReq.Collection, geoReq.StartTime.Format(ISOFormat), geoReq.CRS, bboxWkt, nameSpaces, geoReq.PolygonSegments, geoReq.QueryLimit), " ", "%20", -1)
url = strings.Replace(fmt.Sprintf("http://%s%s?intersects&metadata=gdal&time=%s&srs=%s&wkt=%s&namespace=%s&nseg=%d&limit=%d", p.APIAddress, geoReq.Collection, geoReq.StartTime.Format(ISOFormat), crs, bboxWkt, nameSpaces, geoReq.PolygonSegments, geoReq.QueryLimit), " ", "%20", -1)
} else {
url = strings.Replace(fmt.Sprintf("http://%s%s?intersects&metadata=gdal&time=%s&until=%s&srs=%s&wkt=%s&namespace=%s&nseg=%d&limit=%d", p.APIAddress, geoReq.Collection, geoReq.StartTime.Format(ISOFormat), geoReq.EndTime.Format(ISOFormat), geoReq.CRS, bboxWkt, nameSpaces, geoReq.PolygonSegments, geoReq.QueryLimit), " ", "%20", -1)
url = strings.Replace(fmt.Sprintf("http://%s%s?intersects&metadata=gdal&time=%s&until=%s&srs=%s&wkt=%s&namespace=%s&nseg=%d&limit=%d", p.APIAddress, geoReq.Collection, geoReq.StartTime.Format(ISOFormat), geoReq.EndTime.Format(ISOFormat), crs, bboxWkt, nameSpaces, geoReq.PolygonSegments, geoReq.QueryLimit), " ", "%20", -1)
}

return url
Expand Down
6 changes: 3 additions & 3 deletions utils/wms.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,13 +486,14 @@ func CheckDisableServices(layer *Layer, service string) bool {

func GetCanonicalBbox(srs string, bbox []float64) ([]float64, error) {
srs = strings.ToUpper(strings.TrimSpace(srs))
if srs == "EPSG:3857" {
dst := "EPSG:3857"
if srs == dst {
return bbox, nil
}

var opts []*C.char
opts = append(opts, C.CString(fmt.Sprintf("SRC_SRS=%s", srs)))
opts = append(opts, C.CString("DST_SRS=EPSG:3857"))
opts = append(opts, C.CString(fmt.Sprintf("DST_SRS=%s", dst)))
for _, opt := range opts {
defer C.free(unsafe.Pointer(opt))
}
Expand All @@ -512,7 +513,6 @@ func GetCanonicalBbox(srs string, bbox []float64) ([]float64, error) {
if bSuccess[0] != 0 && bSuccess[1] != 0 {
return []float64{float64(dx[0]), float64(dy[0]), float64(dx[1]), float64(dy[1])}, nil
} else {

return bbox, fmt.Errorf("GDALGenImgProjTransform failed")
}
}
Expand Down

0 comments on commit fab8cb9

Please sign in to comment.