Added more SOS test links

Author: alexrobin

sensorhub-webui-core/src/main/java/org/sensorhub/ui/SOSAdminPanel.java

@@ -23,6 +23,7 @@
 import org.vast.ows.sos.SOSServiceCapabilities;
 import com.vaadin.data.Property;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Link;
@@ -43,7 +44,8 @@
 public class SOSAdminPanel extends DefaultModulePanel<SOSService> implements IModuleAdminPanel<SOSService>
 {
     private static final long serialVersionUID = -5196033911134749125L;
-    protected static final String PROP_ENDPOINT = "endPoint";
+    private static final String PROP_ENDPOINT = "endPoint";
+    private static final String LINK_TARGET = "osh-sos";
 
 
     @SuppressWarnings("serial")
@@ -53,12 +55,12 @@ public LinkItem(String label, String linkText, String href)
         {
             setSpacing(true);
             addComponent(new Label(label + ":"));
-            addComponent(new Link(linkText, new ExternalResource(href), "osh-sos", 0, 0, null));
+            addComponent(new Link(linkText, new ExternalResource(href), LINK_TARGET, 0, 0, null));
         }
 
         public void addLinkItem(String linkText, String href)
         {
-            addComponent(new Link(linkText, new ExternalResource(href), "osh-sos", 0, 0, null));
+            addComponent(new Link(linkText, new ExternalResource(href), LINK_TARGET, 0, 0, null));
         }
     }    
 
@@ -92,7 +94,7 @@ public void build(final MyBeanItem<ModuleConfig> beanItem, final SOSService modu
             // link to capabilities
             baseUrl += "?service=SOS&version=2.0&request=";
             String href = baseUrl + "GetCapabilities";
-            Link link = new Link("Service Capabilities", new ExternalResource(href), "osh-sos", 0, 0, null);
+            Link link = new Link("Service Capabilities", new ExternalResource(href), LINK_TARGET, 0, 0, null);
             link.setWidthUndefined();
             addComponent(link);
 
@@ -122,22 +124,33 @@ public void build(final MyBeanItem<ModuleConfig> beanItem, final SOSService modu
                 //linkItem.addLinkItem("JSON", href);
                 tabLayout.addComponent(linkItem);
 
-                // result template
-                href = baseUrl + "GetResultTemplate&offering=" + offering.getIdentifier() +
-                                 "&observedProperty=" + offering.getObservableProperties().iterator().next();
-                linkItem = new LinkItem("Record Description", "XML", href);
-                href += "&responseFormat=" + OWSUtils.JSON_MIME_TYPE;
-                linkItem.addLinkItem("JSON", href);
-                tabLayout.addComponent(linkItem);
-                
-                // latest obs
-                href = baseUrl + "GetResult&offering=" + offering.getIdentifier() +
-                        "&observedProperty=" + offering.getObservableProperties().iterator().next() +
-                        "&temporalFilter=phenomenonTime,now";
-                linkItem = new LinkItem("Latest Measurements", "RAW", href);
-                href += "&responseFormat=" + OWSUtils.JSON_MIME_TYPE;
-                linkItem.addLinkItem("JSON", href);
-                tabLayout.addComponent(linkItem);
+                for (String obs: offering.getObservableProperties())
+                {                
+                    // spacer
+                    Label spacer = new Label();
+                    spacer.setStyleName(STYLE_SPACER);
+                    spacer.setHeight(10, Unit.PIXELS);
+                    tabLayout.addComponent(spacer);
+                    
+                    // observable name
+                    String label = obs.substring(obs.lastIndexOf('/')+1);
+                    tabLayout.addComponent(new Label("<b>"+label+"</b>", ContentMode.HTML));
+                    
+                    // result template
+                    href = baseUrl + "GetResultTemplate&offering=" + offering.getIdentifier() + "&observedProperty=" + obs;
+                    linkItem = new LinkItem("Record Description", "XML", href);
+                    href += "&responseFormat=" + OWSUtils.JSON_MIME_TYPE;
+                    linkItem.addLinkItem("JSON", href);
+                    tabLayout.addComponent(linkItem);
+                    
+                    // latest obs
+                    href = baseUrl + "GetResult&offering=" + offering.getIdentifier() + "&observedProperty=" + obs +
+                                     "&temporalFilter=phenomenonTime,now";
+                    linkItem = new LinkItem("Latest Measurements", "RAW", href);
+                    href += "&responseFormat=" + OWSUtils.JSON_MIME_TYPE;
+                    linkItem.addLinkItem("JSON", href);
+                    tabLayout.addComponent(linkItem);
+                }
             }
         }
     }

sensorhub-webui-core/src/main/java/org/sensorhub/ui/api/UIConstants.java

@@ -31,7 +31,8 @@ public interface UIConstants
     public final static String STYLE_LINK = "link";
     public final static String STYLE_PRESSED = "v-pressed";
     public final static String STYLE_BORDERLESS = "borderless";
-    public final static String STYLE_SPINNER = "spinner";    
+    public final static String STYLE_SPACER = "spacer";
+    public final static String STYLE_SPINNER = "spinner";
     public final static String STYLE_SECTION_BUTTONS = "section-buttons";
 
     // constants for icon resources

sensorhub-webui-core/widgetset/src/main/resources/VAADIN/themes/sensorhub/sensorhub.scss

@@ -50,6 +50,10 @@ $v-layout-margin-right: 25px;
       clear: none;
    }
 
+   .v-slot-spacer {
+      line-height: 0;
+   }
+   
    .v-slot-section-buttons {
       float: right;
       margin-top: 20px;

sensorhub-webui-core/widgetset/src/main/resources/VAADIN/themes/sensorhub/styles.css

@@ -12727,6 +12727,10 @@ div.v-layout.v-horizontal.v-widget {
 	clear: none;
 }
 
+.sensorhub .v-slot-spacer {
+	line-height: 0;
+}
+
 .sensorhub .v-slot-section-buttons {
 	float: right;
 	margin-top: 20px;