diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-20 16:15:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-20 16:15:28 +0100 |
| commit | 429a0106bca08b9bdb07cc80e9dbab08d98c3682 (patch) | |
| tree | 52da5ed5e8d904ef4f31ddfca723f955111e7320 | |
| parent | 2a4875869399d5be11cce3f9723512e447aa4c5b (diff) | |
| download | Chimère-429a0106bca08b9bdb07cc80e9dbab08d98c3682.tar.bz2 Chimère-429a0106bca08b9bdb07cc80e9dbab08d98c3682.zip | |
Fix permalink initialization
| -rw-r--r-- | chimere/models.py | 8 | ||||
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 2 | ||||
| -rw-r--r-- | chimere/views.py | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/chimere/models.py b/chimere/models.py index a2a88e4..1306111 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -1201,9 +1201,13 @@ class Marker(GeographicItem): return cats.all()[0] def get_absolute_url(self, area_name=''): - parameters = 'current_feature=%d' % self.id + cat = '' if self.default_category: - parameters += '&checked_categories=%s' % self.default_category.pk + cat = self.default_category.pk + parameters = "12;{}:{};;{};point-{};3;foot;;;".format( + round(self.point.x, 4), round(self.point.y, 4), cat, self.pk + ) + urn = TinyUrl.getUrnByParameters(parameters) area_name = area_name + '/' if area_name else '' url = reverse('chimere:tiny', args=[area_name, urn]) diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index a680724..b182b92 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -969,6 +969,8 @@ function transformCoordToLonLat(coord) { var current_feature = items[4]; var post_load_helper = function(){ // have to wait for something - but cannot figure what... + view.setZoom(zoom + 1); + view.setZoom(zoom - 1); setTimeout(function(){ if (current_feature){ methods._showPopup(map_id, current_feature, false); diff --git a/chimere/views.py b/chimere/views.py index 3ff8059..50afd87 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -1012,7 +1012,6 @@ def redirectFromTinyURN(request, area_name='', tiny_urn=''): Redirect from a tiny Urn """ parameters = models.TinyUrl.getParametersByUrn(tiny_urn) - detail = parameters.split(';') current_item = None if len(detail) >= 5: |