refinement translaties

nlextract · Mar 18, 2015 · 0b85522 · 0b85522
1 parent dfd991e
commit 0b85522
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/bonnebladen/bin/bonnetrans.sh b/bonnebladen/bin/bonnetrans.sh
@@ -11,9 +11,10 @@
 # bonnetrans.sh b027-1932.png
 
 # Bepaal onze home/bin dir
-BIN_DIR=`dirname $0`/..
-BIN_DIR=`(cd "$BIN_DIR"; pwd)`
-DATA_DIR=${BIN_DIR}/..
+HOME_DIR=`dirname $0`/..
+HOME_DIR=`(cd "$HOME_DIR"; pwd)`
+BIN_DIR=${HOME_DIR}/bin
+DATA_DIR=${HOME_DIR}/data
 
 # In de settings file per host, staat de locatie van de bron
 # .png van de Bonnebladen
@@ -22,7 +23,6 @@ SETTINGS_SCRIPT="${BIN_DIR}/settings.sh"
 
 fileName=$1
 
-
 # Extraheer bladnummer, jaar en basis-filenaam
 bladnr=`echo $fileName | cut -d'b' -f2 | cut -d'-' -f1`
 jaar=`echo $fileName | cut -d'-' -f2 | cut -d'.' -f1`
@@ -80,11 +80,14 @@ function createGeoTiff() {
 
     # Maak GeoTIFF van TIFF met juiste georeferentie uit CSV, en internal tiling
     echo "gdal_translate"
-	gdal_translate -of GTiff -a_ullr $nw $se -co TILED=YES -a_srs EPSG:28992  $tmp_tif $dst_tif
+	# gdal_translate -of GTiff -a_ullr $nw $se -co TILED=YES -a_srs EPSG:28992  $tmp_tif $dst_tif
+    gdal_translate -b 1 -b 2 -b 3 -of GTiff -co TILED=YES -co PROFILE=Geotiff -co COMPRESS=JPEG -co JPEG_QUALITY=95 \
+            -co PHOTOMETRIC=YCBCR -co BLOCKXSIZE=512 -co BLOCKYSIZE=512 -a_srs EPSG:28992  $tmp_tif $dst_tif
+
     # gdal_translate -b 1 -b 2 -b 3 -of GTiff -a_ullr $nw $se -co TILED=YES -co PROFILE=Geotiff -co COMPRESS=JPEG -co JPEG_QUALITY=95 -co PHOTOMETRIC=YCBCR -co BLOCKXSIZE=512 -co BLOCKYSIZE=512 -a_srs EPSG:28992  $tmp_tif $dst_tif
 
 	# Zet nodata op wit (niet duidelijk of dit zin heeft....)
-    python gdalsetnull.py $dst_tif 255 255 255
+    python $BIN_DIR/gdalsetnull.py $dst_tif 255 255 255
 
     # Maak overview (pyramid)
 	echo "Maak overview met gdaladdo"
@@ -94,7 +97,8 @@ function createGeoTiff() {
     #    gdaladdo %THIS_DIR%.tif -r average --config COMPRESS_OVERVIEW JPEG
     #    --config JPEG_QUALITY_OVERVIEW 60 --config INTERLEAVE_OVERVIEW PIXEL
     #      --config PHOTOMETRIC_OVERVIEW YCBCR 2 4 8 16 32 64 128 256 512
-    gdaladdo -r average $dst_tif  ${GDAL_OVERVIEW_LEVELS}
+    # gdaladdo -r average $dst_tif  ${GDAL_OVERVIEW_LEVELS}
+    gdaladdo -r gauss --config COMPRESS_OVERVIEW JPEG --config PHOTOMETRIC_OVERVIEW YCBCR --config JPEG_QUALITY_OVERVIEW 90 --config INTERLEAVE_OVERVIEW PIXEL $dst_tif  2 4 8 16
     # gdaladdo -r gauss --config COMPRESS_OVERVIEW JPEG --config PHOTOMETRIC_OVERVIEW YCBCR --config JPEG_QUALITY_OVERVIEW 95 --config INTERLEAVE_OVERVIEW PIXEL $dst_tif  ${GDAL_OVERVIEW_LEVELS}
 
     # Tijdelijke bestanden weggooien
@@ -106,6 +110,8 @@ function createGeoTiff() {
 if [ -e $src ]
 then
     createGeoTiff $src $dst
+else
+	echo "source file: $src does not exist!"
 fi
 
 # Oude code/pogingen evt nog later naar kijken

diff --git a/bonnebladen/bin/settings-vm-kademo.sh b/bonnebladen/bin/settings-vm-kademo.sh
@@ -2,7 +2,7 @@
 # maak een file voor je host aan en die wordt automagisch meegenomen
 
 # Hulpvar
-BONNE_DATA_HOME=/var/kademo/data/bonne
+BONNE_DATA_HOME=/var/nlextract/data/bonne
 
 # Bron bladen directory
 BONNE_DATA_SRC_DIR=${BONNE_DATA_HOME}/src

diff --git a/bonnebladen/bin/settings.sh b/bonnebladen/bin/settings.sh
@@ -33,11 +33,11 @@ CROP=4000x2500+18
 # Plaatje is typisch 4018, 2527 neem grootste
 # log(4200) / log(2) - log (512) / log(2) = 3.036 = ~4
 
-GDAL_OVERVIEW_LEVELS="2 4 8 16"
+GDAL_OVERVIEW_LEVELS="2 4 8 16 32"
 
 # Mask image om randen transparant te maken
 BONNE_MASK_COLOR='#FFFFFF'
-BONNE_MASK_IMG=../data/bonnemask.png
+BONNE_MASK_IMG=${DATA_DIR}/bonnemask.png
 
 # Per-host settings
 SETTINGS_SCRIPT="${BIN_DIR}/settings-`hostname`.sh"