LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Revised syntax/method for specifying POIs

Browse Source
This commit is contained in:
Andrew Chin
2012-04-14 22:09:12 -04:00
parent 85e2ac202f
commit 2a6769c5ac
4 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -430,7 +430,6 @@ overviewer.views.SignControlView = Backbone.View.extend({
}});
}
iconURL = overviewerConfig.CONST.image.signMarker;
//dataRoot['markers'] = [];
//
for (i in dataRoot) {
@@ -442,11 +441,11 @@ overviewer.views.SignControlView = Backbone.View.extend({
'position': overviewer.util.fromWorldToLatLng(entity.x,
entity.y, entity.z, overviewer.mapView.options.currentTileSet),
'map': overviewer.map,
'title': jQuery.trim(entity.Text1 + "\n" + entity.Text2 + "\n" + entity.Text3 + "\n" + entity.Text4),
'icon': iconURL,
'title': jQuery.trim(entity.text),
'icon': dataRoot[i].icon,
'visible': false
});
if (entity['id'] == 'Sign') {
if (entity.createInfoWindow) {
overviewer.util.createMarkerInfoWindow(marker);
}
jQuery.extend(entity, {markerObj: marker});

8
overviewer_core/settingsValidators.py
View File

@@ -47,8 +47,12 @@ def validateMarkers(filterlist):
if type(filterlist) != list:
raise ValidationException("Markers must specify a list of filters")
for x in filterlist:
if not callable(x):
raise ValidationException("%r must be a function"% x)
if "name" not in x:
raise ValidationException("Must define a name")
if "filterFunction" not in x:
raise ValidationException("Must define a filter function")
if not callable(x['filterFunction']):
raise ValidationException("%r must be a function"% x['filterFunction'])
return filterlist
def validateOverlays(renderlist):