From ae9352b61ec4e053c2586d2f782bfb89704cb769 Mon Sep 17 00:00:00 2001
From: Martin Spott <Martin.Spott@mgras.net>
Date: Wed, 25 Jan 2012 01:05:25 -0800
Subject: [PATCH] Merge minor cleanup

---
 gisscripts/grass01import.sh  | 4 ++--
 gisscripts/grass02reclass.sh | 2 +-
 gisscripts/grass05extract.sh | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gisscripts/grass01import.sh b/gisscripts/grass01import.sh
index 269ff855..f46aefe7 100755
--- a/gisscripts/grass01import.sh
+++ b/gisscripts/grass01import.sh
@@ -45,7 +45,7 @@ case ${MODE} in
 	    # Local, pre-intersected Shapefiles
 	    DSN=${HOME}/live/corine
 #	    PREFIX=nl_
-	    PREFIX=clc00_
+	    PREFIX=clc06_
 	    SELECTION=${DSN}/${PREFIX}c[0-9][0-9][0-9].shp
 	    SNAP=1
 	    SPAT=""
@@ -57,7 +57,7 @@ case ${MODE} in
 	    PREFIX=cs_
 	    # Maybe unsafe because "_" matches any single character in LIKE;
 	    # escape understores.
-	    SELECTION=`${PSQL} "SELECT f_table_name FROM geometry_columns WHERE f_table_name LIKE '$(echo ${PREFIX} | sed -e 's/_/\\_/g')%' AND type LIKE 'ST_Polygon' ORDER BY f_table_name"`
+	    SELECTION=`${PSQL} "SELECT f_table_name FROM geometry_columns WHERE f_table_name LIKE '$(echo ${PREFIX} | sed -e 's/_/\\_/g')%' AND type LIKE 'POLYGON' ORDER BY f_table_name"`
 #	    SELECTION=`psql -tA -c "\dt" | awk -F\| '{print $2}' | grep \^${PREFIX}`
 	    SNAP=0.0003  # Fits nicely with VMap0, consider SNAP=0.00001 for accurate data
 #	    SPAT="spatial=2.8,49.8,8.2,54.2"  # spatial=-123,37,-121,38  # spatial=3,50,8,54
diff --git a/gisscripts/grass02reclass.sh b/gisscripts/grass02reclass.sh
index 293b983f..152fb6cb 100755
--- a/gisscripts/grass02reclass.sh
+++ b/gisscripts/grass02reclass.sh
@@ -26,7 +26,7 @@ RUNDIR=`pwd`
 cd `dirname ${0}` && export BASEDIR=`pwd`
 cd ${RUNDIR}
 #
-MAPPINGFILE=${BASEDIR}/CORINEtoCStest.txt
+MAPPINGFILE=${BASEDIR}/CORINEtoCS.txt
 #
 
 case ${MODE} in
diff --git a/gisscripts/grass05extract.sh b/gisscripts/grass05extract.sh
index edecef10..802517d6 100755
--- a/gisscripts/grass05extract.sh
+++ b/gisscripts/grass05extract.sh
@@ -30,7 +30,7 @@ cd `dirname ${0}` && export BASEDIR=`pwd`
 cd ${RUNDIR}
 #
 
-MAPPINGFILE=${BASEDIR}/CORINEtoCStest.txt
+MAPPINGFILE=${BASEDIR}/CORINEtoCS.txt
 #EXTRACTPREFIX=clc00_nl_
 EXTRACTPREFIX=clc00_
 CLEANMAP=${EXTRACTPREFIX}_dissolved
@@ -39,7 +39,7 @@ case ${MODE} in
 	shp)
 	    # Re-project from EPSG:3035 - this one is _not_ to be run inside
 	    # the import location !!!
-	    v.proj location=corine mapset=PERMANENT input=${CLEANMAP}  # output=${CLEANMAP}
+	    v.proj location=corine_laea mapset=PERMANENT input=${CLEANMAP}  # output=${CLEANMAP}
 	;;
 esac