[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Maposmatic-dev] [PATCH] Adding link from jobs to OpenStreetMap main sit
From: |
Pierre Mauduit |
Subject: |
[Maposmatic-dev] [PATCH] Adding link from jobs to OpenStreetMap main site |
Date: |
Wed, 4 Aug 2010 18:30:34 +0200 |
From: Pierre Mauduit <address@hidden(none)>
---
www/maposmatic/templatetags/extratags.py | 4 ++++
www/templates/maposmatic/job.html | 9 +++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/www/maposmatic/templatetags/extratags.py
b/www/maposmatic/templatetags/extratags.py
index 0eb02a7..5fa06f7 100644
--- a/www/maposmatic/templatetags/extratags.py
+++ b/www/maposmatic/templatetags/extratags.py
@@ -61,6 +61,9 @@ def job_status_to_icon_name(value, arg, autoescape=None):
if value == 4: return 'job-cancelled'
return 'job-error'
+def valueabs(value):
+ return abs(value)
+
def feedparsed(value):
return datetime.datetime(*value[:6])
@@ -68,3 +71,4 @@ def feedparsed(value):
register.filter('job_status_to_str', job_status_to_str)
register.filter('job_status_to_icon_name', job_status_to_icon_name)
register.filter('feedparsed', feedparsed)
+register.filter('abs', valueabs)
diff --git a/www/templates/maposmatic/job.html
b/www/templates/maposmatic/job.html
index e635cdf..a874f94 100644
--- a/www/templates/maposmatic/job.html
+++ b/www/templates/maposmatic/job.html
@@ -53,10 +53,15 @@
</form>
{% endifequal %}{% endif %}
{% if job.administrative_city %}
- {% ifnotequal job.administrative_city job.maptitle %}<h3>{{
job.administrative_city }}</h3>{% endifnotequal %}
+ <h3>
+ {% ifnotequal job.administrative_city job.maptitle %} {{
job.administrative_city }} - {% endifnotequal %}
+ <a href="http://www.osm.org?relation={{ job.administrative_osmid|abs
}}">{% trans "View on OpenStreetMap" %}</a></h3>
{% else %}
<h3>({{ job.lat_upper_left|floatformat:3 }}, {{
job.lon_upper_left|floatformat:3 }}) →
- ({{ job.lat_bottom_right|floatformat:3 }}, {{
job.lon_bottom_right|floatformat:3 }})</h3>
+ ({{ job.lat_bottom_right|floatformat:3 }}, {{
job.lon_bottom_right|floatformat:3 }})
+ - <a href="http://www.osm.org?maxlat={{ job.lat_upper_left
}}&maxlon={{ job.lon_bottom_right }}&minlat={{ job.lat_bottom_right
}}&minlon={{ job.lon_upper_left }}&zoom=15">{% trans "View on
OpenStreetMap" %}</a>
+ </h3>
+
{% endif %}
<h4>{% trans "Rendering: " %}</h4>
--
1.7.1
- [Maposmatic-dev] [PATCH] Adding link from jobs to OpenStreetMap main site,
Pierre Mauduit <=