Merge branch 'master' of git.elab.kth.se:davide/ELAB-partsearch

parts/server.py

@@ -111,8 +111,10 @@ def getMap(mapurl):
         x = int(request.args.get('x'))
         y = int(request.args.get('y'))
         pointer = Image.open('maps/here.png')
+        pointerLayer = Image.new("RGBA", mapimage.size)
         width, height = pointer.size
-        mapimage.paste(pointer, (x - int(width/2), y-int(height/2)), pointer)
+        pointerLayer.paste(pointer, (x - int(width/2), y-int(height/2)))
+        mapimage = Image.alpha_composite(mapimage, pointerLayer)
     return serveImage(mapimage)