Git commit 0dbfded83199e27aa15c5f6ae9e250129349376f by Dennis Nienh=C3=BCse=
r.
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]         =3D createH=
ighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6);
     m_defaultStyle[GeoDataPlacemark::HighwayMotorway]          =3D createH=
ighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10);
     m_defaultStyle[GeoDataPlacemark::HighwayMotorwayLink]      =3D createH=
ighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10);
+    m_defaultStyle[GeoDataPlacemark::HighwayCorridor]          =3D createH=
ighwayStyle("#ffffff", "#bbbbbb", osmFont, "000000", 1, 3);
     m_defaultStyle[GeoDataPlacemark::TransportAirportRunway]   =3D createH=
ighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1, Qt::NoPen);
     m_defaultStyle[GeoDataPlacemark::TransportAirportTaxiway]  =3D createH=
ighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1, Qt::NoPen);
     m_defaultStyle[GeoDataPlacemark::TransportAirportApron]    =3D createW=
ayStyle("#e9d1ff", Qt::transparent, true, false);
@@ -1037,6 +1038,7 @@ void StyleBuilder::Private::initializeOsmVisualCatego=
ries()
     s_visualCategories[OsmTag("highway", "trunk_link")]         =3D GeoDat=
aPlacemark::HighwayTrunkLink;
     s_visualCategories[OsmTag("highway", "unclassified")]       =3D GeoDat=
aPlacemark::HighwayUnclassified;
     s_visualCategories[OsmTag("highway", "unknown")]            =3D GeoDat=
aPlacemark::HighwayUnknown;
+    s_visualCategories[OsmTag("highway", "corridor")]           =3D GeoDat=
aPlacemark::HighwayCorridor;
 =

     s_visualCategories[OsmTag("natural", "bay")]                =3D GeoDat=
aPlacemark::NaturalWater;
     s_visualCategories[OsmTag("natural", "coastline")]          =3D GeoDat=
aPlacemark::NaturalWater;
@@ -1274,6 +1276,7 @@ void StyleBuilder::Private::initializeMinimumZoomLeve=
ls()
     s_defaultMinZoomLevels[GeoDataPlacemark::HighwayUnknown]      =3D 16;
     s_defaultMinZoomLevels[GeoDataPlacemark::HighwayUnclassified] =3D 16;
     s_defaultMinZoomLevels[GeoDataPlacemark::HighwayTrafficSignals]      =
=3D 17;
+    s_defaultMinZoomLevels[GeoDataPlacemark::HighwayCorridor]     =3D 18;
 =

     s_defaultMinZoomLevels[GeoDataPlacemark::AccomodationCamping] =3D 16;
     s_defaultMinZoomLevels[GeoDataPlacemark::AccomodationHostel] =3D 16;
@@ -2257,6 +2260,7 @@ QString StyleBuilder::visualCategoryName(GeoDataPlace=
mark::GeoDataVisualCategory
         visualCategoryNames[GeoDataPlacemark::HighwayTrunk] =3D "HighwayTr=
unk";
         visualCategoryNames[GeoDataPlacemark::HighwayMotorwayLink] =3D "Hi=
ghwayMotorwayLink";
         visualCategoryNames[GeoDataPlacemark::HighwayMotorway] =3D "Highwa=
yMotorway";
+        visualCategoryNames[GeoDataPlacemark::HighwayCorridor] =3D "Highwa=
yCorridor";
         visualCategoryNames[GeoDataPlacemark::Building] =3D "Building";
         visualCategoryNames[GeoDataPlacemark::AccomodationCamping] =3D "Ac=
comodationCamping";
         visualCategoryNames[GeoDataPlacemark::AccomodationHostel] =3D "Acc=
omodationHostel";
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp b/src/lib/mar=
ble/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/marbl=
e/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 GeoDataFe=
ature
         HighwayFootway,
         HighwayTrack,
         HighwayPedestrian,
+        HighwayCorridor,
         HighwayCycleway,
         HighwayService,
         HighwayRoad,