Skip to content

Commit 1772870

Browse files
committed
Merge branch 'release/4.1.0'
2 parents 015cf77 + c890dd6 commit 1772870

File tree

205 files changed

+10345
-1783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+10345
-1783
lines changed

.circleci/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ aliases:
4444
docker:
4545
- image: circleci/openjdk:8-jdk
4646
environment:
47-
SCALA_VERSION: 2.12.8
47+
SCALA_VERSION: 2.12.10
4848

4949
version: 2
5050
workflows:
@@ -56,8 +56,8 @@ workflows:
5656
tags:
5757
only:
5858
- /^(.*)$/
59-
- "openjdk8-scala2.12.8":
60-
filters: # required since `openjdk8-scala2.12.8_deploy` has tag filters AND requires `openjdk8-scala2.12.8`
59+
- "openjdk8-scala2.12.10":
60+
filters: # required since `openjdk8-scala2.12.10_deploy` has tag filters AND requires `openjdk8-scala2.12.10`
6161
tags:
6262
only:
6363
- /^(.*)$/
@@ -73,9 +73,9 @@ workflows:
7373
- develop
7474
- /release\/.*/
7575
- /hotfix\/.*/
76-
- "openjdk8-scala2.12.8_deploy":
76+
- "openjdk8-scala2.12.10_deploy":
7777
requires:
78-
- "openjdk8-scala2.12.8"
78+
- "openjdk8-scala2.12.10"
7979
filters:
8080
tags:
8181
only:
@@ -91,14 +91,14 @@ jobs:
9191
<<: *openjdk8-scala2_11_12_environment
9292
steps: *run_cibuild
9393

94-
"openjdk8-scala2.12.8":
94+
"openjdk8-scala2.12.10":
9595
<<: *openjdk8-scala2_12_8_environment
9696
steps: *run_cibuild
9797

9898
"openjdk8-scala2.11.12_deploy":
9999
<<: *openjdk8-scala2_11_12_environment
100100
steps: *run_cipublish
101101

102-
"openjdk8-scala2.12.8_deploy":
102+
"openjdk8-scala2.12.10_deploy":
103103
<<: *openjdk8-scala2_12_8_environment
104104
steps: *run_cipublish

.jabbarc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

.sbtopts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
-J-Xms1G
33
-J-Xss2M
44
-Djava.awt.headless=true
5+
-Dsbt.color=always
6+
-Dsbt.supershell=false

CHANGELOG.md

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [4.1.0] - 2020-03-03
10+
11+
### Added
12+
- Add support for an interpolated version of the color map [#161](https://github.com/geotrellis/geotrellis-server/issues/161)
13+
- Generate WCS 1.1.1 protocol using XSD data model [#188](https://github.com/geotrellis/geotrellis-server/issues/188)
14+
- WCS 1.1.1 GetCoverage Support [#192](https://github.com/geotrellis/geotrellis-server/issues/192)
15+
- RasterSource Catalog [#162](https://github.com/geotrellis/geotrellis-server/issues/162)
16+
- {WCS|WMTS|WMS}Model uses RasterSource catalog [#163](https://github.com/geotrellis/geotrellis-server/issues/163)
17+
- WCS DescribeCoverage may include time TemporalDomain [#211](https://github.com/geotrellis/geotrellis-server/issues/211)
18+
19+
### Changed
20+
- Included split dependencies a la GeoTrellis 3.2 for cats ecosystem libraries [\#184](https://github.com/geotrellis/geotrellis-server/pull/184)
21+
- Dropped WCS 1.0.0 support
22+
- Updated MAML up to 0.6.0 [#199](https://github.com/geotrellis/geotrellis-server/pull/199)
23+
- Add ability to configure subset of OGC services [#151](https://github.com/geotrellis/geotrellis-server/issues/151)
24+
25+
### Fixed
26+
- Use default styles appropriately when configured [#149](https://github.com/geotrellis/geotrellis-server/issues/149)
27+
- Use linspace function to ensure correct interpolation of [#205](https://github.com/geotrellis/geotrellis-server/issues/205)
28+
- SLF4J backends have been excluded and marked as Runtime dependencies as necessary to make logging work again [#205](https://github.com/geotrellis/geotrellis-server/issues/205)
29+
- Fixed color interpolation bug related to constructing a range when the step is 0 [#111](https://github.com/geotrellis/geotrellis-server/issues/111)
30+
- Non-integer (floating point) ColorMap keys now work with or without being quoted [#187](https://github.com/geotrellis/geotrellis-server/issues/187)
31+
- Missing `<ows:Title>` and `<ows:Abstract>` elements in WCS GetCapabilities response [#114](https://github.com/geotrellis/geotrellis-server/issues/114)
32+
- Layer definition elements unused in WMS GetCapabilities response [#115](https://github.com/geotrellis/geotrellis-server/issues/115)
33+
- Bad assembly strategy [#142](https://github.com/geotrellis/geotrellis-server/issues/142)
34+
935
## [4.0.1] - 2019-11-22
1036

1137
### Changed
12-
- Make publishSettings accessible to aggregate modules
38+
- Make publishSettings accessible to aggregate modules
1339

1440
## [4.0.0]- 2019-11-21
1541

1642
### Added
1743
- Enable artifact publishing for `opengis`, `ogc`, and `stac` subprojects [\#147](https://github.com/geotrellis/geotrellis-server/pull/147)
1844
- Included more link types based on OGC Features API [\#176](https://github.com/geotrellis/geotrellis-server/pull/176)
45+
- Included more OGC specs (sld, se, wfs, filter) [#186](https://github.com/geotrellis/geotrellis-server/pull/186)
1946

2047
### Changed
2148
- *Breaking* Update StacItem and StacLinkType compliance and better ergonomics with labeling extension [\#145](https://github.com/geotrellis/geotrellis-server/pull/145)
@@ -37,7 +64,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3764
### Changed
3865
- Update geotrellis-contrib [#135](https://github.com/geotrellis/geotrellis-server/pull/135)
3966

40-
[Unreleased]: https://github.com/geotrellis/geotrellis-server/compare/4.0.1...HEAD
67+
[Unreleased]: https://github.com/geotrellis/geotrellis-server/compare/4.1.0...HEAD
68+
[4.1.0]: https://github.com/geotrellis/geotrellis-server/compare/4.0.1...4.1.0
4169
[4.0.1]: https://github.com/geotrellis/geotrellis-server/compare/4.0.0...4.0.1
4270
[4.0.0]: https://github.com/geotrellis/geotrellis-server/compare/3.4.0...4.0.0
4371
[3.4.0]: https://github.com/geotrellis/geotrellis-server/compare/3.3.8...3.4.0

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
### About the library
1+
# GeoTrellis Server
2+
3+
[![CircleCI](https://circleci.com/gh/geotrellis/geotrellis-server.svg?style=svg)](https://circleci.com/gh/geotrellis/geotrellis-server) [![Join the chat at https://gitter.im/geotrellis/geotrellis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/geotrellis/geotrellis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
24

35
GeoTrellis Server is a set of components designed to simplify
46
viewing, processing, and serving raster data from arbitrary sources

bench/src/main/scala/geotrellis/server/TmsReificationBench.scala

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2020 Azavea
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
// package geotrellis.server
218

319
// import geotrellis.server.vlm.geotiff._

0 commit comments

Comments
 (0)