From 3d41ce627f7a3a957aa1e27cf98121ffafce38ad Mon Sep 17 00:00:00 2001
From: brnkhy <baran.kahyaoglu@mapbox.com>
Date: Fri, 28 Apr 2017 18:44:18 +0300
Subject: [PATCH 1/2] add map id textbox to mesh factory editor

---
 .../Mapbox/Core/Unity/Editor/MeshFactoryEditor.cs    | 12 ++++++++++++
 .../Unity/MeshGeneration/Factories/MeshFactory.cs    |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sdkproject/Assets/Mapbox/Core/Unity/Editor/MeshFactoryEditor.cs b/sdkproject/Assets/Mapbox/Core/Unity/Editor/MeshFactoryEditor.cs
index 92d13d901..b820fe1f7 100644
--- a/sdkproject/Assets/Mapbox/Core/Unity/Editor/MeshFactoryEditor.cs
+++ b/sdkproject/Assets/Mapbox/Core/Unity/Editor/MeshFactoryEditor.cs
@@ -7,14 +7,18 @@
 [CustomEditor(typeof(MeshFactory))]
 public class MeshFactoryEditor : FactoryEditor
 {
+    private string _defaultMapId = "mapbox.mapbox-streets-v7";
     private MonoScript script;
     private MeshFactory _factory;
     SerializedProperty _visualizerList;
+    public SerializedProperty mapId_Prop, customMapId_Prop;
+
     private int ListSize;
     void OnEnable()
     {
         _factory = target as MeshFactory;
         _visualizerList = serializedObject.FindProperty("Visualizers");
+        mapId_Prop = serializedObject.FindProperty("_mapId");
         script = MonoScript.FromScriptableObject(_factory);
     }
     public override void OnInspectorGUI()
@@ -25,6 +29,14 @@ public override void OnInspectorGUI()
         script = EditorGUILayout.ObjectField("Script", script, typeof(MonoScript), false) as MonoScript;
         GUI.enabled = true;
 
+        EditorGUILayout.BeginHorizontal();
+        EditorGUILayout.PropertyField(mapId_Prop, new GUIContent("Map Id"));
+        if (GUILayout.Button("R", GUILayout.Width(30)))
+        {
+            mapId_Prop.stringValue = _defaultMapId;
+        }
+        EditorGUILayout.EndHorizontal();
+
         EditorGUILayout.Space();
         EditorGUILayout.Space();
         EditorGUILayout.LabelField("Layer Visualizers");
diff --git a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MeshFactory.cs b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MeshFactory.cs
index 8f1d190eb..dd0fd2b7e 100644
--- a/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MeshFactory.cs
+++ b/sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MeshFactory.cs
@@ -15,7 +15,7 @@ namespace Mapbox.Unity.MeshGeneration.Factories
     public class MeshFactory : Factory
     {
         [SerializeField]
-        private string _mapId = "mapbox.mapbox-streets-v7";
+        private string _mapId = "";
         public List<LayerVisualizerBase> Visualizers;
 
         private Dictionary<Vector2, UnityTile> _tiles;

From 95a416575028c1c804d1c20141e0529f8477ab53 Mon Sep 17 00:00:00 2001
From: David Rhodes <david.rhodes@mapbox.com>
Date: Fri, 28 Apr 2017 14:26:55 -0600
Subject: [PATCH 2/2] =?UTF-8?q?=E2=80=9Creset=E2=80=9D=20button=20now=20up?=
 =?UTF-8?q?dates=20the=20test=20field=20immediately.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sdkproject/Assets/Mapbox/Core/Unity/Editor/MeshFactoryEditor.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdkproject/Assets/Mapbox/Core/Unity/Editor/MeshFactoryEditor.cs b/sdkproject/Assets/Mapbox/Core/Unity/Editor/MeshFactoryEditor.cs
index b820fe1f7..26f62945d 100644
--- a/sdkproject/Assets/Mapbox/Core/Unity/Editor/MeshFactoryEditor.cs
+++ b/sdkproject/Assets/Mapbox/Core/Unity/Editor/MeshFactoryEditor.cs
@@ -34,6 +34,8 @@ public override void OnInspectorGUI()
         if (GUILayout.Button("R", GUILayout.Width(30)))
         {
             mapId_Prop.stringValue = _defaultMapId;
+            GUI.FocusControl(null);
+            Repaint();
         }
         EditorGUILayout.EndHorizontal();