2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

label ordering

Browse source
This commit is contained in:
Laura Klünder 2019-12-22 01:56:11 +01:00
parent d3e9134d5a
commit 3dedf7db66
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/c3nav/mapdata/models/locations.py
View file

@ -444,3 +444,4 @@ class LabelSettings(SerializableMixin, models.Model):
verbose_name = _('Label Settings') verbose_name = _('Label Settings')
verbose_name_plural = _('Label Settings') verbose_name_plural = _('Label Settings')
default_related_name = 'labelsettings' default_related_name = 'labelsettings'
ordering = ('min_zoom', '-font_size')

13
src/c3nav/site/static/site/js/c3nav.js
View file

@ -97,6 +97,11 @@ c3nav = {
} }
}); });
}, },
_sort_labels: function(a, b) {
var result = (b.label_settings.min_zoom || -10) - (a.label_settings.min_zoom || -10)
if (result === 0) result = a.label_settings.font_size - b.label_settings.font_size;
return result;
},
_last_time_searchable_locations_loaded: null, _last_time_searchable_locations_loaded: null,
_searchable_locations_interval: 120000, _searchable_locations_interval: 120000,
_searchable_locations_loaded: function(data) { _searchable_locations_loaded: function(data) {
@ -119,6 +124,9 @@ c3nav = {
labels[location.point[0]].push(location); labels[location.point[0]].push(location);
} }
} }
for (level_id in labels) {
labels[level_id].sort(c3nav._sort_labels);
}
c3nav.locations = locations; c3nav.locations = locations;
c3nav.locations_by_id = locations_by_id; c3nav.locations_by_id = locations_by_id;
c3nav.labels = labels; c3nav.labels = labels;
@ -316,8 +324,11 @@ c3nav = {
if (!labels) return; if (!labels) return;
for (var location of labels) { for (var location of labels) {
if (zoom < (location.label_settings.min_zoom || -10)) {
// since the labels are sorted by min_zoom, we can just leave here
break;
}
if (bounds.contains(location.label.getLatLng()) && if (bounds.contains(location.label.getLatLng()) &&
(location.label_settings.min_zoom || -10) < zoom &&
(location.label_settings.max_zoom || 10) > zoom) { (location.label_settings.max_zoom || 10) > zoom) {
c3nav._labelLayer._maybeAddLayerToRBush(location.label); c3nav._labelLayer._maybeAddLayerToRBush(location.label);
} }