moved berlin dataset to only be deployed on dbis-isochrone

CHANGELOG.md

 Upcoming version:
 -----------------
+  - moved berlin dataset to only be deployed on dbis-isochrone (Nikolaus Krismer)
   - added functions for MineT(X) algorithm to postgis/postgresql DB (Nikolaus Krismer)
   - updated gradle to version 3.0 (Nikolaus Krismer)
   - added dataset of berlin o virtual machine (Nikolaus Krismer)

Vagrantfile

@@ -24,7 +24,7 @@ vname="isochrone-local"
 
 if HOSTNAME.strip.eql? hostnameDbisTests
 #  puts "Starting box 'isochrone-jenkins'"
-  deployAllDatasets=true
+  deployAllDatasets=false
   isJenkinsDeploy=true
   vname="isochrone-jenkins"
 elsif HOSTNAME.strip.eql? hostnameDbisIsochrone

bootstrap/importData.sh

@@ -194,16 +194,16 @@ function fn_init_geoserver() {
 	fi
 
 	fn_echo "Preparing data from OpenStreetMap to be imported into geoserver"
-	fn_filter_osm_data "Berlin" "${OSM_FILE_GERMANY}"
 	fn_filter_osm_data "Bolzano" "${OSM_FILE_ITALY}"
 	fn_filter_osm_data "Innsbruck" "${OSM_FILE_AUSTRIA}"
 	fn_filter_osm_data "Salzburg" "${OSM_FILE_AUSTRIA}"
 	fn_filter_osm_data "SanFrancisco" "${OSM_FILE_US_CALIFORNIA}"
 	fn_filter_osm_data "WashingtonDC" "${OSM_FILE_US_DC}"
 	if $DEPLOY_ALL_DATASETS; then
-#		fn_filter_osm_data "Italy" "${OSM_FILE_ITALY}"
 		fn_filter_osm_data "AltoAdige" "${OSM_FILE_ITALY}"
+		fn_filter_osm_data "Berlin" "${OSM_FILE_GERMANY}"
 #		fn_filter_osm_data "GreatBritain" "${OSM_FILE_GREATBRITAIN}"
+#		fn_filter_osm_data "Italy" "${OSM_FILE_ITALY}"
 	fi
 
 	# TODO: We need to import the data into the database before issueing to geoserver that there are tables available
@@ -328,15 +328,15 @@ if $DEPLOY_ANY_DATASET; then
 	SRID_ARR=(${TARGET_SRID//,/ })
 	for CURRENT_SRID in "${SRID_ARR[@]}"; do
 		# Import real world datasets
-		fn_import_dataset "Berlin" "$CURRENT_SRID"
 		fn_import_dataset "Bolzano" "$CURRENT_SRID"
 		fn_import_dataset "Innsbruck" "$CURRENT_SRID"
 		fn_import_dataset "Salzburg" "$CURRENT_SRID"
 		fn_import_dataset "SanFrancisco" "$CURRENT_SRID"
 		fn_import_dataset "WashingtonDC" "$CURRENT_SRID"
 		if $DEPLOY_ALL_DATASETS; then
-#			fn_import_dataset "Italy" "$CURRENT_SRID"
 			fn_import_dataset "AltoAdige" "$CURRENT_SRID"
+			fn_import_dataset "Berlin" "$CURRENT_SRID"
+#			fn_import_dataset "Italy" "$CURRENT_SRID"
 		fi
 
 		# Not importing datasets one-by-one into spatialite -> we copy data from postgis (after postgis data import)