Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update OSHDB to version 1.0.0 #283

Merged
merged 2 commits into from
Nov 23, 2022
Merged

update OSHDB to version 1.0.0 #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ce1298
update OSHDB to version 1.0.0
joker234 Nov 23, 2022
b5b7083
add Changelog for update to 1.0.0
joker234 Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ Changelog

### Breaking Changes
* remove caching command line parameter ([#281])
* update to OSHDB 1.0.0-SNAPSHOT ([#281])
* update to OSHDB 1.0.0 ([#281], [#283])

### New Features
* tag translator parameter are now configurable via CLI parameter: `tt.maxbytesvalue`, `tt.maxnumroles` ([#281])

[#281]: https://github.com/GIScience/ohsome-api/pull/281
[#283]: https://github.com/GIScience/ohsome-api/pull/283


## 1.7.0
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<jts2geojson.version>0.17.0</jts2geojson.version>
<mavenjar.version>3.2.0</mavenjar.version>
<opencsv.version>5.6</opencsv.version>
<oshdb.version>1.0.0-RC1</oshdb.version>
<oshdb.version>1.0.0</oshdb.version>
<projectlombok.version>1.18.16</projectlombok.version>
<sonar.sources>src/main/lombok</sonar.sources>
<springboot.version>2.5.14</springboot.version>
Expand Down
1 change: 0 additions & 1 deletion src/main/lombok/org/heigit/ohsome/ohsomeapi/oshdb/DbConnData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
public class DbConnData {

public static OSHDBDatabase db = null;
public static OSHDBJdbc keytables = null;
public static TagTranslator tagTranslator = null;
public static DataSource dbSource = null;
public static DataSource keytablesDbSource = null;
Expand Down
10 changes: 1 addition & 9 deletions src/main/lombok/org/heigit/ohsome/ohsomeapi/utils/RequestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,7 @@ public static boolean usesCsvFormat(HttpServletRequest request) {
* #readTree(String) readTree}
*/
public static void extractOSHDBMetadata() throws IOException {
OSHDBDatabase db;
if (DbConnData.keytables != null) {
db = DbConnData.keytables;
} else {
if (!(DbConnData.db instanceof OSHDBJdbc)) {
throw new DatabaseAccessException(ExceptionMessages.DATABASE_ACCESS);
}
db = DbConnData.db;
}
OSHDBDatabase db = DbConnData.db;
if (db.metadata("extract.region") != null) {
String dataPolyString = db.metadata("extract.region");
ObjectMapper mapper = new ObjectMapper();
Expand Down