- fix carttogeod() function (don't convert the altitude from radian to degree ;-)

[flightgear.git] / src / Scripting / NasalSys.cxx

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index bb3ab5590701b40f0afa2fed47882d3fae70e3bc..991147e790c5619d3b4e0ad14e24f86fe1f47612 100644 (file)
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fstream>
 
 #include <plib/ul.h>
 
@@ -358,6 +359,40 @@ static naRef f_directory(naContext c, naRef me, int argc, naRef* args)
     return result;
 }
 
+// Parse XML file.
+//     parsexml(<path> [, <start-tag> [, <end-tag> [, <data> [, <pi>]]]]);
+//
+// <path>      ... absolute path of an XML file
+// <start-tag> ... callback function with two args: tag name, attribute hash
+// <end-tag>   ... callback function with one arg:  tag name
+// <data>      ... callback function with one arg:  data
+// <pi>        ... callback function with two args: target, data
+//                 (pi = "processing instruction")
+// All four callback functions are optional and default to nil.
+// The function returns nil on error, and the file name otherwise.
+static naRef f_parsexml(naContext c, naRef me, int argc, naRef* args)
+{
+    if(argc < 1 || !naIsString(args[0]))
+        naRuntimeError(c, "parsexml(): path argument missing or not a string");
+    if(argc > 5) argc = 5;
+    for(int i=1; i<argc; i++)
+        if(!(naIsNil(args[i]) || naIsFunc(args[i])))
+            naRuntimeError(c, "parsexml(): callback argument not a function");
+
+    const char* file = naStr_data(args[0]);
+    std::ifstream input(file);
+    NasalXMLVisitor visitor(c, argc, args);
+    try {
+        readXML(input, visitor);
+    } catch (const sg_exception& e) {
+        string msg = string("parsexml(): file '") + file + "' "
+                     + e.getFormattedMessage();
+        naRuntimeError(c, msg.c_str());
+        return naNil();
+    }
+    return args[0];
+}
+
 // Return UNIX epoch time in seconds.
 static naRef f_systime(naContext c, naRef me, int argc, naRef* args)
 {
@@ -379,14 +414,13 @@ static naRef f_systime(naContext c, naRef me, int argc, naRef* args)
 // Convert a cartesian point to a geodetic lat/lon/altitude.
 static naRef f_carttogeod(naContext c, naRef me, int argc, naRef* args)
 {
-    const double RAD2DEG = 180.0 / SGD_PI;
     double lat, lon, alt, xyz[3];
     if(argc != 3) naRuntimeError(c, "carttogeod() expects 3 arguments");
     for(int i=0; i<3; i++)
         xyz[i] = naNumValue(args[i]).num;
     sgCartToGeod(xyz, &lat, &lon, &alt);
-    lat *= RAD2DEG;
-    lon *= RAD2DEG;
+    lat *= SG_RADIANS_TO_DEGREES;
+    lon *= SG_RADIANS_TO_DEGREES;
     naRef vec = naNewVector(c);
     naVec_append(vec, naNum(lat));
     naVec_append(vec, naNum(lon));
@@ -397,11 +431,10 @@ static naRef f_carttogeod(naContext c, naRef me, int argc, naRef* args)
 // Convert a geodetic lat/lon/altitude to a cartesian point.
 static naRef f_geodtocart(naContext c, naRef me, int argc, naRef* args)
 {
-    const double DEG2RAD = SGD_PI / 180.0;
     if(argc != 3) naRuntimeError(c, "geodtocart() expects 3 arguments");
-    double lat = naNumValue(args[0]).num * DEG2RAD;
-    double lon = naNumValue(args[1]).num * DEG2RAD;
-    double alt = naNumValue(args[2]).num * DEG2RAD;
+    double lat = naNumValue(args[0]).num * SG_DEGREES_TO_RADIANS;
+    double lon = naNumValue(args[1]).num * SG_DEGREES_TO_RADIANS;
+    double alt = naNumValue(args[2]).num;
     double xyz[3];
     sgGeodToCart(lat, lon, alt, xyz);
     naRef vec = naNewVector(c);
@@ -462,6 +495,7 @@ static struct { char* name; naCFunction func; } funcs[] = {
     { "rand",  f_rand },
     { "srand",  f_srand },
     { "directory", f_directory },
+    { "parsexml", f_parsexml },
     { "systime", f_systime },
     { "carttogeod", f_carttogeod },
     { "geodtocart", f_geodtocart },
@@ -586,7 +620,7 @@ void FGNasalSys::loadPropertyScripts()
             loadModule(p, module);
         }
         */
-        
+
         const char* src = n->getStringValue("script");
         if(!n->hasChild("script")) src = 0; // Hrm...
         if(src)
@@ -914,3 +948,59 @@ FGNasalModelData::~FGNasalModelData()
 }
 
 
+
+// NasalXMLVisitor class: handles EasyXML visitor callback for parsexml()
+//
+NasalXMLVisitor::NasalXMLVisitor(naContext c, int argc, naRef* args) :
+    _c(naSubContext(c)),
+    _start_element(argc > 1 ? args[1] : naNil()),
+    _end_element(argc > 2 ? args[2] : naNil()),
+    _data(argc > 3 ? args[3] : naNil()),
+    _pi(argc > 4 ? args[4] : naNil())
+{
+}
+
+void NasalXMLVisitor::startElement(const char* tag, const XMLAttributes& a)
+{
+    if(naIsNil(_start_element)) return;
+    naRef attr = naNewHash(_c);
+    for(int i=0; i<a.size(); i++) {
+        naRef name = make_string(a.getName(i));
+        naRef value = make_string(a.getValue(i));
+        naHash_set(attr, name, value);
+    }
+    call(_start_element, 2, make_string(tag), attr);
+}
+
+void NasalXMLVisitor::endElement(const char* tag)
+{
+    if(!naIsNil(_end_element)) call(_end_element, 1, make_string(tag));
+}
+
+void NasalXMLVisitor::data(const char* str, int len)
+{
+    if(!naIsNil(_data)) call(_data, 1, make_string(str, len));
+}
+
+void NasalXMLVisitor::pi(const char* target, const char* data)
+{
+    if (!naIsNil(_pi)) call(_pi, 2, make_string(target), make_string(data));
+}
+
+void NasalXMLVisitor::call(naRef func, int num, naRef a, naRef b)
+{
+    naRef args[2];
+    args[0] = a;
+    args[1] = b;
+    naCall(_c, func, num, args, naNil(), naNil());
+    if(naGetError(_c))
+        naRethrowError(_c);
+}
+
+naRef NasalXMLVisitor::make_string(const char* s, int n)
+{
+    return naStr_fromdata(naNewString(_c), const_cast<char *>(s),
+                          n < 0 ? strlen(s) : n);
+}
+
+