Reset configuration default values

geotrellis · Apr 28, 2021 · 1e8b0d7 · 1e8b0d7
1 parent cdeee27
commit 1e8b0d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,7 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Default time period configurable on the WMS layer with a time dimension [#325](https://github.com/geotrellis/geotrellis-server/issues/325)
 - STAC Periodic Temporal extent support [#354](https://github.com/geotrellis/geotrellis-server/issues/354)
 - WMS GetFeatureInfo [#321](https://github.com/geotrellis/geotrellis-server/issues/321)
-- Effectful RasterSources [#362](https://github.com/geotrellis/geotrellis-server/pull/362)
+- MosaicRasterSource improvements [#344](https://github.com/geotrellis/geotrellis-server/issues/344)
 
 ### Changed
 - Update GT Server STAC4S dependency [#319](https://github.com/geotrellis/geotrellis-server/issues/319)

diff --git a/stac-example/src/main/resources/application.conf b/stac-example/src/main/resources/application.conf
@@ -230,7 +230,7 @@ layers = {
         asset = "B4"
         asset-limit = 1000
         source = "http://localhost:9090/"
-        ignore-time = true
+        ignore-time = false
         default-style = "red-to-blue"
         time-default = "oldest"
         compute-time-positions = false
@@ -256,7 +256,7 @@ layers = {
         asset = "B3"
         asset-limit = 1000
         source = "http://localhost:9090/"
-        ignore-time = true
+        ignore-time = false
         default-style = "red-to-blue"
         compute-time-positions = false
         parallel-mosaic = true
@@ -280,7 +280,7 @@ layers = {
         asset = "B2"
         asset-limit = 1000
         source = "http://localhost:9090/"
-        ignore-time = true
+        ignore-time = false
         default-style = "red-to-blue"
         compute-time-positions = false
         parallel-mosaic = true

diff --git a/stac-example/src/main/scala/geotrellis/server/ogc/Main.scala b/stac-example/src/main/scala/geotrellis/server/ogc/Main.scala
@@ -111,9 +111,8 @@ object Main
             def createServer: Resource[IO, Server[IO]] =
               for {
                 conf         <- Conf.loadResourceF[IO](configPath)
-                /** MosaicRasterSources pool. */
+                /** MosaicRasterSources pool init for the graceful shutdown. */
                 blockingPool <- Resource.make(IO.delay(BlockingThreadPool.pool))(p => IO.delay(p.shutdown()))
-                blockingShift = IO.contextShift(ExecutionContext.fromExecutor(blockingPool))
                 /** Uses server pool. */
                 http4sClient <- Http4sBackend.usingDefaultBlazeClientBuilder[IO](Blocker.liftExecutionContext(executionContext), executionContext)
                 simpleSources = conf.layers.values.collect { case rsc: RasterSourceConf => rsc.toLayer }.toList
@@ -143,7 +142,7 @@ object Main
                                   WmtsModel[IO](
                                     svc.serviceMetadata,
                                     svc.tileMatrixSets,
-                                    svc.layerSources(simpleSources, http4sClient, blockingShift)
+                                    svc.layerSources(simpleSources, http4sClient)
                                   )
                                 }
                 _            <- Resource.liftF(
@@ -156,7 +155,7 @@ object Main
                 wcsModel      = conf.wcs.map { svc =>
                                   WcsModel[IO](
                                     svc.serviceMetadata,
-                                    svc.layerSources(simpleSources, http4sClient, blockingShift),
+                                    svc.layerSources(simpleSources, http4sClient),
                                     svc.supportedProjections,
                                     ExtendedParameters.extendedParametersBinding
                                   )