Changeset 13936

Timestamp:

03/05/08 17:52:33 (4 months ago)

Author:

rouault

Message:

Update of X-Plane driver

Files:

• trunk/gdal/ogr/ogrsf_frmts/xplane/GNUmakefile (modified) (2 diffs)
• trunk/gdal/ogr/ogrsf_frmts/xplane/makefile.vc (modified) (1 diff)
• trunk/gdal/ogr/ogrsf_frmts/xplane/ogr_xplane.h (modified) (13 diffs)
• trunk/gdal/ogr/ogrsf_frmts/xplane/ogr_xplane_geo_utils.cpp (added)
• trunk/gdal/ogr/ogrsf_frmts/xplane/ogr_xplane_geo_utils.h (added)
• trunk/gdal/ogr/ogrsf_frmts/xplane/ogrxplanedatasource.cpp (modified) (26 diffs)
• trunk/gdal/ogr/ogrsf_frmts/xplane/ogrxplanelayer.cpp (modified) (27 diffs)
• trunk/gdal/ogr/ogrsf_frmts/xplane/test_geo_utils.cpp (added)

trunk/gdal/ogr/ogrsf_frmts/xplane/GNUmakefile

@@ -3 +3 @@
-include ../../../GDALmake.opt
-
-
+ ogr_xplane_geo_utils.o
-
-CPPFLAGS        :=      -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS)
@@ -14 +14 @@
-$(O_OBJ):       ogr_xplane.h
-
+test_geo_utils: test_geo_utils.o ogr_xplane_geo_utils.o
+        $(CXX) test_geo_utils.o ogr_xplane_geo_utils.o -o test_geo_utils -lm

trunk/gdal/ogr/ogrsf_frmts/xplane/makefile.vc

@@ -1 +1 @@
-
-
+ogr_xplane_geo_utils.obj
-
-EXTRAFLAGS =    -I.. -I..\.. 

trunk/gdal/ogr/ogrsf_frmts/xplane/ogr_xplane.h

@@ -104 +104 @@
-  public:
-                        OGRXPlaneILSLayer();
-void       
+OGRFeature*
-                                   const char* pszAptICAO,
-                                   const char* pszRwyNum,
@@ -125 +125 @@
-  public:
-                        OGRXPlaneVORLayer();
-void       
+OGRFeature*
-                                   const char* pszNavaidName,
-                                   const char* pszSubType,
@@ -145 +145 @@
-  public:
-                        OGRXPlaneNDBLayer();
-void       
+OGRFeature*
-                                   const char* pszNavaidName,
-                                   const char* pszSubType,
@@ -164 +164 @@
-  public:
-                        OGRXPlaneGSLayer();
-void       
+OGRFeature*
-                                   const char* pszAptICAO,
-                                   const char* pszRwyNum,
@@ -185 +185 @@
-  public:
-                        OGRXPlaneMarkerLayer();
-void       
+OGRFeature*
-                                   const char* pszRwyNum,
-                                   const char* pszSubType,
@@ -203 +203 @@
-  public:
-                        OGRXPlaneDMEILSLayer();
-void       
+OGRFeature*
-                                   const char* pszAptICAO,
-                                   const char* pszRwyNum,
@@ -224 +224 @@
-  public:
-                        OGRXPlaneDMELayer();
-void       
+OGRFeature*
-                                   const char* pszNavaidName,
-                                   const char* pszSubType,
@@ -247 +247 @@
-    /* If the airport has a tower, its coordinates are the tower coordinates */
-    /* If it has no tower, then we pick up the coordinates of the threshold of its first found runway */
-void       
+OGRFeature*
-                                   const char* pszAptName,
-                                   double dfElevation,
@@ -260 +260 @@
-
-/************************************************************************/
-         OGRXPlaneRunwayLayer     
+OGRXPlaneRunwayThresholdLayerLayer
-/************************************************************************/
-
@@ -313 +313 @@
-{
-    { 0, "None" },
-o
-u
+O
+U
-};
-
@@ -324 +324 @@
-
-
-
-
-
-
-
-void       
-unwayID
+Threshold
+
+
+Threshold
+
+OGRFeature*
+wyNum
-                                   double dfLat,
-                                   double dfLon,
@@ -346 +346 @@
-                                   int bHasTouchdownLights,
-                                   const char* pszREIL);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/************************************************************************/
@@ -358 +484 @@
-                        OGRXPlaneATCFreqLayer();
-
-void       
+OGRFeature*
-                                   const char* pszATCType,
-                                   const char* pszATCFreqName,
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-

trunk/gdal/ogr/ogrsf_frmts/xplane/ogrxplanedatasource.cpp

@@ -28 +28 @@
- ****************************************************************************/
-
+#include <math.h>
+
-#include "ogr_xplane.h"
-cpl_conv
+ogr_xplane_geo_utils
-
-#define FEET_TO_METER       0.30479999798832
-#define NM_TO_KM            1.852
+
-
-/************************************************************************/
@@ -129 +132 @@
-
-
+#define ASSERT_MIN_COL(nMinColNum) \
+            if (nTokens < nMinColNum) \
+            { \
+                CPLDebug("XPlane", "Line %d : not enough columns : %d. %d is the minimum required", \
+                        nLineNumber, nTokens, nMinColNum); \
+                goto next_line; \
+            }
+
+#define READ_STRING_UNTIL_END(osResult, iFirstIndice) \
+            if (nTokens > iFirstIndice) \
+            { \
+                int _i; \
+                int _nIDsToSum = nTokens - iFirstIndice; \
+                osResult = papszTokens[iFirstIndice]; \
+                for(_i=1;_i<_nIDsToSum;_i++) \
+                { \
+                    osResult += " "; \
+                    osResult += papszTokens[iFirstIndice + _i]; \
+                } \
+            }
+
-enum
-{
@@ -236 +260 @@
-
-        dfFrequency = READ_DOUBLE(4, "frequency");
+        /* NDB frequencies are in kHz. Others must be divided by 100 */
+        /* to get a frequency in MHz */
+        if (nType != NAVAID_NDB)
+            dfFrequency /= 100.;
-
-        /* nautical miles to kilometer */
@@ -244 +272 @@
-        if (nType == NAVAID_NDB)
-        {
-            int nIDsToSum = nTokens - 8;
-            char* pszSubType = "";
-            CPLString osNavaidName;
@@ -252 +279 @@
-            {
-                pszSubType = papszTokens[nTokens-1];
-IDsToSum
+Tokens
-            }
-            else
@@ -258 +285 @@
-                CPLDebug("XPlane", "Unexpected NDB subtype : %s", papszTokens[nTokens-1]);
-            }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-            poNDBLayer->AddFeature(pszNavaidId, osNavaidName, pszSubType,
@@ -277 +294 @@
-        else if (nType == NAVAID_VOR)
-        {
-            int nIDsToSum = nTokens - 8;
-            char* pszSubType = "";
-            CPLString osNavaidName;
@@ -288 +304 @@
-            {
-                pszSubType = papszTokens[nTokens-1];
-IDsToSum
+Tokens
-            }
-            else
@@ -294 +310 @@
-                CPLDebug("XPlane", "Unexpected VOR subtype : %s", papszTokens[nTokens-1]);
-            }
-
-
-
-
-
-
-
+
+
+
-            poVORLayer->AddFeature(pszNavaidId, osNavaidName, pszSubType,
-                                   dfLat, dfLon,
@@ -311 +323 @@
-            dfTrueHeading = READ_DOUBLE_WITH_BOUNDS(6, "true heading", 0., 360.);
-
-
-
-
-
-
-
+
-
-            pszAptICAO = papszTokens[8];
@@ -327 +334 @@
-                EQUAL(pszSubType, "LOC") ||
-                EQUAL(pszSubType, "LDA") ||
-
+
+
+
-            {
-                poILSLayer->AddFeature(pszNavaidId, pszAptICAO, pszRwyNum, pszSubType,
@@ -354 +363 @@
-            }
-
-
-
-
-
-
-
+
-
-            pszAptICAO = papszTokens[8];
@@ -384 +388 @@
-            dfTrueHeading = READ_DOUBLE_WITH_BOUNDS(6, "true heading", 0., 360.);
-
-
-
-
-
-
-
+
-
-            pszAptICAO = papszTokens[8];
@@ -412 +411 @@
-        else if (nType == NAVAID_DME_COLOC || nType == NAVAID_DME_STANDALONE)
-        {
-            int nIDsToSum = nTokens - 8;
-            char* pszSubType = "";
-            CPLString osNavaidName;
@@ -440 +438 @@
-                if (EQUAL(papszTokens[nTokens-1], "DME"))
-                {
-IDsToSum
-2
-2
-2
-2
+Tokens
+1
+1
+1
+1
-                    {
-2
-IDsToSum
+1
+Tokens
-                    }
-                }
@@ -455 +453 @@
-                }
-
-
-
-
-
-
-
-
+
+
-                poDMELayer->AddFeature(pszNavaidId, osNavaidName, pszSubType,
-                                       dfLat, dfLon,
@@ -486 +479 @@
-{
-    APT_AIRPORT_HEADER         = 1,
+    APT_RUNWAY_TAXIWAY_V_810   = 10,
-    APT_RUNWAY                 = 100,
-    APT_WATER_RUNWAY           = 101,
@@ -496 +490 @@
-    APT_NODE_END               = 115,
-    APT_NODE_END_WITH_BEZIER   = 116,
-FEATURE
-LINEAR_FEATURE_2
+HEADER 
+BOUNDARY_HEADER 
-    APT_VASI_PAPI_WIGWAG       = 21,
-    APT_TAXIWAY_SIGNS          = 20,
@@ -559 +553 @@
-    OGRXPlaneAPTLayer* poAPTLayer = new OGRXPlaneAPTLayer();
-    OGRXPlaneRunwayLayer* poRunwayLayer = new OGRXPlaneRunwayLayer();
+    OGRXPlaneRunwayThresholdLayer* poRunwayThresholdLayer = new OGRXPlaneRunwayThresholdLayer();
+    OGRXPlaneWaterRunwayLayer* poWaterRunwayLayer = new OGRXPlaneWaterRunwayLayer();
+    OGRXPlaneWaterRunwayThresholdLayer* poWaterRunwayThresholdLayer = new OGRXPlaneWaterRunwayThresholdLayer();
+    OGRXPlaneHelipadLayer* poHelipadLayer = new OGRXPlaneHelipadLayer();
+    OGRXPlaneHelipadPolygonLayer* poHelipadPolygonLayer = new OGRXPlaneHelipadPolygonLayer();
-    OGRXPlaneATCFreqLayer* poATCFreqLayer = new OGRXPlaneATCFreqLayer();
+    OGRXPlaneStartupLocationLayer* poStartupLocationLayer = new OGRXPlaneStartupLocationLayer();
+    OGRXPlaneAPTLightBeaconLayer* poAPTLightBeaconLayer = new OGRXPlaneAPTLightBeaconLayer();
+    OGRXPlaneAPTWindsockLayer* poAPTWindsockLayer = new OGRXPlaneAPTWindsockLayer();
+    OGRXPlaneTaxiwaySignLayer* poTaxiwaySignLayer = new OGRXPlaneTaxiwaySignLayer();
+    OGRXPlane_VASI_PAPI_WIGWAG_Layer* poVASI_PAPI_WIGWAG_Layer = new OGRXPlane_VASI_PAPI_WIGWAG_Layer();
-
-    RegisterLayer(poAPTLayer);
-    RegisterLayer(poRunwayLayer);
+    RegisterLayer(poRunwayThresholdLayer);
+    RegisterLayer(poWaterRunwayLayer);
+    RegisterLayer(poWaterRunwayThresholdLayer);
+    RegisterLayer(poHelipadLayer);
+    RegisterLayer(poHelipadPolygonLayer);
-    RegisterLayer(poATCFreqLayer);
+    RegisterLayer(poStartupLocationLayer);
+    RegisterLayer(poAPTLightBeaconLayer);
+    RegisterLayer(poAPTWindsockLayer);
+    RegisterLayer(poTaxiwaySignLayer);
+    RegisterLayer(poVASI_PAPI_WIGWAG_Layer);
-
-    while((pszLine = CPLReadLine(fp)) != NULL)
@@ -594 +608 @@
-        }
-
-
-
-
-
-
-
-
+
-
-        nType = atoi(papszTokens[0]);
@@ -618 +626 @@
-            bRunwayFound = FALSE;
-
-
-
-
-
-
-
-
-
+
-
-            /* feet to meter */
-            dfElevation = READ_DOUBLE_WITH_BOUNDS_AND_CONVERSION(1, "elevation", FEET_TO_METER, -1000., 10000.);
-
-            bControlTower = atoi(papszTokens[2]);
-
-            // papszTokens[3] ignored
-
-            osAptICAO = papszTokens[4];
-
-
-
-
-
-
-
-
+
-
-            bAptHeaderFound = TRUE;
+        }
+        else if (nType == APT_RUNWAY_TAXIWAY_V_810)
+        {
+            /*
+            ASSERT_MIN_COL(15);
+
+            dfLat = READ_DOUBLE_WITH_BOUNDS(1, "latitude", -90., 90.);
+            dfLon = READ_DOUBLE_WITH_BOUNDS(2, "longitude", -180., 180.);
+            pszRwyNum = papszTokens[3];
+            dfTrueHeading = READ_DOUBLE_WITH_BOUNDS(4, "true heading", 0., 360.);
+            dfLength = READ_DOUBLE(5, "length");
+            dfLength *= FEET_TO_METER;
+            dfDisplacedThresholdLength1 = atoi(papszTokens[6]) * FEET_TO_METER;
+            if (strchr(papszTokens[6])
+                dfDisplacedThresholdLength2 = atoi(strchr(papszTokens[6]) + 1) * FEET_TO_METER;
+            dfStopwayLength1 = atoi(papszTokens[7]) * FEET_TO_METER;
+            if (strchr(papszTokens[7])
+                dfStopwayLength2 = atoi(strchr(papszTokens[7]) + 1) * FEET_TO_METER;
+            dfWidth = READ_DOUBLE(8, "width");
+            dfWidth *= FEET_TO_METER;
+            if (strlen(papszTokens[9] == 6)
+            {
+                eVisualApproachLighting1 = papszTokens[9][0] - '0';
+                // TODO
+            }
+            */
-        }
-        else if (nType == APT_RUNWAY)
@@ -653 +670 @@
-            int bHasCenterLineLights, bHasMIRL, bHasDistanceRemainingSigns;
-            int nCurToken;
-
-if (nTokens < 8 + 9 + 9)
-{
-    CPLDebug("XPlane", "Line %d : not enough columns : %d",
-            nLineNumber, nTokens)
-
-}
+
+double adfLat[2], adfLon[2];
+OGRFeature* apoRunwayThreshold[2];
+double dfLength;
+CPLString aosRunwayId[2]
+
+ASSERT_MIN_COL(8 + 9 + 9);
-
-            dfWidth = READ_DOUBLE(1, "runway width");
-
-            eSurfaceCode = atoi(papszTokens[2]);
-
-            eShoulderCode = atoi(papszTokens[3]);
-
-            dfSmoothness = READ_DOUBLE_WITH_BOUNDS(4, "runway smoothness", 0., 1.);
-
-            bHasCenterLineLights = atoi(papszTokens[5]);
-
-            bHasMIRL = atoi(papszTokens[6]) == 2;
-
-            bHasDistanceRemainingSigns = atoi(papszTokens[7]);
-
-
-
-
-
+
+
-                double dfLat, dfLon, dfDisplacedThresholdLength, dfStopwayLength;
-                int eMarkings, eApproachLightingCode, eREIL;
-                int bHasTouchdownLights;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-                if (!bRunwayFound)
@@ -695 +708 @@
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                bRunwayFound = TRUE;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+