summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Rahn <[email protected]>2015-09-11 03:21:25 +0200
committerTorsten Rahn <[email protected]>2015-09-11 03:21:56 +0200
commit4b84111b0e021a80d6acfa5e6056f1748926719f (patch)
treeb2fde2d4256e6d86bc61815a94cedef6cd8c3fff
parent1837cc38fa7f037b85dec2fecdfeecb52571acee (diff)
Minor OSM bugfixes.
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.cpp15
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.h1
-rw-r--r--src/lib/marble/layers/GeometryLayer.cpp7
-rw-r--r--src/lib/marble/osm/OsmPresetLibrary.cpp5
4 files changed, 17 insertions, 11 deletions
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.cpp b/src/lib/marble/geodata/data/GeoDataFeature.cpp
index a777c6f..edc0e52 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.cpp
+++ b/src/lib/marble/geodata/data/GeoDataFeature.cpp
@@ -396,8 +396,8 @@ void GeoDataFeaturePrivate::initializeDefaultStyles()
s_defaultStyle[GeoDataFeature::MoneyAtm] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/atm.16", amenityColor );
s_defaultStyle[GeoDataFeature::MoneyBank] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/bank.16", amenityColor );
- s_defaultStyle[GeoDataFeature::AmenityCommunityCentre] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/community_centre-14", amenityColor );
- s_defaultStyle[GeoDataFeature::AmenityNightClub] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/nightclub.18", amenityColor );
+ s_defaultStyle[GeoDataFeature::AmenityCommunityCentre] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/community_centre-14", amenityColor );
+ s_defaultStyle[GeoDataFeature::AmenityNightClub] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/nightclub.18", amenityColor );
s_defaultStyle[GeoDataFeature::AmenityBench] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/bench.16", amenityColor );
s_defaultStyle[GeoDataFeature::AmenityCourtHouse] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/courthouse-16", amenityColor );
s_defaultStyle[GeoDataFeature::AmenityFireStation] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/firestation.16", amenityColor );
@@ -412,7 +412,7 @@ void GeoDataFeaturePrivate::initializeDefaultStyles()
s_defaultStyle[GeoDataFeature::AmenityTownHall] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/town_hall.16", amenityColor );
s_defaultStyle[GeoDataFeature::AmenityWasteBasket] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/waste_basket.10", amenityColor );
- s_defaultStyle[GeoDataFeature::AmenityDrinkingWater] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "individual/drinking_water.16", amenityColor );
+ s_defaultStyle[GeoDataFeature::AmenityDrinkingWater] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/drinking_water.16", amenityColor );
s_defaultStyle[GeoDataFeature::ShopBeverages] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "shop/beverages-14", shopColor );
s_defaultStyle[GeoDataFeature::ShopHifi] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "shop/hifi-14", shopColor );
@@ -457,7 +457,7 @@ void GeoDataFeaturePrivate::initializeDefaultStyles()
s_defaultStyle[GeoDataFeature::ManmadePier] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "", transportationColor, "#f2efe9", QColor( "#f2efe9" ).darker() );
- s_defaultStyle[GeoDataFeature::TouristAttraction] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, QString(), amenityColor );
+ s_defaultStyle[GeoDataFeature::TouristAttraction] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/tourist_memorial.16", amenityColor );
s_defaultStyle[GeoDataFeature::TouristCastle] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/cinema.16", amenityColor );
s_defaultStyle[GeoDataFeature::TouristCinema] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/cinema.16", amenityColor );
s_defaultStyle[GeoDataFeature::TouristMonument] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/monument.16", amenityColor );
@@ -482,6 +482,7 @@ void GeoDataFeaturePrivate::initializeDefaultStyles()
s_defaultStyle[GeoDataFeature::TransportTaxiRank] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "transportation/taxi.16", transportationColor );
s_defaultStyle[GeoDataFeature::TransportBicycleParking] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "transportation/bicycle_parking.16", transportationColor );
s_defaultStyle[GeoDataFeature::TransportMotorcycleParking] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "transportation/motorcycle_parking.16", transportationColor );
+ s_defaultStyle[GeoDataFeature::TransportSubwayEntrance] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "transportation/subway_entrance", transportationColor );
s_defaultStyle[GeoDataFeature::ReligionPlaceOfWorship] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "black/place_of_worship.16" );
s_defaultStyle[GeoDataFeature::ReligionBahai] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, QString() );
s_defaultStyle[GeoDataFeature::ReligionBuddhist] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "black/buddhist.16" );
@@ -531,9 +532,9 @@ void GeoDataFeaturePrivate::initializeDefaultStyles()
s_defaultStyle[GeoDataFeature::LeisurePark] = GeoDataFeaturePrivate::createWayStyle( "#CDF6CA", "#CDF6CA", true, false );
s_defaultStyle[GeoDataFeature::LeisurePlayground] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/playground.16", amenityColor, "#CCFFF1", "#BDFFED" );
s_defaultStyle[GeoDataFeature::LeisurePitch] = GeoDataFeaturePrivate::createWayStyle( "#8ad3af", QColor("#8ad3af").darker(150), true, true );
- s_defaultStyle[GeoDataFeature::LeisureSportsCentre] = GeoDataFeaturePrivate::createWayStyle( "#3c9", QColor("#3c9").darker(150), true, true );
- s_defaultStyle[GeoDataFeature::LeisureStadium] = GeoDataFeaturePrivate::createWayStyle( "#3c9", QColor("#3c9").darker(150), true, true );
- s_defaultStyle[GeoDataFeature::LeisureTrack] = GeoDataFeaturePrivate::createWayStyle( "#74dcba", QColor("#74dcba").darker(150), true, true );
+ s_defaultStyle[GeoDataFeature::LeisureSportsCentre] = GeoDataFeaturePrivate::createWayStyle( "#33cc99", QColor("#33cc99").darker(150), true, true );
+ s_defaultStyle[GeoDataFeature::LeisureStadium] = GeoDataFeaturePrivate::createWayStyle( "#33cc99", QColor("#33cc99").darker(150), true, true );
+ s_defaultStyle[GeoDataFeature::LeisureTrack] = GeoDataFeaturePrivate::createWayStyle( "#74dcba", QColor("#74dcba").darker(150), true, true );
s_defaultStyle[GeoDataFeature::LanduseAllotments] = GeoDataFeaturePrivate::createWayStyle( "#E4C6AA", "#E4C6AA", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/allotments.png") );
s_defaultStyle[GeoDataFeature::LanduseBasin] = GeoDataFeaturePrivate::createWayStyle( QColor(0xB5, 0xD0, 0xD0, 0x80 ), QColor( 0xB5, 0xD0, 0xD0 ) );
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.h b/src/lib/marble/geodata/data/GeoDataFeature.h
index 380e582..5a3f0ff 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature.h
@@ -299,6 +299,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
TransportTramStop,
TransportBicycleParking,
TransportMotorcycleParking,
+ TransportSubwayEntrance,
// OpenStreetMap category religion
ReligionPlaceOfWorship,
diff --git a/src/lib/marble/layers/GeometryLayer.cpp b/src/lib/marble/layers/GeometryLayer.cpp
index 01a80bd..4c98197 100644
--- a/src/lib/marble/layers/GeometryLayer.cpp
+++ b/src/lib/marble/layers/GeometryLayer.cpp
@@ -165,8 +165,11 @@ void GeometryLayerPrivate::initializeDefaultValues()
//Leisure
s_defaultZValues[GeoDataFeature::LeisurePark] = s_defaultZValue - 14;
- s_defaultZValues[GeoDataFeature::LeisurePlayground] = s_defaultZValue - 13.5;
- s_defaultZValues[GeoDataFeature::LeisurePitch] = s_defaultZValue - 13.5;
+ s_defaultZValues[GeoDataFeature::LeisurePlayground] = s_defaultZValue - 13;
+ s_defaultZValues[GeoDataFeature::LeisurePitch] = s_defaultZValue - 13;
+ s_defaultZValues[GeoDataFeature::LeisureSportsCentre] = s_defaultZValue - 13;
+ s_defaultZValues[GeoDataFeature::LeisureStadium] = s_defaultZValue - 13;
+ s_defaultZValues[GeoDataFeature::LeisureTrack] = s_defaultZValue - 13;
s_defaultZValues[GeoDataFeature::TransportParking] = s_defaultZValue - 13;
diff --git a/src/lib/marble/osm/OsmPresetLibrary.cpp b/src/lib/marble/osm/OsmPresetLibrary.cpp
index 0f69e28..9d11ebd 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.cpp
+++ b/src/lib/marble/osm/OsmPresetLibrary.cpp
@@ -141,6 +141,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "religion", "shinto" ) ] = GeoDataFeature::ReligionShinto;
s_visualCategories[ OsmTag( "religion", "sikh" ) ] = GeoDataFeature::ReligionSikh;
+ s_visualCategories[ OsmTag( "historic", "memorial" ) ] = GeoDataFeature::TouristAttraction;
s_visualCategories[ OsmTag( "tourism", "attraction" ) ] = GeoDataFeature::TouristAttraction;
s_visualCategories[ OsmTag( "tourism", "camp_site" ) ] = GeoDataFeature::AccomodationCamping;
s_visualCategories[ OsmTag( "tourism", "hostel" ) ] = GeoDataFeature::AccomodationHostel;
@@ -225,6 +226,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "landuse", "vineyard" ) ] = GeoDataFeature::LanduseVineyard;
s_visualCategories[ OsmTag( "landuse", "village_green" ) ] = GeoDataFeature::LanduseGrass;
+ s_visualCategories[ OsmTag( "leisure", "common" ) ] = GeoDataFeature::LanduseGrass;
s_visualCategories[ OsmTag( "leisure", "garden" ) ] = GeoDataFeature::LanduseGrass;
s_visualCategories[ OsmTag( "leisure", "park" ) ] = GeoDataFeature::LeisurePark;
s_visualCategories[ OsmTag( "leisure", "playground" ) ] = GeoDataFeature::LeisurePlayground;
@@ -262,6 +264,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "transport", "bus_stop" ) ] = GeoDataFeature::TransportBusStop;
s_visualCategories[ OsmTag( "amenity", "bicycle_parking" ) ] = GeoDataFeature::TransportBicycleParking;
s_visualCategories[ OsmTag( "amenity", "motorcycle_parking" ) ] = GeoDataFeature::TransportMotorcycleParking;
+ s_visualCategories[ OsmTag( "railway", "subway_entrance" ) ] = GeoDataFeature::TransportSubwayEntrance;
s_visualCategories[ OsmTag( "place", "city" ) ] = GeoDataFeature::LargeCity;
s_visualCategories[ OsmTag( "place", "hamlet" ) ] = GeoDataFeature::SmallCity;
@@ -289,7 +292,6 @@ void OsmPresetLibrary::initializeAdditionalOsmTags()
s_additionalOsmTags << OsmTag( "barrier", "fence" );
s_additionalOsmTags << OsmTag( "barrier", "wall" );
s_additionalOsmTags << OsmTag( "barrier", "gate" );
- s_additionalOsmTags << OsmTag( "amenity", "toilets" );
@@ -399,7 +401,6 @@ void OsmPresetLibrary::initializeAdditionalOsmTags()
s_additionalOsmTags << OsmTag( "email", "" );
s_additionalOsmTags << OsmTag( "fee", "" );
s_additionalOsmTags << OsmTag( "destination", "" );
- s_additionalOsmTags << OsmTag( "drinking_water", "yes" );
s_additionalOsmTags << OsmTag( "indoor", "yes" );