diff --git a/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java b/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java
index 15f8e83c0d3c6fbe8a2340688319fd61f49c0c85..97b7c298ed7848ef82924baefa854c4e0c486e98 100644
--- a/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java
+++ b/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java
@@ -12,7 +12,6 @@ import com.tngtech.configbuilder.annotation.valueextractor.PropertyValue;
import it.unibz.inf.isochrone.db.TableEntry;
import it.unibz.inf.isochrone.util.EnumContainer.TableType;
-import it.unibz.inf.isochrone.util.Point;
import it.unibz.inf.isochrone.util.ResourceHelper;
import java.io.File;
@@ -69,14 +68,6 @@ public class ConfigDataset {
}
}
- public static class PointTransformer extends TypeTransformer<String, Point> {
- @Override
- public Point transform(final String str) {
- final String[] strProperty = str.split(",");
- return new Point(Double.valueOf(strProperty[0]), Double.valueOf(strProperty[1]));
- }
- }
-
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigDataset.class);
private static final Collection<String> ALL_DATASETS = getAvailableDatasets(true);
private static final String DS_CONFIG_EXTENSION = "xml";
@@ -87,32 +78,12 @@ public class ConfigDataset {
@TypeTransformers(CalendarTransformer.class)
private Calendar clientArrivalTime;
- @PropertyValue("client.poi")
- @TypeTransformers(PointTransformer.class)
- private Point clientPoi;
-
- @NotNull
- @PropertyValue("sql.spatial.dim1.lower")
- private Double dimLower1;
-
- @NotNull
- @PropertyValue("sql.spatial.dim2.lower")
- private Double dimLower2;
-
- @NotNull
- @PropertyValue("sql.spatial.dim1.upper")
- private Double dimUpper1;
-
- @NotNull
- @PropertyValue("sql.spatial.dim2.upper")
- private Double dimUpper2;
-
@NotNull
- @PropertyValue("sql.spatial.srid")
+ @PropertyValue("spatial.srid")
private Integer serverSRID;
@NotNull
- @PropertyValue("par.distance_tolerance")
+ @PropertyValue("spatial.distance_tolerance")
private Integer distanceTolerance;
@NotNull
@@ -206,11 +177,6 @@ public class ConfigDataset {
protected ConfigDataset(final ConfigDataset o) {
clientArrivalTime = o.clientArrivalTime;
- clientPoi = o.clientPoi;
- dimLower1 = o.dimLower1;
- dimLower2 = o.dimLower2;
- dimUpper1 = o.dimUpper1;
- dimUpper2 = o.dimUpper2;
serverSRID = o.serverSRID;
distanceTolerance = o.distanceTolerance;
indexIsoAreaBuffer = o.indexIsoAreaBuffer;
@@ -241,11 +207,6 @@ public class ConfigDataset {
return areaBufferTableEntry;
}
- @JsonIgnore
- public Point getClientPOI() {
- return clientPoi;
- }
-
@JsonProperty(value = "name")
public String getDatasetName() {
return datasetName;
@@ -352,14 +313,6 @@ public class ConfigDataset {
return clientArrivalTime;
}
- protected Point getPointLowerCorner() {
- return new Point(dimLower1, dimLower2);
- }
-
- protected Point getPointUpperCorner() {
- return new Point(dimUpper1, dimUpper2);
- }
-
// Protected static methods
protected static Collection<String> getAvailableDatasets(final boolean filterInvalid) {
diff --git a/src/main/resources/config_bz.xml b/src/main/resources/config_bz.xml
index 14968d6097ed797ae6d7a553f73b5a55970f9004..27f84c06122c6999490ea88d57305ab4d4675f61 100644
--- a/src/main/resources/config_bz.xml
+++ b/src/main/resources/config_bz.xml
@@ -9,6 +9,14 @@
<entry key="tbl.dateCodes">bz_calendar</entry>
<entry key="tbl.routes">bz_routes</entry>
+ <!-- Spatial settings -->
+ <entry key="spatial.distance_tolerance">100</entry>
+ <entry key="spatial.srid">82344</entry>
+
+ <!-- Tables for MrneX -->
+ <entry key="tbl.edge.density">bz_edge_density</entry>
+ <entry key="tbl.vertex.density">bz_vertex_density</entry>
+
<!-- Database result tables -->
<entry key="tbl.isoLinks">bz_iso_edges</entry>
<entry key="idx.isoLinks">sidx_bz_iso_edges</entry>
@@ -20,28 +28,6 @@
<entry key="tbl.isoAreaBuffer">bz_iso_area</entry>
<entry key="idx.isoAreaBuffer">sidx_bz_iso_area</entry>
- <!-- Spatial settings -->
- <entry key="sql.spatial.dim1.el">MDSYS.SDO_DIM_ELEMENT('X',676836.212695921,680931.673598252,0.001)</entry>
- <entry key="sql.spatial.dim2.el">MDSYS.SDO_DIM_ELEMENT('Y', 5148549.05591258,5152597.63201377,0.001)</entry>
- <entry key="sql.spatial.srid">82344</entry>
-
- <!-- Spatial settings -->
- <entry key="sql.spatial.dim1.name">X</entry>
- <entry key="sql.spatial.dim1.lower">673847</entry>
- <entry key="sql.spatial.dim1.upper">688102</entry>
- <entry key="sql.spatial.dim1.tolerance">0.001</entry>
- <entry key="sql.spatial.dim2.name">Y</entry>
- <entry key="sql.spatial.dim2.lower">5142889</entry>
- <entry key="sql.spatial.dim2.upper">5159502</entry>
- <entry key="sql.spatial.dim2.tolerance">0.001</entry>
-
- <!-- Tables for MrneX -->
- <entry key="tbl.edge.density">bz_edge_density</entry>
- <entry key="tbl.vertex.density">bz_vertex_density</entry>
-
<!-- Client settings -->
- <entry key="client.poi">680403,5152152</entry>
<entry key="client.tArrival">10/14/2011 09:00</entry>
-
- <entry key="par.distance_tolerance">100</entry>
</properties>
diff --git a/src/main/resources/config_it.xml b/src/main/resources/config_it.xml
index 6fc81afa8c4a9d79df8824c98d4ef79a47b7627a..680c70a266949e7c6d1e288aad98adea2e59b6e9 100644
--- a/src/main/resources/config_it.xml
+++ b/src/main/resources/config_it.xml
@@ -10,8 +10,8 @@
<entry key="tbl.routes">it_routes</entry>
<!-- Spatial settings -->
- <entry key="sql.spatial.dim1.el">MDSYS.SDO_DIM_ELEMENT('LONGITUDE',-180,180,0.5)</entry>
- <entry key="sql.spatial.dim2.el">MDSYS.SDO_DIM_ELEMENT('LATITUDE', -90, 90,0.5)</entry>
+ <entry key="spatial.distance_tolerance">100</entry>
+ <entry key="spatial.srid">3857</entry>
<!-- Tables for MrneX -->
<entry key="tbl.edge.density">it_edge_density</entry>
@@ -28,20 +28,6 @@
<entry key="tbl.isoAreaBuffer">it_iso_area</entry>
<entry key="idx.isoAreaBuffer">sidx_it_iso_area</entry>
- <!-- Spatial settings -->
- <entry key="sql.spatial.dim1.name">X</entry>
- <entry key="sql.spatial.dim1.lower">611039</entry>
- <entry key="sql.spatial.dim1.upper">2061251</entry>
- <entry key="sql.spatial.dim1.tolerance">0.001</entry>
- <entry key="sql.spatial.dim2.name">Y</entry>
- <entry key="sql.spatial.dim2.lower">4231370</entry>
- <entry key="sql.spatial.dim2.upper">5950390</entry>
- <entry key="sql.spatial.dim2.tolerance">0.001</entry>
- <entry key="sql.spatial.srid">3857</entry>
-
<!-- Client settings -->
- <entry key="client.poi">1262737,5544032</entry>
<entry key="client.tArrival">09/19/2011 10:00</entry>
-
- <entry key="par.distance_tolerance">100</entry>
</properties>
diff --git a/src/main/resources/config_sf.xml b/src/main/resources/config_sf.xml
index 8228683327b289152e49160b8a70f98dad5db488..53964cde256f8cd714cc82d306d107a5f8fbaea1 100644
--- a/src/main/resources/config_sf.xml
+++ b/src/main/resources/config_sf.xml
@@ -11,8 +11,8 @@
<entry key="tbl.routes">sf_routes</entry>
<!-- Spatial settings -->
- <entry key="sql.spatial.dim1.el">MDSYS.SDO_DIM_ELEMENT('LONGITUDE',-180,180,0.5)</entry>
- <entry key="sql.spatial.dim2.el">MDSYS.SDO_DIM_ELEMENT('LATITUDE', -90, 90,0.5)</entry>
+ <entry key="spatial.distance_tolerance">100</entry>
+ <entry key="spatial.srid">3857</entry>
<!-- Tables for MrneX -->
<entry key="tbl.edge.density">sf_edge_density</entry>
@@ -27,20 +27,6 @@
<entry key="tbl.isoAreaBuffer">sf_iso_area</entry>
<entry key="idx.isoAreaBuffer">sidx_sf_iso_area</entry>
- <!-- Spatial settings -->
- <entry key="sql.spatial.dim1.name">X</entry>
- <entry key="sql.spatial.dim1.lower">-13638752</entry>
- <entry key="sql.spatial.dim1.upper">-13618826</entry>
- <entry key="sql.spatial.dim1.tolerance">0.5</entry>
- <entry key="sql.spatial.dim2.name">Y</entry>
- <entry key="sql.spatial.dim2.lower">4531787</entry>
- <entry key="sql.spatial.dim2.upper">4558539</entry>
- <entry key="sql.spatial.dim2.tolerance">0.5</entry>
- <entry key="sql.spatial.srid">3857</entry>
-
<!-- Client settings -->
- <entry key="client.poi">-13628295,4547110</entry>
<entry key="client.tArrival">09/06/2010 10:00</entry>
-
- <entry key="par.distance_tolerance">100</entry>
</properties>
diff --git a/src/main/resources/config_st.xml b/src/main/resources/config_st.xml
index 6540374c79e5b6799ab033817c593adf38e7c7e3..4dd93a1adf56b213a55dfa3b9416a6c4d604d1ad 100644
--- a/src/main/resources/config_st.xml
+++ b/src/main/resources/config_st.xml
@@ -10,9 +10,8 @@
<entry key="tbl.routes">st_routes</entry>
<!-- Spatial settings -->
- <entry key="sql.spatial.dim1.el">MDSYS.SDO_DIM_ELEMENT('X',676836.212695921,680931.673598252,0.001)</entry>
- <entry key="sql.spatial.dim2.el">MDSYS.SDO_DIM_ELEMENT('Y', 5148549.05591258,5152597.63201377,0.001)</entry>
- <entry key="sql.spatial.srid">82344</entry>
+ <entry key="spatial.distance_tolerance">100</entry>
+ <entry key="spatial.srid">82344</entry>
<!-- Tables for MrneX -->
<entry key="tbl.edge.density">st_edge_density</entry>
@@ -29,19 +28,6 @@
<entry key="tbl.isoAreaBuffer">st_iso_area</entry>
<entry key="idx.isoAreaBuffer">sidx_st_iso_area</entry>
- <!-- Spatial settings -->
- <entry key="sql.spatial.dim1.name">X</entry>
- <entry key="sql.spatial.dim1.lower">602203</entry>
- <entry key="sql.spatial.dim1.upper">762653</entry>
- <entry key="sql.spatial.dim1.tolerance">0.001</entry>
- <entry key="sql.spatial.dim2.name">Y</entry>
- <entry key="sql.spatial.dim2.lower">5119529</entry>
- <entry key="sql.spatial.dim2.upper">5228659</entry>
- <entry key="sql.spatial.dim2.tolerance">0.001</entry>
-
<!-- Client settings -->
- <entry key="client.poi">680939,5151957</entry>
<entry key="client.tArrival">09/01/2010 10:00</entry>
-
- <entry key="par.distance_tolerance">100</entry>
</properties>