[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble] src: Show speed cameras
From: Dennis_Nienhüser <nienhueser () kde ! org>
Date: 2016-12-03 12:31:41
Message-ID: E1cD9Th-0007C3-Kq () code ! kde ! org
[Download RAW message or body]
Git commit 70b63f20aa01738805dafab16011a99436d2ac31 by Dennis Nienhüser.
Committed on 03/12/2016 at 12:31.
Pushed by nienhueser into branch 'master'.
Show speed cameras
Patch by Rakete1111, thanks!
Differential Revision: https://phabricator.kde.org/D3574
GCI Task: https://codein.withgoogle.com/tasks/6284569022038016/
M +5 -0 src/lib/marble/StyleBuilder.cpp
M +3 -0 src/lib/marble/declarative/Placemark.cpp
M +1 -0 src/lib/marble/geodata/data/GeoDataPlacemark.cpp
M +1 -0 src/lib/marble/geodata/data/GeoDataPlacemark.h
M +1 -1 src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
M +1 -0 src/plugins/runner/osm/OsmNode.cpp
https://commits.kde.org/marble/70b63f20aa01738805dafab16011a99436d2ac31
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index 0ee18d4..f513ef2 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -159,6 +159,7 @@ StyleBuilder::Private::Private() :
m_defaultMinZoomLevels[GeoDataPlacemark::TransportAirportRunway] = 15;
m_defaultMinZoomLevels[GeoDataPlacemark::TransportAirportTaxiway] = 15;
m_defaultMinZoomLevels[GeoDataPlacemark::TransportAirportApron] = 15;
+ m_defaultMinZoomLevels[GeoDataPlacemark::TransportSpeedCamera] = 17;
#if 0 // not needed as long as default min zoom level is 15
for(int i = GeoDataPlacemark::AccomodationCamping; i <= \
GeoDataPlacemark::ReligionSikh; i++) @@ -737,6 +738,7 @@ void \
StyleBuilder::Private::initializeDefaultStyles()
m_defaultStyle[GeoDataPlacemark::TransportAirportRunway] = \
createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1, \
Qt::NoPen);
m_defaultStyle[GeoDataPlacemark::TransportAirportTaxiway] = \
createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1, \
Qt::NoPen);
m_defaultStyle[GeoDataPlacemark::TransportAirportApron] = \
createWayStyle("#e9d1ff", Qt::transparent, true, false); + \
m_defaultStyle[GeoDataPlacemark::TransportSpeedCamera] = \
createOsmPOIStyle(osmFont, "individual/speedcamera");
m_defaultStyle[GeoDataPlacemark::NaturalWater] = createStyle(4, 0, \
waterColor, waterColor, true, false, Qt::SolidPattern, Qt::SolidLine, Qt::RoundCap, \
false, QVector< qreal >(), @@ -1168,6 +1170,7 @@ void \
StyleBuilder::Private::initializeOsmVisualCategories()
s_visualCategories[OsmTag("transport", "train_station")] = \
GeoDataPlacemark::TransportTrainStation;
s_visualCategories[OsmTag("transport", "tram_stop")] = \
GeoDataPlacemark::TransportTramStop;
s_visualCategories[OsmTag("transport", "bus_stop")] = \
GeoDataPlacemark::TransportBusStop; + s_visualCategories[OsmTag("highway", \
"speed_camera")] = GeoDataPlacemark::TransportSpeedCamera;
s_visualCategories[OsmTag("amenity", "bicycle_parking")] = \
GeoDataPlacemark::TransportBicycleParking;
s_visualCategories[OsmTag("amenity", "motorcycle_parking")] = \
GeoDataPlacemark::TransportMotorcycleParking;
s_visualCategories[OsmTag("railway", "subway_entrance")] = \
GeoDataPlacemark::TransportSubwayEntrance; @@ -1580,6 +1583,7 @@ QStringList \
StyleBuilder::renderOrder() const
paintLayerOrder << Private::createPaintLayerItem("Point", \
GeoDataPlacemark::EducationSchool);
paintLayerOrder << Private::createPaintLayerItem("Point", \
GeoDataPlacemark::EducationUniversity);
paintLayerOrder << Private::createPaintLayerItem("Point", \
GeoDataPlacemark::HealthHospital); + paintLayerOrder << \
Private::createPaintLayerItem("Point", \
GeoDataPlacemark::TransportSpeedCamera);
paintLayerOrder << Private::createPaintLayerItem("Point", \
GeoDataPlacemark::MilitaryDangerArea);
paintLayerOrder << QStringLiteral("Polygon/Building/frame");
@@ -1834,6 +1838,7 @@ QString \
StyleBuilder::visualCategoryName(GeoDataPlacemark::GeoDataVisualCategory
visualCategoryNames[GeoDataPlacemark::TransportTaxiRank] = \
"TransportTaxiRank";
visualCategoryNames[GeoDataPlacemark::TransportTrainStation] = \
"TransportTrainStation";
visualCategoryNames[GeoDataPlacemark::TransportTramStop] = \
"TransportTramStop"; + \
visualCategoryNames[GeoDataPlacemark::TransportSpeedCamera] = \
"TransportSpeedCamera";
visualCategoryNames[GeoDataPlacemark::TransportBicycleParking] = \
"TransportBicycleParking";
visualCategoryNames[GeoDataPlacemark::TransportMotorcycleParking] = \
"TransportMotorcycleParking";
visualCategoryNames[GeoDataPlacemark::TransportSubwayEntrance] = \
"TransportSubwayEntrance";
diff --git a/src/lib/marble/declarative/Placemark.cpp \
b/src/lib/marble/declarative/Placemark.cpp index a5d2b1e..c8a94e1 100644
--- a/src/lib/marble/declarative/Placemark.cpp
+++ b/src/lib/marble/declarative/Placemark.cpp
@@ -207,6 +207,9 @@ QString Placemark::description() const
addTagDescription(m_description, QStringLiteral("backrest"), \
QStringLiteral("no"), tr("No backrest", "A bench provides no backrest to lean \
against")); } else if (category == GeoDataPlacemark::AmenityWasteBasket) {
addTagValue(m_description, QStringLiteral("waste"));
+ } else if (category == GeoDataPlacemark::TransportSpeedCamera) {
+ addTagValue(m_description, QStringLiteral("maxspeed"), tr("%1 km/h"));
+ addTagValue(m_description, "ref");
}
if (category == GeoDataPlacemark::AmenityRecycling || category == \
GeoDataPlacemark::AmenityPostBox) {
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp \
b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp index 12b2a13..af8e172 100644
--- a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
+++ b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
@@ -584,6 +584,7 @@ QString GeoDataPlacemark::categoryName() const
case TransportBicycleParking: return GeoDataPlacemarkPrivate::tr("Bicycle \
Parking");
case TransportMotorcycleParking: return GeoDataPlacemarkPrivate::tr("Motorcycle \
Parking");
case TransportSubwayEntrance: return GeoDataPlacemarkPrivate::tr("Subway \
Entrance"); + case TransportSpeedCamera: return GeoDataPlacemarkPrivate::tr("Speed \
Camera");
case ReligionPlaceOfWorship: return GeoDataPlacemarkPrivate::tr("Place Of \
Worship"); case ReligionBahai: return GeoDataPlacemarkPrivate::tr("Bahai");
case ReligionBuddhist: return GeoDataPlacemarkPrivate::tr("Buddhist");
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.h \
b/src/lib/marble/geodata/data/GeoDataPlacemark.h index 1417b80..f0132e2 100644
--- a/src/lib/marble/geodata/data/GeoDataPlacemark.h
+++ b/src/lib/marble/geodata/data/GeoDataPlacemark.h
@@ -368,6 +368,7 @@ class GEODATA_EXPORT GeoDataPlacemark: public GeoDataFeature
TransportBicycleParking,
TransportMotorcycleParking,
TransportSubwayEntrance,
+ TransportSpeedCamera,
// OpenStreetMap category religion
ReligionPlaceOfWorship,
diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp \
b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp index 998854e..3847b63 \
100644
--- a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
+++ b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
@@ -79,7 +79,7 @@ LocalOsmSearchRunner::LocalOsmSearchRunner( const QStringList \
&databaseFiles, QO
m_categoryMap[OsmPlacemark::TransportTramStop] = \
GeoDataPlacemark::TransportTramStop;
m_categoryMap[OsmPlacemark::TransportRentalBicycle] = \
GeoDataPlacemark::TransportRentalBicycle;
m_categoryMap[OsmPlacemark::TransportRentalCar] = \
GeoDataPlacemark::TransportRentalCar;
- m_categoryMap[OsmPlacemark::TransportSpeedCamera] = \
GeoDataPlacemark::OsmSite; + m_categoryMap[OsmPlacemark::TransportSpeedCamera] \
= GeoDataPlacemark::TransportSpeedCamera;
m_categoryMap[OsmPlacemark::TransportTaxiRank] = \
GeoDataPlacemark::TransportTaxiRank;
m_categoryMap[OsmPlacemark::PlacesRegion] = GeoDataPlacemark::OsmSite;
m_categoryMap[OsmPlacemark::PlacesCounty] = GeoDataPlacemark::OsmSite;
diff --git a/src/plugins/runner/osm/OsmNode.cpp b/src/plugins/runner/osm/OsmNode.cpp
index 7287b38..bd3886f 100644
--- a/src/plugins/runner/osm/OsmNode.cpp
+++ b/src/plugins/runner/osm/OsmNode.cpp
@@ -145,6 +145,7 @@ qint64 \
OsmNode::popularityFor(GeoDataPlacemark::GeoDataVisualCategory category) \
popularities << GeoDataPlacemark::HealthHospital; popularities << \
GeoDataPlacemark::AmenityToilets; popularities << GeoDataPlacemark::MoneyAtm;
+ popularities << GeoDataPlacemark::TransportSpeedCamera;
popularities << GeoDataPlacemark::NaturalPeak;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic