diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp --- a/src/lib/marble/StyleBuilder.cpp +++ b/src/lib/marble/StyleBuilder.cpp @@ -517,6 +517,8 @@ m_defaultStyle[GeoDataPlacemark::ShopCarParts] = createOsmPOIStyle(osmFont, "shop/car_parts-14", shopColor); m_defaultStyle[GeoDataPlacemark::ShopMotorcycle] = createOsmPOIStyle(osmFont, "shop/motorcycle-14", shopColor); m_defaultStyle[GeoDataPlacemark::ShopOutdoor] = createOsmPOIStyle(osmFont, "shop/outdoor-14", shopColor); + m_defaultStyle[GeoDataPlacemark::ShopSports] = createOsmPOIStyle(osmFont, "shop/sports", shopColor); + m_defaultStyle[GeoDataPlacemark::ShopCopy] = createOsmPOIStyle(osmFont, "shop/copyshop", shopColor); m_defaultStyle[GeoDataPlacemark::ShopMusicalInstrument] = createOsmPOIStyle(osmFont, "shop/musical_instrument-14", shopColor); m_defaultStyle[GeoDataPlacemark::ShopPhoto] = createOsmPOIStyle(osmFont, "shop/photo-14", shopColor); m_defaultStyle[GeoDataPlacemark::ShopBook] = createOsmPOIStyle(osmFont, "shop/shop_books.16", shopColor); @@ -885,6 +887,8 @@ s_visualCategories[OsmTag("shop", "car_parts")] = GeoDataPlacemark::ShopCarParts; s_visualCategories[OsmTag("shop", "motorcycle")] = GeoDataPlacemark::ShopMotorcycle; s_visualCategories[OsmTag("shop", "outdoor")] = GeoDataPlacemark::ShopOutdoor; + s_visualCategories[OsmTag("shop", "sports")] = GeoDataPlacemark::ShopSports; + s_visualCategories[OsmTag("shop", "copy")] = GeoDataPlacemark::ShopCopy; s_visualCategories[OsmTag("shop", "musical_instrument")] = GeoDataPlacemark::ShopMusicalInstrument; s_visualCategories[OsmTag("shop", "photo")] = GeoDataPlacemark::ShopPhoto; s_visualCategories[OsmTag("shop", "books")] = GeoDataPlacemark::ShopBook; @@ -1958,6 +1962,8 @@ visualCategoryNames[GeoDataPlacemark::ShopCarParts] = "ShopCarParts"; visualCategoryNames[GeoDataPlacemark::ShopMotorcycle] = "ShopMotorcycle"; visualCategoryNames[GeoDataPlacemark::ShopOutdoor] = "ShopOutdoor"; + visualCategoryNames[GeoDataPlacemark::ShopSports] = "ShopSports"; + visualCategoryNames[GeoDataPlacemark::ShopCopy] = "ShopCopy"; visualCategoryNames[GeoDataPlacemark::ShopMusicalInstrument] = "ShopMusicalInstrument"; visualCategoryNames[GeoDataPlacemark::ShopPhoto] = "ShopPhoto"; visualCategoryNames[GeoDataPlacemark::ShopBook] = "ShopBook"; diff --git a/src/lib/marble/declarative/Placemark.cpp b/src/lib/marble/declarative/Placemark.cpp --- a/src/lib/marble/declarative/Placemark.cpp +++ b/src/lib/marble/declarative/Placemark.cpp @@ -126,6 +126,31 @@ if (category == GeoDataPlacemark::ShopButcher) { addTagValue(m_description, "butcher"); } + } else if (category == GeoDataPlacemark::ShopCopy) { + QString const computer = m_placemark.osmData().tagValue(QStringLiteral("service:computer")); + QString const copy = m_placemark.osmData().tagValue(QStringLiteral("service:copy")); + QString const scan = m_placemark.osmData().tagValue(QStringLiteral("service:scan")); + QString const fax = m_placemark.osmData().tagValue(QStringLiteral("service:fax")); + QString const phone = m_placemark.osmData().tagValue(QStringLiteral("service:phone")); + QString const print = m_placemark.osmData().tagValue(QStringLiteral("service:print")); + QString const press = m_placemark.osmData().tagValue(QStringLiteral("service:press")); + QString const prepress = m_placemark.osmData().tagValue(QStringLiteral("service:prepress")); + addTagDescription(m_description, QStringLiteral("computer"), QStringLiteral("yes"), tr("Computers available", "A copy shop provides computers for customer use")); + addTagDescription(m_description, QStringLiteral("computer"), QStringLiteral("no"), tr("No computers available", "A copy shop does not provide computers for customer use")); + addTagDescription(m_description, QStringLiteral("copy"), QStringLiteral("yes"), tr("Photocopying service", "A copy shop provides photocopying service")); + addTagDescription(m_description, QStringLiteral("copy"), QStringLiteral("no"), tr("No photocopying service", "A copy shop does not provide photocopying service")); + addTagDescription(m_description, QStringLiteral("scan"), QStringLiteral("yes"), tr("Digital scanning", "A copy shop provides a service for scanning documents into digital files")); + addTagDescription(m_description, QStringLiteral("scan"), QStringLiteral("no"), tr("No digital scanning", "A copy shop does not provide a service for scanning documents into digital files")); + addTagDescription(m_description, QStringLiteral("fax"), QStringLiteral("yes"), tr("Fax service", "A copy shop provides a service to send documents through fax")); + addTagDescription(m_description, QStringLiteral("fax"), QStringLiteral("no"), tr("No fax service", "A copy shop does not provide a service to send documents through fax")); + addTagDescription(m_description, QStringLiteral("phone"), QStringLiteral("yes"), tr("Phone service", "A copy shop provides a paid service to make phone calls")); + addTagDescription(m_description, QStringLiteral("phone"), QStringLiteral("no"), tr("No phone service", "A copy shop does not provide a paid service to make phone calls")); + addTagDescription(m_description, QStringLiteral("print"), QStringLiteral("yes"), tr("Digital printing", "A copy shop provides services to print paper documents from digital files")); + addTagDescription(m_description, QStringLiteral("print"), QStringLiteral("no"), tr("No digital printing", "A copy shop does not provide services to print paper documents from digital files")); + addTagDescription(m_description, QStringLiteral("press"), QStringLiteral("yes"), tr("Press printing service", "A copy shop provides a professional service to print a large number of copies of a document")); + addTagDescription(m_description, QStringLiteral("press"), QStringLiteral("no"), tr("No press printing service", "A copy shop does not provide a professional service to print a large number of copies of a document")); + addTagDescription(m_description, QStringLiteral("prepress"), QStringLiteral("yes"), tr("Press printing assistance", " A copy shop provides help with preparing special printing techniques")); + addTagDescription(m_description, QStringLiteral("prepress"), QStringLiteral("no"), tr(" No press printing assistance", " A copy shop does not provide help with preparing special printing techniques")); } else if (category == GeoDataPlacemark::TransportBusStop) { addTagValue(m_description, "network"); addTagValue(m_description, "operator"); diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.h b/src/lib/marble/geodata/data/GeoDataPlacemark.h --- a/src/lib/marble/geodata/data/GeoDataPlacemark.h +++ b/src/lib/marble/geodata/data/GeoDataPlacemark.h @@ -313,6 +313,8 @@ ShopCarParts, ShopMotorcycle, ShopOutdoor, + ShopSports, + ShopCopy, ShopMusicalInstrument, ShopPhoto, ShopBook, diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp --- a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp +++ b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp @@ -535,6 +535,8 @@ case ShopCarParts: return GeoDataPlacemarkPrivate::tr("Car Parts"); case ShopMotorcycle: return GeoDataPlacemarkPrivate::tr("Motorcycle"); case ShopOutdoor: return GeoDataPlacemarkPrivate::tr("Outdoor"); + case ShopSports: return GeoDataPlacemarkPrivate::tr("Sports"); + case ShopCopy: return GeoDataPlacemarkPrivate::tr("Copy"); case ShopMusicalInstrument: return GeoDataPlacemarkPrivate::tr("Musical Instrument"); case ShopPhoto: return GeoDataPlacemarkPrivate::tr("Photo"); case ShopBook: return GeoDataPlacemarkPrivate::tr("Book"); diff --git a/src/plugins/runner/osm/OsmNode.cpp b/src/plugins/runner/osm/OsmNode.cpp --- a/src/plugins/runner/osm/OsmNode.cpp +++ b/src/plugins/runner/osm/OsmNode.cpp @@ -243,6 +243,8 @@ popularities << GeoDataPlacemark::ShopCarParts; popularities << GeoDataPlacemark::ShopMotorcycle; popularities << GeoDataPlacemark::ShopOutdoor; + popularities << GeoDataPlacemark::ShopSports; + popularities << GeoDataPlacemark::ShopCopy; popularities << GeoDataPlacemark::ShopMusicalInstrument; popularities << GeoDataPlacemark::ShopPhoto; popularities << GeoDataPlacemark::ShopBook;