diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ed8c8c6..1afe03cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/pom.xml b/pom.xml index 897f8d0b..7015f581 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 0.17.0 3.2.0 5.6 - 1.0.0-RC1 + 1.0.0 1.18.16 src/main/lombok 2.5.14 diff --git a/src/main/lombok/org/heigit/ohsome/ohsomeapi/oshdb/DbConnData.java b/src/main/lombok/org/heigit/ohsome/ohsomeapi/oshdb/DbConnData.java index 547d3de9..fe80b983 100644 --- a/src/main/lombok/org/heigit/ohsome/ohsomeapi/oshdb/DbConnData.java +++ b/src/main/lombok/org/heigit/ohsome/ohsomeapi/oshdb/DbConnData.java @@ -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; diff --git a/src/main/lombok/org/heigit/ohsome/ohsomeapi/utils/RequestUtils.java b/src/main/lombok/org/heigit/ohsome/ohsomeapi/utils/RequestUtils.java index c6bb309b..005a2a0a 100644 --- a/src/main/lombok/org/heigit/ohsome/ohsomeapi/utils/RequestUtils.java +++ b/src/main/lombok/org/heigit/ohsome/ohsomeapi/utils/RequestUtils.java @@ -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();