From 7a47363ed2a6be3454e23b93364c9b42cc414b85 Mon Sep 17 00:00:00 2001
From: Martin Spott <martin@hypersphere.calit2.net>
Date: Mon, 22 Nov 2010 08:00:56 -0800
Subject: [PATCH] Forgot cosmetic update ....

---
 gisscripts/IntersectsRemoval.sh | 34 ++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/gisscripts/IntersectsRemoval.sh b/gisscripts/IntersectsRemoval.sh
index d2d40e57..78e65450 100755
--- a/gisscripts/IntersectsRemoval.sh
+++ b/gisscripts/IntersectsRemoval.sh
@@ -1,12 +1,31 @@
 #!/bin/bash
 #
+# Written by Martin Spott
+#
+# Copyright (C) 2010  Martin Spott - Martin (at) flightgear (dot) org
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+
 PGHOST=geoscope.optiputer.net
 PGUSER=martin
 PGDATABASE=landcover
-PGSQL2SHPCONN="-h ${PGHOST} -u ${PGUSER} -g wkb_geometry -b -r ${PGDATABASE}"
+PGSQL2SHPCS="-h ${PGHOST} -u ${PGUSER} -g wkb_geometry -b -r ${PGDATABASE}"
 PSQL="psql -tA -h ${PGHOST} -U ${PGUSER} -d ${PGDATABASE} -c"
 SHAPE=`basename ${1} | cut -f 1 -d \. | uniq`
-CUTLAYER=tempcutout
+CUTLAYER=temphole
 DIFFLAYER=tempdiff
 LAYERPREFIX=cs_
 LOGSCRIPT=${HOME}/cs_intersects.log
@@ -79,12 +98,16 @@ CheckWithin () {
 SingularizeDump () {
     if [ `${PSQL} "SELECT COUNT(*) FROM ${DIFFLAYER}"` -gt 0 ]; then
         for OGC_FID in `${PSQL} "SELECT ogc_fid FROM ${DIFFLAYER} WHERE NumGeometries(wkb_geometry) IS NOT NULL"`; do
-            ${PSQL} "INSERT INTO ${DIFFLAYER} (wkb_geometry) (SELECT GeometryN(wkb_geometry, generate_series(1, NumGeometries(wkb_geometry))) AS wkb_geometry FROM ${DIFFLAYER} WHERE ogc_fid = ${OGC_FID})"
+            ${PSQL} "INSERT INTO ${DIFFLAYER} (wkb_geometry) \
+                (SELECT GeometryN(wkb_geometry, generate_series(1, NumGeometries(wkb_geometry))) \
+                AS wkb_geometry \
+                FROM ${DIFFLAYER} \
+                WHERE ogc_fid = ${OGC_FID})"
             ${PSQL} "DELETE FROM ${DIFFLAYER} WHERE ogc_fid = ${OGC_FID}"
         done
         CPSTRING="INSERT INTO ${CSLAYER} (wkb_geometry) (SELECT wkb_geometry FROM ${DIFFLAYER})"
         if [ ${MODE} == "testing" ]; then
-            pgsql2shp -f ${DUMPDIR}/${CSLAYER}.shp ${PGSQL2SHPCONN} "SELECT * FROM ${DIFFLAYER}"
+            pgsql2shp -f ${DUMPDIR}/${CSLAYER}.shp ${PGSQL2SHPCS} "SELECT * FROM ${DIFFLAYER}"
         elif [ ${MODE} == "production" ]; then
             ${PSQL} "${CPSTRING}"
         fi
@@ -97,7 +120,8 @@ CheckIntersects () {
         echo "Selection requires to contain exactly one single feature - exiting !"
         exit 1
     else
-        for CSLAYER in `${PSQL} "SELECT f_table_name FROM geometry_columns WHERE f_table_name LIKE '${LAYERPREFIX}%' AND type LIKE 'POLYGON' ORDER BY f_table_name"`; do
+        for CSLAYER in `${PSQL} "SELECT f_table_name FROM geometry_columns WHERE f_table_name LIKE '${LAYERPREFIX}%' \
+            AND type LIKE 'POLYGON' ORDER BY f_table_name"`; do
             InitDiffTable
             for OGC_FID in `${PSQL} "SELECT ogc_fid FROM ${CSLAYER} WHERE wkb_geometry && (SELECT wkb_geometry FROM ${CUTLAYER}) ORDER BY ogc_fid"`; do
                 RETURN=`${PSQL} "SELECT ST_Intersects((SELECT wkb_geometry FROM ${CUTLAYER}), (SELECT wkb_geometry FROM ${CSLAYER} WHERE ogc_fid = ${OGC_FID}))"`