diff options
author | Sergey Magidovich <mgsergio@mapswithme.com> | 2016-04-29 18:06:03 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-05-12 10:19:15 +0300 |
commit | f5b8d2e12efce80832ad058f564bc9204013e247 (patch) | |
tree | a7b2e69079fa657330e9d3d348becc96af3a5f5f /qt | |
parent | 6e58ba0abc25d4737036c3efe8ac80ee74ea5c4b (diff) |
Reload edits on map update.
Diffstat (limited to 'qt')
-rw-r--r-- | qt/editor_dialog.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/qt/editor_dialog.cpp b/qt/editor_dialog.cpp index 7e105b9fba..f9e39a5eea 100644 --- a/qt/editor_dialog.cpp +++ b/qt/editor_dialog.cpp @@ -85,6 +85,10 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo) grid->addWidget(new QLabel(kStreetObjectName), row, 0); QComboBox * cmb = new QComboBox(); cmb->setEditable(true); + + if (emo.GetStreet().m_defaultName.empty()) + cmb->addItem(""); + for (int i = 0; i < nearbyStreets.size(); ++i) { string street = nearbyStreets[i].m_defaultName; @@ -199,7 +203,10 @@ void EditorDialog::OnSave() QString const editedStreet = findChild<QComboBox *>(kStreetObjectName)->currentText(); QStringList const names = editedStreet.split(" / ", QString::SkipEmptyParts); QString const localized = names.size() > 1 ? names.at(1) : QString(); - m_feature.SetStreet({names.at(0).toStdString(), localized.toStdString()}); + if (!names.empty()) + m_feature.SetStreet({names.at(0).toStdString(), localized.toStdString()}); + else + m_feature.SetStreet({}); m_feature.SetPostcode(findChild<QLineEdit *>(kPostcodeObjectName)->text().toStdString()); } |