[Marble-commits] KDE/kdeedu/marble/src

[Andrew Manson]

SVN commit 996008 by mansona:

working on the GeoGraphicsItem implementation of the Osm GeoParser


 M  +0 -2      lib/geodata/CMakeLists.txt  
 D             lib/geodata/handlers/osm (directory)  
 M  +4 -1      plugins/render/osmannotate/CMakeLists.txt  
 AM            plugins/render/osmannotate/osm (directory)   lib/geodata/handlers/osm#995946
 A             plugins/render/osmannotate/osm/OsmBoundsGraphicsItem.cpp   [License: LGPL]
 A             plugins/render/osmannotate/osm/OsmBoundsGraphicsItem.h   [License: LGPL]
 M  +10 -4     plugins/render/osmannotate/osm/OsmBoundsTagHandler.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/CMakeLists.txt #996007:996008
@@ -8,7 +8,6 @@
 FILE( GLOB geodata_scene_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} geodata/scene/*.cpp )
 FILE( GLOB geodata_handlers_dgml_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} geodata/handlers/dgml/*.cpp )
 FILE( GLOB geodata_handlers_kml_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} geodata/handlers/kml/*.cpp )
-FILE( GLOB geodata_handlers_osm_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} geodata/handlers/osm/*.cpp )
 
 FILE( GLOB geodata_data_HDRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} geodata/data/*.h )
 
@@ -42,7 +41,6 @@
         ${geodata_parser_SRCS}
         ${geodata_handlers_gpx_SRCS}
         ${geodata_handlers_kml_SRCS}
-        ${geodata_handlers_osm_SRCS}
         ${geodata_handlers_dgml_SRCS}
         ${geodata_handlers_osmnamefinder_SRCS}
    )
--- trunk/KDE/kdeedu/marble/src/plugins/render/osmannotate/CMakeLists.txt #996007:996008
@@ -7,12 +7,15 @@
 )
 INCLUDE(${QT_USE_FILE})
 
+FILE( GLOB geodata_handlers_osm_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} osm/*.cpp )
+
 set( osmannotate_SRCS
         OsmAnnotatePlugin.cpp
         TmpGraphicsItem.cpp
         TextAnnotation.cpp
         AreaAnnotation.cpp
         GeoWidgetBubble.cpp
-        TextEditor.cpp )
+        TextEditor.cpp
+        ${geodata_handlers_osm_SRCS} )
 
 marble_add_plugin( OsmAnnotatePlugin ${osmannotate_SRCS} )
** trunk/KDE/kdeedu/marble/src/plugins/render/osmannotate/osm #property svn:mergeinfo
   + 
--- trunk/KDE/kdeedu/marble/src/plugins/render/osmannotate/osm/OsmBoundsTagHandler.cpp #995946:996008
@@ -14,6 +14,7 @@
 #include "GeoDataLineString.h"
 #include "GeoDataParser.h"
 #include "GeoDataPlacemark.h"
+#include "OsmBoundsGraphicsItem.h"
 #include "OsmElementDictionary.h"
 
 namespace Marble
@@ -38,15 +39,18 @@
 
     GeoDataCoordinates topLeft( minlon, minlat, 0, GeoDataCoordinates::Degree );
     GeoDataCoordinates topRight( maxlon, minlat, 0 , GeoDataCoordinates::Degree );
-    GeoDataCoordinates botLeft( minlon, maxlat, 0 , GeoDataCoordinates::Degree );
-    GeoDataCoordinates botRight( maxlon, maxlat, 0 , GeoDataCoordinates::Degree );
+    GeoDataCoordinates bottomLeft( minlon, maxlat, 0 , GeoDataCoordinates::Degree );
+    GeoDataCoordinates bottomRight( maxlon, maxlat, 0 , GeoDataCoordinates::Degree );
 
     bound.append( topLeft );
     bound.append( topRight );
-    bound.append( botRight );
-    bound.append( botLeft );
+    bound.append( bottomRight );
+    bound.append( bottomLeft );
 
     QList<GeoGraphicsItem*>* model = parser.activeModel();
+
+
+    OsmBoundsGraphicsItem* item = new OsmBoundsGraphicsItem(bound);
 //
 //    GeoDataPlacemark* place = new GeoDataPlacemark;
 //
@@ -56,6 +60,8 @@
 //
 //    model->append( dynamic_cast<GeoGraphicsItem*>( place ) );
 
+    model->append( item );
+
     return 0;
 
 }