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

fix get_color() on ModelInstanceWrapper

Browse source
This commit is contained in:
Laura Klünder 2017-06-16 18:38:41 +02:00
parent 8fef2a81a9
commit edfb083c61
7 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/c3nav/mapdata/models/geometry/level.py
View file

@ -14,11 +14,11 @@ class LevelGeometryMixin(GeometryMixin):
class Meta:
abstract = True
def get_geojson_properties(self) -> dict:
result = super().get_geojson_properties()
def get_geojson_properties(self, *args, instance=None, **kwargs) -> dict:
result = super().get_geojson_properties(*args, **kwargs)
result['level'] = self.level_id
if hasattr(self, 'get_color'):
color = self.get_color()
color = self.get_color(instance=instance)
if color:
result['color'] = color
if hasattr(self, 'opacity'):
@ -70,8 +70,8 @@ class Space(SpecificLocation, LevelGeometryMixin, models.Model):
result['public'] = self.public
return result
def get_color(self):
color = super().get_color()
def get_color(self, *args, **kwargs):
color = super().get_color(*args, **kwargs)
if not color:
color = {
'stairs': '#dddddd',