Changeset 2286

Timestamp:

03/08/10 10:52:16 (5 months ago)

Author:

gm78

Message:

In order for a KML feature to be visible, the visibility tag of all its ancestors must be also visible. Fixed the Visible property for KML data sets.

Location:

FalconView/trunk/public/fvw_core/GeodataDataSources

Files:

• KMLNetworkLinkResource.cpp (modified) (1 diff)
• LibkmlGroundOverlay.cpp (modified) (1 diff)
• LibkmlNetworkLink.cpp (modified) (1 diff)
• LibkmlScreenOverlay.cpp (modified) (1 diff)
• UtilityMethods.cpp (modified) (1 diff)
• UtilityMethods.h (modified) (1 diff)

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

@@ -33 +33 @@
       return NULL;
 
-   if (m_wrappedDataSource == NULL)
+   if (m_wrappedDataSource == NULL && m_kmlFile != NULL)
    {
       // populate the data source from the URL

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

@@ -327 +327 @@
 STDMETHODIMP CLibkmlGroundOverlay::get_Visible(VARIANT_BOOL *visible)
 {
-   *visible = m_ground_overlay->has_visibility() ? (m_ground_overlay->get_visibility() ? VARIANT_TRUE : VARIANT_FALSE) : VARIANT_TRUE;
+   *visible = CUtilityMethods::KMLFeatureVisible(m_ground_overlay) ? VARIANT_TRUE : VARIANT_FALSE;
    return S_OK;
 }

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

@@ -379 +379 @@
 {
    // note that we base the visibility on the properties of the network link, not the wrapped object
-   *visible = m_networkLink->has_visibility() ? (m_networkLink->get_visibility() ? VARIANT_TRUE : VARIANT_FALSE) : VARIANT_TRUE;
+   *visible = CUtilityMethods::KMLFeatureVisible(m_networkLink) ? VARIANT_TRUE : VARIANT_FALSE;
    return S_OK;
 }

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

@@ -268 +268 @@
 STDMETHODIMP CLibkmlScreenOverlay::get_Visible(VARIANT_BOOL *visible)
 {
-   *visible = m_screen_overlay->has_visibility() ? (m_screen_overlay->get_visibility() ? VARIANT_TRUE : VARIANT_FALSE) : VARIANT_TRUE;
+   *visible = CUtilityMethods::KMLFeatureVisible(m_screen_overlay) ? VARIANT_TRUE : VARIANT_FALSE;
    return S_OK;
 }

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

@@ -704 +704 @@
 
    return true; // returns true if no region, or region is active
+}
+
+/* static */ bool CUtilityMethods::KMLFeatureVisible(const kmldom::FeaturePtr& feature)
+{
+   if (feature == NULL)
+      return true;
+
+   // In order for a feature to be visible, the <visibility> tag of all its ancestors must also be set to 1
+   if (feature->has_visibility() && feature->get_visibility() == true)
+      return KMLFeatureVisible(kmldom::AsFeature(GetAncestorOfType(feature, kmldom::Type_Feature)));
+
+   return false;
 }
 

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

@@ -109 +109 @@
       DOUBLE degreesPerPixelX, DOUBLE degreesPerPixelY); // use negative number if dpp is not set)
 
+   static bool KMLFeatureVisible(const kmldom::FeaturePtr& feature);
+
    static std::string ResolveURI(const char* base_url, const char* uri);
    static void Create32BppBitmap(VARIANT* imageData, int width, int height);