Skip to content
Snippets Groups Projects
Commit 394d1a0b authored by User expired's avatar User expired
Browse files

renamed datasets

parent ebc457c6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 38 deletions
CHANGELOG.md
+ 1
− 0
View file @ 394d1a0b
Upcoming version: Upcoming version:
----------------- -----------------
- renamed datasets (Nikolaus Krismer)
- added jenkins deploy mode (to prevent tomcat webapp deploy on dbis-tests) (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) - added missing srid for italy and st dataset (Nikolaus Krismer)
- not starting tomcat on jenknis (Nikolaus Krismer) - not starting tomcat on jenknis (Nikolaus Krismer)
......
bootstrap/importData.sh
+ 18
− 38
View file @ 394d1a0b
...@@ -39,26 +39,8 @@ fn_arg2boolean DEPLOY_ALL_DATASETS "${3}" "${DEPLOY_ALL_DATASETS}" ...@@ -39,26 +39,8 @@ fn_arg2boolean DEPLOY_ALL_DATASETS "${3}" "${DEPLOY_ALL_DATASETS}"
# Configuration (tool versions, ...) # # 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="60,120,180,240,300"
DENSITY="100,200,300,400,500,600,700,800,900,1000" 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 # # Function definitions #
...@@ -66,10 +48,8 @@ OSM_KEYS="aerialway,highway,public_transport,railway,route" ...@@ -66,10 +48,8 @@ OSM_KEYS="aerialway,highway,public_transport,railway,route"
function fn_import_dataset() { function fn_import_dataset() {
local NAME="$1" local NAME="$1"
local OSM_FILE="$2" local BOUNDING="$2"
local OSM_FILE_FILTERED="$3" local SRID="$3"
local BOUNDING="$4"
local SRID="$5"
local SQL_EXPORT_FILE="${NAME,,}_export_${SRID}.sql.gz" local SQL_EXPORT_FILE="${NAME,,}_export_${SRID}.sql.gz"
echo "Importing data for region of $NAME (EPSG:${SRID})" echo "Importing data for region of $NAME (EPSG:${SRID})"
...@@ -158,12 +138,12 @@ function fn_init_geoserver() { ...@@ -158,12 +138,12 @@ function fn_init_geoserver() {
if $AVAILABLE_NEO4J_SPATIAL; then 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_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_bolzano.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_innsbruck.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_sanfrancisco.gs >> setup_geoserver_neo4j.log 2>&1
if $DEPLOY_ALL_DATASETS; then 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_italy.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_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 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
fi fi
...@@ -174,12 +154,12 @@ function fn_init_geoserver() { ...@@ -174,12 +154,12 @@ function fn_init_geoserver() {
sed -i "s/@db_password@/$PG_DB_PASSWORD/" $WORKING_DIR/geoserver_setup_postgis_ds.gs 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 $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_bolzano.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_innsbruck.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_sanfrancisco.gs >> setup_geoserver_postgis.log 2>&1
if $DEPLOY_ALL_DATASETS; then 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_italy.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_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 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
fi fi
...@@ -240,13 +220,13 @@ fi ...@@ -240,13 +220,13 @@ fi
SRID_ARR=(${TARGET_SRID//,/ }) SRID_ARR=(${TARGET_SRID//,/ })
for CURRENT_SRID in "${SRID_ARR[@]}"; do for CURRENT_SRID in "${SRID_ARR[@]}"; do
# Import real world datasets # Import real world datasets
fn_import_dataset "Bolzano" "$OSM_FILE_ITALY" "$OSM_FILE_BOLZANO_FILTERED" "$OSM_BOUNDING_BOLZANO" "$CURRENT_SRID" fn_import_dataset "Bolzano" "$CURRENT_SRID"
fn_import_dataset "Innsbruck" "$OSM_FILE_AUSTRIA" "$OSM_FILE_INNSBRUCK_FILTERED" "$OSM_BOUNDING_INNSBRUCK" "$CURRENT_SRID" fn_import_dataset "Innsbruck" "$CURRENT_SRID"
fn_import_dataset "Salzburg" "$OSM_FILE_AUSTRIA" "$OSM_FILE_SALZBURG_FILTERED" "$OSM_BOUNDING_SALZBURG" "$CURRENT_SRID" fn_import_dataset "Salzburg" "$CURRENT_SRID"
fn_import_dataset "SanFrancisco" "$OSM_FILE_CALIFORNIA" "$OSM_FILE_SANFRANCISCO_FILTERED" "$OSM_BOUNDING_SANFRANCISCO" "$CURRENT_SRID" fn_import_dataset "SanFrancisco" "$CURRENT_SRID"
if $DEPLOY_ALL_DATASETS; then if $DEPLOY_ALL_DATASETS; then
fn_import_dataset "Italy" "$OSM_FILE_ITALY" "$OSM_FILE_ITALY_FILTERED" "$OSM_BOUNDING_ITALY" "$CURRENT_SRID" fn_import_dataset "Italy" "$CURRENT_SRID"
fn_import_dataset "TrentoAltoAdige" "$OSM_FILE_ITALY" "$OSM_FILE_TRENTOALTOADIGE_FILTERED" "$OSM_BOUNDING_TRENTOALTOADIGE" "$CURRENT_SRID" fn_import_dataset "AltoAdige" "$CURRENT_SRID"
fi fi
# Not importing datasets one-by-one into spatialite -> we copy data from postgis (after postgis data import) # Not importing datasets one-by-one into spatialite -> we copy data from postgis (after postgis data import)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment