summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Rahn <[email protected]>2015-10-25 14:32:44 +0100
committerTorsten Rahn <[email protected]>2015-10-25 14:33:37 +0100
commit01ef39aa0d0fe45959969e3349eb7b60f8beab3e (patch)
tree43281cd93dd10c6283b3454e42754f8e63cb8adb
parentd5923dee78bfd73b3d13ea6f6a34fab9e9992aa4 (diff)
Adding man_made=bridge (and hence the Golden Gate Bridge).
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.cpp1
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.h1
-rw-r--r--src/lib/marble/layers/GeometryLayer.cpp4
-rw-r--r--src/lib/marble/osm/OsmPresetLibrary.cpp4
4 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.cpp b/src/lib/marble/geodata/data/GeoDataFeature.cpp
index 1b65b83..e69ba10 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.cpp
+++ b/src/lib/marble/geodata/data/GeoDataFeature.cpp
@@ -473,6 +473,7 @@ void GeoDataFeaturePrivate::initializeDefaultStyles()
s_defaultStyle[GeoDataFeature::ShopTravelAgency] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "shop/travel_agency-14", shopColor );
s_defaultStyle[GeoDataFeature::Shop] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "shop/shop-14", shopColor );
+ s_defaultStyle[GeoDataFeature::ManmadeBridge] = GeoDataFeaturePrivate::createWayStyle( QColor("#b8b8b8"), QColor("transparent"), true, true );
s_defaultStyle[GeoDataFeature::ManmadeLighthouse] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "transportation/lighthouse.16", transportationColor, "#f2efe9", QColor( "#f2efe9" ).darker() );
s_defaultStyle[GeoDataFeature::ManmadePier] = GeoDataFeaturePrivate::createStyle(0.0, 3.0, "#f2efe9", "#f2efe9", true, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false );
s_defaultStyle[GeoDataFeature::ManmadeWaterTower] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/water_tower.16", amenityColor );
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.h b/src/lib/marble/geodata/data/GeoDataFeature.h
index 74c9c55..7bc0c00 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature.h
@@ -289,6 +289,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
ShopTravelAgency,
Shop,
+ ManmadeBridge,
ManmadeLighthouse,
ManmadePier,
ManmadeWaterTower,
diff --git a/src/lib/marble/layers/GeometryLayer.cpp b/src/lib/marble/layers/GeometryLayer.cpp
index 60aed68..a8375f8 100644
--- a/src/lib/marble/layers/GeometryLayer.cpp
+++ b/src/lib/marble/layers/GeometryLayer.cpp
@@ -183,6 +183,8 @@ void GeometryLayerPrivate::initializeDefaultValues()
s_defaultZValues[GeoDataFeature::TransportParking] = s_defaultZValue - 13;
+ s_defaultZValues[GeoDataFeature::ManmadeBridge] = s_defaultZValue - 12;
+
s_defaultZValues[GeoDataFeature::HighwayUnknown] = s_defaultZValue - 11;
s_defaultZValues[GeoDataFeature::HighwayPath] = s_defaultZValue - 10;
s_defaultZValues[GeoDataFeature::HighwayTrack] = s_defaultZValue - 9;
@@ -217,6 +219,8 @@ void GeometryLayerPrivate::initializeDefaultValues()
s_defaultMinZoomLevels[GeoDataFeature::NaturalCliff] = 15;
s_defaultMinZoomLevels[GeoDataFeature::Building] = 15;
+ s_defaultMinZoomLevels[GeoDataFeature::ManmadeBridge] = 15;
+
// OpenStreetMap highways
s_defaultMinZoomLevels[GeoDataFeature::HighwaySteps] = 15;
s_defaultMinZoomLevels[GeoDataFeature::HighwayUnknown] = 13;
diff --git a/src/lib/marble/osm/OsmPresetLibrary.cpp b/src/lib/marble/osm/OsmPresetLibrary.cpp
index e39e173..87d8fb4 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.cpp
+++ b/src/lib/marble/osm/OsmPresetLibrary.cpp
@@ -148,6 +148,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
}
+ s_visualCategories[ OsmTag( "man_made", "bridge" ) ] = GeoDataFeature::ManmadeBridge;
s_visualCategories[ OsmTag( "man_made", "lighthouse" ) ] = GeoDataFeature::ManmadeLighthouse;
s_visualCategories[ OsmTag( "man_made", "pier" ) ] = GeoDataFeature::ManmadePier;
s_visualCategories[ OsmTag( "man_made", "water_tower" ) ] = GeoDataFeature::ManmadeWaterTower;
@@ -342,7 +343,6 @@ void OsmPresetLibrary::initializeAdditionalOsmTags()
s_additionalOsmTags << OsmTag( "service", "driveway" );
s_additionalOsmTags << OsmTag( "service", "parking_aisle" );
s_additionalOsmTags << OsmTag( "service", "alley" );
- s_additionalOsmTags << OsmTag( "bridge", "yes" );
s_additionalOsmTags << OsmTag( "tunnel", "yes" );
s_additionalOsmTags << OsmTag( "abutters", "commercial" );
s_additionalOsmTags << OsmTag( "abutters", "industrial" );
@@ -359,7 +359,6 @@ void OsmPresetLibrary::initializeAdditionalOsmTags()
s_additionalOsmTags << OsmTag( "surface", "grass" );
-
// Relations
s_additionalOsmTags << OsmTag( "type", "route" );
s_additionalOsmTags << OsmTag( "type", "route_master" );
@@ -523,6 +522,7 @@ bool OsmPresetLibrary::isAreaTag(const QString &keyValue)
foreach(const QString &value, buildingValues() ) {
s_areaTags.insert( QString("building=%1").arg(value) );
}
+ s_areaTags.insert( "man_made=bridge" );
s_areaTags.insert( "amenity=graveyard" );
s_areaTags.insert( "amenity=parking" );