summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Rahn <[email protected]>2015-10-13 17:24:55 +0200
committerTorsten Rahn <[email protected]>2015-10-13 17:24:55 +0200
commitc6fa9ce7306ff942c974670f2e30ed8bc88fe305 (patch)
treec17a134b1a1612f59864b6b1e55ba500121edbf7
parentb60f249176a0fd6c37dc16cb1d612ee9ceca212c (diff)
Add gate and liftgate barrier symbols.
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.h2
-rw-r--r--src/lib/marble/osm/OsmPresetLibrary.cpp2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.cpp b/src/lib/marble/geodata/data/GeoDataFeature.cpp
index 268ecd2..5dd7550 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.cpp
+++ b/src/lib/marble/geodata/data/GeoDataFeature.cpp
@@ -513,6 +513,8 @@ void GeoDataFeaturePrivate::initializeDefaultStyles()
s_defaultStyle[GeoDataFeature::HighwayTrafficSignals] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/traffic_light" );
+ s_defaultStyle[GeoDataFeature::BarrierGate] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/gate" );
+ s_defaultStyle[GeoDataFeature::BarrierLiftGate] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/liftgate" );
s_defaultStyle[GeoDataFeature::BarrierWall] = GeoDataFeaturePrivate::createWayStyle( "#444444", Qt::transparent, true, false );
s_defaultStyle[GeoDataFeature::HighwaySteps] = GeoDataFeaturePrivate::createStyle(0.0, 2.0, "#F98072", "#F98072", true, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3 );
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.h b/src/lib/marble/geodata/data/GeoDataFeature.h
index b558c74..9c05a2f 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature.h
@@ -232,6 +232,8 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
AmenityGraveyard,
// OpenStreetMap category Barrier
+ BarrierGate,
+ BarrierLiftGate,
BarrierWall,
NaturalPeak,
diff --git a/src/lib/marble/osm/OsmPresetLibrary.cpp b/src/lib/marble/osm/OsmPresetLibrary.cpp
index a13f13a..cc47a1d 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.cpp
+++ b/src/lib/marble/osm/OsmPresetLibrary.cpp
@@ -167,6 +167,8 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "tourism", "viewpoint" ) ] = GeoDataFeature::TouristViewPoint;
s_visualCategories[ OsmTag( "tourism", "zoo" ) ] = GeoDataFeature::TouristZoo;
+ s_visualCategories[ OsmTag( "barrier", "gate" ) ] = GeoDataFeature::BarrierGate;
+ s_visualCategories[ OsmTag( "barrier", "lift_gate" ) ] = GeoDataFeature::BarrierLiftGate;
s_visualCategories[ OsmTag( "barrier", "wall" ) ] = GeoDataFeature::BarrierWall;
s_visualCategories[ OsmTag( "historic", "castle" ) ] = GeoDataFeature::TouristCastle;