[paparazzi-commits] [4710] add "Lambert II ?\195?\169tendu" coordinates support

[Pascal Brisset]

Revision: 4710
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4710
Author:   hecto
Date:     2010-03-18 07:42:37 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
 add "Lambert II ?\195?\169tendu" coordinates support

Modified Paths:
--------------
    paparazzi3/trunk/sw/lib/ocaml/latlong.ml
    paparazzi3/trunk/sw/lib/ocaml/latlong.mli
    paparazzi3/trunk/sw/lib/ocaml/mapCanvas.ml

Modified: paparazzi3/trunk/sw/lib/ocaml/latlong.ml
===================================================================
--- paparazzi3/trunk/sw/lib/ocaml/latlong.ml    2010-03-16 04:23:46 UTC (rev 
4709)
+++ paparazzi3/trunk/sw/lib/ocaml/latlong.ml    2010-03-18 07:42:37 UTC (rev 
4710)
@@ -503,6 +503,7 @@
 type coordinates_kind = 
     WGS84_dec
   | WGS84_dms
+  | LBT2e
   | Bearing of < pos : geographic>
 
 
@@ -512,6 +513,9 @@
       string_degrees_of_geographic geo
   | WGS84_dms ->
       string_dms_of_geographic geo
+  | LBT2e ->
+      let l = lambertIIe_of geo in
+      Printf.sprintf "%d %d" l.lbt_x l.lbt_y
   | Bearing georef ->
       let (dx, dy) = utm_sub (utm_of WGS84 geo) (utm_of WGS84 georef#pos) in
       let d = sqrt (dx*.dx+.dy*.dy) in
@@ -524,6 +528,8 @@
       of_string ("WGS84 " ^ s)
   | WGS84_dms -> 
       of_string ("WGS84_dms " ^ s)
+  | LBT2e ->
+      of_string ("LBT2e " ^ s)
   | Bearing georef ->
       of_string (Printf.sprintf "WGS84_bearing %s %s" 
(string_degrees_of_geographic georef#pos) s)
 

Modified: paparazzi3/trunk/sw/lib/ocaml/latlong.mli
===================================================================
--- paparazzi3/trunk/sw/lib/ocaml/latlong.mli   2010-03-16 04:23:46 UTC (rev 
4709)
+++ paparazzi3/trunk/sw/lib/ocaml/latlong.mli   2010-03-18 07:42:37 UTC (rev 
4710)
@@ -155,6 +155,7 @@
 type coordinates_kind = 
     WGS84_dec
   | WGS84_dms
+  | LBT2e
   | Bearing of < pos : geographic >
 
 val string_of_coordinates : coordinates_kind -> geographic -> string

Modified: paparazzi3/trunk/sw/lib/ocaml/mapCanvas.ml
===================================================================
--- paparazzi3/trunk/sw/lib/ocaml/mapCanvas.ml  2010-03-16 04:23:46 UTC (rev 
4709)
+++ paparazzi3/trunk/sw/lib/ocaml/mapCanvas.ml  2010-03-18 07:42:37 UTC (rev 
4710)
@@ -672,6 +672,7 @@
       let set = fun x () -> selected_georef <- x in
       my_menu_item "WGS84" ~packing:georef_menu#append ~callback:(set 
WGS84_dec) ();
       my_menu_item "WGS84_dms" ~packing:georef_menu#append ~callback:(set 
WGS84_dms) ();
+      my_menu_item "LambertIIe" ~packing:georef_menu#append ~callback:(set 
LBT2e) ();
       optmenu#set_menu georef_menu
      )