#1 fixed

bootstrap/importData.sh

@@ -35,6 +35,27 @@ fn_arg2string PG_DB_USER "${1}" "${PG_DB_USER}"
 fn_arg2string PG_DB_PASSWORD "${2}" "${PG_DB_PASSWORD}"
 fn_arg2boolean IS_LOCAL_TEST_DEPLOY "${3}" "${IS_LOCAL_TEST_DEPLOY}"
 
+# Configuration (tool versions, ...)
+
+CITY_POLYGON_DIR="${SHARED_CONF_DIR}/cityPolygons"
+#OSM_BOUNDING_BZ="top=46.5200 left=11.3000 bottom=46.4500 right=11.3873"
+#OSM_BOUNDING_IBK="top=47.3592 left=11.3020 bottom=47.2108 right=11.4554"
+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_SF="${CITY_POLYGON_DIR}/sanfrancsico.poly"
+OSM_BOUNDING_ST="${CITY_POLYGON_DIR}/trentinoaltoadige.poly"
+OSM_DOWNLOAD_MIRROR="http://download.geofabrik.de"
+OSM_FILE_AUSTRIA="europe/austria-140301.osm.pbf"
+OSM_FILE_ITALY="europe/italy-140301.osm.pbf"
+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_SF_FILTERED="sanfrancisco-140301-filtered.osm"
+OSM_FILE_ST_FILTERED="southtyrol-140301-filtered.osm"
+OSM_KEYS="aerialway,highway,public_transport,railway,route"
+
 ############################
 # Function definitions     #
 ############################
@@ -142,12 +163,12 @@ mkdir -p $WORKING_DIR
 cd $WORKING_DIR
 
 # Import real world datasets
-fn_import_data "Bozen" "$OSM_FILE_ITALY" "$OSM_FILE_BZ_FILTERED" "$OSM_BBOX_BZ" "bz_export.sql.gz" "$TABLE_PREFIX_BZ"
-fn_import_data "Innsbruck" "$OSM_FILE_AUSTRIA" "$OSM_FILE_IBK_FILTERED" "$OSM_BBOX_IBK" "" "$TABLE_PREFIX_IBK"
-fn_import_data "San Francisco" "$OSM_FILE_CALIFORNIA" "$OSM_FILE_SF_FILTERED" "$OSM_BBOX_SF" "sf_export.sql.gz" $TABLE_PREFIX_SF
+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
 #if ! $IS_LOCAL_TEST_DEPLOY; then
-#	fn_import_data "Italy" "$OSM_FILE_ITALY" "$OSM_FILE_IT_FILTERED" "$OSM_BBOX_IT" "it_export.sql.gz" $TABLE_PREFIX_IT
-#	fn_import_data "Alto Adige" "$OSM_FILE_ITALY" "$OSM_FILE_ST_FILTERED" "$OSM_BBOX_ST" "st_export.sql.gz" $TABLE_PREFIX_ST
+#	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
 #fi
 
 # Generate synthetic data

bootstrap/prepareEnvironment.sh

@@ -83,23 +83,6 @@ NEXUS_RELEASE_ISOCHRONE="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=
 #NEXUS_RELEASE_ISOCHRONE="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME&v=0.2.2&p=war"
 NEXUS_SNAPSHOT_ISOCHRONE="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME&v=LATEST&p=war"
 NEXUS_SNAPSHOT_ISOCHRONE_TOOLS="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME_TOOLS&v=LATEST&c=static&p=jar"
-#OSM_BBOX_BZ="top=46.5200 left=11.3000 bottom=46.4500 right=11.3873"
-#OSM_BBOX_IBK="top=47.3592 left=11.3020 bottom=47.2108 right=11.4554"
-OSM_BBOX_BZ="${SHARED_CONF_DIR}/poly_bz.poly"
-OSM_BBOX_IBK="${SHARED_CONF_DIR}/poly_ibk.poly"
-OSM_BBOX_IT="${SHARED_CONF_DIR}/poly_it.poly"
-OSM_BBOX_SF="${SHARED_CONF_DIR}/poly_sf.poly"
-OSM_BBOX_ST="${SHARED_CONF_DIR}/poly_st.poly"
-OSM_DOWNLOAD_MIRROR="http://download.geofabrik.de"
-OSM_FILE_AUSTRIA="europe/austria-140301.osm.pbf"
-OSM_FILE_ITALY="europe/italy-140301.osm.pbf"
-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_SF_FILTERED="sanfrancisco-140301-filtered.osm"
-OSM_FILE_ST_FILTERED="southtyrol-140301-filtered.osm"
-OSM_KEYS="aerialway,highway,public_transport,railway,route"
 OSM2PGROUTING_GIT_URL="https://github.com/pgRouting/osm2pgrouting.git"
 OSM2PGROUTING_VERSION="v2.0.0"
 OSM2PGROUTING_MAPPING_CONF="$DEPLOY_DIR/osm2pgrouting/mapconfig.xml"