Rename Map -> CellMap

Majiir · Sep 1, 2014 · d09ce32 · d09ce32
1 parent be87d24
commit d09ce32
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/Plugin/CellularResourceGenerator.cs b/Plugin/CellularResourceGenerator.cs
@@ -10,7 +10,7 @@ public IBodyResources Load(CelestialBody body, ConfigNode node)
         {
             if (node == null)
             {
-                var amounts = new Map<double>(MapOverlay.GridLevel);
+                var amounts = new CellMap<double>(MapOverlay.GridLevel);
                 Initialize(body, amounts);
                 return new BodyResources(amounts);
             }
@@ -19,7 +19,7 @@ public IBodyResources Load(CelestialBody body, ConfigNode node)
                 var bytes = Misc.FromBase64String(node.GetValue("amounts"));
                 ensureBigEndian(bytes);
 
-                var amounts = new Map<double>(MapOverlay.GridLevel);
+                var amounts = new CellMap<double>(MapOverlay.GridLevel);
                 var count = Cell.CountAtLevel(MapOverlay.GridLevel);
                 for (uint i = 0; i < count; i++) {
                     amounts[new Cell(i)] = BitConverter.ToDouble(bytes, (int)i * 8);
@@ -29,7 +29,7 @@ public IBodyResources Load(CelestialBody body, ConfigNode node)
             }
         }
 
-        public abstract void Initialize(CelestialBody body, Map<double> amounts);
+        public abstract void Initialize(CelestialBody body, CellMap<double> amounts);
 
         private static void ensureBigEndian(byte[] bytes)
         {
@@ -49,9 +49,9 @@ private static void ensureBigEndian(byte[] bytes)
 
         private class BodyResources : IBodyResources
         {
-            private readonly Map<double> amounts;
+            private readonly CellMap<double> amounts;
 
-            public BodyResources(Map<double> amounts)
+            public BodyResources(CellMap<double> amounts)
             {
                 this.amounts = amounts;
                 MaxQuantity = amounts.Max(p => p.Value);

diff --git a/Plugin/GeodesicGrid/Map.cs → Plugin/GeodesicGrid/CellMap.cs b/Plugin/GeodesicGrid/Map.cs → Plugin/GeodesicGrid/CellMap.cs
@@ -5,16 +5,16 @@
 
 namespace Kethane.GeodesicGrid
 {
-    public class Map<T> : IEnumerable<KeyValuePair<Cell, T>>
+    public class CellMap<T> : IEnumerable<KeyValuePair<Cell, T>>
     {
         private readonly T[] values;
 
-        public Map(int level)
+        public CellMap(int level)
         {
             values = new T[Cell.CountAtLevel(level)];
         }
 
-        public Map(int level, Func<Cell, T> selector)
+        public CellMap(int level, Func<Cell, T> selector)
         {
             values = Cell.AtLevel(level).Select(selector).ToArray();
         }

diff --git a/Plugin/Kethane.csproj b/Plugin/Kethane.csproj
@@ -49,7 +49,7 @@
     <Compile Include="GeodesicGrid\Cell.cs" />
     <Compile Include="CellularResourceGenerator.cs" />
     <Compile Include="CompatibilityChecker.cs" />
-    <Compile Include="GeodesicGrid\Map.cs" />
+    <Compile Include="GeodesicGrid\CellMap.cs" />
     <Compile Include="GeodesicGrid\Set.cs" />
     <Compile Include="InstallCleanup.cs" />
     <Compile Include="IWindowToggle.cs" />

diff --git a/Plugin/MapOverlay.cs b/Plugin/MapOverlay.cs
@@ -498,7 +498,7 @@ private static void export()
         {
             var sb = new StringBuilder();
 
-            var cells = new Map<string>(MapOverlay.GridLevel);
+            var cells = new CellMap<string>(MapOverlay.GridLevel);
             foreach (var cell in Cell.AtLevel(MapOverlay.GridLevel))
             {
                 var pos = cell.Position;

diff --git a/Plugin/TerrainData.cs b/Plugin/TerrainData.cs
@@ -23,12 +23,12 @@ public static TerrainData ForBody(CelestialBody body)
             return bodies[body.name];
         }
 
-        private readonly Map<float> heightRatios;
+        private readonly CellMap<float> heightRatios;
 
         private TerrainData(CelestialBody body)
         {
             if (body.pqsController == null) { throw new ArgumentException("Body doesn't have a PQS controller"); }
-            heightRatios = new Map<float>(MapOverlay.GridLevel, c => (float)(body.pqsController.GetSurfaceHeight(c.Position) / body.pqsController.radius));
+            heightRatios = new CellMap<float>(MapOverlay.GridLevel, c => (float)(body.pqsController.GetSurfaceHeight(c.Position) / body.pqsController.radius));
         }
 
         public float GetHeightRatio(Cell cell)