only mapPopulate empty db

lua_scripts/map.lua

@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-
-
 local map = {
     map_tiles = {
         {"-", "-", "w", "w", "-", "-", "-", "-", "-", "-"},
@@ -21,20 +18,18 @@ local map = {
 					x = h,
 					y = i,
 					occupied_by_type = self.map_tiles[h][i],
-=======
-local map = {
-	populate = function(self, map)
-		for h=1,100 do 
-			for i=1,100 do
-				local tile = map:create({
-					x = h,
-					y = i,
-					occupied_by_type = "",
->>>>>>> refs/remotes/origin/master
 					occupied_by_id = ""
 				})
 			end
 		end
+	end,
+	mapExists = function(self, map)
+	    local f = map:select("limit 1")
+	    if not f[1] then
+	        return false
+	    else
+	     return true
+	    end
 	end
 }
 local tiles = {}