Skip to content
Snippets Groups Projects
Commit 031687cb authored by Nikolaus Krismer's avatar Nikolaus Krismer
Browse files

renaming class

parent b2aedb66
No related branches found
No related tags found
No related merge requests found
package it.unibz.inf.isoga.coverage;
import it.unibz.inf.isochrone.util.EnumContainer.Mode;
import it.unibz.inf.isoga.db.IsogaDatabase;
import it.unibz.inf.isoga.db.DatabaseWeb;
import it.unibz.inf.isoga.util.ConfigWeb;
import it.unibz.inf.isoga.util.MathHelper;
......@@ -21,14 +21,14 @@ public class CoverageBuilder {
private static final int FULL_CIRCLE_DEGREE = 360;
private final ConfigWeb config;
private final Mode mode;
private final IsogaDatabase db;
private final DatabaseWeb db;
private final Set<Integer> exploredEdges = new HashSet<Integer>();
private long timeBufferQuery;
public CoverageBuilder(final ConfigWeb config, final Mode mode) {
this.config = config;
this.mode = mode;
db = new IsogaDatabase(config);
db = new DatabaseWeb(config);
}
/**
......
......@@ -42,7 +42,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
* interface. (Mostly inserting vertices and links into the tables
* used for the GeoServer)
*/
public class IsogaDatabase extends Database<ConfigWeb> {
public class DatabaseWeb extends Database<ConfigWeb> {
private final String queryGetIsoEdges;
private final String queryStoreLinks;
private final String queryStorePartialLinks;
......@@ -50,7 +50,7 @@ public class IsogaDatabase extends Database<ConfigWeb> {
private final String queryInsertVertexAnnotation;
private final String queryUpdateVertices;
public IsogaDatabase(final ConfigWeb cfg) {
public DatabaseWeb(final ConfigWeb cfg) {
// FIXME: Should we really use direction OUTGOING here? (should this be a parameter)
super(cfg, Direction.OUTGOING);
......@@ -79,7 +79,7 @@ public class IsogaDatabase extends Database<ConfigWeb> {
+ cfg.getDestinationVertexTableEntry().getTableName() + ".\"ROUTE_ID\">=0";
}
public IsogaDatabase(final ConfigWeb config, final Mode mode) {
public DatabaseWeb(final ConfigWeb config, final Mode mode) {
this(config);
this.mode = mode;
}
......
......@@ -2,7 +2,7 @@ package it.unibz.inf.isoga.network;
import it.unibz.inf.isochrone.network.MemoryOutput;
import it.unibz.inf.isochrone.network.Node;
import it.unibz.inf.isoga.db.IsogaDatabase;
import it.unibz.inf.isoga.db.DatabaseWeb;
import it.unibz.inf.isoga.geometry.BBox;
import it.unibz.inf.isoga.util.ConfigWeb;
......@@ -22,7 +22,7 @@ import org.apache.commons.dbutils.DbUtils;
public class MemoryBBoxOutput extends MemoryOutput {
private final Set<Node> nodes = new HashSet<Node>();
public void storeAll(final ConfigWeb config, final IsogaDatabase db) {
public void storeAll(final ConfigWeb config, final DatabaseWeb db) {
db.storeLinks(links.values(), config);
db.storeVertices(nodes, config);
}
......
......@@ -11,7 +11,7 @@ import it.unibz.inf.isochrone.util.Query;
import it.unibz.inf.isoga.coverage.CoverageBuilder;
import it.unibz.inf.isoga.datastructure.QueryPoint;
import it.unibz.inf.isoga.db.DbUtility;
import it.unibz.inf.isoga.db.IsogaDatabase;
import it.unibz.inf.isoga.db.DatabaseWeb;
import it.unibz.inf.isoga.network.MemoryBBoxOutput;
import it.unibz.inf.isoga.service.dto.RequestIsochrone;
import it.unibz.inf.isoga.service.dto.ResponseIsochrone;
......@@ -61,7 +61,7 @@ public class ServiceIsochrone extends AbstractService<RequestIsochrone, Response
// Timing start
final long start = System.currentTimeMillis();
final IsogaDatabase db = new IsogaDatabase(config, request.getMode());
final DatabaseWeb db = new DatabaseWeb(config, request.getMode());
truncateTables(config);
final Query query = new Query(request.getDirection(), request.getSpeed(), request.getDmax(), request.getDate(), true, dataset, request.getMode());
query.setLocations(locationsFromQueryPoints(request.getQueryPoints(), config));
......@@ -129,7 +129,7 @@ public class ServiceIsochrone extends AbstractService<RequestIsochrone, Response
}
final Set<Location> locations = new HashSet<Location>(queryPoints.size());
final IsogaDatabase db = new IsogaDatabase(config);
final DatabaseWeb db = new DatabaseWeb(config);
for (final QueryPoint qPoint : queryPoints) {
locations.addAll(db.projectOnLinks(qPoint));
}
......
......@@ -2,7 +2,7 @@ package it.unibz.inf.isoga.web;
import it.unibz.inf.isochrone.util.EnumContainer.Dataset;
import it.unibz.inf.isochrone.util.Point;
import it.unibz.inf.isoga.db.IsogaDatabase;
import it.unibz.inf.isoga.db.DatabaseWeb;
import it.unibz.inf.isoga.geometry.BBox;
import it.unibz.inf.isoga.util.ConfigDataset;
import it.unibz.inf.isoga.util.ConfigWeb;
......@@ -140,7 +140,7 @@ public final class ConfigContainer {
e.printStackTrace();
}
final IsogaDatabase db = new IsogaDatabase(config);
final DatabaseWeb db = new DatabaseWeb(config);
final BBox clientBBox = new BBox(db.transform(serverBBox.getLowerCorner()), db.transform(serverBBox.getUpperCorner()));
final Point queryPoint = db.transform(clientPOI);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment