added support to use layer specific settings for blended service (#382)

nci · Mar 20, 2020 · 5aa98bd · 5aa98bd
1 parent bde3d43
commit 5aa98bd
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/processor/tile_pipeline.go b/processor/tile_pipeline.go
@@ -423,6 +423,7 @@ func (dp *TilePipeline) findDepLayers() ([]*GeoReqContext, error) {
 func (dp *TilePipeline) prepareInputGeoRequests(geoReq *GeoTileRequest, depLayers []*GeoReqContext, useOverview bool) {
 	for _, ctx := range depLayers {
 		styleLayer := ctx.StyleLayer
+		layer := ctx.Layer
 		ctx.GeoReq = &GeoTileRequest{ConfigPayLoad: ConfigPayLoad{NameSpaces: styleLayer.RGBExpressions.VarList,
 			ScaleParams: ScaleParams{Offset: styleLayer.OffsetValue,
 				Scale: styleLayer.ScaleValue,
@@ -436,19 +437,19 @@ func (dp *TilePipeline) prepareInputGeoRequests(geoReq *GeoTileRequest, depLayer
 			PolygonSegments:     geoReq.PolygonSegments,
 			GrpcConcLimit:       geoReq.GrpcConcLimit,
 			QueryLimit:          geoReq.QueryLimit,
-			UserSrcGeoTransform: geoReq.UserSrcGeoTransform,
-			UserSrcSRS:          geoReq.UserSrcSRS,
+			UserSrcGeoTransform: layer.UserSrcGeoTransform,
+			UserSrcSRS:          layer.UserSrcSRS,
 			NoReprojection:      geoReq.NoReprojection,
-			AxisMapping:         geoReq.AxisMapping,
-			MasQueryHint:        geoReq.MasQueryHint,
-			SRSCf:               geoReq.SRSCf,
+			AxisMapping:         layer.WmsAxisMapping,
+			MasQueryHint:        layer.MasQueryHint,
+			SRSCf:               layer.SRSCf,
 			FusionUnscale:       geoReq.FusionUnscale,
-			GrpcTileXSize:       geoReq.GrpcTileXSize,
-			GrpcTileYSize:       geoReq.GrpcTileYSize,
-			IndexTileXSize:      geoReq.IndexTileXSize,
-			IndexTileYSize:      geoReq.IndexTileYSize,
-			SpatialExtent:       geoReq.SpatialExtent,
-			IndexResLimit:       geoReq.IndexResLimit,
+			GrpcTileXSize:       layer.GrpcTileXSize,
+			GrpcTileYSize:       layer.GrpcTileYSize,
+			IndexTileXSize:      layer.IndexTileXSize,
+			IndexTileYSize:      layer.IndexTileYSize,
+			SpatialExtent:       layer.SpatialExtent,
+			IndexResLimit:       layer.IndexResLimit,
 			MetricsCollector:    geoReq.MetricsCollector,
 		},
 			Collection: styleLayer.DataSource,