Merge branch 'master' of github.com:geo-data/medin-portal

geo-data · Jan 14, 2015 · e5b19eb · e5b19eb
2 parents fab5660 + 8fb2f89
commit e5b19eb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/python/medin/data/dws.wsdl b/python/medin/data/dws.wsdl
@@ -104,7 +104,7 @@
   </wsdl:binding>
   <wsdl:service name="DiscoveryServiceMEDIN">
     <wsdl:port name="Discovery" binding="tns:DiscoverySoapBinding">
-      <wsdlsoap:address location="http://triton.badc.rl.ac.uk/axis2/services/DiscoveryServiceMEDIN/"/>
+      <wsdlsoap:address location="http://ceda-discovery.ceda.ac.uk:8080/axis2/services/DiscoveryServiceMEDIN/"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
diff --git a/templates/full/metadata.html b/templates/full/metadata.html
@@ -176,20 +176,24 @@ <h3>Download</h3>
 <%def name="format_areaofuse(epsg)">\
 <h3>Area of Use</h3>
 ${format_epsg(epsg)}
+% if None not in (epsg.westBoundLongitude, epsg.southBoundLatitude, epsg.eastBoundLongitude, epsg.northBoundLatitude):
 <div class="sibling">
   Extent: <a href="${script_root}/full/catalogue?bbox=${epsg.westBoundLongitude},${epsg.southBoundLatitude},${epsg.eastBoundLongitude},${epsg.northBoundLatitude}"
         title="Search for all metadata within this area">
         ${epsg.westBoundLongitude}&deg;, ${epsg.southBoundLatitude}&deg;,
         ${epsg.eastBoundLongitude}&deg;, ${epsg.northBoundLatitude}&deg;</a>
 </div>
+% endif
 </%def>\
 
 <%def name="format_datum(epsg)">\
 <h3>Datum</h3>
 ${format_epsg(epsg)}
+% if epsg.realizationEpoch is not None:
 <div class="sibling">
   Realisation epoch: ${format_date(epsg.realizationEpoch)}
 </div>
+% endif
 % if hasattr(epsg, 'primeMeridian'):
 ${format_prime_meridian(epsg.primeMeridian)}
 % endif

diff --git a/templates/light/metadata.html b/templates/light/metadata.html
@@ -146,20 +146,24 @@
 <%def name="format_areaofuse(epsg)">\
 <h4>Area of Use</h4>
 ${format_epsg(epsg)}
+% if None not in (epsg.westBoundLongitude, epsg.southBoundLatitude, epsg.eastBoundLongitude, epsg.northBoundLatitude):
 <div>
   Extent: <a href="${script_root}/light/catalogue?bbox=${epsg.westBoundLongitude},${epsg.southBoundLatitude},${epsg.eastBoundLongitude},${epsg.northBoundLatitude}"
         title="Search for all metadata within this area">
         ${epsg.westBoundLongitude}°, ${epsg.southBoundLatitude}°,
         ${epsg.eastBoundLongitude}°, ${epsg.northBoundLatitude}°</a>
 </div>
+% endif
 </%def>\
 
 <%def name="format_datum(epsg)">\
 <h4>Datum</h4>
 ${format_epsg(epsg)}
+% if epsg.realizationEpoch is not None:
 <div>
   Realisation epoch: ${format_date(epsg.realizationEpoch)}
 </div>
+% endif
 % if hasattr(epsg, 'primeMeridian'):
 ${format_prime_meridian(epsg.primeMeridian)}
 % endif