Revision 86ab79a...

Go back to digest for 11th November 2012

Features in Educational

Dennis Nienhüser committed changes in [marble] /:

New dgml tag <vectortile>, with its parser and new GeoScenes

For GSoC 2012 vector tile rendering, a new tag <vectortile> has been
created for the dgml format and the handler for it in the dgml parser.
In te begining it was thought to call it <vectorTile> as some composed
words tags have also camel casing. But through the code this tile is
compared with the backend=vectortile .tolower() tag and it didn't match
vectortile != vectorTile. So for consistency the tag will be

Now that there are two possible tiled layers (Image tile layers with
<texture> tag and Vector tile layers with <vectortile> tag)
GeoSceneTexture has been turned to GeoSceneTextureTile which extends a
GeoSceneTiled abstract class. Also a GeoSceneVectorTile class has been

GeoSceneTiled stores all the common data for layers containing tiles
and then GeoSceneTextureTile and GeoSceneVectorTile can manage specific
data related to them. Currently booth have the same dgml structure so
this two classes have no specific attribute but they are needed
afterwards for MarbleMap to know if its a VectorTile or a ImageTile

REVIEW: 106009

File Changes

Added 6 files
  • /lib/geodata
  •   src/scene/GeoSceneTextureTile.cpp
  •   src/scene/GeoSceneTextureTile.h
  •   src/scene/GeoSceneVectorTile.cpp
  •   src/scene/GeoSceneVectorTile.h
  •   src/handlers/dgml/DgmlVectortileTagHandler.cpp
  •   src/handlers/dgml/DgmlVectortileTagHandler.h
Modified 35 files
  •   tests/TestGeoSceneWriter.cpp
  •   src/lib/DownloadRegion.cpp
  •   src/lib/ElevationModel.cpp
  •   src/lib/MapWizard.cpp
  •   src/lib/MarbleMap.cpp
  •   src/lib/MarbleModel.cpp
  •   src/lib/MergedLayerDecorator.cpp
  •   src/lib/MergedLayerDecorator.h
  •   src/lib/ScanlineTextureMapperContext.h
  •   src/lib/ServerLayout.cpp
  •   src/lib/ServerLayout.h
  •   src/lib/StackedTileLoader.cpp
  •   src/lib/StackedTileLoader.h
  •   src/lib/TileLoader.cpp
  •   src/lib/TileLoader.h
  •   src/tilecreator/CMakeLists.txt
  •   src/lib/layers/TextureLayer.cpp
  •   src/lib/layers/TextureLayer.h
  •   src/lib/geodata/parser/GeoSceneTypes.cpp
  •   src/lib/geodata/parser/GeoSceneTypes.h
  •   src/lib/geodata/handlers/dgml/DgmlAuxillaryDictionary.cpp
  •   src/lib/geodata/handlers/dgml/DgmlAuxillaryDictionary.h
  •   src/lib/geodata/handlers/dgml/DgmlBlendingTagHandler.cpp
  •   src/lib/geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.cpp
  •   src/lib/geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp
  •   src/lib/geodata/handlers/dgml/DgmlElementDictionary.cpp
  •   src/lib/geodata/handlers/dgml/DgmlElementDictionary.h
  •   src/lib/geodata/handlers/dgml/DgmlInstallMapTagHandler.cpp
  •   src/lib/geodata/handlers/dgml/DgmlProjectionTagHandler.cpp
  •   src/lib/geodata/handlers/dgml/DgmlSourceDirTagHandler.cpp
  •   src/lib/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.cpp
  •   src/lib/geodata/handlers/dgml/DgmlTextureTagHandler.cpp
  •   src/lib/geodata/handlers/dgml/DgmlTileSizeTagHandler.cpp
  •   src/lib/geodata/handlers/dgml/DgmlVisibleTagHandler.cpp
  •   src/lib/geodata/writers/dgml/DgmlTextureTagWriter.cpp
41 files changed in total