From 220f5a17eeeb8d6cf64c6736a16a757f6089b022 Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <niko@krismer.de>
Date: Tue, 11 Feb 2014 11:24:52 +0100
Subject: [PATCH] fixed problem in IsogaConfig after refactoring
---
.../it/unibz/inf/isoga/service/ServiceIsochrone.java | 2 +-
.../java/it/unibz/inf/isoga/util/DSetConfig.java | 12 ++++++++++--
.../java/it/unibz/inf/isoga/util/IsogaConfig.java | 2 +-
3 files changed, 12 insertions(+), 4 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 62ab654b..6b8f59a8 100644
--- a/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
+++ b/src/main/java/it/unibz/inf/isoga/service/ServiceIsochrone.java
@@ -124,7 +124,7 @@ public class ServiceIsochrone extends AbstractService {
final IsogaDatabase db = new IsogaDatabase(config, mode);
truncateTables(config);
final Query query = new Query(direction, speed, dMaxInMinutes * 60, date, true, dataset, mode);
- query.setLocations(locationsFromQueryPoints(qPoints, new IsogaConfig(dataset)));
+ query.setLocations(locationsFromQueryPoints(qPoints, config));
Isochrone isochrone;
if (algorithm.equals("MrneX")) {
isochrone = new MrneX(query, Integer.MAX_VALUE);
diff --git a/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java b/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java
index 974edb29..55bbb24a 100644
--- a/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java
+++ b/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java
@@ -155,8 +155,16 @@ public final class DSetConfig implements Cloneable {
return edgeTableEntry;
}
- public String[] getLayers() {
- return new String[] {edgeLayer, vertexLayer, areaBufferLayer};
+ public Collection<String> getLayers() {
+ // CHECKSTYLE:OFF MagicNumber
+ final Collection<String> result = new ArrayList<String>(3);
+ // CHECKSTYLE:ON MagicNumber
+
+ result.add(edgeLayer);
+ result.add(vertexLayer);
+ result.add(areaBufferLayer);
+
+ return result;
}
public BBox getServerExtent() {
diff --git a/src/main/java/it/unibz/inf/isoga/util/IsogaConfig.java b/src/main/java/it/unibz/inf/isoga/util/IsogaConfig.java
index 48ae5d39..e3fcf3cb 100644
--- a/src/main/java/it/unibz/inf/isoga/util/IsogaConfig.java
+++ b/src/main/java/it/unibz/inf/isoga/util/IsogaConfig.java
@@ -68,7 +68,7 @@ public class IsogaConfig extends Config {
protected void appendPropertiesFromStream(final InputStream inputStream) {
super.appendPropertiesFromStream(inputStream);
- destinationEdgeTableEntry = getTableEntry("tbl.isoLinks", "idx.isoLinks", TableType.EDGE);
+ destinationEdgeTableEntry = getTableEntry(getProperty("tbl.isoLinks"), getProperty("idx.isoLinks"), TableType.EDGE);
destinationAreaBufferTableEntry = getTableEntry(getProperty("tbl.isoAreaBuffer"), getProperty("idx.isoAreaBuffer"), TableType.COVERAGE);
destinationVertexAnnotatedTableEntry = getTableEntry(getProperty("tbl.isoNodesAnnotations"));
destinationVertexTableEntry = getTableEntry(getProperty("tbl.isoNodes"), getProperty("idx.isoNodes"), TableType.VERTEX);
--
GitLab