[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src/lib/marble: Show indoor corridors in buildings
From:       Dennis_Nienhüser <null () kde ! org>
Date:       2016-12-31 19:45:41
Message-ID: E1cNPb3-0006fR-HN () code ! kde ! org
[Download RAW message or body]

Git commit 0dbfded83199e27aa15c5f6ae9e250129349376f by Dennis Nienhüser.
Committed on 31/12/2016 at 19:24.
Pushed by nienhueser into branch 'master'.

Show indoor corridors in buildings

GCI task by Rakete1111, thanks!

Differential Revision: https://phabricator.kde.org/D3876

M  +4    -0    src/lib/marble/StyleBuilder.cpp
M  +1    -0    src/lib/marble/geodata/data/GeoDataPlacemark.cpp
M  +1    -0    src/lib/marble/geodata/data/GeoDataPlacemark.h

https://commits.kde.org/marble/0dbfded83199e27aa15c5f6ae9e250129349376f

diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index 74a816750..eb5a4b2de 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -649,6 +649,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
     m_defaultStyle[GeoDataPlacemark::HighwayTrunkLink]         = \
                createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6);
     m_defaultStyle[GeoDataPlacemark::HighwayMotorway]          = \
                createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10);
     m_defaultStyle[GeoDataPlacemark::HighwayMotorwayLink]      = \
createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10); +    \
m_defaultStyle[GeoDataPlacemark::HighwayCorridor]          = \
                createHighwayStyle("#ffffff", "#bbbbbb", osmFont, "000000", 1, 3);
     m_defaultStyle[GeoDataPlacemark::TransportAirportRunway]   = \
                createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1, \
                Qt::NoPen);
     m_defaultStyle[GeoDataPlacemark::TransportAirportTaxiway]  = \
                createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1, \
                Qt::NoPen);
     m_defaultStyle[GeoDataPlacemark::TransportAirportApron]    = \
createWayStyle("#e9d1ff", Qt::transparent, true, false); @@ -1037,6 +1038,7 @@ void \
                StyleBuilder::Private::initializeOsmVisualCategories()
     s_visualCategories[OsmTag("highway", "trunk_link")]         = \
                GeoDataPlacemark::HighwayTrunkLink;
     s_visualCategories[OsmTag("highway", "unclassified")]       = \
                GeoDataPlacemark::HighwayUnclassified;
     s_visualCategories[OsmTag("highway", "unknown")]            = \
GeoDataPlacemark::HighwayUnknown; +    s_visualCategories[OsmTag("highway", \
"corridor")]           = GeoDataPlacemark::HighwayCorridor;  
     s_visualCategories[OsmTag("natural", "bay")]                = \
                GeoDataPlacemark::NaturalWater;
     s_visualCategories[OsmTag("natural", "coastline")]          = \
GeoDataPlacemark::NaturalWater; @@ -1274,6 +1276,7 @@ void \
StyleBuilder::Private::initializeMinimumZoomLevels()  \
s_defaultMinZoomLevels[GeoDataPlacemark::HighwayUnknown]      = 16;  \
                s_defaultMinZoomLevels[GeoDataPlacemark::HighwayUnclassified] = 16;
     s_defaultMinZoomLevels[GeoDataPlacemark::HighwayTrafficSignals]      = 17;
+    s_defaultMinZoomLevels[GeoDataPlacemark::HighwayCorridor]     = 18;
 
     s_defaultMinZoomLevels[GeoDataPlacemark::AccomodationCamping] = 16;
     s_defaultMinZoomLevels[GeoDataPlacemark::AccomodationHostel] = 16;
@@ -2257,6 +2260,7 @@ QString \
                StyleBuilder::visualCategoryName(GeoDataPlacemark::GeoDataVisualCategory
                
         visualCategoryNames[GeoDataPlacemark::HighwayTrunk] = "HighwayTrunk";
         visualCategoryNames[GeoDataPlacemark::HighwayMotorwayLink] = \
                "HighwayMotorwayLink";
         visualCategoryNames[GeoDataPlacemark::HighwayMotorway] = "HighwayMotorway";
+        visualCategoryNames[GeoDataPlacemark::HighwayCorridor] = "HighwayCorridor";
         visualCategoryNames[GeoDataPlacemark::Building] = "Building";
         visualCategoryNames[GeoDataPlacemark::AccomodationCamping] = \
                "AccomodationCamping";
         visualCategoryNames[GeoDataPlacemark::AccomodationHostel] = \
                "AccomodationHostel";
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp \
b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp index 9e3d49831..fb8c4bcf8 100644
--- a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
+++ b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
@@ -451,6 +451,7 @@ QString GeoDataPlacemark::categoryName() const
     case HighwayTrunk: return GeoDataPlacemarkPrivate::tr("Trunk Road");
     case HighwayMotorwayLink: return GeoDataPlacemarkPrivate::tr("Motorway Link \
Road");  case HighwayMotorway: return GeoDataPlacemarkPrivate::tr("Motorway");
+    case HighwayCorridor: return GeoDataPlacemarkPrivate::tr("Corridor");
     case Building: return GeoDataPlacemarkPrivate::tr("Building");
     case AccomodationCamping: return GeoDataPlacemarkPrivate::tr("Camping");
     case AccomodationHostel: return GeoDataPlacemarkPrivate::tr("Hostel");
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.h \
b/src/lib/marble/geodata/data/GeoDataPlacemark.h index aeb5bfb6e..e9609065f 100644
--- a/src/lib/marble/geodata/data/GeoDataPlacemark.h
+++ b/src/lib/marble/geodata/data/GeoDataPlacemark.h
@@ -189,6 +189,7 @@ class GEODATA_EXPORT GeoDataPlacemark: public GeoDataFeature
         HighwayFootway,
         HighwayTrack,
         HighwayPedestrian,
+        HighwayCorridor,
         HighwayCycleway,
         HighwayService,
         HighwayRoad,


[prev in list] [next in list] [prev in thread] [next in thread]