diff --git a/bootstrap/activateDatabaseLogging.sh b/bootstrap/activateDatabaseLogging.sh index 24e5bf47b13f306f5807bb8959b4a515796df3d6..5b33762ca95f0a5a8efac811f1096bf15ad292c2 100755 --- a/bootstrap/activateDatabaseLogging.sh +++ b/bootstrap/activateDatabaseLogging.sh @@ -1,6 +1,6 @@ #! /bin/bash ############################# -# This script creates postgis (and pgRouting) databases. +# This script activates the postgresql database logging. ############################# if [ "$EUID" -ne "0" ]; then diff --git a/bootstrap/config.sh b/bootstrap/config.sh index fa7048f029457fb4ad24c00c12f51799246b18f3..263ef8928f595309260b8daaea0ed0a798010571 100755 --- a/bootstrap/config.sh +++ b/bootstrap/config.sh @@ -1,6 +1,6 @@ #!/bin/bash ############################# -# This is used to configure the behaviout of the various bootstrap scripts. +# This is used to configure the behavior of the various bootstrap scripts. ############################# IMPORT_DATA_OSM=false @@ -22,7 +22,6 @@ INSTALL_ISOCHRONE_DATAMODEL=true INSTALL_ISOCHRONE_TOOLS=true INSTALL_NEO4J=false INSTALL_NEO4J_SPATIAL=false -INSTALL_PGROUTING=false INSTALL_POSTGIS=true INSTALL_POSTGRES=true INSTALL_POSTGRES_ADMIN=true @@ -65,7 +64,6 @@ AVAILABLE_NEO4J=$([ -d "${DEPLOY_DIR}/neo4j" ] && echo true || echo false) AVAILABLE_NEO4J_SPATIAL=$([ -d "${DEPLOY_DIR}/neo4j-spatial" ] && echo true || echo false) AVAILABLE_POSTGRES=$(type ${EXEC_POSTGRES} >/dev/null 2>&1 && echo true || echo false) AVAILABLE_POSTGIS=$([ -f "${POSTGRES_SHARE}/extension/postgis.control" ] && echo true || echo false) -AVAILABLE_PGROUTING=$([ -f "${POSTGRES_SHARE}/extension/pgrouting.control" ] && echo true || echo false) AVAILABLE_SPATIALITE_ADMIN=$([ -f "${DEPLOY_DIR}/phpliteadmin/phpliteadmin.config.php" ] && echo true || echo false) DOWNLOAD_DIR="${CACHE_DIR_LOCAL}/wget" diff --git a/bootstrap/createDatabase.sh b/bootstrap/createDatabase.sh index f53b5451b4a8cec2f94f1b0b387d82e49f5cec67..e7a554cea32be12755e0df2ca54189eaedcbf0e4 100755 --- a/bootstrap/createDatabase.sh +++ b/bootstrap/createDatabase.sh @@ -1,6 +1,6 @@ #! /bin/bash ############################# -# This script creates postgis (and pgRouting) databases. +# This script creates the postgis databases. ############################# if [ "$EUID" -ne "0" ]; then @@ -57,11 +57,6 @@ if $AVAILABLE_POSTGRES; then PGPASSWORD="$PG_DB_PASSWORD" ${EXEC_POSTGRES} -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -c "CREATE EXTENSION postgis;" >> $WORKING_DIR/setup_database.log 2>&1 PGPASSWORD="$PG_DB_PASSWORD" ${EXEC_POSTGRES} -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -f $SHARED_CONF_DIR/srid_82344_insert.sql >> $WORKING_DIR/setup_database.log 2>&1 fi - - if $AVAILABLE_PGROUTING; then - echo "Registering pgRouting extension for database \"$PG_DB_NAME\"" - PGPASSWORD="$PG_DB_PASSWORD" ${EXEC_POSTGRES} -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -c "CREATE EXTENSION pgRouting;" >> $WORKING_DIR/setup_database.log 2>&1 - fi if $AVAILABLE_ISOCHRONE_DATAMODEL; then echo "Initializing database schema for isochrone-datamodel (used for testing, ...)" diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh index 0ff96e7de004cd7b1b548b9e288ab30e9c3050d9..193022bca8c893d3a6c1c4dffd274a03c84fb193 100755 --- a/bootstrap/importData.sh +++ b/bootstrap/importData.sh @@ -83,7 +83,7 @@ fn_import_data() { VALID_SQL=true fi fi - if ( $AVAILABLE_PGROUTING || $AVAILABLE_NEO4J_SPATIAL ) && ( $IMPORT_DATA_OSM_CACHED || $IMPORT_DATA_OSM ); then + if ( $AVAILABLE_NEO4J_SPATIAL ) && ( $IMPORT_DATA_OSM_CACHED || $IMPORT_DATA_OSM ); then # osm data does not need to be downloaded (since it would not be imported afterwards) VALID_OSM=true fi @@ -112,6 +112,7 @@ fn_import_data() { fi if ! $VALID_OSM; then + # sql export has been handeled above -> if no data from osm should be used then we can return here return 0 fi @@ -138,14 +139,6 @@ fn_import_data() { fi fi - if $AVAILABLE_PGROUTING; then - echo " - importing filtered OpenStreetMap data into pgRouting" - $DEPLOY_DIR/osm2pgrouting/build/osm2pgrouting -file "$DATA_DIR/$OSM_FILE_FILTERED" -conf "$OSM2PGROUTING_MAPPING_CONF" -dbname $PG_DB_NAME -user $PG_DB_USER -passwd $PG_DB_PASSWORD -clean -prefixtables $TABLE_PREFIX >> "import_osm2pgrouting_$NAME.log" 2>&1 - - echo " - creating pgRouting topology" - PGPASSWORD="$PG_DB_PASSWORD" psql -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -c "SELECT pgr_createTopology('${TABLE_PREFIX}ways', $TOPOLOGY_TOLERANCE, 'the_geom', 'gid');" >> "$WORKING_DIR/setup_database_$NAME.log" 2>&1 - fi - if $AVAILABLE_NEO4J_SPATIAL; then echo " - importing filtered OpenStreetMap data into neo4j-spatial" cd $DEPLOY_DIR/neo4j-spatial diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh index 3e3a3782a11cd42b738ee186789dbd534653031f..0ca4a71381ec082b8180d4646893459c257583d0 100755 --- a/bootstrap/prepareEnvironment.sh +++ b/bootstrap/prepareEnvironment.sh @@ -7,9 +7,7 @@ # - neo4j-spatial # - postgresql # - postgis -# - pgRouting # - osmosis -# - osm2pgrouting # into a centos6 (32bit and 64bit) or centos7 (64bit only) environment. # # It can be used in the context of a Vagrantfile to configure a vagrant box and all @@ -85,9 +83,6 @@ NEXUS_RELEASE_ISOCHRONE_WEB="$NEXUS_BASE_URL/service/local/artifact/maven/conten NEXUS_SNAPSHOT_ISOCHRONE_WEB="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME_WEB&v=LATEST&p=war" NEXUS_SNAPSHOT_ISOCHRONE_TOOLS="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME_TOOLS&v=LATEST&c=all&p=jar" NEXUS_SNAPSHOT_ISOCHRONE_DATAMODEL="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME_DATAMODEL&v=LATEST&c=all&p=jar" -OSM2PGROUTING_GIT_URL="https://github.com/pgRouting/osm2pgrouting.git" -OSM2PGROUTING_VERSION="v2.0.0" -OSM2PGROUTING_MAPPING_CONF="$DEPLOY_DIR/osm2pgrouting/mapconfig.xml" OSMOSIS_VERSION="0.43.1" OSMOSIS_FILE="osmosis-$OSMOSIS_VERSION.zip" OSMOSIS_DOWNLOAD_URL="http://bretth.dev.openstreetmap.org/osmosis-build/$OSMOSIS_FILE" @@ -100,9 +95,6 @@ POSTGRESQL_DATA_DIR="/var/lib/pgsql/data" POSTGRESQL_SERVICE_NAME="postgresql" POSTGRESQL_SHORT_VERSION="" POSTGRESQL_VERSION="" -PGROUTING_GIT_URL="https://github.com/pgRouting/pgrouting.git" -PGROUTING_VERSION="auto" # activate to install from repository -#PGROUTING_VERSION="2.0.0" # activate to install from source REPO_ELGIS="none" REPO_EPEL="none" REPO_POSTGRESQL="none" # will be set later (depending on architecture) @@ -201,9 +193,6 @@ fi if $INSTALL_ISOCHRONE_TOOLS || $INSTALL_ISOCHRONE_DATAMODEL || $INSTALL_TOMCAT || $INSTALL_GEOSERVER || $INSTALL_NEO4J || $INSTALL_NEO4J_SPATIAL || $IMPORT_DATA_OSM; then INSTALL_JAVA=true fi -if $INSTALL_PGROUTING; then - INSTALL_POSTGIS=true -fi if $INSTALL_POSTGRES_ADMIN || $INSALL_POSTGIS; then INSTALL_POSTGRES=true fi @@ -279,7 +268,7 @@ if [ ! $REPO_ELGIS == "none" ]; then fi if [ ! $REPO_EPEL == "none" ]; then - # Epel Repository is needed for dependencies (gdal!) of postgresql/postgis/pgRouting + # Epel Repository is needed for dependencies (gdal!) of postgresql/postgis echo "Installing epel repository" fn_download $DOWNLOAD_DIR/epel-repo.rpm $REPO_EPEL yum -y localinstall $DOWNLOAD_DIR/epel-repo.rpm >> $WORKING_DIR/install_epel_repo.log 2>&1 @@ -330,13 +319,6 @@ if $INSTALL_POSTGIS; then echo " - postgis $POSTGIS_VERSION" fi fi -if $INSTALL_PGROUTING; then - if [ "$PGROUTING_VERSION" == "auto" ]; then - echo " - pgRouting" - else - echo " - pgRouting $PGROUTING_VERSION" - fi -fi if $INSTALL_SPATIALITE; then echo " - spatialite $SPATIALITE_VERSION"; fi if $INSTALL_SPATIALITE_ADMIN; then echo " - phpLiteAdmin $PHPLITEADMIN_VERSION"; fi if $INSTALL_TOMCAT; then echo " - tomcat $TOMCAT_VERSION"; fi @@ -405,38 +387,6 @@ if $INSTALL_POSTGRES_ADMIN; then yum -y install phpPgAdmin >> $WORKING_DIR/install_phpPgAdmin.log 2>&1 fi -if $INSTALL_PGROUTING; then - if [ "$PGROUTING_VERSION" == "auto" ]; then - echo "Installing pgRouting (from repository)" - yum -y install pgrouting_$POSTGRESQL_SHORT_VERSION >> $WORKING_DIR/install_pgRouting.log 2>&1 - else - echo "Installing pgRouting dependencies" - yum -y install boost-devel $POSTGRESQL_PKG_NAME-devel $POSTGRESQL_PKG_NAME-libs postgis2_$POSTGRESQL_SHORT_VERSION-devel >> $WORKING_DIR/install_pgRouting_deps.log 2>&1 - -# echo "Installing CGAL 4.3" -# fn_download_newer $DOWNLOAD_DIR/CGAL-4.3.zip https://gforge.inria.fr/frs/download.php/32996/CGAL-4.3.zip -# cp $DOWNLOAD_DIR/CGAL-4.3.zip $DEPLOY_DIR/CGAL-4.3.zip -# unzip -o -d $DEPLOY_DIR $DEPLOY_DIR/CGAL-4.3.zip >> $WORKING_DIR/install_cgal.log 2>&1 -# cd $DEPLOY_DIR/CGAL-4.3 -# cmake . >> $WORKING_DIR/install_cgal.log 2>&1 -# make >> $WORKING_DIR/install_cgal.log 2>&1 -# make install >> $WORKING_DIR/install_cgal.log 2>&1 -# cd $WORKING_DIR - - echo "Installing pgRouting $PGROUTING_VERSION (from source)" - git clone -q "$PGROUTING_GIT_URL" $DEPLOY_DIR/pgRouting-$PGROUTING_VERSION - ln -sf $DEPLOY_DIR/pgRouting-$PGROUTING_VERSION $DEPLOY_DIR/pgRouting - cd $DEPLOY_DIR/pgRouting - git checkout -q pgrouting-$PGROUTING_VERSION >> /dev/null 2>&1 - mkdir build - cd build - cmake -DWITH_DD=OFF -DBoost_DIR:PATH=/usr/lib64/boost -DPOSTGRESQL_EXECUTABLE:FILEPATH="$PostgreSQL_ROOT"/bin/postgres -DPOSTGRESQL_PG_CONFIG:FILEPATH="$PostgreSQL_ROOT"/bin/pg_config .. >> $WORKING_DIR/install_pgRouting.log 2>&1 - make >> $WORKING_DIR/install_pgRouting.log 2>&1 - make install >> $WORKING_DIR/install_pgRouting.log 2>&1 - cd $WORKING_DIR - fi -fi - if $INSTALL_JAVA; then echo "Installing java (oracle jdk-$JAVA_VERSION)" fn_download_newer $DOWNLOAD_DIR/$JAVA_FILE $CACHE_DIR_REMOTE_ISO/$JAVA_FILE @@ -620,23 +570,6 @@ if $IMPORT_DATA_OSM; then chmod a+x $DEPLOY_DIR/osmosis/bin/osmosis fi -if ( $IMPORT_DATA_OSM || $IMPORT_DATA_OSM_CACHED ) && $INSTALL_PGROUTING; then - echo "Installing osm2pgrouting dependencies" - yum install -y expat-devel boost-devel $POSTGRESQL_PKG_NAME-devel >> $WORKING_DIR/install_osm2pgrouting_deps.log 2>&1 - - echo "Installing osm2pgrouting $OSM2PGROUTING_VERSION" - git clone -q "$OSM2PGROUTING_GIT_URL" $DEPLOY_DIR/osm2pgrouting-$OSM2PGROUTING_VERSION - ln -sf $DEPLOY_DIR/osm2pgrouting-$OSM2PGROUTING_VERSION $DEPLOY_DIR/osm2pgrouting - - cd $DEPLOY_DIR/osm2pgrouting - git checkout -q $OSM2PGROUTING_VERSION >> /dev/null 2>&1 - cmake -H. -Bbuild >> $WORKING_DIR/install_osm2pgrouting.log 2>&1 - cd build/ - make >> $WORKING_DIR/install_osm2pgrouting.log 2>&1 - make install >> $WORKING_DIR/install_osm2pgrouting.log 2>&1 - cd $WORKING_DIR -fi - if $INSTALL_SPATIALITE; then echo "Installing spatialite dependencies" yum -y install sqlite-devel zlib-devel proj-devel freexl-devel geos-devel libxml2-devel >> $WORKING_DIR/install_spatialite_deps.log 2>&1