Changeset 8461 for issm/trunk/src/c/objects/KML/KML_MultiGeometry.cpp

Timestamp:

06/01/11 09:13:35 (14 years ago)

Author:

jschierm

Message:

KML: Addition of KMLFileRead module and KML_Attribute class, along with many other changes during freeze.

File:

• issm/trunk/src/c/objects/KML/KML_MultiGeometry.cpp (modified) (3 diffs)

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

@@ -81 +81 @@
         if (geometry->Size())
                 for (i=0; i<geometry->Size(); i++) {
-                        _printf_(flag,"%s      geometry: [%d] begin\n" ,indent,i);
+                        _printf_(flag,"%s      geometry: -------- begin [%d] --------\n" ,indent,i);
                         ((KML_Geometry *)geometry->GetObjectByOffset(i))->DeepEcho(indent2);
-                        _printf_(flag,"%s      geometry: [%d] end\n"   ,indent,i);
+                        _printf_(flag,"%s      geometry: --------  end  [%d] --------\n" ,indent,i);
                 }
         else
@@ -98 +98 @@
         char  indent2[81];
 
-        if (this->id && strlen(this->id))
-                fprintf(filout,"%s<MultiGeometry id=\"%s\">\n",indent,this->id);
-        else
-                fprintf(filout,"%s<MultiGeometry>\n",indent);
+        fprintf(filout,"%s<MultiGeometry",indent);
+        WriteAttrib(filout," ");
+        fprintf(filout,">\n");
 
         KML_Geometry::Write(filout,indent);
@@ -122 +121 @@
 void  KML_MultiGeometry::Read(FILE* fid,char* kstr){
 
+        char*        kstri;
+        KML_Object*  kobj;
+
+/*  get object attributes  */
+
+        KMLFileTagAttrib(this,
+                                         kstr);
+
+/*  loop over and process fields within opening and closing tags  */
+
+        while (kstri=KMLFileToken(fid)) {
+                if      (!strncmp(kstri,"</MultiGeometry",15)) {
+                        xfree((void**)&kstri);
+                        break;
+                }
+                else if (!strncmp(kstri,"</",2))
+                        _error_("KML_MultiGeometry::Read -- Unexpected closing tag %s.\n",kstri);
+                else if (strncmp(kstri,"<",1))
+                        _error_("KML_MultiGeometry::Read -- Unexpected field \"%s\".\n",kstri);
+
+//              else if (!strncmp(kstri,"<Point", 6)) {
+//                      kobj=(KML_Object*)new KML_Point();
+//                      kobj->Read(fid,kstri);
+//                      geometry  ->AddObject((Object*)kobj);
+//              }
+
+                else if (!strncmp(kstri,"<LineString",11)) {
+                        kobj=(KML_Object*)new KML_LineString();
+                        kobj->Read(fid,kstri);
+                        geometry  ->AddObject((Object*)kobj);
+                }
+
+                else if (!strncmp(kstri,"<LinearRing",11)) {
+                        kobj=(KML_Object*)new KML_LinearRing();
+                        kobj->Read(fid,kstri);
+                        geometry  ->AddObject((Object*)kobj);
+                }
+
+                else if (!strncmp(kstri,"<Polygon", 8)) {
+                        kobj=(KML_Object*)new KML_Polygon();
+                        kobj->Read(fid,kstri);
+                        geometry  ->AddObject((Object*)kobj);
+                }
+
+                else if (!strncmp(kstri,"<MultiGeometry",14)) {
+                        kobj=(KML_Object*)new KML_MultiGeometry();
+                        kobj->Read(fid,kstri);
+                        geometry  ->AddObject((Object*)kobj);
+                }
+
+                else if (!strncmp(kstri,"<",1))
+                        KML_Geometry::Read(fid,kstri);
+
+                xfree((void**)&kstri);
+        }
 
         return;