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

fixing ambigious redirect error (added missing quotes)

parent 609eece7
No related branches found
No related tags found
No related merge requests found
...@@ -318,7 +318,7 @@ fn_import_data() ...@@ -318,7 +318,7 @@ fn_import_data()
echo "Importing data for region of $NAME" echo "Importing data for region of $NAME"
if ! $VALID_SQL_EXPORT && ! $INSTALL_PGROUTING && ! $INSTALL_NEO4J_SPATIAL; then if ! $VALID_SQL_EXPORT && ! $INSTALL_PGROUTING && ! $INSTALL_NEO4J_SPATIAL; then
echo " - skipping import (since no export was found and neither pgRouting nor neo4j are installed" echo " - skipping import"
return 1 return 1
fi fi
...@@ -336,9 +336,9 @@ fn_import_data() ...@@ -336,9 +336,9 @@ fn_import_data()
echo " - filtering OpenStreetMap data" echo " - filtering OpenStreetMap data"
if [[ "$BOUNDING" == *.poly ]]; then if [[ "$BOUNDING" == *.poly ]]; then
$DEPLOY_DIR/osmosis/bin/osmosis --read-pbf file="$OSM_FILENAME" --bounding-polygon file="$BOUNDING" --way-key keyList="$OSM_KEYS" --used-node --write-xml file="$DEPLOY_DIR/$OSM_FILE_FILTERED" >> initialize_osmData_$NAME.log 2>&1 $DEPLOY_DIR/osmosis/bin/osmosis --read-pbf file="$OSM_FILENAME" --bounding-polygon file="$BOUNDING" --way-key keyList="$OSM_KEYS" --used-node --write-xml file="$DEPLOY_DIR/$OSM_FILE_FILTERED" >> "initialize_osmData_$NAME.log" 2>&1
else else
$DEPLOY_DIR/osmosis/bin/osmosis --read-pbf file="$OSM_FILENAME" --bounding-box $BOUNDING --way-key keyList="$OSM_KEYS" --used-node --write-xml file="$DEPLOY_DIR/$OSM_FILE_FILTERED" >> initialize_osmData_$NAME.log 2>&1 $DEPLOY_DIR/osmosis/bin/osmosis --read-pbf file="$OSM_FILENAME" --bounding-box $BOUNDING --way-key keyList="$OSM_KEYS" --used-node --write-xml file="$DEPLOY_DIR/$OSM_FILE_FILTERED" >> "initialize_osmData_$NAME.log" 2>&1
fi fi
fi fi
...@@ -348,7 +348,7 @@ fn_import_data() ...@@ -348,7 +348,7 @@ fn_import_data()
cp $DOWNLOAD_DIR/$SQL_EXPORT_FILE $DEPLOY_DIR/$SQL_EXPORT_FILE >> /dev/null 2>&1 cp $DOWNLOAD_DIR/$SQL_EXPORT_FILE $DEPLOY_DIR/$SQL_EXPORT_FILE >> /dev/null 2>&1
echo " - importing sql export into postgis database" echo " - importing sql export into postgis database"
gunzip -c $DEPLOY_DIR/$SQL_EXPORT_FILE | PGPASSWORD="$PG_DB_PASSWORD" psql -U "$PG_DB_USER" -h localhost "$PG_DB_NAME" >> $WORKING_DIR/import_schedule_$NAME.log 2>&1 gunzip -c $DEPLOY_DIR/$SQL_EXPORT_FILE | PGPASSWORD="$PG_DB_PASSWORD" psql -U "$PG_DB_USER" -h localhost "$PG_DB_NAME" >> "$WORKING_DIR/import_schedule_$NAME.log" 2>&1
echo " - fixing table permissions" echo " - fixing table permissions"
tables=`PGPASSWORD="$PG_DB_PASSWORD" psql -qAt -U "$PG_DB_USER" -h localhost -c "SELECT tablename FROM pg_tables WHERE schemaname = 'public' AND tableowner = 'postgres';" "$PG_DB_NAME"` tables=`PGPASSWORD="$PG_DB_PASSWORD" psql -qAt -U "$PG_DB_USER" -h localhost -c "SELECT tablename FROM pg_tables WHERE schemaname = 'public' AND tableowner = 'postgres';" "$PG_DB_NAME"`
...@@ -359,10 +359,10 @@ fn_import_data() ...@@ -359,10 +359,10 @@ fn_import_data()
if $INSTALL_PGROUTING; then if $INSTALL_PGROUTING; then
echo " - importing filtered OpenStreetMap data into pgRouting" echo " - importing filtered OpenStreetMap data into pgRouting"
$DEPLOY_DIR/osm2pgrouting/build/osm2pgrouting -file "$DEPLOY_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 $DEPLOY_DIR/osm2pgrouting/build/osm2pgrouting -file "$DEPLOY_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" 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 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 fi
if $INSTALL_NEO4J_SPATIAL; then if $INSTALL_NEO4J_SPATIAL; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment