Switching stmerc (simplified transverse mercator) to gstmerc (Gauss-Schreiber transverse mercator)

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1466 4e78687f-474d-0410-85f9-8d5e500ac6b2

5 files changed, 9 insertions, 9 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index a6a43462..3e7df58a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,7 @@ libproj_la_SOURCES = \
 	PJ_wag7.c PJ_lcca.c PJ_geos.c \
 	PJ_boggs.c PJ_collg.c PJ_crast.c PJ_denoy.c \
 	PJ_eck1.c PJ_eck2.c PJ_eck3.c PJ_eck4.c \
-	PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c PJ_stmerc.c \
+	PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c PJ_gstmerc.c \
 	PJ_gn_sinu.c PJ_goode.c PJ_hatano.c PJ_loxim.c \
 	PJ_mbt_fps.c PJ_mbtfpp.c PJ_mbtfpq.c PJ_moll.c \
 	PJ_nell.c PJ_nell_h.c PJ_putp2.c PJ_putp3.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index fc56997d..1c26b993 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -70,7 +70,7 @@ am_libproj_la_OBJECTS = PJ_aeqd.lo PJ_gnom.lo PJ_laea.lo \
 	PJ_vandg.lo PJ_vandg2.lo PJ_vandg4.lo PJ_wag7.lo PJ_lcca.lo \
 	PJ_geos.lo PJ_boggs.lo PJ_collg.lo PJ_crast.lo PJ_denoy.lo \
 	PJ_eck1.lo PJ_eck2.lo PJ_eck3.lo PJ_eck4.lo PJ_eck5.lo \
-	PJ_fahey.lo PJ_fouc_s.lo PJ_gins8.lo PJ_stmerc.lo \
+	PJ_fahey.lo PJ_fouc_s.lo PJ_gins8.lo PJ_gstmerc.lo \
 	PJ_gn_sinu.lo PJ_goode.lo PJ_hatano.lo PJ_loxim.lo \
 	PJ_mbt_fps.lo PJ_mbtfpp.lo PJ_mbtfpq.lo PJ_moll.lo PJ_nell.lo \
 	PJ_nell_h.lo PJ_putp2.lo PJ_putp3.lo PJ_putp4p.lo PJ_putp5.lo \
@@ -272,7 +272,7 @@ libproj_la_SOURCES = \
 	PJ_wag7.c PJ_lcca.c PJ_geos.c \
 	PJ_boggs.c PJ_collg.c PJ_crast.c PJ_denoy.c \
 	PJ_eck1.c PJ_eck2.c PJ_eck3.c PJ_eck4.c \
-	PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c PJ_stmerc.c \
+	PJ_eck5.c PJ_fahey.c PJ_fouc_s.c PJ_gins8.c PJ_gstmerc.c \
 	PJ_gn_sinu.c PJ_goode.c PJ_hatano.c PJ_loxim.c \
 	PJ_mbt_fps.c PJ_mbtfpp.c PJ_mbtfpq.c PJ_moll.c \
 	PJ_nell.c PJ_nell_h.c PJ_putp2.c PJ_putp3.c \
@@ -451,7 +451,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gall.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_geos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gins8.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_stmerc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gstmerc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gn_sinu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_gnom.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PJ_goode.Plo@am__quote@
diff --git a/src/PJ_stmerc.c b/src/PJ_gstmerc.c
index cd1c873f..69da061d 100644
--- a/src/PJ_stmerc.c
+++ b/src/PJ_gstmerc.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char SCCSID[]="@(#)PJ_stmerc.c	4.5	07/09/24	???	???";
+static const char SCCSID[]="@(#)PJ_gstmerc.c	4.6	08/07/28	DGR	IGN";
 #endif
 #define PROJ_PARMS__ \
 	double lamc;\
@@ -12,7 +12,7 @@ static const char SCCSID[]="@(#)PJ_stmerc.c	4.5	07/09/24	???	???";
 
 #define PJ_LIB__
 # include	<projects.h>
-PROJ_HEAD(stmerc, "Simplified Transverse Mercator (Schreiber, Gauss-Laborde)")
+PROJ_HEAD(gstmerc, "Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion)")
 	"\n\tCyl, Sph&Ell\n\tlat_0= lon_0= k_0=";
 FORWARD(s_forward); /* spheroid */
 	double L, Ls, sinLs1, Ls1;
@@ -34,7 +34,7 @@ INVERSE(s_inverse); /* spheroid */
 	return (lp);
 }
 FREEUP; if (P) pj_dalloc(P); }
-ENTRY0(stmerc)
+ENTRY0(gstmerc)
     P->n1= sqrt(1.0+P->es*pow(cos(P->phi0),4.0)/(1.0-P->es));
     P->phic= asin(sin(P->phi0)/P->n1);
     P->c=       log(pj_tsfn(-1.0*P->phic,0.0,0.0))
diff --git a/src/makefile.vc b/src/makefile.vc
index 9bc8b92e..3c2c3d43 100644
--- a/src/makefile.vc
+++ b/src/makefile.vc
@@ -18,7 +18,7 @@ cylinder = \
 	PJ_cass.obj PJ_cc.obj PJ_cea.obj PJ_eqc.obj \
 	PJ_gall.obj PJ_labrd.obj PJ_lsat.obj PJ_merc.obj \
 	PJ_mill.obj PJ_ocea.obj PJ_omerc.obj PJ_somerc.obj \
-	PJ_tcc.obj PJ_tcea.obj PJ_tmerc.obj PJ_geos.obj PJ_stmerc.obj
+	PJ_tcc.obj PJ_tcea.obj PJ_tmerc.obj PJ_geos.obj PJ_gstmerc.obj
 
 misc = \
 	PJ_airy.obj PJ_aitoff.obj PJ_august.obj PJ_bacon.obj \
diff --git a/src/pj_list.h b/src/pj_list.h
index acd08510..b965cc71 100644
--- a/src/pj_list.h
+++ b/src/pj_list.h
@@ -107,7 +107,7 @@ PROJ_HEAD(sinu, "Sinusoidal (Sanson-Flamsteed)")
 PROJ_HEAD(somerc, "Swiss. Obl. Mercator")
 PROJ_HEAD(stere, "Stereographic")
 PROJ_HEAD(sterea, "Oblique Stereographic Alternative")
-PROJ_HEAD(stmerc, "Simplified Transverse Mercator (Schreiber, Gauss-Laborde)")
+PROJ_HEAD(gstmerc, "Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion)")
 PROJ_HEAD(tcc, "Transverse Central Cylindrical")
 PROJ_HEAD(tcea, "Transverse Cylindrical Equal Area")
 PROJ_HEAD(tissot, "Tissot Conic")