Changeset 8464

Timestamp:

06/01/11 10:46:47 (14 years ago)

Author:

jschierm

Message:

KML: Added KML_Overlay, KML_Icon, KML_GroundOverlay, and KML_LatLonBox classes for overlays.

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (4 diffs)
• objects/KML/KMLFileReadUtils.cpp (modified) (1 diff)
• objects/KML/KMLFileReadUtils.h (modified) (2 diffs)
• objects/KML/KML_Container.cpp (modified) (2 diffs)
• objects/KML/KML_GroundOverlay.cpp (added)
• objects/KML/KML_GroundOverlay.h (added)
• objects/KML/KML_Icon.cpp (added)
• objects/KML/KML_Icon.h (added)
• objects/KML/KML_LatLonBox.cpp (added)
• objects/KML/KML_LatLonBox.h (added)
• objects/KML/KML_Overlay.cpp (added)
• objects/KML/KML_Overlay.h (added)
• objects/objects.h (modified) (2 diffs)

issm/trunk/src/c/Makefile.am

@@ -91 +91 @@
                                         ./objects/KML/KML_Geometry.cpp\
                                         ./objects/KML/KML_Geometry.h\
+                                        ./objects/KML/KML_GroundOverlay.cpp\
+                                        ./objects/KML/KML_GroundOverlay.h\
+                                        ./objects/KML/KML_Icon.cpp\
+                                        ./objects/KML/KML_Icon.h\
+                                        ./objects/KML/KML_LatLonBox.cpp\
+                                        ./objects/KML/KML_LatLonBox.h\
                                         ./objects/KML/KML_LinearRing.cpp\
                                         ./objects/KML/KML_LinearRing.h\
@@ -101 +107 @@
                                         ./objects/KML/KML_Object.cpp\
                                         ./objects/KML/KML_Object.h\
+                                        ./objects/KML/KML_Overlay.cpp\
+                                        ./objects/KML/KML_Overlay.h\
                                         ./objects/KML/KML_Placemark.cpp\
                                         ./objects/KML/KML_Placemark.h\
@@ -748 +756 @@
                                         ./objects/KML/KML_Geometry.cpp\
                                         ./objects/KML/KML_Geometry.h\
+                                        ./objects/KML/KML_GroundOverlay.cpp\
+                                        ./objects/KML/KML_GroundOverlay.h\
+                                        ./objects/KML/KML_Icon.cpp\
+                                        ./objects/KML/KML_Icon.h\
+                                        ./objects/KML/KML_LatLonBox.cpp\
+                                        ./objects/KML/KML_LatLonBox.h\
                                         ./objects/KML/KML_LinearRing.cpp\
                                         ./objects/KML/KML_LinearRing.h\
@@ -758 +772 @@
                                         ./objects/KML/KML_Object.cpp\
                                         ./objects/KML/KML_Object.h\
+                                        ./objects/KML/KML_Overlay.cpp\
+                                        ./objects/KML/KML_Overlay.h\
                                         ./objects/KML/KML_Placemark.cpp\
                                         ./objects/KML/KML_Placemark.h\

issm/trunk/src/c/objects/KML/KMLFileReadUtils.cpp

@@ -317 +317 @@
 
 /*FUNCTION  KMLFileTokenParse {{{1*/
+int KMLFileTokenParse(double* pdval,
+                                          char* ktag,
+                                          FILE* fid){
+
+        char*   kstr;
+
+/*  get next token and convert to appropriate format  */
+
+        if (!(kstr=KMLFileToken(fid)) ||
+                (kstr[0] == '<'))
+                _error_("KMLFileTokenParse -- Missing integer field for %s.\n",ktag);
+
+        sscanf(kstr,"%lg",pdval);
+        xfree((void**)&kstr);
+
+/*  get additional token and compare to closing tag  */
+
+        if (ktag)
+                if (!(kstr=KMLFileToken(fid)) ||
+                        (kstr[0] != '<') ||
+                        (kstr[1] != '/') ||
+                        (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1)))
+                        _error_("KMLFileTokenParse -- Missing closing tag for %s.\n",ktag);
+                else
+                        xfree((void**)&kstr);
+
+//      _printf_(true,"KMLFileTokenParse -- %s=%g.\n",ktag,*pdval);
+
+        return(0);
+}
+/*}}}*/
+
+/*FUNCTION  KMLFileTokenParse {{{1*/
 int KMLFileTokenParse(double (**pdval3)[3],int* m,int maxlen,
                                           char* ktag,

issm/trunk/src/c/objects/KML/KMLFileReadUtils.h

@@ -21 +21 @@
 void KMLFileTagAttrib(KML_Object* kobj,
                                           char* ktag);
-int KMLFileTokenParse(int* pint,
+int KMLFileTokenParse(int* pival,
                                           char* ktag,
                                           FILE* fid);
-int KMLFileTokenParse(bool* pbool,
+int KMLFileTokenParse(bool* pbval,
                                           char* ktag,
                                           FILE* fid);
@@ -30 +30 @@
                                           char* ktag,
                                           FILE* fid);
-int KMLFileTokenParse(float* pfl,
+int KMLFileTokenParse(float* pfval,
                                           char* ktag,
                                           FILE* fid);
-int KMLFileTokenParse(double (**pdoub3)[3],int* m,int maxlen,
+int KMLFileTokenParse(double* pdval,
+                                          char* ktag,
+                                          FILE* fid);
+int KMLFileTokenParse(double (**pdval3)[3],int* m,int maxlen,
                                           char* ktag,
                                           FILE* fid);

issm/trunk/src/c/objects/KML/KML_Container.cpp

@@ -132 +132 @@
         }
 
-        else if (!strncmp(kstr,"<Folder",7)) {
+        else if (!strncmp(kstr,"<Folder", 7)) {
                 kobj=(KML_Object*)new KML_Folder();
                 kobj->Read(fid,kstr);
@@ -138 +138 @@
         }
 
-        else if (!strncmp(kstr,"<Document",9)) {
+        else if (!strncmp(kstr,"<Document", 9)) {
                 kobj=(KML_Object*)new KML_Document();
+                kobj->Read(fid,kstr);
+                feature   ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<GroundOverlay",14)) {
+                kobj=(KML_Object*)new KML_GroundOverlay();
                 kobj->Read(fid,kstr);
                 feature   ->AddObject((Object*)kobj);

issm/trunk/src/c/objects/objects.h

@@ -52 +52 @@
 #include "./KML/KML_Folder.h"
 #include "./KML/KML_Geometry.h"
+#include "./KML/KML_GroundOverlay.h"
+#include "./KML/KML_Icon.h"
+#include "./KML/KML_LatLonBox.h"
 #include "./KML/KML_LinearRing.h"
 #include "./KML/KML_LineString.h"
@@ -57 +60 @@
 #include "./KML/KML_MultiGeometry.h"
 #include "./KML/KML_Object.h"
+#include "./KML/KML_Overlay.h"
 #include "./KML/KML_Placemark.h"
 #include "./KML/KML_Polygon.h"