diff --git a/CHANGELOG.md b/CHANGELOG.md index 348d8f9a31d977c9e315cc185ed7f1c0597af6ec..943fc66dcedd907c19f74b895b7cd85b6941e3d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ Upcoming version: ----------------- + - deactivating invalid datasets (Nikolaus Krismer) - added some more logging output to dataset generation (Nikolaus Krismer) - improved error handling in bash script (Nikolaus Krismer) - improved some messages and the documentation (Nikolaus Krismer) diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh index cbc27a7509e6b0a5a67944b0731cab2a9261094d..b202dd4dd70d7099f413eb5618952c50e209f2bc 100755 --- a/bootstrap/importData.sh +++ b/bootstrap/importData.sh @@ -189,7 +189,7 @@ function fn_init_geoserver() { 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 "Italy" "${OSM_FILE_ITALY}" fn_filter_osm_data "AltoAdige" "${OSM_FILE_ITALY}" fi @@ -207,7 +207,7 @@ function fn_init_geoserver() { sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_sanfrancisco.gs >> setup_geoserver_neo4j.log 2>&1 sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_washingtondc.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_italy.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 fi sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft.gs >> setup_geoserver_neo4j.log 2>&1 @@ -224,7 +224,7 @@ function fn_init_geoserver() { sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_sanfrancisco.gs >> setup_geoserver_postgis.log 2>&1 sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft_washingtondc.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_italy.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 fi sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_postgis_ft.gs >> setup_geoserver_postgis.log 2>&1 @@ -321,7 +321,7 @@ if $DEPLOY_ANY_DATASET; then 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 "Italy" "$CURRENT_SRID" fn_import_dataset "AltoAdige" "$CURRENT_SRID" fi