0
@@ -1,14 +1,16 @@
0
 
0
 local L = TourGuide.Locale
0
 
0
-local zonei, zonec = {}, {}
0
+local zonei, zonec, zonenames = {}, {}, {}
0
 for ci,c in pairs{GetMapContinents()} do
0
-	for zi,z in pairs{GetMapZones(ci)} do
0
+	zonenames[ci] = {GetMapZones(ci)}
0
+	for zi,z in pairs(zonenames[ci]) do
0
     zonei[z], zonec[z] = zi, ci
0
   end
0
 end
0
 
0
 
0
+local cache = {}
0
 local function MapPoint(zone, x, y, desc)
0
   TourGuide:DebugF(1, "Mapping %q - %s (%.2f, %.2f)", desc, zone, x, y)
0
   local zi, zc = zone and zonei[zone], zone and zonec[zone]
0
@@ -17,10 +19,15 @@ local function MapPoint(zone, x, y, desc)
0
     else TourGuide:Print("No zone provided, using current zone.") end
0
 
0
     zi, zc = GetCurrentMapZone(), GetCurrentMapContinent()
0
+		zone = zonenames[zc][zi]
0
   end
0
 
0
   if TomTom then TomTom:AddZWaypoint(zc, zi, x, y, "[TG] "..desc) --AddZWaypoint(c,z,x,y,desc)  select(z, GetMapZones(c))
0
-	elseif Cartographer_Waypoints then Cartographer_Waypoints:AddLHWaypoint(zc, zi, x, y, desc) end -- continent, zone, x, y desc
0
+	elseif Cartographer_Waypoints then
0
+		local pt = NotePoint:new(zone, x/100, y/100, "[TG] "..desc)
0
+		Cartographer_Waypoints:AddWaypoint(pt)
0
+		table.insert(cache, pt.WaypointID)
0
+	end
0
 end
0
 
0
 
0
@@ -58,6 +65,11 @@ function TourGuide:ParseAndMapCoords(note, desc, zone)
0
         end
0
       end
0
     end
0
+	elseif Cartographer_Waypoints then
0
+		while cache[1] do
0
+			local pt = table.remove(cache)
0
+			Cartographer_Waypoints:CancelWaypoint(pt)
0
+		end
0
   end
0
 
0
   if not note then return end