Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit b3859627 authored by Mohammed Nafees's avatar Mohammed Nafees

Render indoor doors, walls and rooms

parent 81bdc81e
......@@ -1087,6 +1087,10 @@ void StyleBuilder::Private::initializeDefaultStyles()
m_defaultStyle[GeoDataPlacemark::ReligionSikh] = createOsmPOIStyle(osmFont, "black/sikhist.16");
m_defaultStyle[GeoDataPlacemark::ReligionTaoist] = createOsmPOIStyle(osmFont, "black/taoist.16");
m_defaultStyle[GeoDataPlacemark::IndoorDoor] = createOsmPOIRingStyle(osmFont, "indoor/door_b.16");
m_defaultStyle[GeoDataPlacemark::IndoorWall] = createOsmPOIStyle(osmFont, "indoor/wall_b.16");
m_defaultStyle[GeoDataPlacemark::IndoorRoom] = createWayStyle(buildingColor.darker(), QColor(Qt::black));
m_defaultStyle[GeoDataPlacemark::HighwayTrafficSignals] = createOsmPOIStyle(osmFont, "individual/traffic_light");
m_defaultStyle[GeoDataPlacemark::HighwayTrafficSignals]->iconStyle().setScale(0.75);
......@@ -1693,6 +1697,10 @@ void StyleBuilder::Private::initializeOsmVisualCategories()
s_visualCategories[OsmTag("aerialway", "zip_line")] = GeoDataPlacemark::AerialwayZipLine;
s_visualCategories[OsmTag("aerialway", "goods")] = GeoDataPlacemark::AerialwayGoods;
s_visualCategories[OsmTag("indoor", "door")] = GeoDataPlacemark::IndoorDoor;
s_visualCategories[OsmTag("indoor", "wall")] = GeoDataPlacemark::IndoorWall;
s_visualCategories[OsmTag("indoor", "room")] = GeoDataPlacemark::IndoorRoom;
//Custom Marble OSM Tags
s_visualCategories[OsmTag("marble_land", "landmass")] = GeoDataPlacemark::Landmass;
s_visualCategories[OsmTag("settlement", "yes")] = GeoDataPlacemark::UrbanArea;
......@@ -2007,6 +2015,10 @@ void StyleBuilder::Private::initializeMinimumZoomLevels()
s_defaultMinZoomLevels[GeoDataPlacemark::AerialwayZipLine] = 15;
s_defaultMinZoomLevels[GeoDataPlacemark::AerialwayGoods] = 15;
s_defaultMinZoomLevels[GeoDataPlacemark::IndoorDoor] = 15;
s_defaultMinZoomLevels[GeoDataPlacemark::IndoorWall] = 15;
s_defaultMinZoomLevels[GeoDataPlacemark::IndoorRoom] = 15;
for (int i = GeoDataPlacemark::PlaceCity; i < GeoDataPlacemark::LastIndex; i++) {
if (s_defaultMinZoomLevels[i] < 0) {
qDebug() << "Missing default min zoom level for GeoDataPlacemark::GeoDataVisualCategory " << i;
......@@ -2822,6 +2834,9 @@ QString StyleBuilder::visualCategoryName(GeoDataPlacemark::GeoDataVisualCategory
visualCategoryNames[GeoDataPlacemark::CrossingRailway] = "CrossingRailway";
visualCategoryNames[GeoDataPlacemark::CrossingSignals] = "CrossingSignals";
visualCategoryNames[GeoDataPlacemark::CrossingZebra] = "CrossingZebra";
visualCategoryNames[GeoDataPlacemark::IndoorDoor] = "IndoorDoor";
visualCategoryNames[GeoDataPlacemark::IndoorWall] = "IndoorWall";
visualCategoryNames[GeoDataPlacemark::IndoorRoom] = "IndoorRoom";
visualCategoryNames[GeoDataPlacemark::LastIndex] = "LastIndex";
}
......
......@@ -667,6 +667,9 @@ QString GeoDataPlacemark::categoryName() const
case CrossingIsland: return GeoDataPlacemarkPrivate::tr("Crosswalk");
case CrossingZebra: return GeoDataPlacemarkPrivate::tr("Crosswalk");
case CrossingRailway: return GeoDataPlacemarkPrivate::tr("Railway Crossing");
case IndoorDoor: return GeoDataPlacemarkPrivate::tr("Door");
case IndoorWall: return GeoDataPlacemarkPrivate::tr("Wall");
case IndoorRoom: return GeoDataPlacemarkPrivate::tr("Room");
case Default:
case Unknown:
......
......@@ -512,6 +512,10 @@ class GEODATA_EXPORT GeoDataPlacemark: public GeoDataFeature
BoundaryMaritime,
IndoorDoor,
IndoorWall,
IndoorRoom,
//Custom OSM Tags
Landmass,
UrbanArea,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment