Author: kake Date: 2007-06-09 22:33:04 +0100 (Sat, 09 Jun 2007) New Revision: 1051
Modified: trunk/templates/navbar_tools.tt trunk/templates/node.tt trunk/templates/node_rdf.tt trunk/templates/rdf_index.tt Log: Finish changing from use of "latitude" and "longitude" template variables to "wgs84_lat" and "wgs84_long" (the first lot of this was accidentally committed in [1049], sorry). Fixes #176.
Modified: trunk/templates/navbar_tools.tt =================================================================== --- trunk/templates/navbar_tools.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/navbar_tools.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -5,8 +5,8 @@ <li><a href="[% script_url %]newpage.cgi">Create New Page</a></li> <li><a href="[% full_cgi_url %]?action=random">Random Page</a></li> <li><a href="[% full_cgi_url %]?action=show_wanted_pages">Wanted Pages</a></li> - [% IF geocache_link AND latitude AND longitude %] - <li><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% latitude %];origin_long=[% longitude %]">Look for nearby geocaches</a></li> + [% IF geocache_link AND wgs84_lat AND wgs84_long %] + <li><a href="http://www.geocaching.com/seek/nearest_cache.asp?origin_lat=[% wgs84_lat %];origin_long=[% wgs84_long %]">Look for nearby geocaches</a></li> [% END %] </ul> </div>
Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/node.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -47,7 +47,7 @@ <span class="node_name">[% node_name %]</span></em> </h2> [% END %] -[% IF not (content || coord_field_1_value || coord_field_2_value || latitude || longitude) %] +[% IF not (content || coord_field_1_value || coord_field_2_value || wgs84_lat || wgs84_long) %] </div> We don't have a node called "[% node_param %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>? [% ELSE %] @@ -86,7 +86,7 @@ </form> </div> [% END %] -[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y) %] +[% IF (wgs84_lat AND wgs84_long) OR (os_x AND os_y) OR (osie_x AND osie_y) %] <div id="coordinates" class="geo"> [% END %] [% IF os_x AND os_y %] @@ -108,15 +108,15 @@ </small> [% END %] -[% IF latitude AND longitude %] +[% IF wgs84_lat AND wgs84_long %] <small> (Latitude: - <abbr class="latitude" title="[% wgs84_lat %]">[% latitude %]</abbr> + <abbr class="latitude" title="[% wgs84_lat %]">[% wgs84_lat %]</abbr> Longitude: - <abbr class="longitude" title="[% wgs84_long %]">[% longitude %]</abbr>) + <abbr class="longitude" title="[% wgs84_long %]">[% wgs84_long %]</abbr>) </small> [% END %] -[% IF (latitude AND longitude) OR (os_x AND os_y) OR (osie_x AND osie_y)%] +[% IF (wgs84_lat AND wgs84_long) OR (os_x AND os_y) OR (osie_x AND osie_y)%] </div> [% END %] <div id="rdf_link">
Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/node_rdf.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -67,9 +67,9 @@ </foaf:based_near> [% END %]
- [% IF latitude AND longitude %] - geo:lat[% latitude %]</geo:lat> - geo:long[% longitude %]</geo:long> + [% IF wgs84_lat AND wgs84_long %] + geo:lat[% wgs84_lat %]</geo:lat> + geo:long[% wgs84_long %]</geo:long> [% END %]
[% IF os_x AND os_y %]
Modified: trunk/templates/rdf_index.tt =================================================================== --- trunk/templates/rdf_index.tt 2007-06-09 19:10:30 UTC (rev 1050) +++ trunk/templates/rdf_index.tt 2007-06-09 21:33:04 UTC (rev 1051) @@ -24,7 +24,7 @@ [%- FOREACH node = nodes %] [% metadata = node.node_data.metadata %]
- [%- IF metadata.os_x.list.first || metadata.os_y.list.first || metadata.latitude.list.first || metadata.longitude.list.first || + [%- IF metadata.os_x.list.first || metadata.os_y.list.first || metadata.wgs84_lat.list.first || metadata.wgs84_long.list.first || metadata.locale.list.first || metadata.address.list.first || metadata.postcode.list.first || metadata.map_link.list.first -%] [% nodeType = 'geo:SpatialThing' %] [%- ELSE -%] @@ -35,9 +35,9 @@ <[% nodeType %] rdf:about="[% full_cgi_url %]?id=[% node.param %];format=rdf#obj"> <rdfs:seeAlso rdf:resource="[% full_cgi_url %]?id=[% node.param %];format=rdf" /> dc:title[% node.name %]</dc:title> - [% IF metadata.latitude.list.first AND metadata.longitude.list.first %] - geo:lat[% metadata.latitude.list.first %]</geo:lat> - geo:long[% metadata.longitude.list.first %]</geo:long> + [% IF metadata.wgs84_lat.list.first AND metadata.wgs84_long.list.first %] + geo:lat[% metadata.wgs84_lat.list.first %]</geo:lat> + geo:long[% metadata.wgs84_long.list.first %]</geo:long> [% END %] <link>[% full_cgi_url %]?[% node.param %]</link> </[% nodeType %]>