Changeset 8461 for issm/trunk/src/c/objects/KML/KML_Placemark.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_Placemark.cpp (modified) (7 diffs)

issm/trunk/src/c/objects/KML/KML_Placemark.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<Placemark id=\"%s\">\n",indent,this->id);
-        else
-                fprintf(filout,"%s<Placemark>\n",indent);
+        fprintf(filout,"%s<Placemark",indent);
+        WriteAttrib(filout," ");
+        fprintf(filout,">\n");
 
         KML_Feature::Write(filout,indent);
@@ -125 +124 @@
         KML_Object*  kobj;
 
-/*  check for id attribute  */
+/*  get object attributes  */
 
-//      KML_Object::Read(fid,kstr);
-        KMLFileTagAttrib( id        ,NULL,KML_OBJECT_ID_LENGTH,
-                                         kstr,
-                                         "id");
+        KMLFileTagAttrib(this,
+                                         kstr);
 
 /*  loop over and process fields within opening and closing tags  */
@@ -144 +141 @@
                         _error_("KML_Placemark::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,kstr);
+                        kobj->Read(fid,kstri);
                         geometry  ->AddObject((Object*)kobj);
                 }
@@ -152 +155 @@
                 else if (!strncmp(kstri,"<LinearRing",11)) {
                         kobj=(KML_Object*)new KML_LinearRing();
-                        kobj->Read(fid,kstr);
+                        kobj->Read(fid,kstri);
                         geometry  ->AddObject((Object*)kobj);
                 }
@@ -158 +161 @@
                 else if (!strncmp(kstri,"<Polygon", 8)) {
                         kobj=(KML_Object*)new KML_Polygon();
-                        kobj->Read(fid,kstr);
+                        kobj->Read(fid,kstri);
                         geometry  ->AddObject((Object*)kobj);
                 }
@@ -164 +167 @@
                 else if (!strncmp(kstri,"<MultiGeometry",14)) {
                         kobj=(KML_Object*)new KML_MultiGeometry();
-                        kobj->Read(fid,kstr);
+                        kobj->Read(fid,kstri);
                         geometry  ->AddObject((Object*)kobj);
                 }