Changeset 11346

Timestamp:

02/07/12 14:24:07 (13 years ago)

Author:

jschierm

Message:

KML: Allow recognized elements within unknown elements.

File:

• issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp

@@ -104 +104 @@
         if (unknwn->Size())
                 for (i=0; i<unknwn->Size(); i++) {
+            _printf_(flag,"%s        unknwn: -------- begin [%d] --------\n" ,indent,i);
                         ((KML_Unknown *)unknwn->GetObjectByOffset(i))->DeepEcho(indent2);
+            _printf_(flag,"%s        unknwn: --------  end  [%d] --------\n" ,indent,i);
                 }
         else
@@ -148 +150 @@
                 _error_("KML_Object::Read -- Unexpected field \"%s\".\n",kstr);
 
+        else if (!strncmp(kstr,"<Placemark",10)) {
+                kobj=(KML_Object*)new KML_Placemark();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<Folder", 7)) {
+                kobj=(KML_Object*)new KML_Folder();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<Document", 9)) {
+                kobj=(KML_Object*)new KML_Document();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<GroundOverlay",14)) {
+                kobj=(KML_Object*)new KML_GroundOverlay();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<LatLonBox",10)) {
+                kobj=(KML_Object*)new KML_LatLonBox();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<Icon", 5)) {
+                kobj=(KML_Object*)new KML_Icon();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<Point", 6)) {
+                kobj=(KML_Object*)new KML_Point();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<LineString",11)) {
+                kobj=(KML_Object*)new KML_LineString();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<LinearRing",11)) {
+                kobj=(KML_Object*)new KML_LinearRing();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<Polygon", 8)) {
+                kobj=(KML_Object*)new KML_Polygon();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<MultiGeometry",14)) {
+                kobj=(KML_Object*)new KML_MultiGeometry();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+//      else if (!strncmp(kstr,"<IconStyle",10)) {
+//              kobj=(KML_Object*)new KML_IconStyle();
+//              kobj->Read(fid,kstr);
+//              unknwn    ->AddObject((Object*)kobj);
+//      }
+
+//      else if (!strncmp(kstr,"<LabelStyle",11)) {
+//              kobj=(KML_Object*)new KML_LabelStyle();
+//              kobj->Read(fid,kstr);
+//              unknwn    ->AddObject((Object*)kobj);
+//      }
+
+        else if (!strncmp(kstr,"<LineStyle",10)) {
+                kobj=(KML_Object*)new KML_LineStyle();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+        else if (!strncmp(kstr,"<PolyStyle",10)) {
+                kobj=(KML_Object*)new KML_PolyStyle();
+                kobj->Read(fid,kstr);
+                unknwn    ->AddObject((Object*)kobj);
+        }
+
+//      else if (!strncmp(kstr,"<BalloonStyle",13)) {
+//              kobj=(KML_Object*)new KML_BalloonStyle();
+//              kobj->Read(fid,kstr);
+//              unknwn    ->AddObject((Object*)kobj);
+//      }
+
+//      else if (!strncmp(kstr,"<ListStyle",10)) {
+//              kobj=(KML_Object*)new KML_ListStyle();
+//              kobj->Read(fid,kstr);
+//              unknwn    ->AddObject((Object*)kobj);
+//      }
+
         else if (!strncmp(kstr,"<",1)) {
                 _printf_(true,"KML_Object::Read -- Unrecognized opening tag %s.\n",kstr);