updated 3DCityDB scripts

Author: clausnagel

resources/3dcitydb/json-schema/geometryProperties.schema.json renamed to resources/3dcitydb/json-schema/geometry-properties.schema.json

@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+# 3DCityDB setup --------------------------------------------------------------
+
+# Print commands and their arguments as they are executed
+set -e;
+
+# psql should stop on error
+psql=( psql -v ON_ERROR_STOP=1 )
+
+# SRID ------------------------------------------------------------------------
+regex_numeric='^[0-9]+$'
+if [ -z ${SRID+x} ]; then
+  # No SRID set -> give instructions on how to create a DB and do nothing
+  echo
+  echo "SRID is not set. No 3DCityDB instance will be created in database '$POSTGRES_DB'."
+  exit
+else
+  # SRID given, check if valid
+  if [[ ! $SRID =~ $regex_numeric ]] || [ $SRID -le 0 ]; then
+        echo
+        echo 'Illegal input! Enter a positive integer for the SRID.'
+  fi
+fi
+
+# SRS_NAME --------------------------------------------------------------------
+if [ -z ${SRS_NAME+x} ]; then
+  # SRS_NAME unset, set default SRS_NAME using HEIGHT_EPSG if set
+  # HEIGHT EPSG ---------------------------------------------------------------
+  if [ -z ${HEIGHT_EPSG+x} ]; then
+    # No HEIGHT_EPSG given
+    SRS_NAME="urn:ogc:def:crs:EPSG::$SRID"
+  else
+    if [ $HEIGHT_EPSG -gt 0 ]; then
+      SRS_NAME="urn:ogc:def:crs,crs:EPSG::$SRID,crs:EPSG::$HEIGHT_EPSG"
+    else
+      SRS_NAME="urn:ogc:def:crs:EPSG::$SRID"
+    fi
+  fi
+else
+  if [ ! -z ${HEIGHT_EPSG+x} ]; then
+    # SRS_NAME is set, HEIGHT_EPSG is ignored
+    echo
+    echo "!!! WARNING: SRS_NAME is set. HEIGHT_EPSG will be ignored."
+  fi
+fi
+
+# Add PostGIS raster extension ------------------------------------------------
+# Get major version from POSTGIS_VERSION, POSTGIS_MAJOR may return string
+postgis_major=$( echo $POSTGIS_VERSION | cut -f1 -d '.' )
+if [ $postgis_major -gt 2 ]; then
+  echo
+  echo "Create PostGIS raster extensions in database '$POSTGRES_DB' ..."
+
+  "${psql[@]}" -d "$POSTGRES_DB" -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"
+
+  echo "Create PostGIS raster extensions in database '$POSTGRES_DB' ...done!"
+fi
+
+# Add PostGIS SFCGAL extension ------------------------------------------------
+if [ ! -z ${POSTGIS_SFCGAL+x} ] && [ ${POSTGIS_SFCGAL} = true ] || [ "${POSTGIS_SFCGAL}" = "yes" ] ; then
+
+  echo "Create PostGIS SFCGAL extensions in database '$POSTGRES_DB' ..."
+
+  "${psql[@]}" -d "$POSTGRES_DB" -c "CREATE EXTENSION IF NOT EXISTS postgis_sfcgal;"
+
+  echo "Create PostGIS SFCGAL extensions in database '$POSTGRES_DB' ...done!"
+  SFCGAL=true
+else
+  SFCGAL=false
+fi
+
+# Setup 3DCityDB schema -------------------------------------------------------
+echo
+echo "Setting up 3DCityDB database schema in database '$POSTGRES_DB' ..."
+
+"${psql[@]}" -d "$POSTGRES_DB" -f "create-db.sql" \
+  -v srid="$SRID" -v srs_name="$SRS_NAME" > /dev/null
+
+echo "Setting up 3DCityDB database schema in database '$POSTGRES_DB' ...done!"
+
+# Echo info -------------------------------------------------------------------
+cat <<EOF
+
+# 3DCityDB Docker PostGIS ######################################################
+#
+# PostgreSQL/PostGIS -----------------------------------------------------------
+#   PostgreSQL version  $PG_MAJOR - $PG_VERSION
+#   PostGIS version     $POSTGIS_VERSION
+#
+# 3DCityDB ---------------------------------------------------------------------
+#   https://github.com/3dcitydb/3dcitydb
+#
+#   3DCityDB version  $CITYDBVERSION
+#   DBNAME            $POSTGRES_DB
+#   SRID              $SRID
+#   SRSNAME           $SRS_NAME
+#   HEIGHT_EPSG       $HEIGHT_EPSG
+#   SFCGAL enabled    $SFCGAL
+#
+# Maintainer -------------------------------------------------------------------
+#   Bruno Willenborg
+#   Chair of Geoinformatics
+#   Department of Aerospace and Geodesy
+#   Technical University of Munich (TUM)
+#   b.willenborg(at)tum.de
+#
+################################################################################
+
+EOF

resources/3dcitydb/json-schema/georeferencedTextureMapping.schema.json renamed to resources/3dcitydb/json-schema/georeferenced-texture-mapping.schema.json

@@ -1,17 +1,8 @@
 #!/bin/bash
 # Provide your database details here ------------------------------------------
-#: '
 export PGBIN=path_to_psql
 export PGHOST=your_host_address
 export PGPORT=5432
 export CITYDB=your_database
 export PGUSER=your_username
-#'
-: '
-export PGBIN=/usr/bin/psql
-export PGHOST=localhost
-export PGPORT=5432
-export CITYDB=local23
-export PGUSER=postgres
-'
 #------------------------------------------------------------------------------

resources/3dcitydb/json-schema/gtOrientation.schema.json renamed to resources/3dcitydb/json-schema/gt-orientation.schema.json

@@ -3,7 +3,7 @@
 # on PostgreSQL/PostGIS
 
 # read database connection details 
-source CONNECTION_DETAILS.sh
+source connection-details.sh
 
 # add PGBIN to PATH
 export PATH="$PGBIN:$PATH"
@@ -38,7 +38,7 @@ echo
 echo '######################################################################################'
 
 # cd to path of the SQL scripts
-cd ../../SQLScripts
+cd ../../sql-scripts
 
 # Prompt for SRID -------------------------------------------------------------
 re='^[0-9]+$'
@@ -83,10 +83,10 @@ echo 'Please enter the corresponding SRS name to be used in exports.'
 read -p "(default SRS_NAME=$SRS_NAME): " var
 SRS_NAME=${var:-$SRS_NAME}
 
-# Run CREATE_DB.sql to create the 3D City Database instance -------------------
+# Run create-db.sql to create the 3D City Database instance -------------------
 echo
 echo "Connecting to \"$PGUSER@$PGHOST:$PGPORT/$CITYDB\" ..."
-psql -d "$CITYDB" -f "CREATE_DB.sql" -v srid="$SRID" -v srs_name="$SRS_NAME"
+psql -d "$CITYDB" -f "create-db.sql" -v srid="$SRID" -v srs_name="$SRS_NAME"
 
 echo
 read -rsn1 -p 'Press ENTER to quit.'

resources/3dcitydb/json-schema/materialMapping.schema.json renamed to resources/3dcitydb/json-schema/material-mapping.schema.json

@@ -3,7 +3,7 @@
 # on PostgreSQL/PostGIS
 
 # read database connection details
-source CONNECTION_DETAILS.sh
+source connection-details.sh
 
 # add PGBIN to PATH
 export PATH="$PGBIN:$PATH"
@@ -38,12 +38,12 @@ echo
 echo '#####################################################################################'
 
 # cd to path of the SQL scripts
-cd ../../SQLScripts/UTIL/SCHEMAS
+cd ../../sql-scripts
 
 # List the existing 3DCityDB schemas ------------------------------------------
 echo
 echo "Reading 3DCityDB schemas from \"$PGUSER@$PGHOST:$PGPORT/$CITYDB\" ..."
-psql -d "$CITYDB" -f "LIST_SCHEMAS.sql"
+psql -d "$CITYDB" -f "util/list-schemas.sql"
 
 if [[ $? -ne 0 ]] ; then
   echo 'Failed to read 3DCityDB schemas from database.'
@@ -58,10 +58,10 @@ echo 'Please enter the name of the 3DCityDB schema you want to create.'
 read -p "(default SCHEMA_NAME=$SCHEMA_NAME): " var
 SCHEMA_NAME=${var:-$SCHEMA_NAME}
 
-# Run CREATE_SCHEMA.sql to create a new 3DCityDB schema -----------------------
+# Run create-schema.sql to create a new 3DCityDB schema -----------------------
 echo
 echo "Connecting to \"$PGUSER@$PGHOST:$PGPORT/$CITYDB\" ..."
-psql -d "$CITYDB" -f "CREATE_SCHEMA.sql" -v schema_name="$SCHEMA_NAME"
+psql -d "$CITYDB" -f "create-schema.sql" -v schema_name="$SCHEMA_NAME"
 
 echo
 read -rsn1 -p 'Press ENTER to quit.'

resources/3dcitydb/json-schema/schemaMapping.schema.json renamed to resources/3dcitydb/json-schema/schema-mapping.schema.json

@@ -3,7 +3,7 @@
 # on PostgreSQL/PostGIS
 
 # read database connection details 
-source CONNECTION_DETAILS.sh
+source connection-details.sh
 
 # add PGBIN to PATH
 export PATH="$PGBIN:$PATH"
@@ -36,12 +36,12 @@ echo
 echo '################################################################################'
 
 # cd to path of the SQL scripts
-cd ../../SQLScripts
+cd ../../sql-scripts
 
-# Run DROP_DB.sql to drop the 3D City Database instance -----------------------
+# Run drop-db.sql to drop the 3D City Database instance -----------------------
 echo
 echo "Connecting to \"$PGUSER@$PGHOST:$PGPORT/$CITYDB\" ..."
-psql -d "$CITYDB" -f "DROP_DB.sql"
+psql -d "$CITYDB" -f "drop-db.sql"
 
 echo
 read -rsn1 -p 'Press ENTER to quit.'

resources/3dcitydb/json-schema/textureMapping.schema.json renamed to resources/3dcitydb/json-schema/texture-mapping.schema.json

@@ -3,7 +3,7 @@
 # on PostgreSQL/PostGIS
 
 # read database connection details 
-source CONNECTION_DETAILS.sh
+source connection-details.sh
 
 # add PGBIN to PATH
 export PATH="$PGBIN:$PATH"
@@ -38,12 +38,12 @@ echo
 echo '############################################################################'
 
 # cd to path of the SQL scripts
-cd ../../SQLScripts/UTIL/SCHEMAS
+cd ../../sql-scripts
 
 # List the existing 3DCityDB schemas ------------------------------------------
 echo
 echo "Reading 3DCityDB schemas from \"$PGUSER@$PGHOST:$PGPORT/$CITYDB\" ..."
-psql -d "$CITYDB" -f "LIST_SCHEMAS.sql"
+psql -d "$CITYDB" -f "util/list-schemas.sql"
 
 if [[ $? -ne 0 ]] ; then
   echo 'Failed to read 3DCityDB schemas from database.'
@@ -66,10 +66,10 @@ while [ 1 ]; do
   fi
 done;
 
-# Run DROP_SCHEMA.sql to remove the selected 3DCityDB schema ------------------
+# Run drop-schema.sql to remove the selected 3DCityDB schema ------------------
 echo
 echo "Connecting to \"$PGUSER@$PGHOST:$PGPORT/$CITYDB\" ..."
-psql -d "$CITYDB" -f "DROP_SCHEMA.sql" -v schema_name="$SCHEMA_NAME"
+psql -d "$CITYDB" -f "drop-schema.sql" -v schema_name="$SCHEMA_NAME"
 
 echo
 read -rsn1 -p 'Press ENTER to quit.'

resources/3dcitydb/json-schema/valArray.schema.json renamed to resources/3dcitydb/json-schema/val-array.schema.json

@@ -3,7 +3,7 @@
 # on PostgreSQL/PostGIS
 
 # read database connection details
-source CONNECTION_DETAILS.sh
+source connection-details.sh
 
 # add PGBIN to PATH
 export PATH="$PGBIN:$PATH"
@@ -40,7 +40,7 @@ echo
 echo '####################################################################################'
 
 # cd to path of the SQL scripts
-cd ../../SQLScripts/UTIL/GRANT_ACCESS
+cd ../../sql-scripts
 
 # Prompt for GRANTEE ----------------------------------------------------------
 while [ 1 ]; do
@@ -59,7 +59,7 @@ done
 # List the existing 3DCityDB schemas ------------------------------------------
 echo
 echo "Reading 3DCityDB schemas from \"$PGUSER@$PGHOST:$PGPORT/$CITYDB\" ..."
-psql -d "$CITYDB" -f "../SCHEMAS/LIST_SCHEMAS.sql"
+psql -d "$CITYDB" -f "util/list-schemas.sql"
 
 if [[ $? -ne 0 ]] ; then
   echo 'Failed to read 3DCityDB schemas from database.'
@@ -92,10 +92,10 @@ while [ 1 ]; do
   fi
 done
 
-# Run GRANT_ACCESS.sql to grant access privileges on a specific schema --------
+# Run grant-access.sql to grant access privileges on a specific schema --------
 echo
 echo "Connecting to \"$PGUSER@$PGHOST:$PGPORT/$CITYDB\" ..."
-psql -d "$CITYDB" -f "GRANT_ACCESS.sql" -v username="$GRANTEE" -v schema_name="$SCHEMA_NAME" -v access_mode="$ACCESS_MODE"
+psql -d "$CITYDB" -f "grant-access.sql" -v username="$GRANTEE" -v schema_name="$SCHEMA_NAME" -v access_mode="$ACCESS_MODE"
 
 echo
 read -rsn1 -p 'Press ENTER to quit.'

resources/3dcitydb/json-schema/worldToTextureMapping.schema.json renamed to resources/3dcitydb/json-schema/world-to-textureMapping.schema.json

@@ -3,7 +3,7 @@
 # on PostgreSQL/PostGIS
 
 # read database connection details
-source CONNECTION_DETAILS.sh
+source connection-details.sh
 
 # add PGBIN to PATH
 export PATH="$PGBIN:$PATH"
@@ -40,7 +40,7 @@ echo
 echo '#######################################################################################'
 
 # cd to path of the SQL scripts
-cd ../../SQLScripts/UTIL/GRANT_ACCESS
+cd ../../sql-scripts
 
 # Prompt for GRANTEE ----------------------------------------------------------
 while [ 1 ]; do
@@ -59,7 +59,7 @@ done
 # List the 3DCityDB schemas granted to GRANTEE --------------------------------
 echo
 echo "Reading 3DCityDB schemas granted to \"$GRANTEE\" from \"$PGUSER@$PGHOST:$PGPORT/$CITYDB\" ..."
-psql -d "$CITYDB" -f "../SCHEMAS/LIST_SCHEMAS_WITH_ACCESS_GRANT.sql" -v username="$GRANTEE"
+psql -d "$CITYDB" -f "util/list-schemas-with-access-grant.sql" -v username="$GRANTEE"
 
 if [[ $? -ne 0 ]] ; then
   echo 'Failed to read 3DCityDB schemas from database.'
@@ -74,10 +74,10 @@ echo "Please enter the name of the 3DCityDB schema that shall be revoked from \"
 read -p "(default SCHEMA_NAME=$SCHEMA_NAME): " var
 SCHEMA_NAME=${var:-$SCHEMA_NAME}
 
-# Run REVOKE_ACCESS.sql to revoke read-only access on a specific schema -------
+# Run revoke-access.sql to revoke read-only access on a specific schema -------
 echo
 echo "Connecting to \"$PGUSER@$PGHOST:$PGPORT/$CITYDB\" ..."
-psql -d "$CITYDB" -f "REVOKE_ACCESS.sql" -v username="$GRANTEE" -v schema_name="$SCHEMA_NAME"
+psql -d "$CITYDB" -f "revoke-access.sql" -v username="$GRANTEE" -v schema_name="$SCHEMA_NAME"
 
 echo
 read -rsn1 -p 'Press ENTER to quit.'

resources/3dcitydb/postgresql/docker-scripts/3dcitydb-initdb.sh

@@ -3,7 +3,7 @@
 :: on PostgreSQL/PostGIS
 
 :: read database connection details  
-call CONNECTION_DETAILS.bat
+call connection-details.bat
 
 :: add PGBIN to PATH
 set PATH=%PGBIN%;%PATH%;%SYSTEMROOT%\System32
@@ -38,7 +38,7 @@ echo.
 echo ######################################################################################
 
 :: cd to path of the SQL scripts
-cd ..\..\SQLScripts
+cd ..\..\sql-scripts
 
 :: Prompt for SRID ------------------------------------------------------------
 :srid
@@ -100,9 +100,9 @@ set /p var="(default SRS_NAME=%SRS_NAME%): "
 
 if /i not "%var%"=="" set SRS_NAME=%var%
 
-:: Run CREATE_DB.sql to create the 3D City Database instance ------------------
+:: Run create-db.sql to create the 3D City Database instance ------------------
 echo.
 echo Connecting to "%PGUSER%@%PGHOST%:%PGPORT%/%CITYDB%" ...
-psql -d "%CITYDB%" -f "CREATE_DB.sql" -v srid="%SRID%" -v srs_name="%SRS_NAME%"
+psql -d "%CITYDB%" -f "create-db.sql" -v srid="%SRID%" -v srs_name="%SRS_NAME%"
 
 pause