Skip to content

Commit ac8b84a

Browse files
committed
Merge branch 'release/4.4.0'
2 parents a72cee5 + 3b6f8fd commit ac8b84a

File tree

165 files changed

+8151
-2250
lines changed

Some content is hidden

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

165 files changed

+8151
-2250
lines changed

.circleci/config.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,33 @@ aliases:
2727
name: "Import signing key"
2828
command: |
2929
gpg --keyserver keyserver.ubuntu.com \
30-
--recv-keys 0x13E9AA1D8153E95E && \
30+
--recv-keys "0x${GPG_KEY_ID}" && \
3131
echo "${GPG_KEY}" | base64 -d > signing_key.asc && \
3232
gpg --import signing_key.asc
3333
- run:
3434
name: Executing cipublish
3535
command: ./scripts/cipublish
3636

3737
# Build environments
38-
- &openjdk8-scala2_12_12_environment
38+
- &openjdk8-scala2_12_13_environment
3939
docker:
4040
- image: circleci/openjdk:8-jdk
4141
environment:
42-
SCALA_VERSION: 2.12.12
42+
SCALA_VERSION: 2.12.13
4343

4444
version: 2
4545
workflows:
4646
version: 2
4747
build:
4848
jobs:
49-
- "openjdk8-scala2.12.12":
49+
- "openjdk8-scala2.12.13":
5050
filters: # required since `openjdk8-scala2.12.12_deploy` has tag filters AND requires `openjdk8-scala2.12.12`
5151
tags:
5252
only:
5353
- /^(.*)$/
54-
- "openjdk8-scala2.12.12_deploy":
54+
- "openjdk8-scala2.12.13_deploy":
5555
requires:
56-
- "openjdk8-scala2.12.12"
56+
- "openjdk8-scala2.12.13"
5757
filters:
5858
tags:
5959
only:
@@ -65,10 +65,10 @@ workflows:
6565
- /hotfix\/.*/
6666

6767
jobs:
68-
"openjdk8-scala2.12.12":
69-
<<: *openjdk8-scala2_12_12_environment
68+
"openjdk8-scala2.12.13":
69+
<<: *openjdk8-scala2_12_13_environment
7070
steps: *run_cibuild
7171

72-
"openjdk8-scala2.12.12_deploy":
73-
<<: *openjdk8-scala2_12_12_environment
72+
"openjdk8-scala2.12.13_deploy":
73+
<<: *openjdk8-scala2_12_13_environment
7474
steps: *run_cipublish

.gitignore

Lines changed: 57 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,65 @@
1-
# Scala #
1+
# Operating System Files
22

3-
project/boot
4-
project/plugins/project
5-
project/plugins/target
6-
project/target
3+
*.DS_Store
4+
Thumbs.db
5+
6+
# Build Files
7+
8+
bin
79
target
8-
.ensime*
9-
ensime-langserver.log
10-
pc.stdout.log
11-
\#*#
12-
*~
10+
build/
11+
.gradle
12+
cmake-build-debug
13+
14+
# Eclipse Project Files
15+
16+
.classpath
17+
.project
18+
.settings
19+
20+
# IntelliJ IDEA Files
21+
22+
*.iml
23+
*.ipr
24+
*.iws
25+
*.idea
26+
27+
# Sublime files
28+
29+
*.sublime-workspace
30+
31+
# VSCode files
32+
33+
.vscode
34+
.history
35+
36+
# Metals
37+
38+
.metals
39+
.bloop
40+
metals.sbt
41+
42+
# SBT
43+
44+
.bsp
45+
46+
# Other
47+
1348
.#*
1449
.lib
1550
*.aux.xml
1651
*.jar
1752
*.crc
18-
.idea
53+
54+
_SUCCESS
55+
56+
*.pyc
57+
.cache
58+
.settings
59+
*.swp
60+
*.swo
61+
62+
nohup.out
63+
derby.log
64+
metastore_db/
1965
*.log
20-
.DS_Store
21-
.bloop
22-
.metals
23-
metals.sbt
24-
.history

.sbtopts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
-J-Xmx2G
22
-J-Xms1G
33
-J-Xss5M
4-
-J-XX:+UseConcMarkSweepGC
5-
-J-XX:+CMSClassUnloadingEnabled
4+
-J-XX:+UseG1GC
65
-Djava.awt.headless=true
76
-Dsbt.color=always
87
-Dsbt.supershell=false

.scalafmt.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
version = "2.6.1"
1+
version = "2.7.5"
22
align = most
33
continuationIndent.callSite = 2
44
continuationIndent.defnSite = 2
55
danglingParentheses = true
66
indentOperator = spray
77
maxColumn = 150
88
newlines.alwaysBeforeTopLevelStatements = false
9-
project.excludeFilters = [".*\\.sbt"]
109
rewrite.rules = [RedundantParens, SortImports]
1110
spaces.inImportCurlyBraces = false
1211
unindentTopLevelOperators = true

CHANGELOG.md

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [4.4.0] - 2021-04-30
10+
11+
## Fixed
12+
- Service endpoints reject requests with unsupported version parameters [#313](https://github.com/geotrellis/geotrellis-server/pull/313)
13+
- Axis Ordering in a wms getmap [#302](https://github.com/geotrellis/geotrellis-server/issues/302)
14+
- Interoperability of STAC and non-STAC layers in mapalgebra layers [#309](https://github.com/geotrellis/geotrellis-server/issues/309)
15+
- OGC endpoints format parameter and HTTP response mime-type not matching [#255](https://github.com/geotrellis/geotrellis-server/issues/255)
16+
- WMS 1.3.0 Boolean representation [#332](https://github.com/geotrellis/geotrellis-server/issues/332)
17+
- Fix WCS projections support [#361](https://github.com/geotrellis/geotrellis-server/pull/361)
18+
- STAC-example cleanup [#363](https://github.com/geotrellis/geotrellis-server/pull/363)
19+
20+
## Added
21+
- WCS services support configuration of `supported-projections` [#314](https://github.com/geotrellis/geotrellis-server/pull/314)
22+
- Add WCS 1.1.0 as the supported version [#330](https://github.com/geotrellis/geotrellis-server/pull/330)
23+
- STAC Collections support [#338](https://github.com/geotrellis/geotrellis-server/issues/338)
24+
- StacAssetRasterSource improvements [#326](https://github.com/geotrellis/geotrellis-server/issues/326)
25+
- StacCollectionRasterSource implementation [#340](https://github.com/geotrellis/geotrellis-server/issues/340)
26+
- WCS Rendering formats support [#195](https://github.com/geotrellis/geotrellis-server/issues/195)
27+
- GeoTrellis Server STAC Package [#350](https://github.com/geotrellis/geotrellis-server/issues/350)
28+
- STAC Collection temporal extents support [#347](https://github.com/geotrellis/geotrellis-server/issues/347)
29+
- OGC Services configurable time representation [#324](https://github.com/geotrellis/geotrellis-server/issues/324)
30+
- Default time period configurable on the WMS layer with a time dimension [#325](https://github.com/geotrellis/geotrellis-server/issues/325)
31+
- STAC Periodic Temporal extent support [#354](https://github.com/geotrellis/geotrellis-server/issues/354)
32+
- WMS GetFeatureInfo [#321](https://github.com/geotrellis/geotrellis-server/issues/321)
33+
- MosaicRasterSource improvements [#344](https://github.com/geotrellis/geotrellis-server/issues/344)
34+
35+
### Changed
36+
- Update GT Server STAC4S dependency [#319](https://github.com/geotrellis/geotrellis-server/issues/319)
37+
- Unnecessary mandatory parameters on WCS 1.1.1 GetCoverage request [#306](https://github.com/geotrellis/geotrellis-server/issues/306)
38+
939
## [4.3.0] - 2021-02-12
1040

1141
## Added
@@ -18,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1848

1949
## Fixed
2050
- Fix STAC API TemporalExtent JSON representation [#293](https://github.com/geotrellis/geotrellis-server/pull/293)
51+
- XML responses in OGC services include a default namespace [#311](https://github.com/geotrellis/geotrellis-server/pull/311)
2152

2253
## [4.2.0] - 2020-06-23
2354

@@ -111,7 +142,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
111142
### Changed
112143
- Update geotrellis-contrib [#135](https://github.com/geotrellis/geotrellis-server/pull/135)
113144

114-
[Unreleased]: https://github.com/geotrellis/geotrellis-server/compare/4.2.0...HEAD
145+
[Unreleased]: https://github.com/geotrellis/geotrellis-server/compare/4.3.0...HEAD
146+
[4.3.0]: https://github.com/geotrellis/geotrellis-server/compare/4.3.0...4.2.0
115147
[4.2.0]: https://github.com/geotrellis/geotrellis-server/compare/4.2.0...4.1.0
116148
[4.1.0]: https://github.com/geotrellis/geotrellis-server/compare/4.0.1...4.1.0
117149
[4.0.1]: https://github.com/geotrellis/geotrellis-server/compare/4.0.0...4.0.1

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# GeoTrellis Server
22

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)
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) [![Maven Central](https://img.shields.io/maven-central/v/com.azavea.geotrellis/geotrellis-server-core_2.12)](http://search.maven.org/#search%7Cga%7C1%7com.azavea.geotrellis)
4+
45

56
GeoTrellis Server is a set of components designed to simplify
67
viewing, processing, and serving raster data from arbitrary sources
@@ -13,16 +14,15 @@ or returned, this project aims to simplify the creation of dynamic,
1314
responsive layers whose transformations can be described in MAML
1415
([Map Algebra Modeling Language](https://github.com/geotrellis/maml/)).
1516

17+
### Getting Started with GeoTrellis Server
1618

17-
### Including Geotrellis Server
18-
19-
Current version:
20-
- 0.1.10
19+
GeoTrellis Server is currently available for Scala 2.12.
2120

22-
Add the geotrellis-server dependency by declaring it within your
23-
project's `build.sbt`:
24-
`libraryDependencies += "com.azavea" %% "geotrellis-server-core" % "0.1.10"`
21+
To get started with SBT, simply add the following to your build.sbt file:
2522

23+
```scala
24+
libraryDependencies += "com.azavea.geotrellis" %% "geotrellis-server-core" % "<latest version>"
25+
```
2626

2727
### High level concepts
2828

0 commit comments

Comments
 (0)