Fork Astrolabe

diff --git a/TomTom.lua b/TomTom.lua
index b3655c2..351a7fd 100755
--- a/TomTom.lua
+++ b/TomTom.lua
@@ -7,7 +7,7 @@
 -- Simple localization table for messages
 local L = TomTomLocals
 local ldb = LibStub("LibDataBroker-1.1")
-local astrolabe = DongleStub("Astrolabe-1.0")
+local astrolabe = DongleStub("TTAstrolabe-1.0")
 local lmd = LibStub("LibMapData-1.0")

 -- Create the addon object
diff --git a/TomTom_POIIntegration.lua b/TomTom_POIIntegration.lua
index 17f016f..24a33d7 100644
--- a/TomTom_POIIntegration.lua
+++ b/TomTom_POIIntegration.lua
@@ -8,7 +8,7 @@ local modTbl = {
     S = IsShiftKeyDown,
 }

-local astrolabe = DongleStub("Astrolabe-1.0")
+local astrolabe = DongleStub("TTAstrolabe-1.0")

 -- This function and the related events/hooks are used to automatically
 -- update the crazy arrow to the closest quest waypoint.
diff --git a/TomTom_Waypoints.lua b/TomTom_Waypoints.lua
index 0be1094..1481bd8 100644
--- a/TomTom_Waypoints.lua
+++ b/TomTom_Waypoints.lua
@@ -8,7 +8,7 @@
 --  TomTom:AddZWaypoint() and TomTom:RemoveWaypoint() instead.
 ----------------------------------------------------------------------------]]

-local astrolabe = DongleStub("Astrolabe-1.0")
+local astrolabe = DongleStub("TTAstrolabe-1.0")

 -- Create a tooltip to be used when mousing over waypoints
 local tooltip = CreateFrame("GameTooltip", "TomTomTooltip", UIParent, "GameTooltipTemplate")
diff --git a/libs/Astrolabe/Astrolabe.lua b/libs/Astrolabe/Astrolabe.lua
index 0be472b..e84df83 100644
--- a/libs/Astrolabe/Astrolabe.lua
+++ b/libs/Astrolabe/Astrolabe.lua
@@ -41,7 +41,7 @@ Note:
 -- WARNING!!!
 -- DO NOT MAKE CHANGES TO THIS LIBRARY WITHOUT FIRST CHANGING THE LIBRARY_VERSION_MAJOR
 -- STRING (to something unique) OR ELSE YOU MAY BREAK OTHER ADDONS THAT USE THIS LIBRARY!!!
-local LIBRARY_VERSION_MAJOR = "Astrolabe-1.0"
+local LIBRARY_VERSION_MAJOR = "TTAstrolabe-1.0"
 local LIBRARY_VERSION_MINOR = tonumber(string.match("$Revision: 125 $", "(%d+)") or 1)

 if not DongleStub then error(LIBRARY_VERSION_MAJOR .. " requires DongleStub.") end
@@ -326,11 +326,13 @@ function Astrolabe:GetUnitPosition( unit, noMapChange )
 			end
 		end
 		local M, F = GetCurrentMapAreaID(), GetCurrentMapDungeonLevel();
-		if ( M ~= lastMapID or F ~= lastFloor ) then
-			-- set map zoom back to what it was before
-			SetMapByID(lastMapID);
-			SetDungeonMapLevel(lastFloor);
-		end
+        -- This code has been commented out to give slightly better behaviour
+        -- when getting the players position (jnw)
+		-- if ( M ~= lastMapID or F ~= lastFloor ) then
+		-- 	-- set map zoom back to what it was before
+		-- 	SetMapByID(lastMapID);
+		-- 	SetDungeonMapLevel(lastFloor);
+		-- end
 		return M, F, x, y;
 	end
 	return GetCurrentMapAreaID(), GetCurrentMapDungeonLevel(), x, y;
@@ -1639,5 +1641,5 @@ end
 setmetatable(WorldMapSize, zeroData); -- setup the metatable so that invalid map IDs don't cause Lua errors

 -- register this library with AstrolabeMapMonitor, this will cause a full update if PLAYER_LOGIN has already fired
-local AstrolabeMapMonitor = DongleStub("AstrolabeMapMonitor");
+local AstrolabeMapMonitor = DongleStub("TTAstrolabeMapMonitor");
 AstrolabeMapMonitor:RegisterAstrolabeLibrary(Astrolabe, LIBRARY_VERSION_MAJOR);
diff --git a/libs/Astrolabe/AstrolabeMapMonitor.lua b/libs/Astrolabe/AstrolabeMapMonitor.lua
index 58b83cc..02dea55 100644
--- a/libs/Astrolabe/AstrolabeMapMonitor.lua
+++ b/libs/Astrolabe/AstrolabeMapMonitor.lua
@@ -42,7 +42,7 @@ Note:
 -- WARNING!!!
 -- DO NOT MAKE CHANGES TO THIS LIBRARY WITHOUT FIRST CHANGING THE LIBRARY_VERSION_MAJOR
 -- STRING (to something unique) OR ELSE YOU MAY BREAK OTHER ADDONS THAT USE THIS LIBRARY!!!
-local LIBRARY_VERSION_MAJOR = "AstrolabeMapMonitor"
+local LIBRARY_VERSION_MAJOR = "TTAstrolabeMapMonitor"
 local LIBRARY_VERSION_MINOR = tonumber(string.match("$Revision: 44 $", "(%d+)") or 1)

 if not DongleStub then error(LIBRARY_VERSION_MAJOR .. " requires DongleStub.") end