Skip to content

Commit 5810de5

Browse files
committed
Merge branch 'master' into 1.8
2 parents 51cb289 + dcd9653 commit 5810de5

File tree

19 files changed

+452
-237
lines changed

19 files changed

+452
-237
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ A clear and concise description of what the bug is.
1212

1313
### General Information
1414
Please include the following general information about the issue and list any additional steps needed to reproduce the bug.
15-
- Version of the ohsome API [e.g. `1.5.0`]
15+
- Version of the ohsome API [e.g. `1.8.0`]
1616
- Which API instance was requested [e.g. remote instance at `https://api.ohsome.org/v1`, local instance with an h2 file or connected to the cluster, etc.]
1717
- Affected endpoint(s) [e.g. /contributions/count]
1818
- URL of your request (and request body if applicable)

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
Changelog
22
=========
33

4+
## 1.9.0-SNAPSHOT (current master)
5+
6+
7+
## 1.8.1
8+
9+
### Bug Fixes
10+
* Fix crash and incorrect output of `…/groupBy/tag` and `…/groupBy/key` endpoints when non-existing tag keys or values are used in a query ([#291])
11+
12+
### Documentation
13+
* Complete documentation of ohsome filters ([#290])
14+
15+
[#290]: https://github.com/GIScience/ohsome-api/pull/290
16+
[#291]: https://github.com/GIScience/ohsome-api/pull/291
17+
18+
419
## 1.8.0
520

621
### Breaking Changes

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
The ohsome API is a generic web API for in-depth analysis of OpenStreetMap (OSM) data with a focus on its history. It allows to get aggregated statistics about the evolution of OSM data itself and about the contributors behind the data. Furthermore, data extraction methods are provided to access the historic development of individual OSM features.
1212

13-
The functionalities of the ohsome API can be accessed via HTTP requests. As a basis underneath serves the [OSHDB API](https://github.com/GIScience/oshdb). The current stable version is [v1.8.0](https://github.com/GIScience/ohsome-api/releases/tag/1.8.0). Developed and maintained by [HeiGIT](https://heigit.org/).
13+
The functionalities of the ohsome API can be accessed via HTTP requests. As a basis underneath serves the [OSHDB API](https://github.com/GIScience/oshdb). The current stable version is [v1.8.1](https://github.com/GIScience/ohsome-api/releases/tag/1.8.1). Developed and maintained by [HeiGIT](https://heigit.org/).
1414

1515
## Using the ohsome API
1616

@@ -39,7 +39,7 @@ Here you see an example response giving the length of residential roads for a bo
3939
"url": "https://ohsome.org/copyrights",
4040
"text": "© OpenStreetMap contributors"
4141
},
42-
"apiVersion": "1.8.0",
42+
"apiVersion": "1.8.1",
4343
"metadata": {
4444
"executionTime": 858,
4545
"description": "Total length of items in meters.",
@@ -122,8 +122,8 @@ These instructions will get you a copy of the project up and running on your loc
122122
2. move to your Maven project directory in a shell (e.g. Windows PowerShell)
123123
3. enter the command `mvn -DskipTests=true package` to build the project (if you want to build it running the integrated tests too, look at the section [Testing](#testing))
124124
4. to run the jar file enter the following (if no additional keytables file is given, you can assume that it is included):
125-
* keytables included: `java -jar target/ohsome-api-1.8.0.jar --database.db=C:/path-to-your-data/ba-wue.oshdb`
126-
* keytables not included: `java -jar target/ohsome-api-1.8.0.jar --database.db=C:/path-to-your-data/ba-wue.oshdb --database.keytables=C:/path-to-your-keytablesFile/keytables`
125+
* keytables included: `java -jar target/ohsome-api-1.8.1.jar --database.db=C:/path-to-your-data/ba-wue.oshdb`
126+
* keytables not included: `java -jar target/ohsome-api-1.8.1.jar --database.db=C:/path-to-your-data/ba-wue.oshdb --database.keytables=C:/path-to-your-keytablesFile/keytables`
127127

128128
Now you should have a running local API, which is ready for receiving requests under *http://localhost:8080/*.
129129
<br>To check if it is running properly, you should be able to visit the swagger documentation under *http://localhost:8080/swagger-ui.html*.

docs/_static/custom.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
html.writer-html5 .rst-content table.docutils td > p, html.writer-html5 .rst-content table.docutils th > p {
2+
/* this setting is changed in the theme for tables, but shouldn't change for us. */
3+
line-height: 24px;
4+
}

docs/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@
9797
# so a file named "default.css" will overwrite the builtin "default.css".
9898
html_static_path = ['_static']
9999

100+
html_css_files = ['custom.css']
101+
100102
# Custom sidebar templates, must be a dictionary that maps document names
101103
# to template names.
102104
#

0 commit comments

Comments
 (0)