diff --git a/CHANGELOG.md b/CHANGELOG.md index b43ff8b62f9fc07250c283b818b7a9e71d11f423..67a78eb21dc75e899d392caab18065ebcf78c9b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +Upcoming version: +----------------- + - added dataset of berlin o virtual machine (Nikolaus Krismer) + Version v0.7.0: --------------- - whitespace formatting (Nikolaus Krismer) diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh index 43452032e2f3ea7192f80ca71f3316b0ada71e10..2089de2cec6c688397cbb77506a2ea1d48390ff2 100755 --- a/bootstrap/importData.sh +++ b/bootstrap/importData.sh @@ -45,6 +45,8 @@ CITY_POLYGON_DIR="${SHARED_CONF_DIR}/cityPolygons" DENSITY="100,200,300,400,500,600,700,800,900,1000" OSM_DOWNLOAD_MIRROR="http://download.geofabrik.de" OSM_FILE_AUSTRIA="europe/austria-latest.osm.pbf" +OSM_FILE_GERMANY="europe/germany-latest.osm.pbf" +OSM_FILE_GREATBRITAIN="europe/great-britain-latest.osm.pbf" OSM_FILE_ITALY="europe/italy-latest.osm.pbf" OSM_FILE_US_CALIFORNIA="north-america/us/california-latest.osm.pbf" OSM_FILE_US_DC="north-america/us/district-of-columbia-latest.osm.pbf" @@ -192,6 +194,7 @@ 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}" @@ -200,6 +203,7 @@ function fn_init_geoserver() { 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 "GreatBritain" "${OSM_FILE_GREATBRITAIN}" fi # TODO: We need to import the data into the database before issueing to geoserver that there are tables available @@ -324,6 +328,7 @@ 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"