summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanjiban Bairagya <sanjiban22393@gmail.com>2016-08-14 08:25:09 (GMT)
committerSanjiban Bairagya <sanjiban22393@gmail.com>2016-08-14 08:25:09 (GMT)
commit147e58f103ddfc139914f72db230cb1b34735ca9 (patch)
tree0121ea766e0f2ec2da6325ccf0d7d97503e63ebd
parent32f677a37c20c429cfa1bff4b7b638c1887d519b (diff)
Render aeroway apron areas
-rw-r--r--src/lib/marble/PlacemarkLayout.cpp1
-rw-r--r--src/lib/marble/StyleBuilder.cpp6
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.h1
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature_p.h1
-rw-r--r--src/lib/marble/osm/OsmPresetLibrary.cpp1
-rw-r--r--src/plugins/runner/local-osm-search/DatabaseQuery.cpp2
-rw-r--r--src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp1
-rw-r--r--src/plugins/runner/local-osm-search/OsmPlacemark.h1
8 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/marble/PlacemarkLayout.cpp b/src/lib/marble/PlacemarkLayout.cpp
index 5433013..1dc5c5a 100644
--- a/src/lib/marble/PlacemarkLayout.cpp
+++ b/src/lib/marble/PlacemarkLayout.cpp
@@ -136,6 +136,7 @@ QSet<GeoDataFeature::GeoDataVisualCategory> acceptedVisualCategories()
<< GeoDataFeature::TransportAirportGate
<< GeoDataFeature::TransportAirportRunway
<< GeoDataFeature::TransportAirportTaxiway
+ << GeoDataFeature::TransportAirportApron
<< GeoDataFeature::TransportBusStation
<< GeoDataFeature::TransportBusStop
<< GeoDataFeature::TransportCarShare
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index 2d6188e..adf12c5 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -127,6 +127,7 @@ StyleBuilder::Private::Private() :
m_defaultMinZoomLevels[GeoDataFeature::HighwayMotorway] = 6;
m_defaultMinZoomLevels[GeoDataFeature::TransportAirportRunway] = 15;
m_defaultMinZoomLevels[GeoDataFeature::TransportAirportTaxiway] = 15;
+ m_defaultMinZoomLevels[GeoDataFeature::TransportAirportApron] = 15;
#if 0 // not needed as long as default min zoom level is 15
for(int i = GeoDataFeature::AccomodationCamping; i <= GeoDataFeature::ReligionSikh; i++)
@@ -689,6 +690,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
m_defaultStyle[GeoDataFeature::HighwayMotorwayLink] = StyleBuilder::Private::createHighwayStyle( "#e892a2", "#dc2a67", QFont(QStringLiteral("Arial")), "000000", 9, 10 );
m_defaultStyle[GeoDataFeature::TransportAirportRunway] = StyleBuilder::Private::createHighwayStyle( "#bbbbcc", "#bbbbcc", QFont(QStringLiteral("Arial")), "000000", 0, 1 );
m_defaultStyle[GeoDataFeature::TransportAirportTaxiway] = StyleBuilder::Private::createHighwayStyle( "#bbbbcc", "#bbbbcc", QFont(QStringLiteral("Arial")), "000000", 0, 1 );
+ m_defaultStyle[GeoDataFeature::TransportAirportApron] = StyleBuilder::Private::createWayStyle( "#e9d1ff", Qt::transparent, true, false );
m_defaultStyle[GeoDataFeature::NaturalWater] = StyleBuilder::Private::createStyle( 4, 0, waterColor, waterColor, true, true,
Qt::SolidPattern, Qt::SolidLine, Qt::RoundCap, false, QVector< qreal >(),
@@ -704,7 +706,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
m_defaultStyle[GeoDataFeature::NaturalBeach] = StyleBuilder::Private::createWayStyle( "#FFF1BA", "#FFF1BA", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/beach.png") );
m_defaultStyle[GeoDataFeature::NaturalWetland] = StyleBuilder::Private::createWayStyle( "#DDECEC", "#DDECEC", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/wetland.png") );
m_defaultStyle[GeoDataFeature::NaturalGlacier] = StyleBuilder::Private::createWayStyle( "#DDECEC", "#DDECEC", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/glacier.png") );
- m_defaultStyle[GeoDataFeature::NaturalIceShelf] = StyleBuilder::Private::createWayStyle( "#8ebebe", "#8ebebe", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/glacier.png") );
+ m_defaultStyle[GeoDataFeature::NaturalIceShelf] = StyleBuilder::Private::createWayStyle( "#8ebebe", "#8ebebe", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/glacier.png") );
m_defaultStyle[GeoDataFeature::NaturalScrub] = StyleBuilder::Private::createWayStyle( "#B5E3B5", "#B5E3B5", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/scrub.png") );
m_defaultStyle[GeoDataFeature::NaturalCliff] = StyleBuilder::Private::createWayStyle( Qt::transparent, Qt::transparent, true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/cliff2.png") );
m_defaultStyle[GeoDataFeature::NaturalHeath] = StyleBuilder::Private::createWayStyle( "#d6d99f", QColor("#d6d99f").darker(150), true, false );
@@ -1154,6 +1156,7 @@ QStringList StyleBuilder::renderOrder() const
paintLayerOrder << Private::createPaintLayerItem("LineString", GeoDataFeature::NaturalReef, "label");
paintLayerOrder << Private::createPaintLayerItem("Polygon", GeoDataFeature::LeisureMarina);
+ paintLayerOrder << Private::createPaintLayerItem("Polygon", GeoDataFeature::TransportAirportApron);
for ( int i = GeoDataFeature::HighwaySteps; i <= GeoDataFeature::HighwayMotorway; i++ ) {
paintLayerOrder << Private::createPaintLayerItem("LineString", (GeoDataFeature::GeoDataVisualCategory)i, "outline");
@@ -1449,6 +1452,7 @@ QString StyleBuilder::visualCategoryName(GeoDataFeature::GeoDataVisualCategory c
visualCategoryNames[GeoDataFeature::TransportAirportGate] = "TransportAirportGate";
visualCategoryNames[GeoDataFeature::TransportAirportRunway] = "TransportAirportRunway";
visualCategoryNames[GeoDataFeature::TransportAirportTaxiway] = "TransportAirportTaxiway";
+ visualCategoryNames[GeoDataFeature::TransportAirportApron] = "TransportAirportApron";
visualCategoryNames[GeoDataFeature::TransportBusStation] = "TransportBusStation";
visualCategoryNames[GeoDataFeature::TransportBusStop] = "TransportBusStop";
visualCategoryNames[GeoDataFeature::TransportCarShare] = "TransportCarShare";
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.h b/src/lib/marble/geodata/data/GeoDataFeature.h
index af988b9..02dd26b 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature.h
@@ -324,6 +324,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
TransportAirportGate,
TransportAirportRunway,
TransportAirportTaxiway,
+ TransportAirportApron,
TransportBusStation,
TransportBusStop,
TransportCarShare,
diff --git a/src/lib/marble/geodata/data/GeoDataFeature_p.h b/src/lib/marble/geodata/data/GeoDataFeature_p.h
index b94213f..2b41a62 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature_p.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature_p.h
@@ -319,6 +319,7 @@ class GeoDataFeaturePrivate
case GeoDataFeature::TransportHelipad: return tr("Helipad");
case GeoDataFeature::TransportAirportGate: return tr("Airport Gate");
case GeoDataFeature::TransportAirportRunway: return tr("Airport Runway");
+ case GeoDataFeature::TransportAirportApron: return tr("Airport Apron");
case GeoDataFeature::TransportAirportTaxiway: return tr("Airport Taxiway");
case GeoDataFeature::TransportAirportTerminal: return tr("Airport Terminal");
case GeoDataFeature::TransportBusStation: return tr("Bus Station");
diff --git a/src/lib/marble/osm/OsmPresetLibrary.cpp b/src/lib/marble/osm/OsmPresetLibrary.cpp
index bc94407..f570584 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.cpp
+++ b/src/lib/marble/osm/OsmPresetLibrary.cpp
@@ -304,6 +304,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "aeroway", "helipad" ) ] = GeoDataFeature::TransportHelipad;
s_visualCategories[ OsmTag( "aeroway", "gate" ) ] = GeoDataFeature::TransportAirportGate;
s_visualCategories[ OsmTag( "aeroway", "runway" ) ] = GeoDataFeature::TransportAirportRunway;
+ s_visualCategories[ OsmTag( "aeroway", "apron" ) ] = GeoDataFeature::TransportAirportApron;
s_visualCategories[ OsmTag( "aeroway", "taxiway" ) ] = GeoDataFeature::TransportAirportTaxiway;
s_visualCategories[ OsmTag( "transport", "airpor_terminal" ) ] = GeoDataFeature::TransportAirportTerminal;
s_visualCategories[ OsmTag( "transport", "bus_station" ) ] = GeoDataFeature::TransportBusStation;
diff --git a/src/plugins/runner/local-osm-search/DatabaseQuery.cpp b/src/plugins/runner/local-osm-search/DatabaseQuery.cpp
index 3270535..70f66db 100644
--- a/src/plugins/runner/local-osm-search/DatabaseQuery.cpp
+++ b/src/plugins/runner/local-osm-search/DatabaseQuery.cpp
@@ -134,6 +134,8 @@ bool DatabaseQuery::isPointOfInterest( const QString &category )
pois["airport"] = OsmPlacemark::TransportAirportTerminal;
pois[QObject::tr( "airport runway" ).toLower()] = OsmPlacemark::TransportAirportRunway;
pois["airport runway"] = OsmPlacemark::TransportAirportRunway;
+ pois[QObject::tr( "airport apron" ).toLower()] = OsmPlacemark::TransportAirportApron;
+ pois["airport apron"] = OsmPlacemark::TransportAirportApron;
pois[QObject::tr( "airport taxiway" ).toLower()] = OsmPlacemark::TransportAirportTaxiway;
pois["airport taxiway"] = OsmPlacemark::TransportAirportTaxiway;
pois[QObject::tr( "bus station" ).toLower()] = OsmPlacemark::TransportBusStation;
diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
index 16712c0..2db4264 100644
--- a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
+++ b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
@@ -68,6 +68,7 @@ LocalOsmSearchRunner::LocalOsmSearchRunner( const QStringList &databaseFiles, QO
m_categoryMap[OsmPlacemark::TransportAirport] = GeoDataFeature::TransportAerodrome;
m_categoryMap[OsmPlacemark::TransportAirportTerminal] = GeoDataFeature::TransportAirportTerminal;
m_categoryMap[OsmPlacemark::TransportAirportRunway] = GeoDataFeature::TransportAirportRunway;
+ m_categoryMap[OsmPlacemark::TransportAirportApron] = GeoDataFeature::TransportAirportApron;
m_categoryMap[OsmPlacemark::TransportAirportTaxiway] = GeoDataFeature::TransportAirportTaxiway;
m_categoryMap[OsmPlacemark::TransportBusStation] = GeoDataFeature::TransportBusStation;
m_categoryMap[OsmPlacemark::TransportBusStop] = GeoDataFeature::TransportBusStop;
diff --git a/src/plugins/runner/local-osm-search/OsmPlacemark.h b/src/plugins/runner/local-osm-search/OsmPlacemark.h
index 7886b34..e291527 100644
--- a/src/plugins/runner/local-osm-search/OsmPlacemark.h
+++ b/src/plugins/runner/local-osm-search/OsmPlacemark.h
@@ -64,6 +64,7 @@ public:
TransportAirportTerminal,
TransportAirportGate,
TransportAirportRunway,
+ TransportAirportApron,
TransportAirportTaxiway,
TransportBusStation,
TransportBusStop,