[Marble-commits] KDE/kdeedu/marble

[Thibaut Gridel]

SVN commit 1189795 by tgridel:

Make KMLTest pass again.
BUG: 202781

 M  +7 -0      src/lib/geodata/data/GeoDataPlacemark.cpp  
 M  +1 -1      tests/CMakeLists.txt  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataPlacemark.cpp #1189794:1189795
@@ -177,8 +177,15 @@
     stream << p()->m_countrycode;
     stream << p()->m_area;
     stream << p()->m_population;
+    if ( p()->m_geometry )
+    {
     stream << p()->m_geometry->geometryId();
     p()->m_geometry->pack( stream );
+    }
+    else
+    {
+        stream << InvalidGeometryId;
+    }
     p()->m_coordinate.pack( stream );
 }
 
--- trunk/KDE/kdeedu/marble/tests/CMakeLists.txt #1189794:1189795
@@ -111,7 +111,7 @@
 marble_add_test( MarbleWidgetTest )
 marble_add_test( TestGeoPainter )
 marble_add_test( TestGeoData ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/geodata/parser/GeoDataTypes.cpp )
-add_definitions( -DCITIES_PATH="\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../data/placemarks/cityplacemarks.kml\\\"" )
+add_definitions( -DCITIES_PATH="\\\"${CMAKE_CURRENT_SOURCE_DIR}/../data/placemarks/cityplacemarks.kml\\\"" )
 marble_add_test( KMLTest )
 
 # marble_add_test( TestOsmAnnotation )