Merge pull request #669

Merge branch 'player_marker' of https://github.com/JonnyJD/Minecraft-Overviewer into devel

Conflicts:
	genPOI.py
	overviewer_core/data/js_src/views.js

overviewer_core/assetmanager.py

@@ -87,6 +87,7 @@ directory.
         dump['CONST']['image'] = {
                 'defaultMarker':    'signpost.png',
                 'signMarker':       'signpost_icon.png',
+                'bedMarker':        'bed.png',
                 'compass':          'compass_upper-left.png',
                 'spawnMarker':      'http://google-maps-icons.googlecode.com/files/home.png',
                 'queryMarker':      'http://google-maps-icons.googlecode.com/files/regroup.png'

overviewer_core/data/js_src/views.js

@@ -437,6 +437,16 @@ overviewer.views.SignControlView = Backbone.View.extend({
             if (!markersDB[groupName].created) {
                 for (j in markersDB[groupName].raw) {
                     var entity = markersDB[groupName].raw[j];
+                    if (entity['id'] == 'Player') {
+                        iconURL = "http://overviewer.org/avatar/"
+                            + entity['EntityId'];
+                    } else if (entity['id'] == 'PlayerSpawn') {
+                        iconURL = overviewerConfig.CONST.image.bedMarker;
+                    } else if (entity['id'] == 'Sign') {
+                        iconURL = overviewerConfig.CONST.image.signMarker;
+                    } else {
+                        iconURL = overviewerConfig.CONST.image.defaultMarker;
+                    }
                     var marker = new google.maps.Marker({
                             'position': overviewer.util.fromWorldToLatLng(entity.x,
                                 entity.y, entity.z, overviewer.mapView.options.currentTileSet),