Commit d5657d48 authored by Torsten Rahn's avatar Torsten Rahn Committed by Torsten Rahn
Browse files

Adding city wall (visible prominently e.g. in Nuremberg)

parent f9134e03
......@@ -538,8 +538,9 @@ void GeoDataFeaturePrivate::initializeDefaultStyles()
s_defaultStyle[GeoDataFeature::PowerTower] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/power_tower", QColor( "#888888" ) );
s_defaultStyle[GeoDataFeature::BarrierCityWall] = GeoDataFeaturePrivate::createStyle( 6.0, 3.0, "#787878", "transparent", true, false, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector< qreal >(), QFont(), "transparent" );
s_defaultStyle[GeoDataFeature::BarrierGate] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/gate" );
s_defaultStyle[GeoDataFeature::BarrierLiftGate] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/liftgate" );
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, "#fa8072", QColor(Qt::white), true, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3 );
......
......@@ -242,6 +242,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
AmenityGraveyard,
// OpenStreetMap category Barrier
BarrierCityWall,
BarrierGate,
BarrierLiftGate,
BarrierWall,
......
......@@ -185,6 +185,7 @@ void GeometryLayerPrivate::initializeDefaultValues()
s_defaultZValues[GeoDataFeature::TransportParking] = s_defaultZValue - 13;
s_defaultZValues[GeoDataFeature::ManmadeBridge] = s_defaultZValue - 12;
s_defaultZValues[GeoDataFeature::BarrierCityWall] = s_defaultZValue - 1;
s_defaultZValues[GeoDataFeature::HighwayUnknown] = s_defaultZValue - 11;
s_defaultZValues[GeoDataFeature::HighwayPath] = s_defaultZValue - 10;
......@@ -220,6 +221,7 @@ void GeometryLayerPrivate::initializeDefaultValues()
s_defaultMinZoomLevels[GeoDataFeature::NaturalScrub] = 10;
s_defaultMinZoomLevels[GeoDataFeature::NaturalCliff] = 15;
s_defaultMinZoomLevels[GeoDataFeature::NaturalPeak] = 11;
s_defaultMinZoomLevels[GeoDataFeature::BarrierCityWall] = 15;
s_defaultMinZoomLevels[GeoDataFeature::Building] = 15;
s_defaultMinZoomLevels[GeoDataFeature::ManmadeBridge] = 15;
......
......@@ -178,6 +178,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "tourism", "zoo" ) ] = GeoDataFeature::TouristZoo;
s_visualCategories[ OsmTag( "tourism", "alpine_hut" ) ] = GeoDataFeature::TouristAlpineHut;
s_visualCategories[ OsmTag( "barrier", "city_wall" ) ] = GeoDataFeature::BarrierCityWall;
s_visualCategories[ OsmTag( "barrier", "gate" ) ] = GeoDataFeature::BarrierGate;
s_visualCategories[ OsmTag( "barrier", "lift_gate" ) ] = GeoDataFeature::BarrierLiftGate;
s_visualCategories[ OsmTag( "barrier", "wall" ) ] = GeoDataFeature::BarrierWall;
......
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