Fix #6589 (Changing POI category on an existing object has no impact.(try to change the category by tapping on label icon))

This commit is contained in:
Nazar-Kutz 2020-07-25 18:01:09 +03:00
parent ad3011a802
commit 744b36b87c

View file

@ -112,6 +112,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
private EditPoiData editPoiData; private EditPoiData editPoiData;
private EditPoiViewPager viewPager; private EditPoiViewPager viewPager;
private AutoCompleteTextView poiTypeEditText; private AutoCompleteTextView poiTypeEditText;
private boolean poiCategoryChanged;
private OnSaveButtonClickListener onSaveButtonClickListener; private OnSaveButtonClickListener onSaveButtonClickListener;
private OpenstreetmapUtil mOpenstreetmapUtil; private OpenstreetmapUtil mOpenstreetmapUtil;
@ -298,7 +299,11 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
if (!getEditPoiData().isInEdit()) { if (!getEditPoiData().isInEdit()) {
if (!poiCategoryChanged) {
getEditPoiData().updateTypeTag(s.toString(), true); getEditPoiData().updateTypeTag(s.toString(), true);
} else {
poiCategoryChanged = false;
}
if (!getMyApplication().isApplicationInitializing()) { if (!getMyApplication().isApplicationInitializing()) {
PoiCategory category = editPoiData.getPoiCategory(); PoiCategory category = editPoiData.getPoiCategory();
if (category != null) { if (category != null) {
@ -643,6 +648,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
} }
public void setPoiCategory(PoiCategory type) { public void setPoiCategory(PoiCategory type) {
poiCategoryChanged = true;
editPoiData.updateType(type); editPoiData.updateType(type);
poiTypeEditText.setText(editPoiData.getPoiTypeString()); poiTypeEditText.setText(editPoiData.getPoiTypeString());
setAdapterForPoiTypeEditText(); setAdapterForPoiTypeEditText();