From 6c4b3e9109b855968be8c780292bb00b01bdcd2a Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Wed, 26 Aug 2015 10:59:39 +0300
Subject: [PATCH] Autocomplete from start

---
 OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java      | 2 +-
 OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java | 4 ++++
 OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java      | 2 +-
 OsmAnd/src/net/osmand/plus/osmedit/NormalDataFragment.java   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
index 5ca9fb4cf2..993de124f8 100644
--- a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
+++ b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
@@ -147,7 +147,7 @@ public class OpeningHoursParser {
 			return s.substring(0, s.length()-2);
 		}
 
-		public String toStringNoMoths() {
+		public String toStringNoMonths() {
 			StringBuilder s = new StringBuilder();
 			if (rules.isEmpty()) {
 				return "";
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java
index 6b9e95db9d..a100a3d17c 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java
@@ -16,6 +16,7 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import net.osmand.PlatformUtil;
 import net.osmand.osm.PoiType;
 import net.osmand.osm.edit.OSMSettings;
 import net.osmand.plus.OsmandApplication;
@@ -24,11 +25,14 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.osmedit.data.EditPoiData;
 import net.osmand.plus.osmedit.data.Tag;
 
+import org.apache.commons.logging.Log;
+
 import java.util.Iterator;
 import java.util.Map;
 
 public class AdvancedDataFragment extends Fragment {
 	private static final String TAG = "AdvancedDataFragment";
+	private static final Log LOG = PlatformUtil.getLog(AdvancedDataFragment.class);
 
 	private TagAdapterLinearLayoutHack mAdapter;
 	private EditPoiData.TagsChangedListener mTagsChangedListener;
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
index f632fa1fec..f5d80f9b7a 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
@@ -297,7 +297,7 @@ public class EditPoiFragment extends Fragment {
 				fragmentManager.popBackStack();
 			}
 		});
-
+		updateType(editPoiData.amenity);
 		return view;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/NormalDataFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/NormalDataFragment.java
index 8a1bdb9ace..a86d1dac2c 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/NormalDataFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/NormalDataFragment.java
@@ -295,7 +295,7 @@ public class NormalDataFragment extends Fragment {
 			}
 			if (mIsUserInput) {
 				Tag openHours = new Tag(OSMSettings.OSMTagKey.OPENING_HOURS.getValue(),
-						openingHours.toStringNoMoths());
+						openingHours.toStringNoMonths());
 				data.tags.remove(openHours);
 				data.tags.add(openHours);
 				data.notifyDatasetChanged(null);