diff --git a/src/lib/marble/geodata/CMakeLists.txt b/src/lib/marble/geodata/CMakeLists.txt index add79b2c6..3ffe99b1f 100644 --- a/src/lib/marble/geodata/CMakeLists.txt +++ b/src/lib/marble/geodata/CMakeLists.txt @@ -1,496 +1,497 @@ SET ( geodata_data_SRCS geodata/data/LonLatParser.cpp geodata/data/GeoDataRegion.cpp geodata/data/GeoDataUpdate.cpp geodata/data/GeoDataViewVolume.cpp geodata/data/GeoDataHotSpot.cpp geodata/data/GeoDataAlias.cpp geodata/data/GeoDataImagePyramid.cpp geodata/data/GeoDataGeometry.cpp geodata/data/GeoDataPoint.cpp geodata/data/GeoDataPhotoOverlay.cpp geodata/data/GeoDataTimePrimitive.cpp geodata/data/GeoDataVec2.cpp geodata/data/GeoDataBalloonStyle.cpp geodata/data/GeoDataNetworkLink.cpp geodata/data/GeoDataLineStyle.cpp geodata/data/GeoDataScreenOverlay.cpp geodata/data/GeoDataContainer.cpp geodata/data/GeoDataItemIcon.cpp geodata/data/GeoDataTour.cpp geodata/data/GeoDataOverlay.cpp geodata/data/GeoDataListStyle.cpp geodata/data/GeoDataFlyTo.cpp geodata/data/GeoDataMultiTrack.cpp geodata/data/GeoDataSnippet.cpp geodata/data/GeoDataStyle.cpp geodata/data/GeoDataLinearRing.cpp geodata/data/GeoDataFolder.cpp geodata/data/GeoDataDocument.cpp geodata/data/GeoDataLatLonAltBox.cpp geodata/data/GeoDataStyleSelector.cpp geodata/data/GeoDataLod.cpp geodata/data/GeoDataColorStyle.cpp geodata/data/GeoDataData.cpp geodata/data/GeoDataLocation.cpp geodata/data/GeoDataPolygon.cpp geodata/data/GeoDataLineString.cpp geodata/data/GeoDataOrientation.cpp geodata/data/GeoDataLookAt.cpp geodata/data/GeoDataPlacemark.cpp geodata/data/GeoDataPlaylist.cpp geodata/data/GeoDataPolyStyle.cpp geodata/data/GeoDataModel.cpp geodata/data/GeoDataLink.cpp geodata/data/GeoDataIconStyle.cpp geodata/data/GeoDataAbstractView.cpp geodata/data/GeoDataStyleMap.cpp geodata/data/GeoDataExtendedData.cpp geodata/data/GeoDataLabelStyle.cpp geodata/data/GeoDataTimeSpan.cpp geodata/data/GeoDataMultiGeometry.cpp geodata/data/GeoDataSimpleArrayData.cpp geodata/data/GeoDataObject.cpp geodata/data/GeoDataLatLonQuad.cpp geodata/data/GeoDataCoordinates.cpp geodata/data/GeoDataTrack.cpp geodata/data/GeoDataNetworkLinkControl.cpp geodata/data/GeoDataFeature.cpp geodata/data/GeoDataCamera.cpp geodata/data/GeoDataTimeStamp.cpp geodata/data/GeoDataGroundOverlay.cpp geodata/data/GeoDataLatLonBox.cpp geodata/data/GeoDataScale.cpp geodata/data/GeoDataResourceMap.cpp geodata/data/GeoDataTourControl.cpp geodata/data/GeoDataAccuracy.cpp geodata/data/GeoDataWait.cpp geodata/data/GeoDataSoundCue.cpp geodata/data/GeoDataAnimatedUpdate.cpp geodata/data/GeoDataSchema.cpp geodata/data/GeoDataSimpleField.cpp geodata/data/GeoDataChange.cpp geodata/data/GeoDataCreate.cpp geodata/data/GeoDataDelete.cpp geodata/data/GeoDataSchemaData.cpp geodata/data/GeoDataSimpleData.cpp ) SET ( geodata_scene_SRCS geodata/scene/GeoSceneAbstractTileProjection.cpp geodata/scene/GeoSceneMercatorTileProjection.cpp geodata/scene/GeoSceneEquirectTileProjection.cpp geodata/scene/GeoSceneIcon.cpp geodata/scene/GeoSceneTileDataset.cpp geodata/scene/GeoSceneVectorTileDataset.cpp geodata/scene/GeoSceneGeodata.cpp geodata/scene/GeoSceneGroup.cpp geodata/scene/GeoSceneZoom.cpp geodata/scene/GeoSceneLegend.cpp geodata/scene/GeoSceneTextureTileDataset.cpp geodata/scene/GeoSceneAbstractDataset.cpp geodata/scene/GeoSceneItem.cpp geodata/scene/GeoSceneLicense.cpp geodata/scene/GeoSceneSection.cpp geodata/scene/GeoSceneFilter.cpp geodata/scene/GeoSceneHead.cpp geodata/scene/GeoSceneVector.cpp geodata/scene/GeoSceneSettings.cpp geodata/scene/GeoSceneDocument.cpp geodata/scene/GeoSceneMap.cpp geodata/scene/GeoSceneProperty.cpp geodata/scene/GeoSceneLayer.cpp geodata/scene/GeoScenePalette.cpp ) # handlers and writers sources SET ( geodata_handlers_dgml_SRCS geodata/handlers/dgml/DgmlFilterTagHandler.h geodata/handlers/dgml/DgmlHeadingTagHandler.h geodata/handlers/dgml/DgmlDocumentTagHandler.cpp geodata/handlers/dgml/DgmlMinimumTagHandler.cpp geodata/handlers/dgml/DgmlHeadTagHandler.h geodata/handlers/dgml/DgmlLayerTagHandler.cpp geodata/handlers/dgml/DgmlMinimumTagHandler.h geodata/handlers/dgml/DgmlTargetTagHandler.cpp geodata/handlers/dgml/DgmlSourceFileTagHandler.h geodata/handlers/dgml/DgmlSourceFileTagHandler.cpp geodata/handlers/dgml/DgmlGeodataTagHandler.h geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.h geodata/handlers/dgml/DgmlProjectionTagHandler.cpp geodata/handlers/dgml/DgmlLegendTagHandler.cpp geodata/handlers/dgml/DgmlTargetTagHandler.h geodata/handlers/dgml/DgmlAuxillaryDictionary.cpp geodata/handlers/dgml/DgmlGeodataTagHandler.cpp geodata/handlers/dgml/DgmlBlendingTagHandler.h geodata/handlers/dgml/DgmlSourceDirTagHandler.cpp geodata/handlers/dgml/DgmlValueTagHandler.h geodata/handlers/dgml/DgmlMapTagHandler.h geodata/handlers/dgml/DgmlPropertyTagHandler.h geodata/handlers/dgml/DgmlAttributeDictionary.h geodata/handlers/dgml/DgmlThemeTagHandler.cpp geodata/handlers/dgml/DgmlInstallMapTagHandler.h geodata/handlers/dgml/DgmlPropertyTagHandler.cpp geodata/handlers/dgml/DgmlAvailableTagHandler.h geodata/handlers/dgml/DgmlMaximumTagHandler.h geodata/handlers/dgml/DgmlHeadTagHandler.cpp geodata/handlers/dgml/DgmlLegendTagHandler.h geodata/handlers/dgml/DgmlProjectionTagHandler.h geodata/handlers/dgml/DgmlAttributeDictionary.cpp geodata/handlers/dgml/DgmlInstallMapTagHandler.cpp geodata/handlers/dgml/DgmlVectorTagHandler.h geodata/handlers/dgml/DgmlDiscreteTagHandler.cpp geodata/handlers/dgml/DgmlNameTagHandler.cpp geodata/handlers/dgml/DgmlLicenseTagHandler.h geodata/handlers/dgml/DgmlAvailableTagHandler.cpp geodata/handlers/dgml/DgmlStorageLayoutTagHandler.h geodata/handlers/dgml/DgmlThemeTagHandler.h geodata/handlers/dgml/DgmlSettingsTagHandler.h geodata/handlers/dgml/DgmlDescriptionTagHandler.h geodata/handlers/dgml/DgmlBrushTagHandler.cpp geodata/handlers/dgml/DgmlSectionTagHandler.h geodata/handlers/dgml/DgmlTextureTagHandler.h geodata/handlers/dgml/DgmlDownloadUrlTagHandler.cpp geodata/handlers/dgml/DgmlBlendingTagHandler.cpp geodata/handlers/dgml/DgmlBrushTagHandler.h geodata/handlers/dgml/DgmlZoomTagHandler.h geodata/handlers/dgml/DgmlVectorTagHandler.cpp geodata/handlers/dgml/DgmlDiscreteTagHandler.h geodata/handlers/dgml/DgmlMapTagHandler.cpp geodata/handlers/dgml/DgmlVectortileTagHandler.cpp geodata/handlers/dgml/DgmlVisibleTagHandler.cpp geodata/handlers/dgml/DgmlHeadingTagHandler.cpp geodata/handlers/dgml/DgmlTileSizeTagHandler.h geodata/handlers/dgml/DgmlPenTagHandler.h geodata/handlers/dgml/DgmlZoomTagHandler.cpp geodata/handlers/dgml/DgmlTileSizeTagHandler.cpp geodata/handlers/dgml/DgmlTextureTagHandler.cpp geodata/handlers/dgml/DgmlPenTagHandler.cpp geodata/handlers/dgml/DgmlDescriptionTagHandler.cpp geodata/handlers/dgml/DgmlElementDictionary.h geodata/handlers/dgml/DgmlIconTagHandler.cpp geodata/handlers/dgml/DgmlValueTagHandler.cpp geodata/handlers/dgml/DgmlLicenseTagHandler.cpp geodata/handlers/dgml/DgmlTextTagHandler.cpp geodata/handlers/dgml/DgmlMaximumTagHandler.cpp geodata/handlers/dgml/DgmlPaletteTagHandler.cpp geodata/handlers/dgml/DgmlGroupTagHandler.cpp geodata/handlers/dgml/DgmlDownloadUrlTagHandler.h geodata/handlers/dgml/DgmlItemTagHandler.h geodata/handlers/dgml/DgmlSourceDirTagHandler.h geodata/handlers/dgml/DgmlGroupTagHandler.h geodata/handlers/dgml/DgmlStorageLayoutTagHandler.cpp geodata/handlers/dgml/DgmlTextTagHandler.h geodata/handlers/dgml/DgmlFilterTagHandler.cpp geodata/handlers/dgml/DgmlVisibleTagHandler.h geodata/handlers/dgml/DgmlSectionTagHandler.cpp geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.cpp geodata/handlers/dgml/DgmlIconTagHandler.h geodata/handlers/dgml/DgmlNameTagHandler.h geodata/handlers/dgml/DgmlDocumentTagHandler.h geodata/handlers/dgml/DgmlPaletteTagHandler.h geodata/handlers/dgml/DgmlVectortileTagHandler.h geodata/handlers/dgml/DgmlElementDictionary.cpp geodata/handlers/dgml/DgmlItemTagHandler.cpp geodata/handlers/dgml/DgmlSettingsTagHandler.cpp geodata/handlers/dgml/DgmlAuxillaryDictionary.h geodata/handlers/dgml/DgmlLayerTagHandler.h geodata/handlers/dgml/DgmlRenderOrderTagHandler.cpp geodata/handlers/dgml/DgmlRenderOrderTagHandler.h ) SET ( geodata_writers_dgml_SRCS geodata/writers/dgml/DgmlSectionTagWriter.h geodata/writers/dgml/DgmlSettingsTagWriter.cpp geodata/writers/dgml/DgmlTagWriter.h geodata/writers/dgml/DgmlItemTagWriter.h geodata/writers/dgml/DgmlSettingsTagWriter.h geodata/writers/dgml/DgmlMapTagWriter.cpp geodata/writers/dgml/DgmlSectionTagWriter.cpp geodata/writers/dgml/DgmlGeodataTagWriter.h geodata/writers/dgml/DgmlVectorTagWriter.h geodata/writers/dgml/DgmlGeodataTagWriter.cpp geodata/writers/dgml/DgmlLayerTagWriter.cpp geodata/writers/dgml/DgmlDocumentTagWriter.cpp geodata/writers/dgml/DgmlTextureTagWriter.h geodata/writers/dgml/DgmlMapTagWriter.h geodata/writers/dgml/DgmlVectorTagWriter.cpp geodata/writers/dgml/DgmlDocumentTagWriter.h geodata/writers/dgml/DgmlHeadTagWriter.cpp geodata/writers/dgml/DgmlLegendTagWriter.cpp geodata/writers/dgml/DgmlLegendTagWriter.h geodata/writers/dgml/DgmlHeadTagWriter.h geodata/writers/dgml/DgmlTextureTagWriter.cpp geodata/writers/dgml/DgmlTagWriter.cpp geodata/writers/dgml/DgmlLayerTagWriter.h geodata/writers/dgml/DgmlItemTagWriter.cpp ) SET( geodata_graphicsitem_SRCS geodata/graphicsitem/GeoLineStringGraphicsItem.cpp geodata/graphicsitem/GeoPhotoGraphicsItem.cpp geodata/graphicsitem/GeoPointGraphicsItem.cpp geodata/graphicsitem/GeoPolygonGraphicsItem.cpp geodata/graphicsitem/AbstractGeoPolygonGraphicsItem.cpp geodata/graphicsitem/BuildingGeoPolygonGraphicsItem.cpp geodata/graphicsitem/GeoTrackGraphicsItem.cpp geodata/graphicsitem/ScreenOverlayGraphicsItem.cpp ) SET ( geodata_handlers_kml_SRCS geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp geodata/handlers/kml/KmlAltitudeTagHandler.cpp geodata/handlers/kml/KmlAnimatedUpdateTagHandler.cpp geodata/handlers/kml/KmlAreaTagHandler.cpp geodata/handlers/kml/KmlBalloonStyleTagHandler.cpp geodata/handlers/kml/KmlBeginTagHandler.cpp geodata/handlers/kml/KmlBgColorTagHandler.cpp geodata/handlers/kml/KmlCameraTagHandler.cpp geodata/handlers/kml/KmlChangeTagHandler.cpp geodata/handlers/kml/KmlColorModeTagHandler.cpp geodata/handlers/kml/KmlColorTagHandler.cpp geodata/handlers/kml/KmlCoordinatesTagHandler.cpp geodata/handlers/kml/KmlCountrycodeTagHandler.cpp geodata/handlers/kml/KmlCountryNameCodeTagHandler.cpp geodata/handlers/kml/KmlDataTagHandler.cpp geodata/handlers/kml/KmlDescriptionTagHandler.cpp geodata/handlers/kml/KmlDisplayModeTagHandler.cpp geodata/handlers/kml/KmlDisplayNameTagHandler.cpp geodata/handlers/kml/KmlDocumentTagHandler.cpp geodata/handlers/kml/KmlDurationTagHandler.cpp geodata/handlers/kml/KmldrawOrderTagHandler.cpp geodata/handlers/kml/KmlEastTagHandler.cpp geodata/handlers/kml/KmlElementDictionary.cpp geodata/handlers/kml/KmlEndTagHandler.cpp geodata/handlers/kml/KmlExtendedDataTagHandler.cpp geodata/handlers/kml/KmlExtrudeTagHandler.cpp geodata/handlers/kml/KmlFillTagHandler.cpp geodata/handlers/kml/KmlFlyToModeTagHandler.cpp geodata/handlers/kml/KmlFlyToTagHandler.cpp geodata/handlers/kml/KmlFlyToViewTagHandler.cpp geodata/handlers/kml/KmlFolderTagHandler.cpp geodata/handlers/kml/KmlGroundOverlayTagHandler.cpp geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp geodata/handlers/kml/KmlGxTimeSpanTagHandler.cpp geodata/handlers/kml/KmlGxTimeStampTagHandler.cpp geodata/handlers/kml/KmlHeadingTagHandler.cpp geodata/handlers/kml/KmlHotSpotTagHandler.cpp geodata/handlers/kml/KmlHrefTagHandler.cpp geodata/handlers/kml/KmlHttpQueryTagHandler.cpp geodata/handlers/kml/KmlIconStyleTagHandler.cpp geodata/handlers/kml/KmlIconTagHandler.cpp geodata/handlers/kml/KmlInnerBoundaryIsTagHandler.cpp geodata/handlers/kml/KmlItemIconTagHandler.cpp geodata/handlers/kml/KmlKeyTagHandler.cpp geodata/handlers/kml/KmlLabelStyleTagHandler.cpp geodata/handlers/kml/KmlLatitudeTagHandler.cpp geodata/handlers/kml/KmlLatLonAltBoxTagHandler.cpp geodata/handlers/kml/KmlLatLonBoxTagHandler.cpp geodata/handlers/kml/KmlLatLonQuadTagHandler.cpp geodata/handlers/kml/KmlLinearRingTagHandler.cpp geodata/handlers/kml/KmlLineStringTagHandler.cpp geodata/handlers/kml/KmlLineStyleTagHandler.cpp geodata/handlers/kml/KmlLinkTagHandler.cpp geodata/handlers/kml/KmlListItemTypeTagHandler.cpp geodata/handlers/kml/KmlListStyleTagHandler.cpp geodata/handlers/kml/KmlLodTagHandler.cpp geodata/handlers/kml/KmlLongitudeTagHandler.cpp geodata/handlers/kml/KmlLookAtTagHandler.cpp geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp geodata/handlers/kml/KmlMaxAltitudeTagHandler.cpp geodata/handlers/kml/KmlMaxFadeExtentTagHandler.cpp geodata/handlers/kml/KmlMaxLodPixelsTagHandler.cpp geodata/handlers/kml/KmlMinAltitudeTagHandler.cpp geodata/handlers/kml/KmlMinFadeExtentTagHandler.cpp geodata/handlers/kml/KmlMinLodPixelsTagHandler.cpp geodata/handlers/kml/KmlModelTagHandler.cpp geodata/handlers/kml/KmlMultiGeometryTagHandler.cpp geodata/handlers/kml/KmlMultiTrackTagHandler.cpp +geodata/handlers/kml/KmlMxSizeTagHandler.cpp geodata/handlers/kml/KmlNameTagHandler.cpp geodata/handlers/kml/KmlNetworkLinkTagHandler.cpp geodata/handlers/kml/KmlNorthTagHandler.cpp geodata/handlers/kml/KmlObjectTagHandler.cpp geodata/handlers/kml/KmlOpenTagHandler.cpp geodata/handlers/kml/KmlOuterBoundaryIsTagHandler.cpp geodata/handlers/kml/KmlOutlineTagHandler.cpp geodata/handlers/kml/KmlOverlayXYTagHandler.cpp geodata/handlers/kml/KmlPairTagHandler.cpp geodata/handlers/kml/KmlPhotoOverlayTagHandler.cpp geodata/handlers/kml/KmlPlacemarkTagHandler.cpp geodata/handlers/kml/KmlPlaylistTagHandler.cpp geodata/handlers/kml/KmlPointTagHandler.cpp geodata/handlers/kml/KmlPolygonTagHandler.cpp geodata/handlers/kml/KmlPolyStyleTagHandler.cpp geodata/handlers/kml/KmlPopTagHandler.cpp geodata/handlers/kml/KmlRangeTagHandler.cpp geodata/handlers/kml/KmlRefreshIntervalTagHandler.cpp geodata/handlers/kml/KmlRefreshModeTagHandler.cpp geodata/handlers/kml/KmlRefreshVisibilityTagHandler.cpp geodata/handlers/kml/KmlRegionTagHandler.cpp geodata/handlers/kml/KmlRoleTagHandler.cpp geodata/handlers/kml/KmlRollTagHandler.cpp geodata/handlers/kml/KmlRotationTagHandler.cpp geodata/handlers/kml/KmlRotationXYTagHandler.cpp geodata/handlers/kml/Kml_scaleTagHandler.cpp geodata/handlers/kml/KmlSchemaDataTagHandler.cpp geodata/handlers/kml/KmlSchemaTagHandler.cpp geodata/handlers/kml/KmlScreenOverlayTagHandler.cpp geodata/handlers/kml/KmlScreenXYTagHandler.cpp geodata/handlers/kml/KmlSimpleArrayDataTagHandler.cpp geodata/handlers/kml/KmlSimpleDataTagHandler.cpp geodata/handlers/kml/KmlSimpleFieldTagHandler.cpp geodata/handlers/kml/KmlSizeTagHandler.cpp geodata/handlers/kml/KmlSouthTagHandler.cpp geodata/handlers/kml/KmlStateTagHandler.cpp geodata/handlers/kml/KmlStyleMapTagHandler.cpp geodata/handlers/kml/KmlStyleTagHandler.cpp geodata/handlers/kml/KmlStyleUrlTagHandler.cpp geodata/handlers/kml/KmlTessellateTagHandler.cpp geodata/handlers/kml/KmlTextColorTagHandler.cpp geodata/handlers/kml/KmlTextTagHandler.cpp geodata/handlers/kml/KmlTiltTagHandler.cpp geodata/handlers/kml/KmlTimeSpanTagHandler.cpp geodata/handlers/kml/KmlTimeStampTagHandler.cpp geodata/handlers/kml/KmlTourTagHandler.cpp geodata/handlers/kml/KmlTourControlTagHandler.cpp geodata/handlers/kml/KmlTrackTagHandler.cpp geodata/handlers/kml/KmlValueTagHandler.cpp geodata/handlers/kml/KmlViewBoundScaleTagHandler.cpp geodata/handlers/kml/KmlVisibilityTagHandler.cpp geodata/handlers/kml/KmlWaitTagHandler.cpp geodata/handlers/kml/KmlWestTagHandler.cpp geodata/handlers/kml/KmlWhenTagHandler.cpp geodata/handlers/kml/KmlWidthTagHandler.cpp geodata/handlers/kml/KmlViewFormatTagHandler.cpp geodata/handlers/kml/KmlViewRefreshModeTagHandler.cpp geodata/handlers/kml/KmlViewRefreshTimeTagHandler.cpp geodata/handlers/kml/KmlViewVolumeTagHandler.cpp geodata/handlers/kml/KmlLeftFovTagHandler.cpp geodata/handlers/kml/KmlRightFovTagHandler.cpp geodata/handlers/kml/KmlBottomFovTagHandler.cpp geodata/handlers/kml/KmlTopFovTagHandler.cpp geodata/handlers/kml/KmlNearTagHandler.cpp geodata/handlers/kml/KmlImagePyramidTagHandler.cpp geodata/handlers/kml/KmlTileSizeTagHandler.cpp geodata/handlers/kml/KmlMaxHeightTagHandler.cpp geodata/handlers/kml/KmlMaxWidthTagHandler.cpp geodata/handlers/kml/KmlGridOriginTagHandler.cpp geodata/handlers/kml/KmlShapeTagHandler.cpp geodata/handlers/kml/KmlMinRefreshPeriodTagHandler.cpp geodata/handlers/kml/KmlMaxSessionLengthTagHandler.cpp geodata/handlers/kml/KmlCookieTagHandler.cpp geodata/handlers/kml/KmlMessageTagHandler.cpp geodata/handlers/kml/KmlLinkNameTagHandler.cpp geodata/handlers/kml/KmlLinkDescriptionTagHandler.cpp geodata/handlers/kml/KmlLinkSnippetTagHandler.cpp geodata/handlers/kml/KmlSnippetTagHandler.cpp geodata/handlers/kml/KmlExpiresTagHandler.cpp geodata/handlers/kml/KmlUpdateTagHandler.cpp geodata/handlers/kml/KmlNetworkLinkControlTagHandler.cpp geodata/handlers/kml/KmlplayModeTagHandler.cpp geodata/handlers/kml/KmlOrientationTagHandler.cpp geodata/handlers/kml/KmlScaleTagHandler.cpp geodata/handlers/kml/KmlXTagHandler.cpp geodata/handlers/kml/KmlYTagHandler.cpp geodata/handlers/kml/KmlZTagHandler.cpp geodata/handlers/kml/KmlLocationTagHandler.cpp geodata/handlers/kml/KmlResourceMapTagHandler.cpp geodata/handlers/kml/KmlAliasTagHandler.cpp geodata/handlers/kml/KmlSourceHrefTagHandler.cpp geodata/handlers/kml/KmlTargetHrefTagHandler.cpp geodata/handlers/kml/KmlSoundCueTagHandler.cpp geodata/handlers/kml/KmldelayedStartTagHandler.cpp geodata/handlers/kml/KmlBalloonVisibilityTagHandler.cpp geodata/handlers/kml/KmlCreateTagHandler.cpp geodata/handlers/kml/KmlDeleteTagHandler.cpp geodata/handlers/kml/KmlOsmPlacemarkDataTagHandler.cpp geodata/handlers/kml/KmlTagTagHandler.cpp geodata/handlers/kml/KmlMemberTagHandler.cpp geodata/handlers/kml/KmlNdTagHandler.cpp ) SET ( geodata_writers_kml_SRCS geodata/writers/kml/KmlAnimatedUpdateTagWriter.cpp geodata/writers/kml/KmlBalloonStyleTagWriter.cpp geodata/writers/kml/KmlCameraTagWriter.cpp geodata/writers/kml/KmlColorStyleTagWriter.cpp geodata/writers/kml/KmlDataTagWriter.cpp geodata/writers/kml/KmlDocumentTagWriter.cpp geodata/writers/kml/KmlExtendedDataTagWriter.cpp geodata/writers/kml/KmlFeatureTagWriter.cpp geodata/writers/kml/KmlFolderTagWriter.cpp geodata/writers/kml/KmlFlyToTagWriter.cpp geodata/writers/kml/KmlGroundOverlayWriter.cpp geodata/writers/kml/KmlIconStyleTagWriter.cpp geodata/writers/kml/KmlLatLonAltBoxWriter.cpp geodata/writers/kml/KmlLatLonBoxWriter.cpp geodata/writers/kml/KmlLatLonQuadWriter.cpp geodata/writers/kml/KmlLabelStyleTagWriter.cpp geodata/writers/kml/KmlLinearRingTagWriter.cpp geodata/writers/kml/KmlLineStringTagWriter.cpp geodata/writers/kml/KmlLineStyleTagWriter.cpp geodata/writers/kml/KmlLinkTagWriter.cpp geodata/writers/kml/KmlListStyleTagWriter.cpp geodata/writers/kml/KmlLodTagWriter.cpp geodata/writers/kml/KmlLookAtTagWriter.cpp geodata/writers/kml/KmlModelTagWriter.cpp geodata/writers/kml/KmlMultiGeometryTagWriter.cpp geodata/writers/kml/KmlMultiTrackTagWriter.cpp geodata/writers/kml/KmlNetworkLinkTagWriter.cpp geodata/writers/kml/KmlNetworkLinkControlTagWriter.cpp geodata/writers/kml/KmlObjectTagWriter.cpp geodata/writers/kml/KmlOverlayTagWriter.cpp geodata/writers/kml/KmlPhotoOverlayWriter.cpp geodata/writers/kml/KmlPlacemarkTagWriter.cpp geodata/writers/kml/KmlPlaylistTagWriter.cpp geodata/writers/kml/KmlPointTagWriter.cpp geodata/writers/kml/KmlPolygonTagWriter.cpp geodata/writers/kml/KmlPolyStyleTagWriter.cpp geodata/writers/kml/KmlRegionTagWriter.cpp geodata/writers/kml/KmlSchemaTagWriter.cpp geodata/writers/kml/KmlSchemaDataTagWriter.cpp geodata/writers/kml/KmlSimpleDataTagWriter.cpp geodata/writers/kml/KmlSimpleFieldTagWriter.cpp geodata/writers/kml/KmlScreenOverlayWriter.cpp geodata/writers/kml/KmlStyleMapTagWriter.cpp geodata/writers/kml/KmlStyleTagWriter.cpp geodata/writers/kml/KmlTagWriter.cpp geodata/writers/kml/KmlTimeSpanWriter.cpp geodata/writers/kml/KmlTimeStampTagWriter.cpp geodata/writers/kml/KmlTourTagWriter.cpp geodata/writers/kml/KmlTrackWriter.cpp geodata/writers/kml/KmlUpdateTagWriter.cpp geodata/writers/kml/KmlOsmPlacemarkDataTagWriter.cpp ) # writer and the parser sources SET ( geodata_parser_SRCS geodata/parser/GeoDataParser.cpp geodata/parser/GeoDataTypes.cpp geodata/parser/GeoDocument.cpp geodata/parser/GeoParser.cpp geodata/parser/GeoSceneParser.cpp geodata/parser/GeoSceneTypes.cpp geodata/parser/GeoTagHandler.cpp ) SET( geodata_writer_SRCS geodata/writer/GeoTagWriter.cpp geodata/writer/GeoWriter.cpp geodata/writer/GeoWriterBackend.cpp geodata/writer/GeoDataDocumentWriter.cpp ) SET( geodata_SRCS ${geodata_data_SRCS} ${geodata_graphicsitem_SRCS} ${geodata_scene_SRCS} ${geodata_parser_SRCS} ${geodata_writer_SRCS} ${geodata_handlers_kml_SRCS} ${geodata_handlers_dgml_SRCS} ${geodata_writers_kml_SRCS} ${geodata_writers_dgml_SRCS} ) #add_subdirectory(geodata/data/tests) diff --git a/src/lib/marble/geodata/handlers/kml/KmlElementDictionary.cpp b/src/lib/marble/geodata/handlers/kml/KmlElementDictionary.cpp index 77bb6eb7d..8801cbce6 100644 --- a/src/lib/marble/geodata/handlers/kml/KmlElementDictionary.cpp +++ b/src/lib/marble/geodata/handlers/kml/KmlElementDictionary.cpp @@ -1,236 +1,237 @@ /* Copyright (C) 2007 Nikolas Zimmermann This file is part of the KDE project This library is free software you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License aint with this library see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "KmlElementDictionary.h" namespace Marble { // One static list of all tag names, to avoid string comparisons all-over-the-place namespace kml { const char kmlTag_nameSpace20[] = "http://earth.google.com/kml/2.0"; const char kmlTag_nameSpace21[] = "http://earth.google.com/kml/2.1"; const char kmlTag_nameSpace22[] = "http://earth.google.com/kml/2.2"; const char kmlTag_nameSpaceOgc22[] = "http://www.opengis.net/kml/2.2"; const char kmlTag_nameSpaceGx22[] = "http://www.google.com/kml/ext/2.2"; const char kmlTag_nameSpaceMx[] = "http://marble.kde.org"; const char kmlTag_address[] = "address"; const char kmlTag_AddressDetails[] = "AddressDetails"; const char kmlTag_Alias[] = "Alias"; const char kmlTag_altitude[] = "altitude"; const char kmlTag_altitudeMode[] = "altitudeMode"; const char kmlTag_BalloonStyle[] = "BalloonStyle"; const char kmlTag_begin[] = "begin"; const char kmlTag_bgColor[] = "bgColor"; const char kmlTag_bottomFov[] = "bottomFov"; const char kmlTag_Camera[] = "Camera"; const char kmlTag_Change[] = "Change"; const char kmlTag_code[] = "code"; const char kmlTag_color[] = "color"; const char kmlTag_colorMode[] = "colorMode"; const char kmlTag_ColorStyle[] = "ColorStyle"; const char kmlTag_Container[] = "Container"; const char kmlTag_cookie[] = "cookie"; const char kmlTag_coordinates[] = "coordinates"; const char kmlTag_Create[] = "Create"; const char kmlTag_Data[] = "Data"; const char kmlTag_Delete[] = "Delete"; const char kmlTag_description[] = "description"; const char kmlTag_displayMode[] = "displayMode"; const char kmlTag_displayName[] = "displayName"; const char kmlTag_Document[] = "Document"; const char kmlTag_drawOrder[] = "drawOrder"; const char kmlTag_duration[] = "duration"; const char kmlTag_east[] = "east"; const char kmlTag_end[] = "end"; const char kmlTag_expires[] = "expires"; const char kmlTag_ExtendedData[] = "ExtendedData"; const char kmlTag_extrude[] = "extrude"; const char kmlTag_Feature[] = "Feature"; const char kmlTag_fill[] = "fill"; const char kmlTag_flyToMode[] = "flyToMode"; const char kmlTag_flyToView[] = "flyToView"; const char kmlTag_Folder[] = "Folder"; const char kmlTag_geomColor[] = "geomColor"; const char kmlTag_Geometry[] = "Geometry"; const char kmlTag_GeometryCollection[] = "GeometryCollection"; const char kmlTag_geomScale[] = "geomScale"; const char kmlTag_gridOrigin[] = "gridOrigin"; const char kmlTag_GroundOverlay[] = "GroundOverlay"; const char kmlTag_h[] = "h"; const char kmlTag_heading[] = "heading"; +const char kmlTag_height[] = "height"; const char kmlTag_href[] = "href"; const char kmlTag_hotSpot[] = "hotSpot"; const char kmlTag_httpQuery[] = "httpQuery"; const char kmlTag_Icon[] = "Icon"; const char kmlTag_IconStyle[] = "IconStyle"; const char kmlTag_ImagePyramid[] = "ImagePyramid"; const char kmlTag_innerBoundaryIs[] = "innerBoundaryIs"; const char kmlTag_ItemIcon[] = "ItemIcon"; const char kmlTag_key[] = "key"; const char kmlTag_kml[] = "kml"; const char kmlTag_labelColor[] = "labelColor"; const char kmlTag_LabelStyle[] = "LabelStyle"; const char kmlTag_latitude[] = "latitude"; const char kmlTag_LatLonAltBox[] = "LatLonAltBox"; const char kmlTag_LatLonBox[] = "LatLonBox"; const char kmlTag_LatLonQuad[] = "LatLonQuad"; const char kmlTag_leftFov[] = "leftFov"; const char kmlTag_LinearRing[] = "LinearRing"; const char kmlTag_LineString[] = "LineString"; const char kmlTag_LineStyle[] = "LineStyle"; const char kmlTag_Link[] = "Link"; const char kmlTag_linkDescription[] = "linkDescription"; const char kmlTag_linkName[] = "linkName"; const char kmlTag_linkSnippet[] = "linkSnippet"; const char kmlTag_listItemType[] = "listItemType"; const char kmlTag_ListStyle[] = "ListStyle"; const char kmlTag_Location[] = "Location"; const char kmlTag_Lod[] = "Lod"; const char kmlTag_longitude[] = "longitude"; const char kmlTag_LookAt[] = "LookAt"; const char kmlTag_maxAltitude[] = "maxAltitude"; const char kmlTag_maxFadeExtent[] = "maxFadeExtent"; const char kmlTag_maxHeight[] = "maxHeight"; const char kmlTag_maxLodPixels[] = "maxLodPixels"; const char kmlTag_maxSessionLength[] = "maxSessionLength"; const char kmlTag_maxWidth[] = "maxWidth"; const char kmlTag_message[] = "message"; const char kmlTag_Metadata[] = "Metadata"; const char kmlTag_minAltitude[] = "minAltitude"; const char kmlTag_minFadeExtent[] = "minFadeExtent"; const char kmlTag_minLodPixels[] = "minLodPixels"; const char kmlTag_minRefreshPeriod[] = "minRefreshPeriod"; const char kmlTag_Model[] = "Model"; const char kmlTag_MultiGeometry[] = "MultiGeometry"; const char kmlTag_name[] = "name"; const char kmlTag_near[] = "near"; const char kmlTag_NetworkLink[] = "NetworkLink"; const char kmlTag_NetworkLinkControl[] = "NetworkLinkControl"; const char kmlTag_north[] = "north"; const char kmlTag_Object[] = "Object"; const char kmlTag_ObjArrayField[] = "ObjArrayField"; const char kmlTag_ObjField[] = "ObjField"; const char kmlTag_open[] = "open"; const char kmlTag_Orientation[] = "Orientation"; const char kmlTag_OsmPlacemarkData[] = "OsmPlacemarkData"; const char kmlTag_member[] = "member"; const char kmlTag_nd[] = "nd"; const char kmlTag_tag[] = "tag"; const char kmlTag_outerBoundaryIs[] = "outerBoundaryIs"; const char kmlTag_outline[] = "outline"; const char kmlTag_Overlay[] = "Overlay"; const char kmlTag_overlayXY[] = "overlayXY"; const char kmlTag_Pair[] = "Pair"; const char kmlTag_phoneNumber[] = "phoneNumber"; const char kmlTag_PhotoOverlay[] = "PhotoOverlay"; const char kmlTag_Placemark[] = "Placemark"; const char kmlTag_Point[] = "Point"; const char kmlTag_Polygon[] = "Polygon"; const char kmlTag_PolyStyle[] = "PolyStyle"; const char kmlTag_range[] = "range"; const char kmlTag_refreshInterval[] = "refreshInterval"; const char kmlTag_refreshMode[] = "refreshMode"; const char kmlTag_refreshVisibility[] = "refreshVisibility"; const char kmlTag_Region[] = "Region"; const char kmlTag_request[] = "request"; const char kmlTag_ResourceMap[] = "ResourceMap"; const char kmlTag_Response[] = "Response"; const char kmlTag_rightFov[] = "rightFov"; const char kmlTag_roll[] = "roll"; const char kmlTag_rotation[] = "rotation"; const char kmlTag_rotationXY[] = "rotationXY"; const char kmlTag_Scale[] = "Scale"; const char kmlTag_scale[] = "scale"; const char kmlTag_Schema[] = "Schema"; const char kmlTag_SchemaData[] = "SchemaData"; const char kmlTag_SchemaField[] = "SchemaField"; const char kmlTag_ScreenOverlay[] = "ScreenOverlay"; const char kmlTag_screenXY[] = "screenXY"; const char kmlTag_shape[] = "shape"; const char kmlTag_SimpleArrayData[] = "SimpleArrayData"; const char kmlTag_SimpleArrayField[] = "SimpleArrayField"; const char kmlTag_SimpleData[] = "SimpleData"; const char kmlTag_SimpleField[] = "SimpleField"; const char kmlTag_size[] = "size"; const char kmlTag_Snippet[] = "Snippet"; const char kmlTag_sourceHref[] = "sourceHref"; const char kmlTag_south[] = "south"; const char kmlTag_state[] = "state"; const char kmlTag_Status[] = "Status"; const char kmlTag_Style[] = "Style"; const char kmlTag_StyleMap[] = "StyleMap"; const char kmlTag_StyleSelector[] = "StyleSelector"; const char kmlTag_styleUrl[] = "styleUrl"; const char kmlTag_targetHref[] = "targetHref"; const char kmlTag_tessellate[] = "tessellate"; const char kmlTag_text[] = "text"; const char kmlTag_textColor[] = "textColor"; const char kmlTag_tileSize[] = "tileSize"; const char kmlTag_tilt[] = "tilt"; const char kmlTag_TimeSpan[] = "TimeSpan"; const char kmlTag_TimeStamp[] = "TimeStamp"; const char kmlTag_topFov[] = "topFov"; const char kmlTag_Update[] = "Update"; const char kmlTag_Url[] = "Url"; const char kmlTag_value[] = "value"; const char kmlTag_viewBoundScale[] = "viewBoundScale"; const char kmlTag_viewFormat[] = "viewFormat"; const char kmlTag_viewRefreshMode[] = "viewRefreshMode"; const char kmlTag_viewRefreshTime[] = "viewRefreshTime"; const char kmlTag_ViewVolume[] = "ViewVolume"; const char kmlTag_visibility[] = "visibility"; const char kmlTag_w[] = "w"; const char kmlTag_west[] = "west"; const char kmlTag_when[] = "when"; const char kmlTag_width[] = "width"; const char kmlTag_x[] = "x"; const char kmlTag_y[] = "y"; const char kmlTag_z[] = "z"; const char kmlTag_AnimatedUpdate[] = "AnimatedUpdate"; const char kmlTag_FlyTo[] = "FlyTo"; const char kmlTag_MultiTrack[] = "MultiTrack"; const char kmlTag_Track[] = "Track"; const char kmlTag_coord[] = "coord"; const char kmlTag_delayedStart[] = "delayedStart"; const char kmlTag_SoundCue[] = "SoundCue"; const char kmlTag_Tour [] = "Tour"; const char kmlTag_TourControl[] = "TourControl"; const char kmlTag_Wait[] = "Wait"; const char kmlTag_Playlist[] = "Playlist"; const char kmlTag_playMode[] = "playMode"; const char kmlTag_balloonVisibility[] = "balloonVisibility"; #ifdef KML_LAZY_IMP const char kmlTag_MarblePlacemark[] = "MarblePlacemark"; const char kmlTag_area[] = "area"; const char kmlTag_pop[] = "pop"; const char kmlTag_role[] = "role"; const char kmlTag_CountryNameCode[] = "CountryNameCode"; const char kmlTag_countrycode[] = "countrycode"; #endif // KML_LAZY_IMP } } diff --git a/src/lib/marble/geodata/handlers/kml/KmlElementDictionary.h b/src/lib/marble/geodata/handlers/kml/KmlElementDictionary.h index 1f9234192..1e1123167 100644 --- a/src/lib/marble/geodata/handlers/kml/KmlElementDictionary.h +++ b/src/lib/marble/geodata/handlers/kml/KmlElementDictionary.h @@ -1,256 +1,257 @@ /* Copyright (C) 2007 Nikolas Zimmermann This file is part of the KDE project This library is free software you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License aint with this library see the file COPYING.LIB. If not, write the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef MARBLE_KML_KMLELEMENTDICTIONARY_H #define MARBLE_KML_KMLELEMENTDICTIONARY_H #include "geodata_export.h" namespace Marble { // Lists all known KML 2.1 tags (http://code.google.com/apis/kml/documentation/kmlTag_tags_21.html) namespace kml { GEODATA_EXPORT extern const char kmlTag_nameSpace20[]; GEODATA_EXPORT extern const char kmlTag_nameSpace21[]; GEODATA_EXPORT extern const char kmlTag_nameSpace22[]; GEODATA_EXPORT extern const char kmlTag_nameSpaceOgc22[]; GEODATA_EXPORT extern const char kmlTag_nameSpaceGx22[]; GEODATA_EXPORT extern const char kmlTag_nameSpaceMx[]; GEODATA_EXPORT extern const char kmlTag_address[]; GEODATA_EXPORT extern const char kmlTag_AddressDetails[]; GEODATA_EXPORT extern const char kmlTag_Alias[]; GEODATA_EXPORT extern const char kmlTag_altitude[]; GEODATA_EXPORT extern const char kmlTag_altitudeMode[]; GEODATA_EXPORT extern const char kmlTag_BalloonStyle[]; GEODATA_EXPORT extern const char kmlTag_begin[]; GEODATA_EXPORT extern const char kmlTag_bgColor[]; GEODATA_EXPORT extern const char kmlTag_bottomFov[]; GEODATA_EXPORT extern const char kmlTag_Camera[]; GEODATA_EXPORT extern const char kmlTag_Change[]; GEODATA_EXPORT extern const char kmlTag_code[]; GEODATA_EXPORT extern const char kmlTag_color[]; GEODATA_EXPORT extern const char kmlTag_colorMode[]; GEODATA_EXPORT extern const char kmlTag_ColorStyle[]; GEODATA_EXPORT extern const char kmlTag_Container[]; GEODATA_EXPORT extern const char kmlTag_cookie[]; GEODATA_EXPORT extern const char kmlTag_coordinates[]; GEODATA_EXPORT extern const char kmlTag_Create[]; GEODATA_EXPORT extern const char kmlTag_Data[]; GEODATA_EXPORT extern const char kmlTag_Delete[]; GEODATA_EXPORT extern const char kmlTag_description[]; GEODATA_EXPORT extern const char kmlTag_displayMode[]; GEODATA_EXPORT extern const char kmlTag_displayName[]; GEODATA_EXPORT extern const char kmlTag_Document[]; GEODATA_EXPORT extern const char kmlTag_drawOrder[]; GEODATA_EXPORT extern const char kmlTag_duration[]; GEODATA_EXPORT extern const char kmlTag_east[]; GEODATA_EXPORT extern const char kmlTag_end[]; GEODATA_EXPORT extern const char kmlTag_expires[]; GEODATA_EXPORT extern const char kmlTag_ExtendedData[]; GEODATA_EXPORT extern const char kmlTag_extrude[]; GEODATA_EXPORT extern const char kmlTag_Feature[]; GEODATA_EXPORT extern const char kmlTag_fill[]; GEODATA_EXPORT extern const char kmlTag_flyToMode[]; GEODATA_EXPORT extern const char kmlTag_flyToView[]; GEODATA_EXPORT extern const char kmlTag_Folder[]; GEODATA_EXPORT extern const char kmlTag_geomColor[]; GEODATA_EXPORT extern const char kmlTag_Geometry[]; GEODATA_EXPORT extern const char kmlTag_GeometryCollection[]; GEODATA_EXPORT extern const char kmlTag_geomScale[]; GEODATA_EXPORT extern const char kmlTag_gridOrigin[]; GEODATA_EXPORT extern const char kmlTag_GroundOverlay[]; GEODATA_EXPORT extern const char kmlTag_h[]; GEODATA_EXPORT extern const char kmlTag_heading[]; + GEODATA_EXPORT extern const char kmlTag_height[]; GEODATA_EXPORT extern const char kmlTag_href[]; GEODATA_EXPORT extern const char kmlTag_hotSpot[]; GEODATA_EXPORT extern const char kmlTag_httpQuery[]; GEODATA_EXPORT extern const char kmlTag_Icon[]; GEODATA_EXPORT extern const char kmlTag_IconStyle[]; GEODATA_EXPORT extern const char kmlTag_ImagePyramid[]; GEODATA_EXPORT extern const char kmlTag_innerBoundaryIs[]; GEODATA_EXPORT extern const char kmlTag_ItemIcon[]; GEODATA_EXPORT extern const char kmlTag_key[]; GEODATA_EXPORT extern const char kmlTag_kml[]; GEODATA_EXPORT extern const char kmlTag_labelColor[]; GEODATA_EXPORT extern const char kmlTag_LabelStyle[]; GEODATA_EXPORT extern const char kmlTag_latitude[]; GEODATA_EXPORT extern const char kmlTag_LatLonAltBox[]; GEODATA_EXPORT extern const char kmlTag_LatLonBox[]; GEODATA_EXPORT extern const char kmlTag_LatLonQuad[]; GEODATA_EXPORT extern const char kmlTag_leftFov[]; GEODATA_EXPORT extern const char kmlTag_LinearRing[]; GEODATA_EXPORT extern const char kmlTag_LineString[]; GEODATA_EXPORT extern const char kmlTag_LineStyle[]; GEODATA_EXPORT extern const char kmlTag_Link[]; GEODATA_EXPORT extern const char kmlTag_linkDescription[]; GEODATA_EXPORT extern const char kmlTag_linkName[]; GEODATA_EXPORT extern const char kmlTag_linkSnippet[]; GEODATA_EXPORT extern const char kmlTag_listItemType[]; GEODATA_EXPORT extern const char kmlTag_ListStyle[]; GEODATA_EXPORT extern const char kmlTag_Location[]; GEODATA_EXPORT extern const char kmlTag_Lod[]; GEODATA_EXPORT extern const char kmlTag_longitude[]; GEODATA_EXPORT extern const char kmlTag_LookAt[]; GEODATA_EXPORT extern const char kmlTag_maxAltitude[]; GEODATA_EXPORT extern const char kmlTag_maxFadeExtent[]; GEODATA_EXPORT extern const char kmlTag_maxHeight[]; GEODATA_EXPORT extern const char kmlTag_maxLodPixels[]; GEODATA_EXPORT extern const char kmlTag_maxSessionLength[]; GEODATA_EXPORT extern const char kmlTag_maxWidth[]; GEODATA_EXPORT extern const char kmlTag_message[]; GEODATA_EXPORT extern const char kmlTag_Metadata[]; GEODATA_EXPORT extern const char kmlTag_minAltitude[]; GEODATA_EXPORT extern const char kmlTag_minFadeExtent[]; GEODATA_EXPORT extern const char kmlTag_minLodPixels[]; GEODATA_EXPORT extern const char kmlTag_minRefreshPeriod[]; GEODATA_EXPORT extern const char kmlTag_Model[]; GEODATA_EXPORT extern const char kmlTag_MultiGeometry[]; GEODATA_EXPORT extern const char kmlTag_name[]; GEODATA_EXPORT extern const char kmlTag_near[]; GEODATA_EXPORT extern const char kmlTag_NetworkLink[]; GEODATA_EXPORT extern const char kmlTag_NetworkLinkControl[]; GEODATA_EXPORT extern const char kmlTag_north[]; GEODATA_EXPORT extern const char kmlTag_Object[]; GEODATA_EXPORT extern const char kmlTag_ObjArrayField[]; GEODATA_EXPORT extern const char kmlTag_ObjField[]; GEODATA_EXPORT extern const char kmlTag_open[]; GEODATA_EXPORT extern const char kmlTag_Orientation[]; GEODATA_EXPORT extern const char kmlTag_OsmPlacemarkData[]; GEODATA_EXPORT extern const char kmlTag_member[]; GEODATA_EXPORT extern const char kmlTag_nd[]; GEODATA_EXPORT extern const char kmlTag_tag[]; GEODATA_EXPORT extern const char kmlTag_outerBoundaryIs[]; GEODATA_EXPORT extern const char kmlTag_outline[]; GEODATA_EXPORT extern const char kmlTag_Overlay[]; GEODATA_EXPORT extern const char kmlTag_overlayXY[]; GEODATA_EXPORT extern const char kmlTag_Pair[]; GEODATA_EXPORT extern const char kmlTag_phoneNumber[]; GEODATA_EXPORT extern const char kmlTag_PhotoOverlay[]; GEODATA_EXPORT extern const char kmlTag_Placemark[]; GEODATA_EXPORT extern const char kmlTag_Point[]; GEODATA_EXPORT extern const char kmlTag_Polygon[]; GEODATA_EXPORT extern const char kmlTag_PolyStyle[]; GEODATA_EXPORT extern const char kmlTag_range[]; GEODATA_EXPORT extern const char kmlTag_refreshInterval[]; GEODATA_EXPORT extern const char kmlTag_refreshMode[]; GEODATA_EXPORT extern const char kmlTag_refreshVisibility[]; GEODATA_EXPORT extern const char kmlTag_Region[]; GEODATA_EXPORT extern const char kmlTag_request[]; GEODATA_EXPORT extern const char kmlTag_ResourceMap[]; GEODATA_EXPORT extern const char kmlTag_Response[]; GEODATA_EXPORT extern const char kmlTag_rightFov[]; GEODATA_EXPORT extern const char kmlTag_roll[]; GEODATA_EXPORT extern const char kmlTag_rotation[]; GEODATA_EXPORT extern const char kmlTag_rotationXY[]; GEODATA_EXPORT extern const char kmlTag_Scale[]; GEODATA_EXPORT extern const char kmlTag_scale[]; GEODATA_EXPORT extern const char kmlTag_Schema[]; GEODATA_EXPORT extern const char kmlTag_SchemaData[]; GEODATA_EXPORT extern const char kmlTag_SchemaField[]; GEODATA_EXPORT extern const char kmlTag_ScreenOverlay[]; GEODATA_EXPORT extern const char kmlTag_screenXY[]; GEODATA_EXPORT extern const char kmlTag_shape[]; GEODATA_EXPORT extern const char kmlTag_SimpleArrayData[]; GEODATA_EXPORT extern const char kmlTag_SimpleArrayField[]; GEODATA_EXPORT extern const char kmlTag_SimpleField[]; GEODATA_EXPORT extern const char kmlTag_SimpleData[]; GEODATA_EXPORT extern const char kmlTag_size[]; GEODATA_EXPORT extern const char kmlTag_Snippet[]; GEODATA_EXPORT extern const char kmlTag_south[]; GEODATA_EXPORT extern const char kmlTag_sourceHref[]; GEODATA_EXPORT extern const char kmlTag_state[]; GEODATA_EXPORT extern const char kmlTag_Status[]; GEODATA_EXPORT extern const char kmlTag_Style[]; GEODATA_EXPORT extern const char kmlTag_StyleMap[]; GEODATA_EXPORT extern const char kmlTag_StyleSelector[]; GEODATA_EXPORT extern const char kmlTag_styleUrl[]; GEODATA_EXPORT extern const char kmlTag_targetHref[]; GEODATA_EXPORT extern const char kmlTag_tessellate[]; GEODATA_EXPORT extern const char kmlTag_text[]; GEODATA_EXPORT extern const char kmlTag_textColor[]; GEODATA_EXPORT extern const char kmlTag_tileSize[]; GEODATA_EXPORT extern const char kmlTag_tilt[]; GEODATA_EXPORT extern const char kmlTag_TimeSpan[]; GEODATA_EXPORT extern const char kmlTag_TimeStamp[]; GEODATA_EXPORT extern const char kmlTag_topFov[]; GEODATA_EXPORT extern const char kmlTag_Update[]; GEODATA_EXPORT extern const char kmlTag_Url[]; GEODATA_EXPORT extern const char kmlTag_value[]; GEODATA_EXPORT extern const char kmlTag_viewBoundScale[]; GEODATA_EXPORT extern const char kmlTag_viewFormat[]; GEODATA_EXPORT extern const char kmlTag_viewRefreshMode[]; GEODATA_EXPORT extern const char kmlTag_viewRefreshTime[]; GEODATA_EXPORT extern const char kmlTag_ViewVolume[]; GEODATA_EXPORT extern const char kmlTag_visibility[]; GEODATA_EXPORT extern const char kmlTag_w[]; GEODATA_EXPORT extern const char kmlTag_west[]; GEODATA_EXPORT extern const char kmlTag_when[]; GEODATA_EXPORT extern const char kmlTag_width[]; GEODATA_EXPORT extern const char kmlTag_x[]; GEODATA_EXPORT extern const char kmlTag_y[]; GEODATA_EXPORT extern const char kmlTag_z[]; // Google KML Extension Namespace (http://code.google.com/apis/kml/documentation/kmlreference.html#kmlextensions) GEODATA_EXPORT extern const char kmlTag_AnimatedUpdate[]; GEODATA_EXPORT extern const char kmlTag_FlyTo[]; GEODATA_EXPORT extern const char kmlTag_MultiTrack[]; GEODATA_EXPORT extern const char kmlTag_Track[]; GEODATA_EXPORT extern const char kmlTag_coord[]; GEODATA_EXPORT extern const char kmlTag_delayedStart[]; GEODATA_EXPORT extern const char kmlTag_SoundCue[]; GEODATA_EXPORT extern const char kmlTag_Tour[]; GEODATA_EXPORT extern const char kmlTag_TourControl[]; GEODATA_EXPORT extern const char kmlTag_Wait[]; GEODATA_EXPORT extern const char kmlTag_Playlist[]; GEODATA_EXPORT extern const char kmlTag_playMode[]; GEODATA_EXPORT extern const char kmlTag_balloonVisibility[]; #ifdef KML_LAZY_IMP // preliminary implementation for the extra defined Tags GEODATA_EXPORT extern const char kmlTag_MarblePlacemark[]; GEODATA_EXPORT extern const char kmlTag_area[]; GEODATA_EXPORT extern const char kmlTag_pop[]; GEODATA_EXPORT extern const char kmlTag_role[]; GEODATA_EXPORT extern const char kmlTag_CountryNameCode[]; GEODATA_EXPORT extern const char kmlTag_countrycode[]; #endif // KML_LAZY_IMP } // Helper macros #define KML_DEFINE_TAG_HANDLER_20(Name) GEODATA_DEFINE_TAG_HANDLER(kml, Kml, Name, kmlTag_nameSpace20) #define KML_DEFINE_TAG_HANDLER_21(Name) GEODATA_DEFINE_TAG_HANDLER(kml, Kml, Name, kmlTag_nameSpace21) #define KML_DEFINE_TAG_HANDLER_22(Name) GEODATA_DEFINE_TAG_HANDLER(kml, Kml, Name, kmlTag_nameSpace22) #define KML_DEFINE_TAG_HANDLER_OGC22(Name) GEODATA_DEFINE_TAG_HANDLER(kml, Kml, Name, kmlTag_nameSpaceOgc22) #define KML_DEFINE_TAG_HANDLER_GX22(Name) GEODATA_DEFINE_TAG_HANDLER(kml, Kml, Name, kmlTag_nameSpaceGx22) #define KML_DEFINE_TAG_HANDLER_MX(Name) GEODATA_DEFINE_TAG_HANDLER(kml, Kml, Name, kmlTag_nameSpaceMx) #define KML_DEFINE_TAG_HANDLER(Name) \ KML_DEFINE_TAG_HANDLER_20(Name) \ KML_DEFINE_TAG_HANDLER_21(Name) \ KML_DEFINE_TAG_HANDLER_22(Name) \ KML_DEFINE_TAG_HANDLER_OGC22(Name) } #endif diff --git a/src/lib/marble/geodata/handlers/kml/KmlMxSizeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMxSizeTagHandler.cpp new file mode 100644 index 000000000..9103c6f09 --- /dev/null +++ b/src/lib/marble/geodata/handlers/kml/KmlMxSizeTagHandler.cpp @@ -0,0 +1,44 @@ +// +// This file is part of the Marble Virtual Globe. +// +// This program is free software licensed under the GNU LGPL. You can +// find a copy of this license in LICENSE.txt in the top directory of +// the source code. +// +// Copyright 2016 Dennis Nienhüser +// + +#include "KmlMxSizeTagHandler.h" + +#include "KmlElementDictionary.h" +#include "GeoDataIconStyle.h" +#include "GeoParser.h" +#include "MarbleDebug.h" + +namespace Marble +{ +namespace kml +{ +namespace mx +{ +KML_DEFINE_TAG_HANDLER_MX( size ) + +GeoNode* KmlsizeTagHandler::parse( GeoParser& parser ) const +{ + if ( parser.parentElement().is() ) { + auto const width = parser.attribute(kmlTag_width).toInt(); + auto const height = parser.attribute(kmlTag_height).toInt(); + auto const size = QSize(width, height); + if (size.isEmpty()) { + mDebug() << "Invalid size in icon style: width=" << width << ", height=" << height; + } else { + parser.parentElement().nodeAs()->setSize(size); + } + } + + return 0; +} + +} +} +} diff --git a/src/lib/marble/geodata/handlers/kml/KmlMxSizeTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlMxSizeTagHandler.h new file mode 100644 index 000000000..12ad53cf0 --- /dev/null +++ b/src/lib/marble/geodata/handlers/kml/KmlMxSizeTagHandler.h @@ -0,0 +1,35 @@ +// +// This file is part of the Marble Virtual Globe. +// +// This program is free software licensed under the GNU LGPL. You can +// find a copy of this license in LICENSE.txt in the top directory of +// the source code. +// +// Copyright 2016 Dennis Nienhüser +// + +#ifndef MARBLE_KMLMXSIZETAGHANDLER_H +#define MARBLE_KMLMXSIZETAGHANDLER_H + +#include "GeoTagHandler.h" + +namespace Marble +{ +namespace kml +{ +namespace mx +{ + +class KmlsizeTagHandler : public GeoTagHandler +{ +public: + virtual GeoNode* parse(GeoParser&) const; +}; + +} +} +} + +#endif + + diff --git a/src/lib/marble/geodata/writers/kml/KmlIconStyleTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlIconStyleTagWriter.cpp index 3e7b48e93..770edb14b 100644 --- a/src/lib/marble/geodata/writers/kml/KmlIconStyleTagWriter.cpp +++ b/src/lib/marble/geodata/writers/kml/KmlIconStyleTagWriter.cpp @@ -1,95 +1,103 @@ // // This file is part of the Marble Virtual Globe. // // This program is free software licensed under the GNU LGPL. You can // find a copy of this license in LICENSE.txt in the top directory of // the source code. // // Copyright 2010 Dennis Nienhüser // #include "KmlIconStyleTagWriter.h" #include "GeoDataIconStyle.h" #include "GeoDataTypes.h" #include "GeoWriter.h" #include "KmlElementDictionary.h" namespace Marble { static GeoTagWriterRegistrar s_writerIconStyle( GeoTagWriter::QualifiedName( GeoDataTypes::GeoDataIconStyleType, kml::kmlTag_nameSpaceOgc22 ), new KmlIconStyleTagWriter ); KmlIconStyleTagWriter::KmlIconStyleTagWriter() : KmlColorStyleTagWriter( kml::kmlTag_IconStyle ) { // nothing to do } bool KmlIconStyleTagWriter::writeMid( const GeoNode *node, GeoWriter& writer ) const { const GeoDataIconStyle *style = static_cast( node ); if ( style->scale() != 1.0 ) { writer.writeElement( kml::kmlTag_scale, QString::number( style->scale(), 'f' ) ); } + if (!style->size().isEmpty()) { + writer.writeNamespace(kml::kmlTag_nameSpaceMx, QStringLiteral("mx")); + writer.writeStartElement(kml::kmlTag_nameSpaceMx, kml::kmlTag_size); + writer.writeAttribute(kml::kmlTag_width, QString::number(style->size().width())); + writer.writeAttribute(kml::kmlTag_height, QString::number(style->size().height())); + writer.writeEndElement(); + } + if ( !style->iconPath().isEmpty() ) { writer.writeStartElement( kml::kmlTag_Icon ); writer.writeStartElement( kml::kmlTag_href ); writer.writeCharacters( style->iconPath() ); writer.writeEndElement(); writer.writeEndElement(); } GeoDataHotSpot::Units xunits, yunits; QPointF const hotSpot = style->hotSpot( xunits, yunits ); bool const emptyHotSpot = hotSpot.x() == 0.5 && hotSpot.y() == 0.5 && xunits == GeoDataHotSpot::Fraction && yunits == GeoDataHotSpot::Fraction; if ( !emptyHotSpot ) { writer.writeStartElement( kml::kmlTag_hotSpot ); if ( hotSpot.x() != 0.5 || xunits != GeoDataHotSpot::Fraction ) { writer.writeAttribute( "x", QString::number( hotSpot.x(), 'f' ) ); } if ( hotSpot.y() != 0.5 || yunits != GeoDataHotSpot::Fraction ) { writer.writeAttribute( "y", QString::number( hotSpot.y(), 'f' ) ); } if ( xunits != GeoDataHotSpot::Fraction ) { writer.writeAttribute( "xunits", unitString( xunits ) ); } if ( yunits != GeoDataHotSpot::Fraction ) { writer.writeAttribute( "yunits", unitString( yunits ) ); } writer.writeEndElement(); } return true; } bool KmlIconStyleTagWriter::isEmpty( const GeoNode *node ) const { const GeoDataIconStyle *style = static_cast( node ); GeoDataHotSpot::Units xunits, yunits; QPointF const hotSpot = style->hotSpot( xunits, yunits ); return style->iconPath().isEmpty() && hotSpot.x() == 0.5 && hotSpot.y() == 0.5 && xunits == GeoDataHotSpot::Fraction && yunits == GeoDataHotSpot::Fraction; } QString KmlIconStyleTagWriter::unitString(GeoDataHotSpot::Units unit) { switch (unit) { case GeoDataHotSpot::Pixels: return "pixels"; case GeoDataHotSpot::InsetPixels: return "insetPixels"; case GeoDataHotSpot::Fraction: return "fraction"; } return "fraction"; } }