[Mapbender-commits] r10004 - trunk/mapbender/resources/db

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-12-07 06:01:10 -0800 (Fri, 07 Dec 2018)
New Revision: 10004

Modified:
   trunk/mapbender/resources/db/install_geoportal_mb28.sh
Log:
Fix for sequences and new configuration options - thanx to frank jaeger

Modified: trunk/mapbender/resources/db/install_geoportal_mb28.sh
===================================================================
--- trunk/mapbender/resources/db/install_geoportal_mb28.sh	2018-12-06 10:27:57 UTC (rev 10003)
+++ trunk/mapbender/resources/db/install_geoportal_mb28.sh	2018-12-07 14:01:10 UTC (rev 10004)
@@ -51,6 +51,27 @@
 ############################################################
 bbox_wgs84_space="6.05 48.9 8.6 50.96"
 ############################################################
+# other values for configuration files - mobile viewer & atomFeedClient
+############################################################
+# atomFeedClient.conf / config.js - mm2_config.js
+center_x_i="385000"
+center_y_i="5543000"
+# config.js - mm2_config.js
+initial_scale_i="1500000"
+map_extent_csv=$bbox_wgs84
+if [ $use_ssl = 'true' ]; then
+    server_url="https://"$domain_name
+else
+if [ $use_ssl = 'false' ]; then
+    server_url="http://"$domain_name
+fi
+background_hybrid_tms_url="http://www.gdi-rp-dienste2.rlp.de/mapcache/tms/1.0.0/topplusbkg@UTM32"
+background_aerial_wms_url="http://geo4.service24.rlp.de/wms/dop_basis.fcgi"
+# mobilemap.conf
+dhm_wms_url="http://www.gdi-rp-dienste2.rlp.de/cgi-bin/mapserv.fcgi?map=/data/umn/geoportal/dhm_query/dhm.map&"
+catalogue_interface=$server_url"/mapbender/php/mod_callMetadata.php?"
+background_wms_csv="1819,1382,1635"
+############################################################
 # default services
 ############################################################
 #wms_1_url="'http://geo4.service24.rlp.de/wms/dop_basis.fcgi?REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS'"
@@ -343,6 +364,8 @@
 su - postgres -c "dropdb -p $mapbender_database_port $mapbender_database_name"
 su - postgres -c "createdb -p $mapbender_database_port -E UTF8 $mapbender_database_name -T template0"
 
+sudo -u postgres psql -q -p $mapbender_database_port -d $mapbender_database_name -c "DROP USER $mapbender_database_user"
+
 sudo -u postgres psql -q -p $mapbender_database_port -d $mapbender_database_name -c "CREATE USER $mapbender_database_user WITH ENCRYPTED PASSWORD '$mapbender_database_password'"
 
 # su -c - postgres "createlang plpgsql -d $mapbender_database_name" - not needed for debian 8+
@@ -634,6 +657,9 @@
 UPDATE spatial_ref_sys SET proj4text='+proj=tmerc +lat_0=0 +lon_0=15 +k=1 +x_0=5500000 +y_0=0 +datum=potsdam +ellps=bessel +nadgrids=@BETA2007.gsb,null +units=m +no_defs' WHERE srid = 31469;
 EOF
 sudo -u postgres psql -q -d mapbender -f ${installation_folder}geoportal_database_proj_adaption.sql
+
+sudo -u postgres psql -q -p $mapbender_database_port -d $mapbender_database_name -f ${installation_folder}mapbender/resources/db/pgsql/pgsql_serial_set_sequences_2.7.sql
+
 #####################
 fi # end of installation of the mapbender database
 
@@ -780,7 +806,25 @@
     sed -i "s#%%INSTALLATIONFOLDER%%#${installation_folder}#g" ${installation_folder}conf/extent_service_geoportal_rlp.conf    
     sed -i "s/%%BBOXWGS84%%/$bbox_wgs84/g" ${installation_folder}conf/extent_service_geoportal_rlp.conf
     cp ${installation_folder}conf/extent_service_geoportal_rlp.conf ${installation_folder}mapbender/tools/wms_extent/extent_service.conf
-fi
+    # conf file for atomFeedClient
+    sed -i "s#%%center_x_i%%#${center_x_i}#g" ${installation_folder}conf/atomFeedClient.conf
+    sed -i "s#%%center_y_i%%#${center_y_i}#g" ${installation_folder}conf/atomFeedClient.conf
+    cp ${installation_folder}conf/atomFeedClient.conf ${installation_folder}mapbender/conf/atomFeedClient.conf
+    # conf file for mobilemap client
+    sed -i "s#%%center_x_i%%#${center_x_i}#g" ${installation_folder}conf/config.js
+    sed -i "s#%%center_y_i%%#${center_y_i}#g" ${installation_folder}conf/config.js
+    sed -i "s#%%initial_scale_i%%#${initial_scale_i}#g" ${installation_folder}conf/config.js
+    sed -i "s#%%map_extent_csv%%#${map_extent_csv}#g" ${installation_folder}conf/config.js
+    sed -i "s#%%server_url%%#${server_url}#g" ${installation_folder}conf/config.js
+    sed -i "s#%%background_hybrid_tms_url%%#${background_hybrid_tms_url}#g" ${installation_folder}conf/config.js
+    sed -i "s#%%background_aerial_wms_url%%#${background_aerial_wms_url}#g" ${installation_folder}conf/config.js
+    cp ${installation_folder}conf/config.js ${installation_folder}mapbender/http/extensions/mobilemap2/scripts/netgis/config.js
+    # conf file for mobilemap.conf
+    sed -i "s#%%dhm_wms_url%%#${dhm_wms_url}#g" ${installation_folder}conf/mobilemap.conf
+    sed -i "s#%%catalogue_interface%%#${catalogue_interface}#g" ${installation_folder}conf/mobilemap.conf
+    sed -i "s#%%background_wms_csv%%#${background_wms_csv}#g" ${installation_folder}conf/mobilemap.conf
+    cp ${installation_folder}conf/mobilemap.conf ${installation_folder}mapbender/conf/mobilemap.conf
+
 if [ $checkout_custom_svn = 'true' ]; then
     # override information in custom conf files 
     # mapbender.conf