From 20d58ef413f1d06cc64a4bdc32d8a1b08d440b95 Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Wed, 13 Mar 2013 20:24:02 -0500
Subject: [PATCH] Issue #1663 - name the default geometry column

Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: f81212d4449ca0440642751b2b6cb2e03b2fdbee [formerly d35246ef3162d693161b140179966f47845e85af] [formerly 267b2c4dfa1e614609dded01cd8239a546d72aec] [formerly 37d869ef605d8ee13bf7c06343bbf9f476efc91e [formerly 267b2c4dfa1e614609dded01cd8239a546d72aec [formerly 2a8a3a3dab4d3e816bdb484ac94f456a80cd2616]]]
Former-commit-id: 37d869ef605d8ee13bf7c06343bbf9f476efc91e
Former-commit-id: f85c6a8bcab56873e52500a8858a7ccc31a3523f [formerly 6eec33384332dce3bffdcd4c41f9e3d727bf6004]
Former-commit-id: 1ce9d40711338fca93743935c6b5d1cb665db60b
---
 edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh b/edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
index 9a66d1cbb3..937e1cea19 100755
--- a/edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
+++ b/edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
@@ -64,7 +64,7 @@ ${PSQLBINDIR}psql -d maps -U ${PGUSER} -q -p ${PGPORT} -c "
     DELETE from ${SCHEMA}.map_version WHERE table_name='${TABLE}';
     DROP TABLE IF EXISTS ${SCHEMA}.${TABLE}
 "
-${PGBINDIR}shp2pgsql -W LATIN1 -s 4326 -I ${SHAPEFILEPATH} ${SCHEMA}.${TABLE} | ${PSQLBINDIR}psql -d maps -U ${PGUSER} -q -p ${PGPORT} -f -
+${PGBINDIR}shp2pgsql -W LATIN1 -s 4326 -g the_geom -I ${SHAPEFILEPATH} ${SCHEMA}.${TABLE} | ${PSQLBINDIR}psql -d maps -U ${PGUSER} -q -p ${PGPORT} -f -
 ${PSQLBINDIR}psql -d maps -U ${PGUSER} -q -p ${PGPORT} -c "
     INSERT INTO ${SCHEMA}.map_version (table_name, filename) values ('${TABLE}','${SHAPEFILENAME}');
     SELECT AddGeometryColumn('${SCHEMA}','${TABLE}','the_geom_0','4326',(SELECT type FROM public.geometry_columns WHERE f_table_schema='${SCHEMA}' and f_table_name='${TABLE}' and f_geometry_column='the_geom'),2);