LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Re-implement spawn marker

Browse Source 
Let's hope this works, any bugs are totally my fault.
This commit is contained in:
Nicolas F
2016-07-06 18:43:34 +02:00
committed by Andrew Chin
parent 64598e9c01
commit cfa2a9f39b
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
overviewer_core/assetmanager.py
View File

@@ -103,8 +103,8 @@ directory.
'defaultMarker': 'signpost.png', 'defaultMarker': 'signpost.png',
'signMarker': 'signpost_icon.png', 'signMarker': 'signpost_icon.png',
'bedMarker': 'bed.png', 'bedMarker': 'bed.png',
'spawnMarker': 'https://google-maps-icons.googlecode.com/files/home.png', 'spawnMarker': 'icons/marker_home.png',
'queryMarker': 'https://google-maps-icons.googlecode.com/files/regroup.png' 'queryMarker': 'icons/marker_location.png'
} }
dump['CONST']['mapDivId'] = 'mcmap' dump['CONST']['mapDivId'] = 'mcmap'
dump['CONST']['regionStrokeWeight'] = 2 # Obselete dump['CONST']['regionStrokeWeight'] = 2 # Obselete

6
overviewer_core/data/js_src/overviewer.js
View File

@@ -52,9 +52,13 @@ overviewer.collections = {
'markerInfo': {}, 'markerInfo': {},
/** /**
* holds a reference to the spawn marker. * holds a reference to the current spawn marker.
*/ */
'spawnMarker': null, 'spawnMarker': null,
/**
* contains the spawn marker for each world
*/
'spawnMarkers': {},
/** /**
* if a user visits a specific URL, this marker will point to the coordinates in the hash * if a user visits a specific URL, this marker will point to the coordinates in the hash

19
overviewer_core/data/js_src/util.js
View File

@@ -109,6 +109,18 @@ overviewer.util = {
overviewer.map.on('baselayerchange', function(ev) { overviewer.map.on('baselayerchange', function(ev) {
overviewer.current_layer[overviewer.current_world] = ev.name; overviewer.current_layer[overviewer.current_world] = ev.name;
// Remove old spawn marker, add new one
if (overviewer.collections.spawnMarker) {
overviewer.collections.spawnMarker.remove();
}
if (overviewer.collections.spawnMarkers[overviewer.current_world]) {
overviewer.collections.spawnMarker = overviewer.collections
.spawnMarkers[overviewer.current_world];
overviewer.collections.spawnMarker.addTo(overviewer.map);
} else {
overviewer.collections.spawnMarker = null;
}
}); });
var tset = overviewerConfig.tilesets[0]; var tset = overviewerConfig.tilesets[0];
@@ -152,6 +164,13 @@ overviewer.util = {
if (typeof(obj.spawn) == "object") { if (typeof(obj.spawn) == "object") {
var latlng = overviewer.util.fromWorldToLatLng(obj.spawn[0], obj.spawn[1], obj.spawn[2], obj); var latlng = overviewer.util.fromWorldToLatLng(obj.spawn[0], obj.spawn[1], obj.spawn[2], obj);
overviewer.collections.centers[obj.world] = [ latlng, 1 ]; overviewer.collections.centers[obj.world] = [ latlng, 1 ];
/// TODO: Retina Icon
var spawnIcon = L.icon({
iconUrl: overviewerConfig.CONST.image.spawnMarker,
});
var ohaimark = L.marker(latlng, {icon: spawnIcon, title: "Spawn"});
overviewer.collections.spawnMarkers[obj.world] = ohaimark;
} else { } else {
overviewer.collections.centers[obj.world] = [ [0, 0], 1 ]; overviewer.collections.centers[obj.world] = [ [0, 0], 1 ];
} }