Implemented no_height functionality.

git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/trunk/wradmin@533 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/wradmin/wradmin/controllers/coordtool.py b/wradmin/wradmin/controllers/coordtool.py
index b60203e15d48766deae1a07f82e8148d1121a1ba..19336370a7284ca0f2f6a975e2c3f42a30ea1741 100644 (file)
--- a/wradmin/wradmin/controllers/coordtool.py
+++ b/wradmin/wradmin/controllers/coordtool.py
@@ -21,7 +21,7 @@ class CoordtoolController(BaseController):
 
     def convert(self):
         input = request.POST['input']
-        no_height = request.POST.has_key('no_height')
+        no_elevation = request.POST.has_key('no_elevation')
         simplify = request.POST.has_key('simplify')
         swap_latlon = request.POST.has_key('swap_latlon')
         c.no_geoformat = request.POST.has_key('no_geoformat')
@@ -43,6 +43,9 @@ class CoordtoolController(BaseController):
         if swap_latlon:
             c.result = [(latitude, longitude, elevation) for (longitude, latitude, elevation) in c.result]
         
+        if no_elevation:
+            c.result = [(longitude, latitude, None) for (longitude, latitude, elevation) in c.result]
+        
         c.geo_winterrodeln = wradmin.model.validators.MultiGeo(output_format = geo.FORMAT_WINTERRODELN)
         c.geo_gmapplugin = wradmin.model.validators.MultiGeo(output_format = geo.FORMAT_GMAPPLUGIN)
         c.geo_gpx = wradmin.model.validators.MultiGeo(output_format = geo.FORMAT_GPX)

diff --git a/wradmin/wradmin/templates/coordtool.html b/wradmin/wradmin/templates/coordtool.html
index 3e9243e162ed75adef43915c6ca227a529fa7dfe..afd3e271ddb10119a7a60ca9e36e2ad2c398bf1f 100644 (file)
--- a/wradmin/wradmin/templates/coordtool.html
+++ b/wradmin/wradmin/templates/coordtool.html
@@ -51,7 +51,7 @@
            47.233008, 11.452201<br/>
            47.233810, 11.452150</p>
     </td></tr>
-    <tr><td><input type="checkbox" name="no_height" />Höhe weglassen</td><td></td></tr>
+    <tr><td><input type="checkbox" name="no_elevation" />Höhe weglassen</td><td></td></tr>
     <tr><td><input type="checkbox" name="simplify" /> Weg vereinfachen <em>(noch nicht implementiert)</em></td><td></td></tr>
     <tr><td><input type="checkbox" name="swap_latlon" />Geogr. Länge und Breite vertauschen</td><td></td></tr>
     <tr><td><input type="checkbox" name="no_geoformat" /> Zielformat <strong>&lt;geo&gt;</strong> auslassen</td><td>47.222134 N 11.467211 E</td></tr>

diff --git a/wradmin/wradmin/templates/index.html b/wradmin/wradmin/templates/index.html
index 2ff6aeb78c131c6744a5eb16669aaebd01b5f050..7c842dda283991fb08719f748303de5b966d7ffe 100644 (file)
--- a/wradmin/wradmin/templates/index.html
+++ b/wradmin/wradmin/templates/index.html
@@ -21,7 +21,7 @@
     <li><a href="${h.url_for(controller='gasthaus', action='list')}">Gasthäuser</a></li>
     <li><a href="${h.url_for(controller='maptool', action='index')}">Maptool</a></li>
     <li><a href="${h.url_for(controller='coordtool', action='index')}">Koordinaten-Rechner</a></li>
-    <li><a href="${h.url_for(controller='wrgpxtool', action='index')}">Winterrodeln-GPX Datei Werkzeuge</a></li>
+    <!-- <li><a href="${h.url_for(controller='wrgpxtool', action='index')}">Winterrodeln-GPX Datei Werkzeuge</a></li> -->
 </ul>
 
 <ul>