Changeset 2316

Timestamp:

03/10/10 12:31:39 (5 months ago)

Author:

JO94

Message:

fixed loading of data from KMZ retrieved within network links

Location:

FalconView/trunk/public/fvw_core/GeodataDataSources

Files:

• KMLNetworkLinkResource.cpp (modified) (3 diffs)
• KMLNetworkLinkResource.h (modified) (3 diffs)
• LibkmlDataSource.cpp (modified) (1 diff)
• LibkmlDataSource.h (modified) (1 diff)

FalconView/trunk/public/fvw_core/GeodataDataSources/KMLNetworkLinkResource.cpp

@@ +1 @@
+// Copyright (c) 1994-2010 Georgia Tech Research Corporation, Atlanta, GA
+// This file is part of FalconView(tm).
+
+// FalconView(tm) is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// FalconView(tm) is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public License
+// along with FalconView(tm).  If not, see <http://www.gnu.org/licenses/>.
+
+// FalconView(tm) is a trademark of Georgia Tech Research Corporation.
+
 // KMLNetworkLinkResource.cpp
 //
@@ -26 +44 @@
    std::string errors;
    m_kmlFile = kmlengine::KmlFile::CreateFromParse(kml_data, &errors);
+   if (kmlengine::KmzFile::IsKmz(kml_data))
+      m_kmz_file = kmlengine::KmzFile::OpenFromString(kml_data);
 
    __super::Load();
@@ -43 +63 @@
       CLibkmlDataSource* ds = (CLibkmlDataSource*)CInternalObjectRegistry::GetObject(handle);
 
-      ds->SetKmlFilePath(ResolvedUri());
-
+      ds->SetKmlFilePathAndKmzFile(ResolvedUri(), m_kmz_file);
       ds->WrapKMLFile(m_kmlFile);
 

FalconView/trunk/public/fvw_core/GeodataDataSources/KMLNetworkLinkResource.h

@@ +1 @@
+// Copyright (c) 1994-2010 Georgia Tech Research Corporation, Atlanta, GA
+// This file is part of FalconView(tm).
+
+// FalconView(tm) is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// FalconView(tm) is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public License
+// along with FalconView(tm).  If not, see <http://www.gnu.org/licenses/>.
+
+// FalconView(tm) is a trademark of Georgia Tech Research Corporation.
+
 // KMLNetworkLinkResource.h
 //
@@ -5 +23 @@
 
 #include "KMLResource.h"
-#include "kml/engine/kml_file.h"
+#include "kml/dom.h"
+#include "kml/engine.h"
 
 class CLibkmlNetworkLink;
@@ -13 +32 @@
    CLibkmlNetworkLink *m_pParentNetworkLink;
    kmlengine::KmlFilePtr m_kmlFile;
+   kmlengine::KmzFilePtr m_kmz_file;
    IFvDataSourcePtr m_wrappedDataSource;
 

FalconView/trunk/public/fvw_core/GeodataDataSources/LibkmlDataSource.cpp

@@ -375 +375 @@
       return;
    }
+
    if (m_kmz_file && !CUtilityMethods::LooksLikeHttp(path))
    {

FalconView/trunk/public/fvw_core/GeodataDataSources/LibkmlDataSource.h

@@ -138 +138 @@
    void WrapKMLFile(const kmlengine::KmlFilePtr& kml_file);
 
-   void SetKmlFilePath(const std::string& path) { m_kml_file_path = path; }
+   void SetKmlFilePathAndKmzFile(const std::string& path, kmlengine::KmzFilePtr kmz_file)
+   {
+      m_kml_file_path = path;
+      m_kmz_file = kmz_file;
+   }
 
    // ILibkmlDataSource Methods