platform/settings.cpp

@@ -21,6 +21,7 @@ namespace settings
 using namespace std;
 
 char const * kMeasurementUnits = "Units";
+char const * kDeveloperMode = "DeveloperMode";
 
 StringStorage::StringStorage() : StringStorageBase(GetPlatform().SettingsPathForFile(SETTINGS_FILE_NAME)) {}
 

platform/settings.hpp

@@ -11,6 +11,8 @@ namespace settings
 /// Metric or Imperial.
 extern char const * kMeasurementUnits;
 
+extern char const * kDeveloperMode;
+
 template <class T>
 bool FromString(std::string const & str, T & outValue);
 

qt/CMakeLists.txt

@@ -36,8 +36,10 @@ set(SRC
   mwms_borders_selection.hpp
   osm_auth_dialog.cpp
   osm_auth_dialog.hpp
-  place_page_dialog.cpp
-  place_page_dialog.hpp
+  place_page_dialog_developer.cpp
+  place_page_dialog_developer.hpp
+  place_page_dialog_user.cpp
+  place_page_dialog_user.hpp
   preferences_dialog.cpp
   preferences_dialog.hpp
   popup_menu_holder.cpp

qt/draw_widget.cpp

@@ -2,7 +2,8 @@
 
 #include "qt/create_feature_dialog.hpp"
 #include "qt/editor_dialog.hpp"
-#include "qt/place_page_dialog.hpp"
+#include "qt/place_page_dialog_developer.hpp"
+#include "qt/place_page_dialog_user.hpp"
 #include "qt/qt_common/helpers.hpp"
 #include "qt/routing_settings_dialog.hpp"
 #include "qt/screenshoter.hpp"
@@ -649,8 +650,14 @@ void DrawWidget::ShowPlacePage()
     address = m_framework.GetAddressAtPoint(info.GetMercator());
   }
 
-  PlacePageDialog dlg(this, info, address);
-  if (dlg.exec() == QDialog::Accepted)
+  std::unique_ptr<QDialog> placePageDialog = nullptr;
+  bool developerMode;
+  if (settings::Get(settings::kDeveloperMode, developerMode) && developerMode)
+    placePageDialog = std::make_unique<PlacePageDialogDeveloper>(this, info, address);
+  else
+    placePageDialog = std::make_unique<PlacePageDialogUser>(this, info, address);
+
+  if (placePageDialog->exec() == QDialog::Accepted)
   {
     osm::EditableMapObject emo;
     if (m_framework.GetEditableMapObject(info.GetID(), emo))

qt/main.cpp

@@ -148,6 +148,16 @@ int main(int argc, char * argv[])
     QApplication::setApplicationName("Organic Maps");
 #endif
 
+
+#ifdef DEBUG
+  static bool constexpr developerMode = true;
+#else
+  static bool constexpr developerMode = false;
+#endif
+  bool outvalue;
+  if (!settings::Get(settings::kDeveloperMode, outvalue))
+    settings::Set(settings::kDeveloperMode, developerMode);
+
   // Display EULA if needed.
   char const * settingsEULA = "EulaAccepted";
   bool eulaAccepted = false;

qt/place_page_dialog_developer.cpp

@@ -1,4 +1,4 @@
-#include "qt/place_page_dialog.hpp"
+#include "qt/place_page_dialog_developer.hpp"
 
 #include "qt/qt_common/text_dialog.hpp"
 
@@ -12,8 +12,8 @@
 
 #include <string>
 
-PlacePageDialog::PlacePageDialog(QWidget * parent, place_page::Info const & info,
-                                 search::ReverseGeocoder::Address const & address)
+PlacePageDialogDeveloper::PlacePageDialogDeveloper(QWidget * parent, place_page::Info const & info,
+                                                   search::ReverseGeocoder::Address const & address)
   : QDialog(parent)
 {
   QGridLayout * grid = new QGridLayout();
@@ -86,13 +86,13 @@ PlacePageDialog::PlacePageDialog(QWidget * parent, place_page::Info const & info
   QDialogButtonBox * dbb = new QDialogButtonBox();
   QPushButton * closeButton = new QPushButton("Close");
   closeButton->setDefault(true);
-  connect(closeButton, &QAbstractButton::clicked, this, &PlacePageDialog::OnClose);
+  connect(closeButton, &QAbstractButton::clicked, this, &PlacePageDialogDeveloper::OnClose);
   dbb->addButton(closeButton, QDialogButtonBox::RejectRole);
 
   if (info.ShouldShowEditPlace())
   {
     QPushButton * editButton = new QPushButton("Edit Place");
-    connect(editButton, &QAbstractButton::clicked, this, &PlacePageDialog::OnEdit);
+    connect(editButton, &QAbstractButton::clicked, this, &PlacePageDialogDeveloper::OnEdit);
     dbb->addButton(editButton, QDialogButtonBox::AcceptRole);
   }
 
@@ -137,5 +137,5 @@ PlacePageDialog::PlacePageDialog(QWidget * parent, place_page::Info const & info
   setWindowTitle(ppTitle.c_str());
 }
 
-void PlacePageDialog::OnClose() { reject(); }
-void PlacePageDialog::OnEdit() { accept(); }
+void PlacePageDialogDeveloper::OnClose() { reject(); }
+void PlacePageDialogDeveloper::OnEdit() { accept(); }

qt/place_page_dialog_developer.hpp

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "search/reverse_geocoder.hpp"
+
+#include <QtWidgets/QDialog>
+
+namespace place_page
+{
+class Info;
+}
+
+class PlacePageDialogDeveloper : public QDialog
+{
+  Q_OBJECT
+public:
+  PlacePageDialogDeveloper(QWidget * parent, place_page::Info const & info,
+                           search::ReverseGeocoder::Address const & address);
+
+private slots:
+  void OnClose();
+  void OnEdit();
+};

qt/place_page_dialog_user.cpp

@@ -0,0 +1,246 @@
+#include "qt/place_page_dialog_user.hpp"
+
+#include "qt/qt_common/text_dialog.hpp"
+
+#include "map/place_page_info.hpp"
+#include "indexer/validate_and_format_contacts.hpp"
+#include "platform/settings.hpp"
+
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QBoxLayout>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QGridLayout>
+
+#include <sstream>
+#include <string>
+
+namespace
+{
+static int constexpr kMaxLengthOfPlacePageDescription = 500;
+static int constexpr kMinWidthOfShortDescription = 390;
+
+std::string_view stripSchemeFromURI(std::string_view uri) {
+  for (std::string_view prefix : {"https://", "http://"})
+  {
+    if (strings::StartsWith(uri, prefix))
+      return uri.substr(prefix.size());
+  }
+  return uri;
+}
+}  // namespace
+
+class QHLine : public QFrame
+{
+public:
+  QHLine(QWidget * parent = nullptr) : QFrame(parent)
+  {
+    setFrameShape(QFrame::HLine);
+    setFrameShadow(QFrame::Sunken);
+  }
+};
+
+PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info const & info,
+                                         search::ReverseGeocoder::Address const & address)
+  : QDialog(parent)
+{
+  auto const & title = info.GetTitle();
+
+  QVBoxLayout * layout = new QVBoxLayout();
+  {
+    QVBoxLayout * header = new QVBoxLayout();
+
+    if (!title.empty())
+      header->addWidget(new QLabel(QString::fromStdString("<h1>" + title + "</h1>")));
+
+    if (auto subTitle = info.GetSubtitle(); !subTitle.empty())
+      header->addWidget(new QLabel(QString::fromStdString(subTitle)));
+
+    if (auto addressFormatted = address.FormatAddress(); !addressFormatted.empty())
+      header->addWidget(new QLabel(QString::fromStdString(addressFormatted)));
+
+    layout->addLayout(header);
+  }
+
+  {
+    QHLine * line = new QHLine();
+    layout->addWidget(line);
+  }
+
+  {
+    QGridLayout * data = new QGridLayout();
+
+    int row = 0;
+
+    auto const addEntry = [data, &row](std::string const & key, std::string const & value, bool isLink = false)
+    {
+      data->addWidget(new QLabel(QString::fromStdString(key)), row, 0);
+      QLabel * label = new QLabel(QString::fromStdString(value));
+      label->setTextInteractionFlags(Qt::TextSelectableByMouse);
+      if (isLink)
+      {
+        label->setOpenExternalLinks(true);
+        label->setTextInteractionFlags(Qt::TextBrowserInteraction);
+        label->setText(QString::fromStdString("<a href=\"" + value + "\">" + value + "</a>"));
+      }
+      data->addWidget(label, row++, 1);
+      return label;
+    };
+
+    if (info.IsBookmark())
+      addEntry("Bookmark", "Yes");
+
+
+    // Wikipedia fragment
+    if (auto const & wikipedia = info.GetMetadata(feature::Metadata::EType::FMD_WIKIPEDIA); !wikipedia.empty())
+    {
+      QLabel * name = new QLabel("Wikipedia");
+      name->setOpenExternalLinks(true);
+      name->setTextInteractionFlags(Qt::TextBrowserInteraction);
+      name->setText(QString::fromStdString("<a href=\"" + feature::Metadata::ToWikiURL(std::string(wikipedia)) + "\">Wikipedia</a>"));
+      data->addWidget(name, row++, 0);
+    }
+
+    // Description
+    if (auto description = info.GetWikiDescription(); !description.empty())
+    {
+      QPushButton * wikiButton = new QPushButton("Wikipedia Description");
+      wikiButton->setAutoDefault(false);
+      connect(wikiButton, &QAbstractButton::clicked, this, [this, description, title]()
+      {
+        auto textDialog = TextDialog(this, QString::fromStdString(description), QString::fromStdString("Wikipedia: " + title));
+        textDialog.exec();
+      });
+
+      data->addWidget(wikiButton, row++, 0, 1, 2, Qt::AlignLeft);
+    }
+
+    // Opening hours fragment
+    if (auto openingHours = info.GetOpeningHours(); !openingHours.empty())
+      addEntry("Opening hours", std::string(openingHours));
+
+    // Cuisine fragment
+    if (auto cuisines = info.FormatCuisines(); !cuisines.empty())
+      addEntry("Cuisine", cuisines);
+
+    // Entrance fragment
+    // TODO
+
+    // Phone fragment
+    if (auto phoneNumber = info.GetMetadata(feature::Metadata::EType::FMD_PHONE_NUMBER); !phoneNumber.empty())
+    {
+      data->addWidget(new QLabel("Phone"), row, 0);
+
+      QLabel * value = new QLabel(QString::fromStdString("<a href='tel:" + std::string(phoneNumber) + "'>" + std::string(phoneNumber) + "</a>"));
+      value->setOpenExternalLinks(true);
+
+      data->addWidget(value, row++, 1);
+    }
+
+    // Operator fragment
+    if (auto operatorName = info.GetMetadata(feature::Metadata::EType::FMD_OPERATOR); !operatorName.empty())
+      addEntry("Operator", std::string(operatorName));
+
+    // Wifi fragment
+    if (info.HasWifi())
+      addEntry("Wi-Fi", "Yes");
+
+    // Links fragment
+    if (auto website = info.GetMetadata(feature::Metadata::EType::FMD_WEBSITE); !website.empty())
+      addEntry("Website", std::string(stripSchemeFromURI(website)), true);
+
+    if (auto email = info.GetMetadata(feature::Metadata::EType::FMD_EMAIL); !email.empty())
+    {
+      data->addWidget(new QLabel("Email"), row, 0);
+
+      QLabel * value = new QLabel(QString::fromStdString("<a href='mailto:" + std::string(email) + "'>" + std::string(email) + "</a>"));
+      value->setOpenExternalLinks(true);
+
+      data->addWidget(value, row++, 1);
+    }
+
+    // Social networks
+    {
+      auto addSocialNetworkWidget = [data, &info, &row](const std::string label, const feature::Metadata::EType eType)
+      {
+        if (auto item = info.GetMetadata(eType); !item.empty())
+        {
+          data->addWidget(new QLabel(QString::fromStdString(label)), row, 0);
+
+          QLabel * value = new QLabel(QString::fromStdString("<a href='" + osm::socialContactToURL(eType, std::string(item)) + "'>" + std::string(item) + "</a>"));
+          value->setOpenExternalLinks(true);
+          value->setTextInteractionFlags(Qt::TextBrowserInteraction);
+
+          data->addWidget(value, row++, 1);
+        }
+      };
+
+      addSocialNetworkWidget("Facebook", feature::Metadata::EType::FMD_CONTACT_FACEBOOK);
+      addSocialNetworkWidget("Instagram", feature::Metadata::EType::FMD_CONTACT_INSTAGRAM);
+      addSocialNetworkWidget("Instagram", feature::Metadata::EType::FMD_CONTACT_INSTAGRAM);
+      addSocialNetworkWidget("Twitter", feature::Metadata::EType::FMD_CONTACT_TWITTER);
+      addSocialNetworkWidget("VK", feature::Metadata::EType::FMD_CONTACT_VK);
+      addSocialNetworkWidget("Line", feature::Metadata::EType::FMD_CONTACT_LINE);
+    }
+
+    if (auto wikimedia_commons = info.GetMetadata(feature::Metadata::EType::FMD_WIKIMEDIA_COMMONS); !wikimedia_commons.empty())
+    {
+      QLabel * value = new QLabel(QString::fromStdString("<a href='" + feature::Metadata::ToWikimediaCommonsURL(std::string(wikimedia_commons)) + "'>Wikimedia Commons</a>"));
+      value->setOpenExternalLinks(true);
+      value->setTextInteractionFlags(Qt::TextBrowserInteraction);
+
+      data->addWidget(value, row++, 0);
+    }
+
+    // Level fragment
+    if (auto level = info.GetMetadata(feature::Metadata::EType::FMD_LEVEL); !level.empty())
+      addEntry("Level", std::string(level));
+
+    // ATM fragment
+    if (info.HasAtm())
+      addEntry("ATM", "Yes");
+
+    // Latlon fragment
+
+    {
+      ms::LatLon const ll = info.GetLatLon();
+      addEntry("Coordinates", strings::to_string_dac(ll.m_lat, 7) + ", " + strings::to_string_dac(ll.m_lon, 7));
+    }
+
+    layout->addLayout(data);
+  }
+
+  {
+    QHLine * line = new QHLine();
+    layout->addWidget(line);
+  }
+
+  {
+    QDialogButtonBox * dbb = new QDialogButtonBox();
+
+    QPushButton * closeButton = new QPushButton("Close");
+    closeButton->setDefault(true);
+    connect(closeButton, &QAbstractButton::clicked, this, &PlacePageDialogUser::OnClose);
+    dbb->addButton(closeButton, QDialogButtonBox::RejectRole);
+
+    if (info.ShouldShowEditPlace())
+    {
+      QPushButton * editButton = new QPushButton("Edit Place");
+      connect(editButton, &QAbstractButton::clicked, this, &PlacePageDialogUser::OnEdit);
+      dbb->addButton(editButton, QDialogButtonBox::ActionRole);
+    }
+
+    layout->addWidget(dbb, Qt::AlignCenter);
+  }
+
+  setLayout(layout);
+
+  auto const ppTitle = std::string("Place Page") + (info.IsBookmark() ? " (bookmarked)" : "");
+  setWindowTitle(ppTitle.c_str());
+}
+
+void PlacePageDialogUser::OnClose() { reject(); }
+void PlacePageDialogUser::OnEdit() { accept(); }

qt/place_page_dialog_user.hpp

@@ -9,11 +9,11 @@ namespace place_page
 class Info;
 }
 
-class PlacePageDialog : public QDialog
+class PlacePageDialogUser : public QDialog
 {
   Q_OBJECT
 public:
-  PlacePageDialog(QWidget * parent, place_page::Info const & info,
+  PlacePageDialogUser(QWidget * parent, place_page::Info const & info,
                   search::ReverseGeocoder::Address const & address);
 
 private slots:

qt/preferences_dialog.cpp

@@ -86,6 +86,17 @@ namespace qt
       });
     }
 
+    QCheckBox * developerModeCheckBox = new QCheckBox("Developer Mode");
+    {
+      bool developerMode;
+      if (settings::Get(settings::kDeveloperMode, developerMode) && developerMode)
+        developerModeCheckBox->setChecked(developerMode);
+      connect(developerModeCheckBox, &QCheckBox::stateChanged, [](int i)
+      {
+        settings::Set(settings::kDeveloperMode, static_cast<bool>(i));
+      });
+    }
+
 #ifdef BUILD_DESIGNER
     QCheckBox * indexRegenCheckBox = new QCheckBox("Enable auto regeneration of geometry index");
     {
@@ -115,6 +126,7 @@ namespace qt
     QVBoxLayout * finalLayout = new QVBoxLayout();
     finalLayout->addWidget(unitsRadioBox);
     finalLayout->addWidget(largeFontCheckBox);
+    finalLayout->addWidget(developerModeCheckBox);
 #ifdef BUILD_DESIGNER
     finalLayout->addWidget(indexRegenCheckBox);
 #endif