Changeset 13482

Timestamp:

01/07/08 10:59:15 (4 months ago)

Author:

warmerdam

Message:

Add EquidistantCylindricalSphere? and GaussLabordeReunion? (#2134)

Files:

• trunk/gdal/ogr/ogr_spatialref.h (modified) (2 diffs)
• trunk/gdal/ogr/ogr_srs_api.h (modified) (1 diff)
• trunk/gdal/ogr/ogr_srs_proj4.cpp (modified) (3 diffs)
• trunk/gdal/ogr/ogrspatialreference.cpp (modified) (2 diffs)
• trunk/gdal/swig/include/osr.i (modified) (2 diffs)

trunk/gdal/ogr/ogr_spatialref.h

@@ -307 +307 @@
-                             double dfFalseEasting, double dfFalseNorthing );
-
+    /** Equidistant Cylindrical Sphere */
+    OGRErr      SetEquidistantCylindricalSphere(double dfCenterLat, double dfCenterLong,
+                            double dfScale,
+                            double dfFalseEasting, double dfFalseNorthing );
+
-    /** Equirectangular */
-    OGRErr      SetEquirectangular(double dfCenterLat, double dfCenterLong,
@@ -322 +327 @@
-    OGRErr      SetGS( double dfCentralMeridian,
-                       double dfFalseEasting, double dfFalseNorthing );
-
+
+
+
+
+
+
-    /** Gnomonic */
-    OGRErr      SetGnomonic(double dfCenterLat, double dfCenterLong,

trunk/gdal/ogr/ogr_srs_api.h

@@ -95 +95 @@
-#define SRS_PT_ECKERT_V         "Eckert_V"
-#define SRS_PT_ECKERT_VI        "Eckert_VI"
-
+
+
+
+
-#define SRS_PT_EQUIRECTANGULAR  "Equirectangular"
-
-
+
+
+
+
+
+
-#define SRS_PT_GOODE_HOMOLOSINE "Goode_Homolosine"
-#define SRS_PT_GNOMONIC         "Gnomonic"

trunk/gdal/ogr/ogr_srs_proj4.cpp

@@ -487 +487 @@
-    }
-
+    else if( EQUAL(pszProj,"eqr") )
+    {
+        SetEquidistantCylindricalSphere( OSR_GDV( papszNV, "lat_ts", 0.0 ),
+                                         OSR_GDV( papszNV, "lon_0", 0.0 )+dfFromGreenwich,
+                                         OSR_GDV( papszNV, "k_0", 6378137.0 ),
+                                         OSR_GDV( papszNV, "x_0", 0.0 ),
+                                         OSR_GDV( papszNV, "y_0", 0.0 ) );
+    }
+
+   else if( EQUAL(pszProj,"glabsgm") )
+   {
+       SetGaussLabordeReunion( OSR_GDV( papszNV, "lat_0", -21.116666667 ),
+                               OSR_GDV( papszNV, "lon_0", 55.53333333309)+dfFromGreenwich,
+                               OSR_GDV( papszNV, "k_0", 1.0 ),
+                               OSR_GDV( papszNV, "x_0", 160000.000 ),
+                               OSR_GDV( papszNV, "y_0", 50000.000 ) );
+   }
+
-    else if( EQUAL(pszProj,"gnom") )
-    {
@@ -1202 +1220 @@
-    }
-
+    else if( EQUAL(pszProjection,SRS_PT_EQUIDISTANT_CYLINDRICAL_SHERE) )
+    {
+        sprintf( szProj4+strlen(szProj4),
+                 "+proj=eqr +lat_ts=%.16g +lon_0=%.16g +k_0=%.16g +x_0=%.16g +y_0=%.16g ",
+                 GetNormProjParm(SRS_PP_LATITUDE_OF_ORIGIN,0.0),
+                 GetNormProjParm(SRS_PP_CENTRAL_MERIDIAN,0.0),
+                 GetNormProjParm(SRS_PP_SCALE_FACTOR,6378137.0),
+                 GetNormProjParm(SRS_PP_FALSE_EASTING,0.0),
+                 GetNormProjParm(SRS_PP_FALSE_NORTHING,0.0) );
+    }
+
-    else if( EQUAL(pszProjection,SRS_PT_EQUIRECTANGULAR) )
-    {
@@ -1210 +1239 @@
-                 GetNormProjParm(SRS_PP_FALSE_EASTING,0.0),
-                 GetNormProjParm(SRS_PP_FALSE_NORTHING,0.0) );
+    }
+
+    else if( EQUAL(pszProjection,SRS_PT_GAUSSLABORDEREUNION) )
+    {
+      sprintf( szProj4+strlen(szProj4),
+               "+proj=glabsgm +lat_0=%.16g +lon_0=%.16g"
+               " +k_0=%.16g +x_0=%.16g +y_0=%.16g ",
+               GetNormProjParm(SRS_PP_LATITUDE_OF_ORIGIN,-21.116666667),
+               GetNormProjParm(SRS_PP_CENTRAL_MERIDIAN,55.53333333309),
+               GetNormProjParm(SRS_PP_SCALE_FACTOR,1.0),
+               GetNormProjParm(SRS_PP_FALSE_EASTING,160000.000),
+               GetNormProjParm(SRS_PP_FALSE_NORTHING,50000.000) );
-    }
-

trunk/gdal/ogr/ogrspatialreference.cpp

@@ -3173 +3173 @@
-
-/************************************************************************/
+/*                         SetEquidistantCylindricalSphere()            */
+/************************************************************************/
+
+OGRErr OGRSpatialReference::SetEquidistantCylindricalSphere(
+                                   double dfCenterLat, double dfCenterLong,
+                                   double dfScale,
+                                   double dfFalseEasting,
+                                   double dfFalseNorthing )
+
+{
+    SetProjection( SRS_PT_EQUIDISTANT_CYLINDRICAL_SHERE );
+    SetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, dfCenterLat );
+    SetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, dfCenterLong );
+    SetNormProjParm( SRS_PP_SCALE_FACTOR, dfScale );
+    SetNormProjParm( SRS_PP_FALSE_EASTING, dfFalseEasting );
+    SetNormProjParm( SRS_PP_FALSE_NORTHING, dfFalseNorthing );
+
+    return OGRERR_NONE;
+}
+
+/************************************************************************/
+/*                       OSRSetEquidistantCylindricalSphere()           */
+/************************************************************************/
+
+OGRErr OSRSetEquidistantCylindricalSphere( OGRSpatialReferenceH hSRS,
+                                  double dfCenterLat, double dfCenterLong,
+                                  double dfScale,
+                                  double dfFalseEasting,
+                                  double dfFalseNorthing )
+
+{
+    return ((OGRSpatialReference *) hSRS)->SetEquidistantCylindricalSphere(
+        dfCenterLat, dfCenterLong, dfScale,
+        dfFalseEasting, dfFalseNorthing );
+}
+
+/************************************************************************/
-/*                         SetEquirectangular()                         */
-/************************************************************************/
@@ -3310 +3347 @@
-    return ((OGRSpatialReference *) hSRS)->SetGEOS( 
-        dfCentralMeridian, dfSatelliteHeight,
+        dfFalseEasting, dfFalseNorthing );
+}
+
+/************************************************************************/
+/*                         SetGaussLabordeReunion()                     */
+/************************************************************************/
+
+OGRErr OGRSpatialReference::SetGaussLabordeReunion(
+                                   double dfCenterLat, double dfCenterLong,
+                                   double dfScale,
+                                   double dfFalseEasting,
+                                   double dfFalseNorthing )
+
+{
+    SetProjection( SRS_PT_GAUSSLABORDEREUNION );
+    SetNormProjParm( SRS_PP_LATITUDE_OF_ORIGIN, dfCenterLat );
+    SetNormProjParm( SRS_PP_CENTRAL_MERIDIAN, dfCenterLong );
+    SetNormProjParm( SRS_PP_SCALE_FACTOR, dfScale );
+    SetNormProjParm( SRS_PP_FALSE_EASTING, dfFalseEasting );
+    SetNormProjParm( SRS_PP_FALSE_NORTHING, dfFalseNorthing );
+
+    return OGRERR_NONE;
+}
+
+/************************************************************************/
+/*                       OSRSetGaussLabordeReunion()                    */
+/************************************************************************/
+
+OGRErr OSRSetGaussLabordeReunion( OGRSpatialReferenceH hSRS,
+                                  double dfCenterLat, double dfCenterLong,
+                                  double dfScale,
+                                  double dfFalseEasting,
+                                  double dfFalseNorthing )
+
+{
+    return ((OGRSpatialReference *) hSRS)->SetGaussLabordeReunion(
+        dfCenterLat, dfCenterLong, dfScale,
-        dfFalseEasting, dfFalseNorthing );
-}

trunk/gdal/swig/include/osr.i

@@ -55 +55 @@
-%constant char *SRS_PT_ECKERT_VI                = SRS_PT_ECKERT_VI;
-%constant char *SRS_PT_EQUIDISTANT_CONIC        = SRS_PT_EQUIDISTANT_CONIC;
+%constant char *SRS_PT_EQUIDISTANT_CYLINDRICAL_SHERE = SRS_PT_EQUIDISTANT_CYLINDRICAL_SHERE;
-%constant char *SRS_PT_EQUIRECTANGULAR          = SRS_PT_EQUIRECTANGULAR;
-%constant char *SRS_PT_GALL_STEREOGRAPHIC       = SRS_PT_GALL_STEREOGRAPHIC;
+%constant char *SRS_PT_GAUSSLABORDEREUNION      = SRS_PT_GAUSSLABORDEREUNION;
-%constant char *SRS_PT_GNOMONIC                 = SRS_PT_GNOMONIC;
-%constant char *SRS_PT_GOODE_HOMOLOSINE         = SRS_PT_GOODE_HOMOLOSINE;
@@ -447 +449 @@
-  }
-
+%feature( "kwargs" ) SetEquidistantCylindricalSphere;
+  OGRErr SetEquidistantCylindricalSphere( double clat, double clong, double sc, double fe, double fn ) {
+    return OSRSetEquidistantCylindricalSphere( self, clat, clong, sc, fe, fn );
+  }
+
+%feature( "kwargs" ) SetGaussLabordeReunion;
+  OGRErr SetGaussLabordeReunion( double clat, double clong, double sc, double fe, double fn ) {
+    return OSRSetGaussLabordeReunion( self, clat, clong, sc, fe, fn );
+  }
+
-%feature( "kwargs" ) SetGS;
-  OGRErr SetGS( double cm,