Add different units to scale the world to (#60)

* Add different units to scale the world to

This defines how to interpret 1 unity unit.

* renamed regionScaleValue to regionScaledValue

* Address comments

Author: tallytalwar

Assets/Editor/MapzenMapEditor.cs

@@ -9,6 +9,7 @@ public class MapzenMapEditor : Editor
 {
     private MapzenMap mapzenMap;
     private bool showTileDataFoldout = false;
+    private bool showRegionScaleRatioFoldout = false;
 
     void OnEnable()
     {
@@ -21,6 +22,8 @@ public override void OnInspectorGUI()
 
         TileDataFoldout();
 
+        RegionScaleRatioFoldout();
+
         base.OnInspectorGUI();
 
         bool valid = IsValid();
@@ -83,16 +86,50 @@ private void TileDataFoldout()
         EditorGUI.indentLevel--;
     }
 
+    private void UnitScaleToggle(MapzenMap mapzenMap, RegionScaleUnits.Units unit)
+    {
+        bool isSet = RegionScaleUnits.Test(unit, mapzenMap.RegionScaleUnit);
+        isSet = EditorGUILayout.Toggle(unit.ToString(), isSet);
+
+        mapzenMap.RegionScaleUnit = isSet ? unit : mapzenMap.RegionScaleUnit;
+    }
+
+    private void RegionScaleRatioFoldout()
+    {
+        showRegionScaleRatioFoldout = EditorGUILayout.Foldout(showRegionScaleRatioFoldout, "Region Scale Ratio");
+        if (!showRegionScaleRatioFoldout)
+        {
+            return;
+        }
+
+        mapzenMap.RegionScaleRatio = EditorGUILayout.FloatField("Scale: ", mapzenMap.RegionScaleRatio);
+        GUILayout.Label("Choose world scale units: ");
+        EditorGUI.indentLevel++;
+
+        EditorGUILayout.BeginHorizontal();
+        UnitScaleToggle(mapzenMap, RegionScaleUnits.Units.Meters);
+        UnitScaleToggle(mapzenMap, RegionScaleUnits.Units.KiloMeters);
+        EditorGUILayout.EndHorizontal();
+        EditorGUILayout.BeginHorizontal();
+        UnitScaleToggle(mapzenMap, RegionScaleUnits.Units.Miles);
+        UnitScaleToggle(mapzenMap, RegionScaleUnits.Units.Feet);
+        EditorGUILayout.EndHorizontal();
+
+        EditorGUI.indentLevel--;
+    }
+
     private void LoadPreferences()
     {
         string key = typeof(MapzenMapEditor).Name;
         showTileDataFoldout = EditorPrefs.GetBool(key + ".showTileDataFoldout");
+        showRegionScaleRatioFoldout = EditorPrefs.GetBool(key + ".showRegionScaleRatioFoldout");
     }
 
     private void SavePreferences()
     {
         string key = typeof(MapzenMapEditor).Name;
         EditorPrefs.SetBool(key + ".showTileDataFoldout", showTileDataFoldout);
+        EditorPrefs.SetBool(key + ".showRegionScaleRatioFoldout", showRegionScaleRatioFoldout);
     }
 
     private bool IsValid()

Assets/Mapzen/RegionScaleUnits.cs

@@ -0,0 +1,37 @@
+using System;
+
+namespace Mapzen
+{
+    public class RegionScaleUnits
+    {
+        [Flags]
+        public enum Units
+        {
+            Meters = 1 << 0,
+            KiloMeters = 1 << 1,
+            Miles = 1 << 2,
+            Feet = 1 << 3,
+        }
+
+        // A name identifer
+        public string name;
+        public Units unit;
+
+        /// <summary>
+        /// Tests whether this unit is enabled
+        /// </summary>
+        /// <param name="unit">The unit to check.</param>
+        /// <param name="regionUnit">Unit defined for the region.</param>
+        public static bool Test(Units unit, Units regionUnit)
+        {
+            return ((int)unit & (int)regionUnit) == (int)unit;
+        }
+
+        public RegionScaleUnits(Units u, string n)
+        {
+            this.unit = u;
+            this.name = n;
+        }
+    }
+}
+

Assets/Mapzen/RegionScaleUnits.cs.meta

@@ -13,7 +13,7 @@ public class MapzenMap : MonoBehaviour
 {
     public GameObjectOptions gameObjectOptions;
 
-    public float regionScaleRatio = 1.0f;
+    private float regionScaleRatio = 1.0f;
 
     public string ApiKey = "vector-tiles-tyHL4AY";
 
@@ -35,6 +35,10 @@ public class MapzenMap : MonoBehaviour
     [SerializeField]
     private SceneGroup.Type groupOptions;
 
+    [HideInInspector]
+    [SerializeField]
+    private RegionScaleUnits.Units regionScaleUnit = RegionScaleUnits.Units.Meters;
+
     private List<TileTask> tasks = new List<TileTask>();
 
     private int nTasksForArea = 0;
@@ -78,7 +82,28 @@ public void DownloadTiles()
                 float offsetX = (tileAddress.x - bounds.min.x);
                 float offsetY = (-tileAddress.y + bounds.min.y);
 
-                TileTask task = new TileTask(tileAddress, groupOptions, response.data, offsetX, offsetY, regionScaleRatio);
+
+                float unitConverter = 1.0f;
+                switch (regionScaleUnit)
+                {
+                    case RegionScaleUnits.Units.Meters:
+                        unitConverter = 1.0f;
+                        break;
+                    case RegionScaleUnits.Units.KiloMeters:
+                        unitConverter = 0.001f;
+                        break;
+                    case RegionScaleUnits.Units.Miles:
+                        unitConverter = 0.00063f;
+                        break;
+                    case RegionScaleUnits.Units.Feet:
+                        unitConverter = 3.28f;
+                        break;
+                    default:
+                        unitConverter = 0.0f;
+                        break;
+                 }
+
+                TileTask task = new TileTask(tileAddress, groupOptions, response.data, offsetX, offsetY, regionScaleRatio * unitConverter);
 
                 task.Start(featureStyling, regionMap);
 
@@ -112,9 +137,20 @@ public List<FeatureStyle> FeatureStyling
         get { return featureStyling; }
     }
 
+    public float RegionScaleRatio {
+        get { return regionScaleRatio; }
+        set { regionScaleRatio = value; }
+    }
+
     public SceneGroup.Type GroupOptions
     {
         get { return groupOptions; }
         set { groupOptions = value; }
     }
+
+    public RegionScaleUnits.Units RegionScaleUnit
+    {
+        get { return regionScaleUnit; }
+        set { regionScaleUnit = value; }
+    }
 }