Changeset 2278

Timestamp:

03/05/10 13:52:02 (5 months ago)

Author:

JO94

Message:

fixed KML polygon fills

Location:

FalconView/trunk/public/fvw_core

Files:

• GeodataDataSources/LibkmlPlacemark.cpp (modified) (4 diffs)
• GeodataRenderers/DefaultRenderer.cs (modified) (1 diff)

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

@@ -221 +221 @@
    if (m_placemark->has_extendeddata())
    {
-       kmldom::ExtendedDataPtr extendedData = m_placemark->get_extendeddata();
-        for (size_t i=0; i<extendedData->get_data_array_size(); i++)
-        {
-            kmldom::DataPtr data = extendedData->get_data_array_at(i);
-            if ((data->has_name()) && (data->has_value()))
-            {
-                FieldMember* newField = new FieldMember((PCHAR)data->get_name().c_str(), (PCHAR)data->get_value().c_str());
-                fields.push_back(newField);
-            }
-        }
+      kmldom::ExtendedDataPtr extendedData = m_placemark->get_extendeddata();
+      for (size_t i=0; i<extendedData->get_data_array_size(); i++)
+      {
+         kmldom::DataPtr data = extendedData->get_data_array_at(i);
+         if ((data->has_name()) && (data->has_value()))
+         {
+            FieldMember* newField = new FieldMember((PCHAR)data->get_name().c_str(), (PCHAR)data->get_value().c_str());
+            fields.push_back(newField);
+         }
+      }
    }
 
@@ -283 +283 @@
          }
 
-         if (iconStyle->has_scale())
+         if (iconStyle->has_scale())
          {
             double scale = iconStyle->get_scale();
@@ -313 +313 @@
       {
          kmldom::LineStylePtr lineStyle = style->get_linestyle();
-         
+
          if (lineStyle->has_color())
          {
@@ -328 +328 @@
       }
 
-      //POLYSTYLES
-      if( style->has_polystyle())
-      {
-          kmldom::PolyStylePtr polyStyle = style->get_polystyle();
-
-          if( polyStyle->has_color())
-          {
+      //POLYSTYLES
+      if( style->has_polystyle())
+      {
+         kmldom::PolyStylePtr polyStyle = style->get_polystyle();
+
+         if( polyStyle->has_color())
+         {
             kmlbase::Color32 color = polyStyle->get_color();
             FieldMember* newField = new FieldMember("style_fill_color", (LONG)color.get_color_argb());
             fields.push_back(newField);
-          }
-
-          if( polyStyle->has_colormode())
-          {
-              FieldMember* newField = new FieldMember("style_colormode", (LONG)polyStyle->get_colormode());
-              fields.push_back(newField);
-          }
-
-          if( polyStyle->has_fill())
-          {
-              FieldMember* newField = new FieldMember("style_fill", (LONG)(polyStyle->get_fill()? 1:0));
-              fields.push_back(newField);
-          }
-
-          if( polyStyle->has_outline())
-          {
-              FieldMember* newField = new FieldMember("style_outline", (LONG)(polyStyle->get_outline()? 1:0));
-              fields.push_back(newField);
-          }
-      }
-
-     //BALLOON TEXT
-     if (style->has_balloonstyle())
-     {
-        kmldom::BalloonStylePtr balloonStyle = style->get_balloonstyle();
-        if (balloonStyle->has_text())
-        {
-           FieldMember* newField = new FieldMember("balloon_style_text", (PCHAR)balloonStyle->get_text().c_str());
-           fields.push_back(newField);
-        }
-     }
-   }
-}
+         }
+
+         if( polyStyle->has_colormode())
+         {
+            FieldMember* newField = new FieldMember("style_colormode", (LONG)polyStyle->get_colormode());
+            fields.push_back(newField);
+         }
+
+         // by default, KML styles without a <fill> tag are to be filled
+         FieldMember* newField = new FieldMember("style_fill", (LONG)(!polyStyle->has_fill() || polyStyle->get_fill() ? 1 : 0));
+         fields.push_back(newField);
+
+         if( polyStyle->has_outline())
+         {
+            FieldMember* newField = new FieldMember("style_outline", (LONG)(polyStyle->get_outline()? 1:0));
+            fields.push_back(newField);
+         }
+      }
+
+      //BALLOON TEXT
+      if (style->has_balloonstyle())
+      {
+         kmldom::BalloonStylePtr balloonStyle = style->get_balloonstyle();
+         if (balloonStyle->has_text())
+         {
+            FieldMember* newField = new FieldMember("balloon_style_text", (PCHAR)balloonStyle->get_text().c_str());
+            fields.push_back(newField);
+         }
+      }
+   }
+}

FalconView/trunk/public/fvw_core/GeodataRenderers/DefaultRenderer.cs

@@ -297 +297 @@
                      if (feature.GetFieldType(i) == FeatureFieldTypes.FIELD_TYPE_LONG)
                      {
-                        m_polygonSettings.fill = (int)feature.GetFieldValue(i) != 0;
+                        m_polygonSettings.outline = (int)feature.GetFieldValue(i) != 0;
                      }
                      break;