From 394d1a0b7bae506d7247c9d10c9af2e0a07563bf Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Wed, 13 Jan 2016 13:31:57 +0100
Subject: [PATCH] renamed datasets

---
 CHANGELOG.md                                  |  1 +
 bootstrap/importData.sh                       | 56 ++++++-------------
 ... => geoserver_setup_neo4j_ft_altoadige.gs} |  0
 ...gs => geoserver_setup_neo4j_ft_bolzano.gs} |  0
 ... => geoserver_setup_neo4j_ft_innsbruck.gs} |  0
 ...t.gs => geoserver_setup_neo4j_ft_italy.gs} |  0
 ... geoserver_setup_neo4j_ft_sanfrancisco.gs} |  0
 ...> geoserver_setup_postgis_ft_altoadige.gs} |  0
 ... => geoserver_setup_postgis_ft_bolzano.gs} |  0
 ...> geoserver_setup_postgis_ft_innsbruck.gs} |  0
 ...gs => geoserver_setup_postgis_ft_italy.gs} |  0
 ...eoserver_setup_postgis_ft_sanfrancisco.gs} |  0
 12 files changed, 19 insertions(+), 38 deletions(-)
 rename conf/{geoserver_setup_neo4j_ft_st.gs => geoserver_setup_neo4j_ft_altoadige.gs} (100%)
 rename conf/{geoserver_setup_neo4j_ft_bz.gs => geoserver_setup_neo4j_ft_bolzano.gs} (100%)
 rename conf/{geoserver_setup_neo4j_ft_ibk.gs => geoserver_setup_neo4j_ft_innsbruck.gs} (100%)
 rename conf/{geoserver_setup_neo4j_ft_it.gs => geoserver_setup_neo4j_ft_italy.gs} (100%)
 rename conf/{geoserver_setup_neo4j_ft_sf.gs => geoserver_setup_neo4j_ft_sanfrancisco.gs} (100%)
 rename conf/{geoserver_setup_postgis_ft_st.gs => geoserver_setup_postgis_ft_altoadige.gs} (100%)
 rename conf/{geoserver_setup_postgis_ft_bz.gs => geoserver_setup_postgis_ft_bolzano.gs} (100%)
 rename conf/{geoserver_setup_postgis_ft_ibk.gs => geoserver_setup_postgis_ft_innsbruck.gs} (100%)
 rename conf/{geoserver_setup_postgis_ft_it.gs => geoserver_setup_postgis_ft_italy.gs} (100%)
 rename conf/{geoserver_setup_postgis_ft_sf.gs => geoserver_setup_postgis_ft_sanfrancisco.gs} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2133ca5..3894d43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 Upcoming version:
 -----------------
+  - renamed datasets (Nikolaus Krismer)
   - added jenkins deploy mode (to prevent tomcat webapp deploy on dbis-tests) (Nikolaus Krismer)
   - added missing srid for italy and st dataset (Nikolaus Krismer)
   - not starting tomcat on jenknis (Nikolaus Krismer)
diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh
index 896154e..838e89c 100755
--- a/bootstrap/importData.sh
+++ b/bootstrap/importData.sh
@@ -39,26 +39,8 @@ fn_arg2boolean DEPLOY_ALL_DATASETS "${3}" "${DEPLOY_ALL_DATASETS}"
 # Configuration (tool versions, ...) #
 ######################################
 
-CITY_POLYGON_DIR="${SHARED_CONF_DIR}/cityPolygons"
-OSM_BOUNDING_BOLZANO="${CITY_POLYGON_DIR}/bolzano.poly"
-OSM_BOUNDING_INNSBRUCK="${CITY_POLYGON_DIR}/innsbruck.poly"
-OSM_BOUNDING_ITALY="${CITY_POLYGON_DIR}/italy.poly"
-OSM_BOUNDING_SALZBURG="${CITY_POLYGON_DIR}/salzburg.poly"
-OSM_BOUNDING_SANFRANCISCO="${CITY_POLYGON_DIR}/sanfrancsico.poly"
-OSM_BOUNDING_TRENTOALTOADIGE="${CITY_POLYGON_DIR}/trentinoaltoadige.poly"
 #DENSITY="60,120,180,240,300"
 DENSITY="100,200,300,400,500,600,700,800,900,1000"
-OSM_DOWNLOAD_MIRROR="http://download.geofabrik.de"
-OSM_FILE_AUSTRIA="europe/austria-140301.osm.pbf"
-OSM_FILE_CALIFORNIA="north-america/us/california-140301.osm.pbf"
-OSM_FILE_BOLZANO_FILTERED="bozen-140301-filtered.osm"
-OSM_FILE_INNSBRUCK_FILTERED="innsbruck-140301-filtered.osm"
-OSM_FILE_ITALY="europe/italy-140301.osm.pbf"
-OSM_FILE_ITALY_FILTERED="italy-140301-filtered.osm"
-OSM_FILE_SALZBURG_FILTERED="salzburg-140301-filtered.osm"
-OSM_FILE_SANFRANCISCO_FILTERED="sanfrancisco-140301-filtered.osm"
-OSM_FILE_TRENTOALTOADIGE_FILTERED="southtyrol-140301-filtered.osm"
-OSM_KEYS="aerialway,highway,public_transport,railway,route"
 
 ############################
 # Function definitions     #
@@ -66,10 +48,8 @@ OSM_KEYS="aerialway,highway,public_transport,railway,route"
 
 function fn_import_dataset() {
 	local NAME="$1"
-	local OSM_FILE="$2"
-	local OSM_FILE_FILTERED="$3"
-	local BOUNDING="$4"
-	local SRID="$5"
+	local BOUNDING="$2"
+	local SRID="$3"
 	local SQL_EXPORT_FILE="${NAME,,}_export_${SRID}.sql.gz"
 
 	echo "Importing data for region of $NAME (EPSG:${SRID})"
@@ -158,12 +138,12 @@ function fn_init_geoserver() {
 
 	if $AVAILABLE_NEO4J_SPATIAL; then
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ds.gs >> setup_geoserver_neo4j.log 2>&1
-		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_bz.gs >> setup_geoserver_neo4j.log 2>&1
-		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_ibk.gs >> setup_geoserver_neo4j.log 2>&1
-		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_sf.gs >> setup_geoserver_neo4j.log 2>&1
+		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_bolzano.gs >> setup_geoserver_neo4j.log 2>&1
+		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_innsbruck.gs >> setup_geoserver_neo4j.log 2>&1
+		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_sanfrancisco.gs >> setup_geoserver_neo4j.log 2>&1
 		if $DEPLOY_ALL_DATASETS; then
-			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_it.gs >> setup_geoserver_neo4j.log 2>&1
-			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_st.gs >> setup_geoserver_neo4j.log 2>&1
+			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_italy.gs >> setup_geoserver_neo4j.log 2>&1
+			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_altoadige.gs >> setup_geoserver_neo4j.log 2>&1
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft.gs >> setup_geoserver_neo4j.log 2>&1
 		fi
 	fi
@@ -174,12 +154,12 @@ function fn_init_geoserver() {
 		sed -i "s/@db_password@/$PG_DB_PASSWORD/" $WORKING_DIR/geoserver_setup_postgis_ds.gs
 
 		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $WORKING_DIR/geoserver_setup_postgis_ds.gs >> setup_geoserver_postgis.log 2>&1
-		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_bz.gs >> setup_geoserver_postgis.log 2>&1
-		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_ibk.gs >> setup_geoserver_postgis.log 2>&1
-		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_sf.gs >> setup_geoserver_postgis.log 2>&1
+		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_bolzano.gs >> setup_geoserver_postgis.log 2>&1
+		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_innsbruck.gs >> setup_geoserver_postgis.log 2>&1
+		sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_sanfrancisco.gs >> setup_geoserver_postgis.log 2>&1
 		if $DEPLOY_ALL_DATASETS; then
-			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_it.gs >> setup_geoserver_postgis.log 2>&1
-			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_st.gs >> setup_geoserver_postgis.log 2>&1
+			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_italy.gs >> setup_geoserver_postgis.log 2>&1
+			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_altoadige.gs >> setup_geoserver_postgis.log 2>&1
 			sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft.gs >> setup_geoserver_postgis.log 2>&1
 		fi
 	fi
@@ -240,13 +220,13 @@ fi
 SRID_ARR=(${TARGET_SRID//,/ })
 for CURRENT_SRID in "${SRID_ARR[@]}"; do
 	# Import real world datasets
-	fn_import_dataset "Bolzano" "$OSM_FILE_ITALY" "$OSM_FILE_BOLZANO_FILTERED" "$OSM_BOUNDING_BOLZANO" "$CURRENT_SRID"
-	fn_import_dataset "Innsbruck" "$OSM_FILE_AUSTRIA" "$OSM_FILE_INNSBRUCK_FILTERED" "$OSM_BOUNDING_INNSBRUCK" "$CURRENT_SRID"
-	fn_import_dataset "Salzburg" "$OSM_FILE_AUSTRIA" "$OSM_FILE_SALZBURG_FILTERED" "$OSM_BOUNDING_SALZBURG" "$CURRENT_SRID"
-	fn_import_dataset "SanFrancisco" "$OSM_FILE_CALIFORNIA" "$OSM_FILE_SANFRANCISCO_FILTERED" "$OSM_BOUNDING_SANFRANCISCO" "$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"
 	if $DEPLOY_ALL_DATASETS; then
-		fn_import_dataset "Italy" "$OSM_FILE_ITALY" "$OSM_FILE_ITALY_FILTERED" "$OSM_BOUNDING_ITALY" "$CURRENT_SRID"
-		fn_import_dataset "TrentoAltoAdige" "$OSM_FILE_ITALY" "$OSM_FILE_TRENTOALTOADIGE_FILTERED" "$OSM_BOUNDING_TRENTOALTOADIGE" "$CURRENT_SRID"
+		fn_import_dataset "Italy" "$CURRENT_SRID"
+		fn_import_dataset "AltoAdige" "$CURRENT_SRID"
 	fi
 	
 	# Not importing datasets one-by-one into spatialite -> we copy data from postgis (after postgis data import)
diff --git a/conf/geoserver_setup_neo4j_ft_st.gs b/conf/geoserver_setup_neo4j_ft_altoadige.gs
similarity index 100%
rename from conf/geoserver_setup_neo4j_ft_st.gs
rename to conf/geoserver_setup_neo4j_ft_altoadige.gs
diff --git a/conf/geoserver_setup_neo4j_ft_bz.gs b/conf/geoserver_setup_neo4j_ft_bolzano.gs
similarity index 100%
rename from conf/geoserver_setup_neo4j_ft_bz.gs
rename to conf/geoserver_setup_neo4j_ft_bolzano.gs
diff --git a/conf/geoserver_setup_neo4j_ft_ibk.gs b/conf/geoserver_setup_neo4j_ft_innsbruck.gs
similarity index 100%
rename from conf/geoserver_setup_neo4j_ft_ibk.gs
rename to conf/geoserver_setup_neo4j_ft_innsbruck.gs
diff --git a/conf/geoserver_setup_neo4j_ft_it.gs b/conf/geoserver_setup_neo4j_ft_italy.gs
similarity index 100%
rename from conf/geoserver_setup_neo4j_ft_it.gs
rename to conf/geoserver_setup_neo4j_ft_italy.gs
diff --git a/conf/geoserver_setup_neo4j_ft_sf.gs b/conf/geoserver_setup_neo4j_ft_sanfrancisco.gs
similarity index 100%
rename from conf/geoserver_setup_neo4j_ft_sf.gs
rename to conf/geoserver_setup_neo4j_ft_sanfrancisco.gs
diff --git a/conf/geoserver_setup_postgis_ft_st.gs b/conf/geoserver_setup_postgis_ft_altoadige.gs
similarity index 100%
rename from conf/geoserver_setup_postgis_ft_st.gs
rename to conf/geoserver_setup_postgis_ft_altoadige.gs
diff --git a/conf/geoserver_setup_postgis_ft_bz.gs b/conf/geoserver_setup_postgis_ft_bolzano.gs
similarity index 100%
rename from conf/geoserver_setup_postgis_ft_bz.gs
rename to conf/geoserver_setup_postgis_ft_bolzano.gs
diff --git a/conf/geoserver_setup_postgis_ft_ibk.gs b/conf/geoserver_setup_postgis_ft_innsbruck.gs
similarity index 100%
rename from conf/geoserver_setup_postgis_ft_ibk.gs
rename to conf/geoserver_setup_postgis_ft_innsbruck.gs
diff --git a/conf/geoserver_setup_postgis_ft_it.gs b/conf/geoserver_setup_postgis_ft_italy.gs
similarity index 100%
rename from conf/geoserver_setup_postgis_ft_it.gs
rename to conf/geoserver_setup_postgis_ft_italy.gs
diff --git a/conf/geoserver_setup_postgis_ft_sf.gs b/conf/geoserver_setup_postgis_ft_sanfrancisco.gs
similarity index 100%
rename from conf/geoserver_setup_postgis_ft_sf.gs
rename to conf/geoserver_setup_postgis_ft_sanfrancisco.gs
-- 
GitLab