LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge commit 'refs/pull/847/head' of github.com:overviewer/Minecraft-Overviewer into merge_847

Browse Source
This commit is contained in:
Andrew Chin
2012-11-29 21:29:49 -05:00
parent 3d3ad4e4d6 4d983f8ada
commit 6ca70deb91
3 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,12 @@ overviewer.collections = {
/**
* holds a reference to the spawn marker.
*/
'spawnMarker': null
'spawnMarker': null,
/**
* if a user visits a specific URL, this marker will point to the coordinates in the hash
*/
'locationMarker': null
};
overviewer.classes = {

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

@@ -91,6 +91,10 @@ overviewer.util = {
compass.render();
spawnmarker.render();
if (overviewer.collections.locationMarker) {
overviewer.collections.locationMarker.setMap(null);
overviewer.collections.locationMarker = null;
}
// update list of spawn overlays
overlayControl.render();
@@ -555,5 +559,7 @@ overviewer.util = {
overviewer.map.setCenter(latlngcoords);
overviewer.map.setZoom(zoom);
var locationmarker = new overviewer.views.LocationIconView();
locationmarker.render();
}
};

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

@@ -556,3 +556,22 @@ overviewer.views.SpawnIconView = Backbone.View.extend({
}
});
overviewer.views.LocationIconView = Backbone.View.extend({
render: function() {
//
if (overviewer.collections.locationMarker) {
overviewer.collections.locationMarker.setMap(null);
overviewer.collections.locationMarker = null;
}
overviewer.collections.locationMarker = new google.maps.Marker({
'position': overviewer.map.getCenter(),
'map': overviewer.map,
'title': 'location',
'icon': overviewerConfig.CONST.image.queryMarker,
'visible': false
});
overviewer.collections.locationMarker.setVisible(true);
}
});