lambert_ruby 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzM5YmI2MWY2OWFhZTVlZmE4ODQ1NGU5YWYzZmU3NGYwNjljYzY3ZQ==
-  data.tar.gz: !binary |-
-    YWM1NWNiNTBlOWIyMGMzZDFjNGYyZmIyZGVjZTEwMjZmYmE1NDk3MA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YmI2ZmIwNDkxMjk2YjMwYTQzY2I3OTY0MTE0MmI1NWNjNjVhMjg3M2QyYmVh
-    MmY5ODVkNjQ0M2IwMzE0ZmQzYjcxZDJhNjU2ZDQzNGI3NTA5YTNiODE1MTc4
-    YzA5YzQ3MGY5YTI0ZGViZWEzNjBiZTg1YmNkNDU3OGVhYWQxOWE=
-  data.tar.gz: !binary |-
-    NTUzODYwZmQyYzQ2YTMwY2I4MDE2ZjRjOThlOTVhN2YxYzQwYWQyMDUwZjIw
-    YmU5MzRkN2EzNWU1N2VkNzBhMjU3ZGY0ZTE4MmY4M2IxM2IyOGFhY2ZjMDJi
-    ODVjMTg4NjM4Zjk3YWUyOWYwOTgxOTJlOTgwZWNhNzYzMzM0MWE=
+SHA1:
+  metadata.gz: f6d21e2b9e2e9f9adc7d68c49b8b7815d5e79d46
+  data.tar.gz: ead3cb60d5d7fe04da12c7365e00af6340a27bba
+SHA512:
+  metadata.gz: a885864daeb46f4bc2dbb4e28cef5619f64694724e59f81fcf489c251de4bb67a450bc057f87ad8ce3d31c919075a592b392a392e401db3c0aaa5282b3ce3d50
+  data.tar.gz: 93b944cb36c7078d73438e8edb4578680cde8b159c8fe475834e9ab950a7ede8d993462d92581e1f5e6ed11b627fede29e4e24b0b462cbe8d6e28369512855dd

data/ext/lambert_ruby/lambert.c

@@ -17,8 +17,31 @@ static double lambert_c[6] = {11603796.98, 11745793.39, 11947992.52, 12136281.99
 static double lambert_xs[6]= {600000.0, 600000.0, 600000.0, 234.358, 600000.0, 700000.0};
 static double lambert_ys[6]= {5657616.674, 6199695.768, 6791905.085, 7239161.542, 8199695.768, 12655612.050};
 
+YGPoint pointToDegree(YGPoint p)
+{
+   
+        p.x = p.x * 180/M_PI;
+        p.y = p.y * 180/M_PI;
+        p.z = p.z * 180/M_PI;
+    
+        return p;
+}
 
-/* 
+YGPoint pointToRadian(YGPoint p)
+{
+        p.x = p.x * M_PI/180;
+        p.y = p.y * M_PI/180;
+        p.z = p.z * M_PI/180;
+    
+    return p;
+}
+
+double latitude_iso_from_lat(double lat, double e)
+{
+    return log(tan(M_PI_4+lat/2)*pow((1-e*sin(lat))/(1+e*sin(lat)),e/2));
+}
+
+/*
  * ALGO0002
  */
 
@@ -41,7 +64,7 @@ double lat_from_lat_iso(double lat_iso, double e,double eps)
 *	ALGO0004 - Lambert vers geographiques
 */
 
-void lambert_to_geographic(const YGLambertPoint * org,YGLambertPoint *dest, LambertZone zone, double lon_merid, double e, double eps)
+void lambert_to_geographic(const YGPoint * org,YGPoint *dest, YGLambertZone zone, double lon_merid, double e, double eps)
 {
 	double n = lambert_n[zone];
 	double C = lambert_c[zone];
@@ -85,11 +108,11 @@ double lambert_normal(double lat, double a, double e)
  *
  */
 
- YGLambertPoint geographic_to_cartesian(double lon, double lat, double he, double a, double e)
+ YGPoint geographic_to_cartesian(double lon, double lat, double he, double a, double e)
  {
  	double N = lambert_normal(lat,a,e);
  	
- 	YGLambertPoint pt = {0,0,0};
+ 	YGPoint pt = {0,0,0};
  	pt.x = (N+he)*cos(lat)*cos(lon);
 
  	pt.y = (N+he)*cos(lat)*sin(lon);
@@ -104,7 +127,7 @@ double lambert_normal(double lat, double a, double e)
  * ALGO0012 - Passage des coordonnées cartésiennes aux coordonnées géographiques
  */
 
- YGLambertPoint cartesian_to_geographic(YGLambertPoint org, double meridien, double a, double e , double eps)
+ YGPoint cartesian_to_geographic(YGPoint org, double meridien, double a, double e , double eps)
  {
  	double x = org.x, y = org.y, z = org.z;
 
@@ -124,7 +147,7 @@ double lambert_normal(double lat, double a, double e)
  	
  	double he = module/cos(phi_i) - a/sqrt(1-e*e*sin(phi_i)*sin(phi_i));
  	
- 	YGLambertPoint pt;
+ 	YGPoint pt;
  	pt.x = lon;
  	pt.y = phi_i;
  	pt.z = he;
@@ -132,40 +155,71 @@ double lambert_normal(double lat, double a, double e)
  	return pt;
  }
 
-
-
 /*
  * Convert Lambert -> WGS84
  * http://geodesie.ign.fr/contenu/fichiers/documentation/pedagogiques/transfo.pdf
  *
  */
 
-void lambert_to_wgs84(const YGLambertPoint * org, YGLambertPoint *dest,LambertZone zone){
+void lambert_to_wgs84(const YGPoint * org, YGPoint *dest,YGLambertZone zone){
+    
+    
+  
+    if(LAMBERT_93 == zone)
+    {
+        lambert_to_geographic(org,dest,zone,LON_MERID_IERS,E_WGS84,DEFAULT_EPS);
+    }
+    else
+    {
+        lambert_to_geographic(org,dest,zone,LON_MERID_PARIS,E_CLARK_IGN,DEFAULT_EPS);
+        YGPoint temp = geographic_to_cartesian(dest->x,dest->y,dest->z,A_CLARK_IGN,E_CLARK_IGN);
+    
+        temp.x= temp.x - 168;
+        temp.y= temp.y - 60;
+        temp.z= temp.z + 320;
+    
+        //WGS84 refers to greenwich
+        temp = cartesian_to_geographic(temp, LON_MERID_IERS, A_WGS84,E_WGS84,DEFAULT_EPS);
+        
+        dest->x = temp.x;
+        dest->y = temp.y;
+    }
+}
+
 
-	lambert_to_geographic(org,dest,zone,LON_MERID_PARIS,E_CLARK_IGN,DEFAULT_EPS);
+void lambert_to_wgs84_deg(const YGPoint * org, YGPoint *dest, YGLambertZone zone)
+{
+	YGPoint temp = {0,0,0};
+	
+	lambert_to_wgs84(org,&temp,zone);
+    *dest = pointToDegree(temp);
+}
 
-	 YGLambertPoint temp = geographic_to_cartesian(dest->x,dest->y,dest->z,A_CLARK_IGN,E_CLARK_IGN);
+double lat_iso(double lat, double e)
+{
+	return log(tan(M_PI_4 + lat/2)*pow((1-e*sin(lat))/(1+e*sin(lat)),e/2));
+}
 
-	 temp.x= temp.x - 168;
-	 temp.y= temp.y - 60;
-	 temp.z= temp.z + 320;
+YGPoint coord_transform(double e, double n, double c, double lambda_c, double x_s, double y_s , double lon, double lat)
+{
+	YGPoint dest = {0,0,0};
 
-	 //WGS84 refers to greenwich
-	 temp = cartesian_to_geographic(temp, LON_MERID_GREENWICH, A_WGS84,E_WGS84,DEFAULT_EPS);
+	double latiso = lat_iso(lat,e);
+	dest.x = x_s + e*exp(-n*latiso)*sin(n*(lon-lambda_c));
+	dest.y = y_s + e*exp(n*latiso)*cos(n*(lon-lambda_c));
 
-	 dest->x = temp.x;
-	 dest->y = temp.y;
+	return dest;
 
 }
 
-
-void lambert_to_wgs84_deg(const YGLambertPoint * org, YGLambertPoint *dest, LambertZone zone)
+YGPoint switch_geodesic_system(YGPoint u, Vector t, double d, Vector r)
 {
-	YGLambertPoint temp = {0,0,0};
-	
-	lambert_to_wgs84(org,&temp,zone);
+	YGPoint v = {0,0,0};
 
-	dest->x = temp.x * 180/M_PI;
-	dest->y = temp.y * 180/M_PI;
-	dest->z = temp.z * 180/M_PI;
-}
+	v.x = t.x + u.x*(1+d) + u.z * r.y - u.y * r.z;
+	v.y = t.y + u.y*(1+d) + u.x * r.z - u.y * r.z;
+	v.z = t.z +u.z*(1+d) + u.y*r.x -u.x*r.y;
+
+	return v;
+
+}

data/ext/lambert_ruby/lambert.h

@@ -1,3 +1,7 @@
+#ifndef __LAMBERT_H
+#define __LAMBERT_H
+
+
 #define DEFAULT_EPS 1e-10
 #define E_CLARK_IGN 0.08248325676
 #define E_WGS84 0.08181919106
@@ -7,9 +11,15 @@
 
 #define LON_MERID_PARIS 0
 #define LON_MERID_GREENWICH 0.04079234433
+#define LON_MERID_IERS (3*M_PI/180)
+#define AUTOCOMEIQUE_FIRST 44*M_PI/180
+#define AUTOCOMEIQUE_SECOND 49*M_PI/180
+#define LAT_ORIG 46.5*M_PI/180
+#define ct_x0 700000.0
+#define ct_y0 6600000.0
 
-#define DISPLAY_YGLambertPoint(YGLambertPoint) printf(#YGLambertPoint" X:%f | Y:%f | Z:%f\n",YGLambertPoint.x,YGLambertPoint.y,YGLambertPoint.z);
-#define DISPLAY_YGLambertPoint_REF(YGLambertPoint) printf(#YGLambertPoint" X:%f | Y:%f | Z:%f\n",YGLambertPoint->x,YGLambertPoint->y,YGLambertPoint->z);
+#define DISPLAY_YGPoint(YGPoint) printf(#YGPoint" X:%f | Y:%f | Z:%f\n",YGPoint.x,YGPoint.y,YGPoint.z);
+#define DISPLAY_YGPoint_REF(YGPoint) printf(#YGPoint" X:%f | Y:%f | Z:%f\n",YGPoint->x,YGPoint->y,YGPoint->z);
 
 typedef enum {
 	LAMBERT_I=0,
@@ -18,14 +28,32 @@ typedef enum {
 	LAMBERT_IV=3,
 	LAMBERT_II_E=4,
 	LAMBERT_93= 5
-} LambertZone;
+} YGLambertZone;
+
+typedef enum {
+    DEGREE,
+    GRAD,
+    RADIAN
+} CoordUnit;
 
 typedef struct {
 	double x;
 	double y;
 	double z;
-} YGLambertPoint;
+    CoordUnit unit;
+} YGPoint;
 
+typedef struct
+{
+    double tx;
+    double ty;
+    double tz;
+} YGTransform;
+
+typedef YGPoint Vector;
+
+YGPoint pointToRadian(YGPoint p);
+YGPoint pointToDegree(YGPoint p);
 
 /*
  * ALGO0021 - Calcul de la grande Normale 
@@ -34,16 +62,16 @@ typedef struct {
 double lambert_normal(double lat, double a, double e);
 
 /*
- * Convert a YGLambertPoint struct from one lambert zone to WGS84 (Rad)
+ * Convert a YGPoint struct from one lambert zone to WGS84 (Rad)
  *
  */
-void lambert_to_wgs84(const YGLambertPoint * org, YGLambertPoint *dest, LambertZone zone);
+void lambert_to_wgs84(const YGPoint * org, YGPoint *dest, YGLambertZone zone);
 
 /*
- * Convert a YGLambertPoint struct from one lambert zone to WGS84 (Deg)
+ * Convert a YGPoint struct from one lambert zone to WGS84 (Deg)
  *
  */
-void lambert_to_wgs84_deg(const YGLambertPoint * org, YGLambertPoint *dest, LambertZone zone);
+void lambert_to_wgs84_deg(const YGPoint * org, YGPoint *dest, YGLambertZone zone);
 
 /*
  * ALGO0002
@@ -55,12 +83,12 @@ double lat_from_lat_iso(double lat_iso, double e, double eps);
 * ALGO0012
 */
 
-YGLambertPoint cartesian_to_geographic(YGLambertPoint org, double meridien, double a, double e , double eps);
+YGPoint cartesian_to_geographic(YGPoint org, double meridien, double a, double e , double eps);
 
 /*
  * ALGO004
  */
-void lambert_to_geographic(const YGLambertPoint * org,YGLambertPoint *dest, LambertZone zone, double lon_merid, double e, double eps);
+void lambert_to_geographic(const YGPoint * org,YGPoint *dest, YGLambertZone zone, double lon_merid, double e, double eps);
 
 /**
  * ALGO0009 - Transformations geographiques -> cartésiennes
@@ -68,4 +96,26 @@ void lambert_to_geographic(const YGLambertPoint * org,YGLambertPoint *dest, Lamb
  *
  */
 
- YGLambertPoint geographic_to_cartesian(double lon, double lat, double he, double a, double e);
+ YGPoint geographic_to_cartesian(double lon, double lat, double he, double a, double e);
+
+ /**
+ * ALGO13 Transformation de Coordonnées à 7 paramètres entre deux systèmes géodésiques
+ */
+ 
+ YGPoint switch_geodesic_system(YGPoint u, Vector t, double d, Vector r);
+ 
+ /**
+ * Algo0001  Calcul de la latitude isomérique
+ */
+double lat_iso(double lat, double e);
+
+/** 
+* Algo003 
+*/
+YGPoint coord_transform(double e, double n, double c, double lambda_c, double x_s, double y_s , double lon, double lat);
+
+/**
+ * Algo 01
+ */
+double latitude_iso_from_lat(double lat, double e);
+ #endif

data/ext/lambert_ruby/lambert/src/lambert.c

@@ -17,8 +17,31 @@ static double lambert_c[6] = {11603796.98, 11745793.39, 11947992.52, 12136281.99
 static double lambert_xs[6]= {600000.0, 600000.0, 600000.0, 234.358, 600000.0, 700000.0};
 static double lambert_ys[6]= {5657616.674, 6199695.768, 6791905.085, 7239161.542, 8199695.768, 12655612.050};
 
+YGPoint pointToDegree(YGPoint p)
+{
+   
+        p.x = p.x * 180/M_PI;
+        p.y = p.y * 180/M_PI;
+        p.z = p.z * 180/M_PI;
+    
+        return p;
+}
 
-/* 
+YGPoint pointToRadian(YGPoint p)
+{
+        p.x = p.x * M_PI/180;
+        p.y = p.y * M_PI/180;
+        p.z = p.z * M_PI/180;
+    
+    return p;
+}
+
+double latitude_iso_from_lat(double lat, double e)
+{
+    return log(tan(M_PI_4+lat/2)*pow((1-e*sin(lat))/(1+e*sin(lat)),e/2));
+}
+
+/*
  * ALGO0002
  */
 
@@ -41,7 +64,7 @@ double lat_from_lat_iso(double lat_iso, double e,double eps)
 *	ALGO0004 - Lambert vers geographiques
 */
 
-void lambert_to_geographic(const YGLambertPoint * org,YGLambertPoint *dest, LambertZone zone, double lon_merid, double e, double eps)
+void lambert_to_geographic(const YGPoint * org,YGPoint *dest, YGLambertZone zone, double lon_merid, double e, double eps)
 {
 	double n = lambert_n[zone];
 	double C = lambert_c[zone];
@@ -85,11 +108,11 @@ double lambert_normal(double lat, double a, double e)
  *
  */
 
- YGLambertPoint geographic_to_cartesian(double lon, double lat, double he, double a, double e)
+ YGPoint geographic_to_cartesian(double lon, double lat, double he, double a, double e)
  {
  	double N = lambert_normal(lat,a,e);
  	
- 	YGLambertPoint pt = {0,0,0};
+ 	YGPoint pt = {0,0,0};
  	pt.x = (N+he)*cos(lat)*cos(lon);
 
  	pt.y = (N+he)*cos(lat)*sin(lon);
@@ -104,7 +127,7 @@ double lambert_normal(double lat, double a, double e)
  * ALGO0012 - Passage des coordonnées cartésiennes aux coordonnées géographiques
  */
 
- YGLambertPoint cartesian_to_geographic(YGLambertPoint org, double meridien, double a, double e , double eps)
+ YGPoint cartesian_to_geographic(YGPoint org, double meridien, double a, double e , double eps)
  {
  	double x = org.x, y = org.y, z = org.z;
 
@@ -124,7 +147,7 @@ double lambert_normal(double lat, double a, double e)
  	
  	double he = module/cos(phi_i) - a/sqrt(1-e*e*sin(phi_i)*sin(phi_i));
  	
- 	YGLambertPoint pt;
+ 	YGPoint pt;
  	pt.x = lon;
  	pt.y = phi_i;
  	pt.z = he;
@@ -132,40 +155,71 @@ double lambert_normal(double lat, double a, double e)
  	return pt;
  }
 
-
-
 /*
  * Convert Lambert -> WGS84
  * http://geodesie.ign.fr/contenu/fichiers/documentation/pedagogiques/transfo.pdf
  *
  */
 
-void lambert_to_wgs84(const YGLambertPoint * org, YGLambertPoint *dest,LambertZone zone){
+void lambert_to_wgs84(const YGPoint * org, YGPoint *dest,YGLambertZone zone){
+    
+    
+  
+    if(LAMBERT_93 == zone)
+    {
+        lambert_to_geographic(org,dest,zone,LON_MERID_IERS,E_WGS84,DEFAULT_EPS);
+    }
+    else
+    {
+        lambert_to_geographic(org,dest,zone,LON_MERID_PARIS,E_CLARK_IGN,DEFAULT_EPS);
+        YGPoint temp = geographic_to_cartesian(dest->x,dest->y,dest->z,A_CLARK_IGN,E_CLARK_IGN);
+    
+        temp.x= temp.x - 168;
+        temp.y= temp.y - 60;
+        temp.z= temp.z + 320;
+    
+        //WGS84 refers to greenwich
+        temp = cartesian_to_geographic(temp, LON_MERID_IERS, A_WGS84,E_WGS84,DEFAULT_EPS);
+        
+        dest->x = temp.x;
+        dest->y = temp.y;
+    }
+}
+
 
-	lambert_to_geographic(org,dest,zone,LON_MERID_PARIS,E_CLARK_IGN,DEFAULT_EPS);
+void lambert_to_wgs84_deg(const YGPoint * org, YGPoint *dest, YGLambertZone zone)
+{
+	YGPoint temp = {0,0,0};
+	
+	lambert_to_wgs84(org,&temp,zone);
+    *dest = pointToDegree(temp);
+}
 
-	 YGLambertPoint temp = geographic_to_cartesian(dest->x,dest->y,dest->z,A_CLARK_IGN,E_CLARK_IGN);
+double lat_iso(double lat, double e)
+{
+	return log(tan(M_PI_4 + lat/2)*pow((1-e*sin(lat))/(1+e*sin(lat)),e/2));
+}
 
-	 temp.x= temp.x - 168;
-	 temp.y= temp.y - 60;
-	 temp.z= temp.z + 320;
+YGPoint coord_transform(double e, double n, double c, double lambda_c, double x_s, double y_s , double lon, double lat)
+{
+	YGPoint dest = {0,0,0};
 
-	 //WGS84 refers to greenwich
-	 temp = cartesian_to_geographic(temp, LON_MERID_GREENWICH, A_WGS84,E_WGS84,DEFAULT_EPS);
+	double latiso = lat_iso(lat,e);
+	dest.x = x_s + e*exp(-n*latiso)*sin(n*(lon-lambda_c));
+	dest.y = y_s + e*exp(n*latiso)*cos(n*(lon-lambda_c));
 
-	 dest->x = temp.x;
-	 dest->y = temp.y;
+	return dest;
 
 }
 
-
-void lambert_to_wgs84_deg(const YGLambertPoint * org, YGLambertPoint *dest, LambertZone zone)
+YGPoint switch_geodesic_system(YGPoint u, Vector t, double d, Vector r)
 {
-	YGLambertPoint temp = {0,0,0};
-	
-	lambert_to_wgs84(org,&temp,zone);
+	YGPoint v = {0,0,0};
 
-	dest->x = temp.x * 180/M_PI;
-	dest->y = temp.y * 180/M_PI;
-	dest->z = temp.z * 180/M_PI;
-}
+	v.x = t.x + u.x*(1+d) + u.z * r.y - u.y * r.z;
+	v.y = t.y + u.y*(1+d) + u.x * r.z - u.y * r.z;
+	v.z = t.z +u.z*(1+d) + u.y*r.x -u.x*r.y;
+
+	return v;
+
+}

data/ext/lambert_ruby/lambert/src/lambert.h

@@ -1,3 +1,7 @@
+#ifndef __LAMBERT_H
+#define __LAMBERT_H
+
+
 #define DEFAULT_EPS 1e-10
 #define E_CLARK_IGN 0.08248325676
 #define E_WGS84 0.08181919106
@@ -7,9 +11,15 @@
 
 #define LON_MERID_PARIS 0
 #define LON_MERID_GREENWICH 0.04079234433
+#define LON_MERID_IERS (3*M_PI/180)
+#define AUTOCOMEIQUE_FIRST 44*M_PI/180
+#define AUTOCOMEIQUE_SECOND 49*M_PI/180
+#define LAT_ORIG 46.5*M_PI/180
+#define ct_x0 700000.0
+#define ct_y0 6600000.0
 
-#define DISPLAY_YGLambertPoint(YGLambertPoint) printf(#YGLambertPoint" X:%f | Y:%f | Z:%f\n",YGLambertPoint.x,YGLambertPoint.y,YGLambertPoint.z);
-#define DISPLAY_YGLambertPoint_REF(YGLambertPoint) printf(#YGLambertPoint" X:%f | Y:%f | Z:%f\n",YGLambertPoint->x,YGLambertPoint->y,YGLambertPoint->z);
+#define DISPLAY_YGPoint(YGPoint) printf(#YGPoint" X:%f | Y:%f | Z:%f\n",YGPoint.x,YGPoint.y,YGPoint.z);
+#define DISPLAY_YGPoint_REF(YGPoint) printf(#YGPoint" X:%f | Y:%f | Z:%f\n",YGPoint->x,YGPoint->y,YGPoint->z);
 
 typedef enum {
 	LAMBERT_I=0,
@@ -18,14 +28,32 @@ typedef enum {
 	LAMBERT_IV=3,
 	LAMBERT_II_E=4,
 	LAMBERT_93= 5
-} LambertZone;
+} YGLambertZone;
+
+typedef enum {
+    DEGREE,
+    GRAD,
+    RADIAN
+} CoordUnit;
 
 typedef struct {
 	double x;
 	double y;
 	double z;
-} YGLambertPoint;
+    CoordUnit unit;
+} YGPoint;
 
+typedef struct
+{
+    double tx;
+    double ty;
+    double tz;
+} YGTransform;
+
+typedef YGPoint Vector;
+
+YGPoint pointToRadian(YGPoint p);
+YGPoint pointToDegree(YGPoint p);
 
 /*
  * ALGO0021 - Calcul de la grande Normale 
@@ -34,16 +62,16 @@ typedef struct {
 double lambert_normal(double lat, double a, double e);
 
 /*
- * Convert a YGLambertPoint struct from one lambert zone to WGS84 (Rad)
+ * Convert a YGPoint struct from one lambert zone to WGS84 (Rad)
  *
  */
-void lambert_to_wgs84(const YGLambertPoint * org, YGLambertPoint *dest, LambertZone zone);
+void lambert_to_wgs84(const YGPoint * org, YGPoint *dest, YGLambertZone zone);
 
 /*
- * Convert a YGLambertPoint struct from one lambert zone to WGS84 (Deg)
+ * Convert a YGPoint struct from one lambert zone to WGS84 (Deg)
  *
  */
-void lambert_to_wgs84_deg(const YGLambertPoint * org, YGLambertPoint *dest, LambertZone zone);
+void lambert_to_wgs84_deg(const YGPoint * org, YGPoint *dest, YGLambertZone zone);
 
 /*
  * ALGO0002
@@ -55,12 +83,12 @@ double lat_from_lat_iso(double lat_iso, double e, double eps);
 * ALGO0012
 */
 
-YGLambertPoint cartesian_to_geographic(YGLambertPoint org, double meridien, double a, double e , double eps);
+YGPoint cartesian_to_geographic(YGPoint org, double meridien, double a, double e , double eps);
 
 /*
  * ALGO004
  */
-void lambert_to_geographic(const YGLambertPoint * org,YGLambertPoint *dest, LambertZone zone, double lon_merid, double e, double eps);
+void lambert_to_geographic(const YGPoint * org,YGPoint *dest, YGLambertZone zone, double lon_merid, double e, double eps);
 
 /**
  * ALGO0009 - Transformations geographiques -> cartésiennes
@@ -68,4 +96,26 @@ void lambert_to_geographic(const YGLambertPoint * org,YGLambertPoint *dest, Lamb
  *
  */
 
- YGLambertPoint geographic_to_cartesian(double lon, double lat, double he, double a, double e);
+ YGPoint geographic_to_cartesian(double lon, double lat, double he, double a, double e);
+
+ /**
+ * ALGO13 Transformation de Coordonnées à 7 paramètres entre deux systèmes géodésiques
+ */
+ 
+ YGPoint switch_geodesic_system(YGPoint u, Vector t, double d, Vector r);
+ 
+ /**
+ * Algo0001  Calcul de la latitude isomérique
+ */
+double lat_iso(double lat, double e);
+
+/** 
+* Algo003 
+*/
+YGPoint coord_transform(double e, double n, double c, double lambda_c, double x_s, double y_s , double lon, double lat);
+
+/**
+ * Algo 01
+ */
+double latitude_iso_from_lat(double lat, double e);
+ #endif

data/ext/lambert_ruby/lambert/src/rgf93.c

@@ -0,0 +1,206 @@
+
+#include "rgf93.h"
+#include "config.h"
+
+#include<stdio.h>
+#include<stdlib.h>
+#include<limits.h>
+#include <string.h>
+#include <math.h>
+
+#define MAX_LINE_BUFFER 1024
+#define MAX_PATH_SIZE 1024
+#define DELTA_REALLOCATION 10
+
+
+typedef struct {
+    
+	double lon;
+	double lat;
+	double tx;
+	double ty;
+	double tz;
+	double precision;
+} NTV2Reg;
+
+static char currentNTVPath[OPEN_MAX];
+static FILE * gridFD = NULL;
+static char grd3dparams[4][MAX_LINE_BUFFER] = {{0}};
+
+static NTV2Reg *regcache = NULL;
+static int lastRegPos = 0;
+static int regcacheSize = 0;
+
+static int lastReadedLine;
+
+
+NTV2Reg regFromLine(const char * line)
+{
+    char *sep = "   ";
+    char *buffer = malloc(strlen(line)* sizeof(char));
+    strcpy(buffer, line);
+    
+    NTV2Reg reg = {0};
+    
+    strtok(buffer, sep);
+    
+   reg.lon = strtod(strtok(NULL, sep), NULL);
+   reg.lat = strtod(strtok(NULL, sep), NULL);
+   reg.tx = strtod(strtok(NULL, sep), NULL);
+   reg.ty = strtod(strtok(NULL, sep), NULL);
+   reg.tz = strtod(strtok(NULL, sep), NULL);
+   reg.precision = strtod(strtok(NULL, sep), NULL);
+    
+   return reg;
+}
+
+void addRegToCache(NTV2Reg reg)
+{
+    if(!regcache)
+    {
+        regcache = malloc(DELTA_REALLOCATION*sizeof(NTV2Reg));
+        regcacheSize = DELTA_REALLOCATION;
+        lastRegPos = 0;
+    }
+    
+    if(lastRegPos > regcacheSize-1)
+    {
+
+        NTV2Reg * newLoc =realloc(regcache, (regcacheSize+DELTA_REALLOCATION)*sizeof(NTV2Reg));
+       
+        regcache = newLoc;
+        regcacheSize+=DELTA_REALLOCATION;
+    
+    }
+    
+    regcache[lastRegPos] = reg;
+    lastRegPos++;
+}
+
+
+int loadGrid()
+{
+    snprintf(currentNTVPath,50,"%s/%s",resource_file_path,"gr3df97a.txt");
+    lastReadedLine = 0;
+    
+    gridFD = fopen(currentNTVPath,"r");
+    
+    if(!gridFD)
+    {
+        printf("Could not open grid file at path :%s\n", currentNTVPath);
+        return -1;
+    }
+    
+    char line[MAX_LINE_BUFFER];
+    while(lastReadedLine < 4)
+    {
+        fgets(line, MAX_LINE_BUFFER, gridFD);
+        ++lastReadedLine;
+    }
+    char line_buffer[MAX_LINE_BUFFER] = {0};
+    
+    while(NULL != fgets(line_buffer, MAX_LINE_BUFFER, gridFD))
+    {
+        NTV2Reg reg = regFromLine(line_buffer);
+        addRegToCache(reg);
+    }
+
+    return 0;
+}
+
+
+void printParameters()
+{
+	printf("===== Parameters =====\n");
+	printf("%s\n", grd3dparams[0]);
+	printf("%s\n", grd3dparams[1]);
+	printf("%s\n", grd3dparams[2]);
+	printf("%s\n", grd3dparams[3]);
+    
+}
+
+void printReg(NTV2Reg reg)
+{
+    printf("LON:%f - LAT:%f - TX:%f - TY:%f - TZ:%f - PRE:%f\n",reg.lon,reg.lat,reg.tx,reg.ty,reg.tz,reg.precision);
+}
+void unloadGrid()
+{
+    fclose(gridFD);
+    free(regcache);
+}
+
+void regToBuff(double *buf,NTV2Reg reg)
+{
+    buf[0] = reg.tx;
+    buf[1] = reg.ty;
+    buf[2] = reg.tz;
+}
+
+void ntvreg_around_point(const YGPoint pt, NTV2Reg *t1, NTV2Reg *t2, NTV2Reg * t3, NTV2Reg * t4)
+{
+    
+    NTV2Reg *a = regcache,*b = regcache+1;
+    
+    while(!(pt.x >= a->lon && pt.x <= b->lon))
+    {
+        ++a;
+        ++b;
+    }
+    
+    NTV2Reg *searchReg = a;
+    
+    while (searchReg->lat > pt.y)
+    {
+        searchReg--;
+    }
+    
+    *t1 = *searchReg;
+    *t2 = *(++searchReg);
+    
+    searchReg = b;
+    
+    while (searchReg->lat < pt.y)
+    {
+        searchReg++;
+    }
+    
+    *t4 = *(searchReg);
+    *t3 = *(--searchReg);
+
+}
+YGTransform ntf_to_rgf93(YGPoint pt)
+{
+    if(!gridFD)
+        loadGrid();
+    
+    NTV2Reg t1,t2,t3,t4;
+   
+    
+    ntvreg_around_point(pt, &t1, &t2, &t3, &t4);
+    
+    double x = (pt.x - t1.lon)/(t3.lon - t1.lon);
+    double y = (pt.y - t1.lat)/(t2.lat - t1.lat);
+    
+   
+    double d[3], t1Buf[3], t2Buf[3], t3Buf[3], t4Buf[3];
+    
+    regToBuff(t1Buf,t1);
+    regToBuff(t2Buf,t2);
+    regToBuff(t3Buf,t3);
+    regToBuff(t4Buf,t4);
+    
+    for(int i = 0; i< 3; ++i)
+    {
+        d[i] =  (1-x)*(1-y)*t1Buf[i] + (1-x)*y*t2Buf[i] + (1-y)*x*t3Buf[i] + x*y*t4Buf[i];
+    }
+    
+    YGTransform tm ={d[0],d[1],d[2]};
+    return tm;
+}
+
+YGTransform rgf93_to_ntf(YGPoint pt)
+{
+    YGTransform tm = ntf_to_rgf93(pt);
+    YGTransform val = {-1*tm.tx,-1*tm.ty,-1*tm.tz};
+    return val;
+}

data/ext/lambert_ruby/lambert/src/rgf93.h

@@ -0,0 +1,7 @@
+#ifndef __NTV2_H
+#define __NTV2_H
+#include "lambert.h"
+
+YGTransform ntf_to_rgf93(YGPoint pt);
+YGTransform rgf93_to_ntf(YGPoint pt);
+#endif

data/ext/lambert_ruby/lambert/tests/test_lambert_cunit.c

@@ -4,6 +4,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include "../src/lambert.h"
+#include "../src/rgf93.h"
 
 #define DISPLAY_POINT(point) printf(#point" X:%f | Y:%f | Z:%f\n",point.x,point.y,point.z);
 
@@ -30,9 +31,9 @@ double rounded_down(double val,int n){
 
 void test_lambert_deg(void)
 {
-	YGLambertPoint org = {999534.581,112186.569,0};
-	YGLambertPoint dest = {0,0,0};
-	LambertZone zone = LAMBERT_I;
+	YGPoint org = {994300.623,113409.981,0};
+	YGPoint dest = {0,0,0};
+	YGLambertZone zone = LAMBERT_I;
 
 	lambert_to_wgs84_deg(&org, &dest, zone);
 	printf("(Deg)Lon:%.11f - Lat:%.11f - H:%.11f\n",dest.x,dest.y,dest.z);
@@ -41,12 +42,11 @@ void test_lambert_deg(void)
 void test_lambert(void)
 {
 
-	YGLambertPoint org = {999534.581,112186.569,0};
-	YGLambertPoint dest = {0,0,0};
-	LambertZone zone = LAMBERT_I;
+	YGPoint org = {999534.581,112186.569,0};
+	YGPoint dest = {0,0,0};
+	YGLambertZone zone = LAMBERT_I;
 
 	lambert_to_wgs84(&org, &dest, zone);
-
 }
 
 void test_algo009(void)
@@ -61,7 +61,7 @@ void test_algo009(void)
 	unsigned int i;
 	for (i =0; i < 3;++i)
 	{
-		YGLambertPoint pt  = geographic_to_cartesian(lon[i],lat[i],he[i],a[i],e[i]);
+		YGPoint pt  = geographic_to_cartesian(lon[i],lat[i],he[i],a[i],e[i]);
 		DISPLAY_POINT(pt);
 	}
 
@@ -122,8 +122,8 @@ void test_algo0012(void)
 	 double ign_eps = 1e-11;
 	for(i=0; i < 3;++i)
 	{
-		YGLambertPoint sample = {x[i],y[i],z[i]};
-		YGLambertPoint val ;
+		YGPoint sample = {x[i],y[i],z[i]};
+		YGPoint val ;
 		val = cartesian_to_geographic(sample,LON_MERID_PARIS,a[i],e[i],eps[i]);
 		
 		// printf("X Computed:%.11f - Expected:%.11f\n",val.x,lon[i]);
@@ -139,9 +139,9 @@ void test_algo0012(void)
 void test_algo004(void)
 {
 
-	YGLambertPoint org = {1029705.083,272723.849,0};
-	YGLambertPoint dest = {0,0,0};
-	YGLambertPoint expected = {0.145512099,0.872664626};
+	YGPoint org = {1029705.083,272723.849,0};
+	YGPoint dest = {0,0,0};
+	YGPoint expected = {0.145512099,0.872664626};
 
 
 	lambert_to_geographic(&org,&dest, LAMBERT_I, LON_MERID_GREENWICH,E_CLARK_IGN,1e-9);
@@ -150,6 +150,35 @@ void test_algo004(void)
 	CU_ASSERT(fabs(dest.y - expected.y) <= 1e-9);
 }
 
+
+void testBug2(void)
+{
+	YGPoint org = {668832.5384,6950138.7285,0};
+	YGPoint dest = {0,0,0};
+	YGLambertZone zone= LAMBERT_93;
+
+	lambert_to_wgs84_deg(&org,&dest,zone);
+	printf("Lat:%.9f - Lon:%.9f",dest.y,dest.x);
+
+}
+void testOpenGrid(void)
+{	
+	YGPoint org = {.x=2.424971108, .y=48.844445839,.z=0,.unit=DEGREE};
+   
+    YGTransform tr = rgf93_to_ntf(org);
+    
+    YGPoint t = {tr.tx,tr.ty,tr.tz};
+    YGPoint null= {0,0,0};
+    
+    org = pointToRadian(org);
+    org =  geographic_to_cartesian(org.x,org.y,org.z,A_WGS84,E_WGS84);
+    
+    org =  switch_geodesic_system(org, t, 0, null);
+    org = cartesian_to_geographic(org, LON_MERID_PARIS, A_CLARK_IGN, E_CLARK_IGN, DEFAULT_EPS);
+    
+    org = pointToDegree(org);
+}
+
 int main(int argc, char **argv){
 
 	CU_pSuite pSuite = NULL;
@@ -171,7 +200,9 @@ int main(int argc, char **argv){
         NULL == CU_add_test(pSuite,"Test Algo004",test_algo004)     ||
         NULL == CU_add_test(pSuite,"Test algo0021",test_algo0021)   ||
         NULL == CU_add_test(pSuite,"test_algo009",test_algo009)     ||
-        NULL == CU_add_test(pSuite,"test_algo009",test_lambert_deg)     ||
+        NULL == CU_add_test(pSuite,"test_lambert_deg",test_lambert_deg)     ||
+        NULL == CU_add_test(pSuite,"testBug2",testBug2)     ||
+        NULL == CU_add_test(pSuite,"testNTFRGF93",testOpenGrid)     ||
         NULL == CU_add_test(pSuite, "Test lambert", test_lambert)
       ) 
    {

data/ext/lambert_ruby/lambert_ruby.c

@@ -30,14 +30,14 @@ static VALUE p_init(int argc, VALUE* argv, VALUE self)
 static VALUE p_convert(VALUE self,VALUE zone){
 
 	double x, y, z;
-	LambertZone cZone = NUM2INT(zone);
+	YGLambertZone cZone = NUM2INT(zone);
 
 	x = NUM2DBL(rb_iv_get(self,"@x"));
 	y = NUM2DBL(rb_iv_get(self,"@y"));
 	z = NUM2DBL(rb_iv_get(self,"@z"));
 
-	YGLambertPoint org = {x,y,z};
-	YGLambertPoint dest = {0,0,0};
+	YGPoint org = {x,y,z};
+	YGPoint dest = {0,0,0};
 
 	lambert_to_wgs84_deg(&org,&dest,cZone);
 
@@ -66,4 +66,4 @@ void Init_lambert_ruby(void) {
 	rb_define_const(rb_mLambert,"LambertIV",INT2NUM(LAMBERT_IV));
 	rb_define_const(rb_mLambert,"LambertIIExtended",INT2NUM(LAMBERT_II_E));
 	rb_define_const(rb_mLambert,"Lambert93",INT2NUM(LAMBERT_93));
-}
+}

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: lambert_ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yannick Heinrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies: []
-description: Ruby wrapper for the lambert library that converts Lambert coordinates
-  to WGS84. It wraps the original C files with a basic Ruby interface.
+description: Ruby wrapper for the lambert library
 email: yannick.heinrich@gmail.com
 executables: []
 extensions:
@@ -20,15 +19,16 @@ extra_rdoc_files: []
 files:
 - lib/lambert_ruby.rb
 - ext/lambert_ruby/lambert/src/lambert.c
+- ext/lambert_ruby/lambert/src/rgf93.c
 - ext/lambert_ruby/lambert/tests/test_lambert_cunit.c
 - ext/lambert_ruby/lambert.c
 - ext/lambert_ruby/lambert_ruby.c
 - ext/lambert_ruby/lambert/src/lambert.h
+- ext/lambert_ruby/lambert/src/rgf93.h
 - ext/lambert_ruby/lambert.h
 - ext/lambert_ruby/extconf.rb
-homepage: https://github.com/YaGeek/lambert-ruby
-licenses:
-- GPL-2
+homepage: http://rubygems.org/gems/lambert_ruby
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -36,12 +36,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -49,6 +49,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Ruby wrapper for the lambert library that converts Lambert coordinates to
-  WGS84
+summary: Ruby wrapper for the lambert library
 test_files: []