# HG changeset patch
# User Bjoern Ricks <bjoern.ricks@intevation.de>
# Date 1348475100 0
# Node ID 5fce1908317ffef488deebe027e21ee064ad6e94
# Parent  36507c71725bf3701fa99364fe51b55358b89f4e
Remove info-url and add official number

Remove the info-url form the response and add the official url of the river.
The info-url will be generated in the client.


flys-artifacts/trunk@5580 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 36507c71725b -r 5fce1908317f flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Sun Sep 23 19:37:54 2012 +0000
+++ b/flys-artifacts/ChangeLog	Mon Sep 24 08:25:00 2012 +0000
@@ -1,3 +1,9 @@
+2012-09-24	Björn Ricks	<bjoern.ricks@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java:
+	  Remove info-url from gauge and river in the response and add official
+	  number to the river.
+
 2012-09-23	Christian Lins	<christian.lins@intevation.de>
 
 	* doc/conf/default-themes.xml,
diff -r 36507c71725b -r 5fce1908317f flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java	Sun Sep 23 19:37:54 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java	Mon Sep 24 08:25:00 2012 +0000
@@ -67,7 +67,8 @@
         ec.addAttr(r, "kmup", Boolean.toString(river.getKmUp()), true);
         ec.addAttr(r, "minq", Double.toString(minmaxq[0]), true);
         ec.addAttr(r, "maxq", Double.toString(minmaxq[1]), true);
-        ec.addAttr(r, "info-url", river.fetchInfoURL(), true);
+        ec.addAttr(r, "official", Long.toString(river.getOfficialNumber()),
+                    true);
 
         Element egs = ec.create("gauges");
 
@@ -84,7 +85,6 @@
             if (name != null) {
                 ec.addAttr(eg, "name", gauge.getName(), true);
             }
-            ec.addAttr(eg, "info-url", gauge.fetchInfoURL(), true);
 
             String aeo = getGaugeValue(gauge.getAeo());
             if (aeo != null) {