Author: ksprotte Date: Mon Feb 11 07:39:01 2008 New Revision: 2465 Modified: branches/bos/projects/bos/payment-website/templates/da/profil.xml branches/bos/projects/bos/payment-website/templates/de/profil.xml branches/bos/projects/bos/payment-website/templates/en/profil.xml branches/bos/projects/bos/web/tags.lisp Log: fix for #16 Koordinaten in Laenge und Breite - Einbau eines Links auf die Profilseite Modified: branches/bos/projects/bos/payment-website/templates/da/profil.xml ============================================================================== --- branches/bos/projects/bos/payment-website/templates/da/profil.xml (original) +++ branches/bos/projects/bos/payment-website/templates/da/profil.xml Mon Feb 11 07:39:01 2008 @@ -55,7 +55,7 @@ </tr> <tr> <td class="Label">kvardratmeter</td> - <td class="Input">til værdi af $(numsqm) m² er blevet opkøbt<br></br>UTM-kordinater: N$(sqm-x) E$(sqm-y) + <td class="Input">til værdi af $(numsqm) m² er blevet opkøbt<br></br>kordinater: $(geo-coord) <br /><a href="/contract-kml/$(contract-id)">Your square metres in Google Earth</a></td> <td class="Info"></td> </tr> Modified: branches/bos/projects/bos/payment-website/templates/de/profil.xml ============================================================================== --- branches/bos/projects/bos/payment-website/templates/de/profil.xml (original) +++ branches/bos/projects/bos/payment-website/templates/de/profil.xml Mon Feb 11 07:39:01 2008 @@ -60,7 +60,7 @@ </tr> <tr> <td class="Label">Quadratmeter</td> - <td class="Input">Insgesamt $(numsqm) Quadratmeter gekauft<br />UTM-Koordinate: N$(sqm-x) E$(sqm-y) + <td class="Input">Insgesamt $(numsqm) Quadratmeter gekauft<br />Koordinate: $(geo-coord) <br /><a href="/contract-kml/$(contract-id)">Ihre Quadratmeter in Google Earth</a></td> <td class="Info"></td> </tr> Modified: branches/bos/projects/bos/payment-website/templates/en/profil.xml ============================================================================== --- branches/bos/projects/bos/payment-website/templates/en/profil.xml (original) +++ branches/bos/projects/bos/payment-website/templates/en/profil.xml Mon Feb 11 07:39:01 2008 @@ -60,7 +60,7 @@ </tr> <tr> <td class="Label">square metres</td> - <td class="Input">a total of $(numsqm) m² has been bought<br />UTM-coordinate: N$(sqm-x) E$(sqm-y) + <td class="Input">a total of $(numsqm) m² has been bought<br />coordinate: $(geo-coord) <br /><a href="/contract-kml/$(contract-id)">Your square metres in Google Earth</a></td> <td class="Info"></td> </tr> Modified: branches/bos/projects/bos/web/tags.lisp ============================================================================== --- branches/bos/projects/bos/web/tags.lisp (original) +++ branches/bos/projects/bos/web/tags.lisp Mon Feb 11 07:39:01 2008 @@ -170,8 +170,9 @@ (setf (get-template-var :name) (user-full-name sponsor)) (setf (get-template-var :sqm-x) (format nil "~,3f" (m2-utm-x (first (contract-m2s contract))))) (setf (get-template-var :sqm-y) (format nil "~,3f" (m2-utm-y (first (contract-m2s contract))))) - (setf (get-template-var :geo-coord) (multiple-value-bind (left top) + (setf (get-template-var :geo-coord) (destructuring-bind (left top . ignore) (contract-bounding-box contract) + (declare (ignore ignore)) (apply #'geometry:format-lon-lat nil (geo-utm:utm-x-y-to-lon-lat (+ +nw-utm-x+ left) (- +nw-utm-y+ top) +utm-zone+ t))))