diff --git a/bootstrap/config.sh b/bootstrap/config.sh
index b78cc420744ae5e7b6b7c226d8366be9ac6ebae5..b7253bbfbee375f5f87f5443e22fc2c440b988f1 100755
--- a/bootstrap/config.sh
+++ b/bootstrap/config.sh
@@ -29,7 +29,9 @@ INSTALL_SPATIALITE=false
INSTALL_SPATIALITE_ADMIN=true
CACHE_DIR_LOCAL="/tmp/vagrant-cache"
-CACHE_DIR_REMOTE="http://dbis-informatik.uibk.ac.at/static/ma/niko/isochrone"
+CACHE_DIR_REMOTE="http://dbis-informatik.uibk.ac.at/static/ma/niko"
+CACHE_DIR_REMOTE_ISO="${CACHE_DIR_REMOTE}/isochrone"
+CACHE_DIR_REMOTE_DATA="${CACHE_DIR_REMOTE}/isochrone_data"
DEPLOY_DIR="/opt"
DATA_DIR="$DEPLOY_DIR/data"
SETUP_DIR="/setup"
diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh
index d56893dd9dd89ba1e28378a38532ed9c7ab0db33..9fa8e7b1564b614f0da2485f450effda55bcfdf9 100755
--- a/bootstrap/importData.sh
+++ b/bootstrap/importData.sh
@@ -43,6 +43,7 @@ CITY_POLYGON_DIR="${SHARED_CONF_DIR}/cityPolygons"
OSM_BOUNDING_BZ="${CITY_POLYGON_DIR}/bolzano.poly"
OSM_BOUNDING_IBK="${CITY_POLYGON_DIR}/innsbruck.poly"
OSM_BOUNDING_IT="${CITY_POLYGON_DIR}/italy.poly"
+OSM_BOUNDING_SBG="${CITY_POLYGON_DIR}/salzburg.poly"
OSM_BOUNDING_SF="${CITY_POLYGON_DIR}/sanfrancsico.poly"
OSM_BOUNDING_ST="${CITY_POLYGON_DIR}/trentinoaltoadige.poly"
OSM_DOWNLOAD_MIRROR="http://download.geofabrik.de"
@@ -52,9 +53,16 @@ OSM_FILE_CALIFORNIA="north-america/us/california-140301.osm.pbf"
OSM_FILE_BZ_FILTERED="bozen-140301-filtered.osm"
OSM_FILE_IBK_FILTERED="innsbruck-140301-filtered.osm"
OSM_FILE_IT_FILTERED="italy-140301-filtered.osm"
+OSM_FILE_SBG_FILTERED="salzburg-140301-filtered.osm"
OSM_FILE_SF_FILTERED="sanfrancisco-140301-filtered.osm"
OSM_FILE_ST_FILTERED="southtyrol-140301-filtered.osm"
OSM_KEYS="aerialway,highway,public_transport,railway,route"
+TABLE_PREFIX_BZ="bolzano_"
+TABLE_PREFIX_IBK="innsbruck_"
+TABLE_PREFIX_IT="italy_"
+TABLE_PREFIX_SBG="salzburg_"
+TABLE_PREFIX_SF="sanfrancisco_"
+TABLE_PREFIX_ST="trentinoaltoadige_"
############################
# Function definitions #
@@ -88,7 +96,7 @@ fn_import_data() {
if $VALID_SQL; then
echo " - downloading sql export"
- fn_download_newer $DOWNLOAD_DIR/$SQL_EXPORT_FILE $CACHE_DIR_REMOTE/$SQL_EXPORT_FILE
+ fn_download_newer $DOWNLOAD_DIR/$SQL_EXPORT_FILE $CACHE_DIR_REMOTE_DATA/$SQL_EXPORT_FILE
cp $DOWNLOAD_DIR/$SQL_EXPORT_FILE $DATA_DIR/$SQL_EXPORT_FILE >> /dev/null 2>&1
echo " - importing sql export into postgis database"
@@ -109,7 +117,7 @@ fn_import_data() {
if $IMPORT_DATA_OSM_CACHED; then
echo " - downloading cached OpenStreetMap file"
- fn_download_newer $DOWNLOAD_DIR/$OSM_FILE_FILTERED $CACHE_DIR_REMOTE/$OSM_FILE_FILTERED
+ fn_download_newer $DOWNLOAD_DIR/$OSM_FILE_FILTERED $CACHE_DIR_REMOTE_DATA/$OSM_FILE_FILTERED
cp $DOWNLOAD_DIR/$OSM_FILE_FILTERED $DATA_DIR/$OSM_FILE_FILTERED >> /dev/null 2>&1
fi
@@ -163,12 +171,13 @@ mkdir -p $WORKING_DIR
cd $WORKING_DIR
# Import real world datasets
-fn_import_data "Bozen" "$OSM_FILE_ITALY" "$OSM_FILE_BZ_FILTERED" "$OSM_BOUNDING_BZ" "bz_export.sql.gz" "$TABLE_PREFIX_BZ"
-fn_import_data "Innsbruck" "$OSM_FILE_AUSTRIA" "$OSM_FILE_IBK_FILTERED" "$OSM_BOUNDING_IBK" "" "$TABLE_PREFIX_IBK"
-fn_import_data "San Francisco" "$OSM_FILE_CALIFORNIA" "$OSM_FILE_SF_FILTERED" "$OSM_BOUNDING_SF" "sf_export.sql.gz" $TABLE_PREFIX_SF
+fn_import_data "Bozen" "$OSM_FILE_ITALY" "$OSM_FILE_BZ_FILTERED" "$OSM_BOUNDING_BZ" "bolzano_export.sql.gz" "$TABLE_PREFIX_BZ"
+fn_import_data "Innsbruck" "$OSM_FILE_AUSTRIA" "$OSM_FILE_IBK_FILTERED" "$OSM_BOUNDING_IBK" "innsbruck_export.sql.gz" "$TABLE_PREFIX_IBK"
+fn_import_data "Salzburg" "$OSM_FILE_AUSTRIA" "$OSM_FILE_SBG_FILTERED" "$OSM_BOUNDING_SBG" "salzburg_export.sql.gz" $TABLE_PREFIX_SBG
+fn_import_data "San Francisco" "$OSM_FILE_CALIFORNIA" "$OSM_FILE_SF_FILTERED" "$OSM_BOUNDING_SF" "sanfrancisco_export.sql.gz" $TABLE_PREFIX_SF
#if ! $IS_LOCAL_TEST_DEPLOY; then
-# fn_import_data "Italy" "$OSM_FILE_ITALY" "$OSM_FILE_IT_FILTERED" "$OSM_BOUNDING_IT" "it_export.sql.gz" $TABLE_PREFIX_IT
-# fn_import_data "Alto Adige" "$OSM_FILE_ITALY" "$OSM_FILE_ST_FILTERED" "$OSM_BOUNDING_ST" "st_export.sql.gz" $TABLE_PREFIX_ST
+# fn_import_data "Italy" "$OSM_FILE_ITALY" "$OSM_FILE_IT_FILTERED" "$OSM_BOUNDING_IT" "italy_export.sql.gz" $TABLE_PREFIX_IT
+# fn_import_data "Alto Adige" "$OSM_FILE_ITALY" "$OSM_FILE_ST_FILTERED" "$OSM_BOUNDING_ST" "trentinoaltoadige_export.sql.gz" $TABLE_PREFIX_ST
#fi
# Generate synthetic data
@@ -219,7 +228,7 @@ fi
if $AVAILABLE_SPATIALITE_ADMIN; then
echo "Importing spatialite database"
- fn_download_newer $DOWNLOAD_DIR/isochrone.db $CACHE_DIR_REMOTE/201505_spatialite.db
+ fn_download_newer $DOWNLOAD_DIR/isochrone.db $CACHE_DIR_REMOTE_DATA/201505_spatialite.db
cp $DOWNLOAD_DIR/isochrone.db $DATA_DIR/isochrone.db
diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index b641df50eeebe5a4de90ca56657c3a3a0abf24a1..95537da4452c889926a4a4b9d591d5795f60cf31 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/bootstrap/prepareEnvironment.sh
@@ -53,7 +53,7 @@ fn_arg2boolean IS_LOCAL_TEST_DEPLOY "${2}" "${IS_LOCAL_TEST_DEPLOY}"
#Armadillo from epel is too new for postgis (version 4 instead of 3), so use hard-coded file here
ARMADILLO_FILE="armadillo-3.800.2-1.el6.x86_64.rpm"
-ARMADILLO_URL="$CACHE_DIR_REMOTE/$ARMADILLO_FILE"
+ARMADILLO_URL="$CACHE_DIR_REMOTE_ISO/$ARMADILLO_FILE"
GEOSERVER_VERSION="2.7.2"
GEOSERVER_FILE="geoserver-$GEOSERVER_VERSION-war.zip"
GEOSERVER_DOWNLOAD_URL="http://sourceforge.net/projects/geoserver/files/GeoServer/$GEOSERVER_VERSION/$GEOSERVER_FILE"
@@ -114,11 +114,6 @@ SELINUX_CONFIG="/etc/selinux/config"
SPATIALITE_VERSION="4.2.0"
SPATIALITE_FILE="libspatialite-$SPATIALITE_VERSION.tar.gz"
SPATIALITE_URL="http://www.gaia-gis.it/gaia-sins/$SPATIALITE_FILE"
-TABLE_PREFIX_BZ="bz_"
-TABLE_PREFIX_IBK="ibk_"
-TABLE_PREFIX_IT="it_"
-TABLE_PREFIX_SF="sf_"
-TABLE_PREFIX_ST="st_"
TEMPLATE_PSIPROBE_VERSION="2.3.3"
TEMPLATE_PSIPROBE_FILE="probe-$TEMPLATE_PSIPROBE_VERSION.zip"
TEMPLATE_PSIPROBE_DOWNLOAD_URL="https://psi-probe.googlecode.com/files/$TEMPLATE_PSIPROBE_FILE"
@@ -476,7 +471,7 @@ fi
if $INSTALL_JAVA; then
echo "Installing java (oracle jdk-$JAVA_VERSION)"
- fn_download_newer $DOWNLOAD_DIR/$JAVA_FILE $CACHE_DIR_REMOTE/$JAVA_FILE
+ fn_download_newer $DOWNLOAD_DIR/$JAVA_FILE $CACHE_DIR_REMOTE_ISO/$JAVA_FILE
yum -y localinstall $DOWNLOAD_DIR/$JAVA_FILE >> $WORKING_DIR/install_java.log 2>&1
ln -sf /usr/java/latest $DEPLOY_DIR/jdk >> $WORKING_DIR/setup_java.log 2>&1
ln -sf /usr/java/latest/jre $DEPLOY_DIR/jre >> $WORKING_DIR/setup_java.log 2>&1
@@ -494,7 +489,7 @@ if $INSTALL_JAVA; then
source /etc/profile.d/java.sh
echo " - installing strong cryptographie"
- fn_download_newer $DOWNLOAD_DIR/$JAVA_CRYPTO_FILE $CACHE_DIR_REMOTE/$JAVA_CRYPTO_FILE
+ fn_download_newer $DOWNLOAD_DIR/$JAVA_CRYPTO_FILE $CACHE_DIR_REMOTE_ISO/$JAVA_CRYPTO_FILE
unzip -j -u -d $DEPLOY_DIR/jre/lib/security $DOWNLOAD_DIR/$JAVA_CRYPTO_FILE >> $WORKING_DIR/setup_java.log 2>&1
fi
@@ -534,7 +529,7 @@ if $INSTALL_GEOSERVER; then
mkdir -p $DEPLOY_DIR/geoserver/data >> $WORKING_DIR/install_geoserver.log 2>&1
echo "Installing geoserver-shell $GEOSERVER_SHELL_VERSION"
- fn_download_newer $DOWNLOAD_DIR/$GEOSERVER_SHELL_FILE $CACHE_DIR_REMOTE/$GEOSERVER_SHELL_FILE
+ fn_download_newer $DOWNLOAD_DIR/$GEOSERVER_SHELL_FILE $CACHE_DIR_REMOTE_ISO/$GEOSERVER_SHELL_FILE
unzip -o -d $DEPLOY_DIR $DOWNLOAD_DIR/$GEOSERVER_SHELL_FILE >> $WORKING_DIR/install_geoserver_shell.log 2>&1
ln -sf $DEPLOY_DIR/gs-shell-0.2-SNAPSHOT $DEPLOY_DIR/gs-shell
make >> $WORKING_DIR/install_geoserver_shell.log 2>&1
diff --git a/conf/cityPolygons/salzburg.poly b/conf/cityPolygons/salzburg.poly
new file mode 100644
index 0000000000000000000000000000000000000000..313ce9edd3eaf312fc87f16abe13a4c88ab5ac47
--- /dev/null
+++ b/conf/cityPolygons/salzburg.poly
@@ -0,0 +1,41 @@
+salzburg
+1
+ 1.3108689E+01 4.7785378E+01
+ 1.3095873E+01 4.7772020E+01
+ 1.3080163E+01 4.7761736E+01
+ 1.3062490E+01 4.7755948E+01
+ 1.3044093E+01 4.7755122E+01
+ 1.3040166E+01 4.7755948E+01
+ 1.3039752E+01 4.7760031E+01
+ 1.3040682E+01 4.7774810E+01
+ 1.3040166E+01 4.7778169E+01
+ 1.2995724E+01 4.7778169E+01
+ 1.2994277E+01 4.7776206E+01
+ 1.2992933E+01 4.7772537E+01
+ 1.2990350E+01 4.7768919E+01
+ 1.2984665E+01 4.7767059E+01
+ 1.2971436E+01 4.7771684E+01
+ 1.2953039E+01 4.7798917E+01
+ 1.2940327E+01 4.7811501E+01
+ 1.2939810E+01 4.7817598E+01
+ 1.2942704E+01 4.7820131E+01
+ 1.2951386E+01 4.7822611E+01
+ 1.2958000E+01 4.7827314E+01
+ 1.2962444E+01 4.7833721E+01
+ 1.2970816E+01 4.7843953E+01
+ 1.2983115E+01 4.7853669E+01
+ 1.2999031E+01 4.7856149E+01
+ 1.3018048E+01 4.7844806E+01
+ 1.3020942E+01 4.7840646E+01
+ 1.3021459E+01 4.7837959E+01
+ 1.3023112E+01 4.7835840E+01
+ 1.3029107E+01 4.7833721E+01
+ 1.3091015E+01 4.7832016E+01
+ 1.3106828E+01 4.7822611E+01
+ 1.3106622E+01 4.7814033E+01
+ 1.3108482E+01 4.7807573E+01
+ 1.3112409E+01 4.7803103E+01
+ 1.3117990E+01 4.7800390E+01
+ 1.3108689E+01 4.7785378E+01
+END
+END