From 35252ec3df518ae5ed7b77c7eabb782f61d34679 Mon Sep 17 00:00:00 2001
From: Emil Axelsson <emil.axelsson@liu.se>
Date: Thu, 15 Nov 2018 09:20:13 +0100
Subject: [PATCH] Improve backwards compatibility of layer support

---
 .../globebrowsing/scripts/layer_support.lua   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/modules/globebrowsing/scripts/layer_support.lua b/modules/globebrowsing/scripts/layer_support.lua
index 6fe0ce1537..654defc655 100644
--- a/modules/globebrowsing/scripts/layer_support.lua
+++ b/modules/globebrowsing/scripts/layer_support.lua
@@ -170,21 +170,23 @@ openspace.globebrowsing.createGibsGdalXml = function (layerName, date, resolutio
 end
 
 openspace.globebrowsing.parseInfoFile = function (file)
+    Name = nil
+    Identifier = nil
+    Description = nil
+    ColorFile = nil
+    HeightFile = nil
+
     local dir = openspace.directoryForPath(file)
     dofile(file)
 
-    local name = nil
-    if Name then
-        name = Name
-    end
-
-    local identifier = Identifier
+    local name = Name or Identifier
+    local identifier = Identifier or Name
 
     local color = nil
     if ColorFile then
         color = {
-            Identifier = Identifier,
-            Name = Name or Identifier,
+            Identifier = identifier,
+            Name = name,
             Description = Description or "",
             FilePath = dir .. '/' .. ColorFile,
             BlendMode = "Color"
@@ -194,8 +196,8 @@ openspace.globebrowsing.parseInfoFile = function (file)
     local height = nil
     if HeightFile then
         height = {
-            Identifier = Identifier,
-            Name = Name or Identifier,
+            Identifier = identifier,
+            Name = name,
             Description = Description or "",
             FilePath = dir .. '/' .. HeightFile,
             TilePixelSize = 90