From 23ba3eefae59676a73725c4a51a9470b64f59b3e Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <niko@krismer.de>
Date: Tue, 11 Feb 2014 20:48:25 +0100
Subject: [PATCH] fixed checkstyle warnings fixed minor bug that would only
occur when datasets were misconfigured
---
.../it/unibz/inf/isoga/service/ServiceIsochrone.java | 8 ++++----
.../unibz/inf/isoga/web/ConfigurationContainer.java | 11 ++++++++++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java b/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
index d109cce6..fd592386 100644
--- a/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
+++ b/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
@@ -32,6 +32,7 @@ import org.json.JSONException;
* @author Nikolaus Krismer
*/
public class ServiceIsochrone extends AbstractService<RequestIsochrone, ResponseIsochrone> {
+ private static final int BUFFER_DISTANCE = 20;
// Constructor
@@ -79,16 +80,15 @@ public class ServiceIsochrone extends AbstractService<RequestIsochrone, Response
response.setBoundingBox(output.getBoundingBox(config));
response.setLog(new TimingLog(totalComputationTime, 0, timeMineX));
} else {
- final long bufferDistance = 20;
final long start1 = System.currentTimeMillis();
final CoverageBuilder coverage = new CoverageBuilder(config, request.getMode());
final String coverageMode = request.getCoverageMode();
if (coverageMode.equalsIgnoreCase("EB")) {
- coverage.createIsoAreaLBA(bufferDistance);
+ coverage.createIsoAreaLBA(BUFFER_DISTANCE);
} else if (coverageMode.equalsIgnoreCase("SB")) {
- coverage.createIsoAreaSBA(request.getDmax(), bufferDistance, request.getSpeed());
+ coverage.createIsoAreaSBA(request.getDmax(), BUFFER_DISTANCE, request.getSpeed());
} else if (coverageMode.equalsIgnoreCase("CHB")) {
- coverage.createIsoAreaCHBA(request.getDmax(), bufferDistance, request.getSpeed());
+ coverage.createIsoAreaCHBA(request.getDmax(), BUFFER_DISTANCE, request.getSpeed());
}
final long timeCoveraging = System.currentTimeMillis() - start1;
diff --git a/src/main/java/it/unibz/inf/isoga/web/ConfigurationContainer.java b/src/main/java/it/unibz/inf/isoga/web/ConfigurationContainer.java
index a09e0c4a..ebcb7941 100644
--- a/src/main/java/it/unibz/inf/isoga/web/ConfigurationContainer.java
+++ b/src/main/java/it/unibz/inf/isoga/web/ConfigurationContainer.java
@@ -106,8 +106,17 @@ public final class ConfigurationContainer {
final String dataSetStr = GLOBAL_CONFIG.getProperty("cfg.datasets");
final String[] dataSets = (dataSetStr == null) ? new String[0] : dataSetStr.split(",");
+ final Dataset[] allSets = Dataset.values();
for (final String dSet : dataSets) {
- final Dataset dataSet = Dataset.valueOf(dSet.toUpperCase());
+ Dataset dataSet = null;
+ final String dSetUpper = dSet.toUpperCase();
+ for (Dataset availableSet : allSets) {
+ if (availableSet.name().equals(dSetUpper)) {
+ dataSet = availableSet;
+ break;
+ }
+ }
+
if (dataSet == null) {
LOGGER.warn("Invalid dataset \"" + dSet + "\" specified. It is not configured in the server enum!");
continue;
--
GitLab