diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-01 13:20:21 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-01 13:20:21 +0200 |
| commit | ea3409f1963584b6b627eee205106a6f8f3cbf25 (patch) | |
| tree | 85e502c9bd146325b4b350ae7f66bd5c5346b001 | |
| parent | 52b2e992917ce313ae9d696d7901a24fad755bce (diff) | |
| download | Chimère-ea3409f1963584b6b627eee205106a6f8f3cbf25.tar.bz2 Chimère-ea3409f1963584b6b627eee205106a6f8f3cbf25.zip | |
getGeoJSONs: fix route
| -rw-r--r-- | chimere/models.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chimere/models.py b/chimere/models.py index 45dedfb..0255acc 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -1294,12 +1294,10 @@ class Polygon(GeographicItem): def _json_get_colors(cls, item, default_values, current_categories): inner_color = None color = default_values['color'] - json_decoder = json.JSONDecoder() if item["color"]: color = item['color'] elif item["categories__pk"]: - key = "{}-{}".format(json_decoder.decode(item["json"])["type"], - item["categories__pk"]) + key = "{}-{}".format(cls.geom_attr, item["categories__pk"]) if key not in current_categories: cat = SubCategory.objects.get(pk=item["categories__pk"]) # [index, color list] @@ -1746,19 +1744,20 @@ class Route(GeographicItem): if item["color"]: color = item['color'] elif item["categories__pk"]: - if item["categories__pk"] not in current_categories: + key = "{}-{}".format(cls.geom_attr, item["categories__pk"]) + if key not in current_categories: cat = SubCategory.objects.get(pk=item["categories__pk"]) # [index, color list] - current_categories[item["categories__pk"]] = \ + current_categories[key] = \ [0, list(Color.objects.filter( color_theme=cat.color_theme))] - idx, colors = current_categories[item["categories__pk"]] + idx, colors = current_categories[key] # category have a color theme if colors: c = colors[idx % len(colors)] color = c.code # index += 1 - current_categories[item["categories__pk"]][0] += 1 + current_categories[key][0] += 1 return {"color": color}, current_categories |