From 085f9852b557e548d2f1c88b6bde813a9b629984 Mon Sep 17 00:00:00 2001 From: Andrew Bird Date: Mon, 14 Oct 2013 15:48:08 -0400 Subject: [PATCH] update static strings --- .../ncsos/describesen/SOSDescribeSensorHandler.java | 2 +- .../asascience/ncsos/outputformatter/GetCapsOutputter.java | 6 ------ .../com/asascience/ncsos/service/SOSBaseRequestHandler.java | 3 ++- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/asascience/ncsos/describesen/SOSDescribeSensorHandler.java b/src/main/java/com/asascience/ncsos/describesen/SOSDescribeSensorHandler.java index 56cf81d..fb54f73 100644 --- a/src/main/java/com/asascience/ncsos/describesen/SOSDescribeSensorHandler.java +++ b/src/main/java/com/asascience/ncsos/describesen/SOSDescribeSensorHandler.java @@ -32,7 +32,7 @@ public class SOSDescribeSensorHandler extends SOSBaseRequestHandler { private final String procedure; private ISOSDescribeSensor describer; - private final String ACCEPTABLE_RESPONSE_FORMAT = "text/xml;subtype=\"sensorML/1.0.1\""; + //private final String ACCEPTABLE_RESPONSE_FORMAT = "text/xml;subtype=\"sensorML/1.0.1\""; /** * Creates a DescribeSensor handler that will parse the information and setup diff --git a/src/main/java/com/asascience/ncsos/outputformatter/GetCapsOutputter.java b/src/main/java/com/asascience/ncsos/outputformatter/GetCapsOutputter.java index 62927c8..8456e33 100644 --- a/src/main/java/com/asascience/ncsos/outputformatter/GetCapsOutputter.java +++ b/src/main/java/com/asascience/ncsos/outputformatter/GetCapsOutputter.java @@ -59,12 +59,6 @@ public class GetCapsOutputter extends SOSOutputFormatter { public static final String XLINKHREF = XLINK_HREF; public static final String XLINK_TITLE = "xlink:title"; public static final String XSITYPE = "xsi:type"; - public static final String[] possibleValueList = {"allowedValues", "anyValue", "noValues", "valuesListReference"}; - public static final String[] possibleValueLink = { - "\"http://www.opengis.net/ows/1.1\":AllowedValues", - "\"http://www.opengis.net/ows/1.1\":AnyValue", - "\"http://www.opengis.net/ows/1.1\":NoValues", - "\"http://www.opengis.net/ows/1.1\":ValuesReference"}; private DOMImplementationLS impl; private boolean exceptionFlag; private Element getCaps, getObs, descSen; diff --git a/src/main/java/com/asascience/ncsos/service/SOSBaseRequestHandler.java b/src/main/java/com/asascience/ncsos/service/SOSBaseRequestHandler.java index 1c1aea3..85cb2ef 100644 --- a/src/main/java/com/asascience/ncsos/service/SOSBaseRequestHandler.java +++ b/src/main/java/com/asascience/ncsos/service/SOSBaseRequestHandler.java @@ -26,6 +26,7 @@ public abstract class SOSBaseRequestHandler { public static final String CF_ROLE = "cf_role"; public static final String GRID = "grid"; + public static final String GRID_MAPPING = "grid_mapping"; public static final String NAME = "name"; public static final String PROFILE = "profile"; public static final String TRAJECTORY = "trajectory"; @@ -667,7 +668,7 @@ public String[] getCRSSRSAuthorities() { ArrayList returnList = new ArrayList(); for (VariableSimpleIF var : featureDataset.getDataVariables()) { for (Attribute attr : var.getAttributes()) { - if (attr.getName().equalsIgnoreCase("grid_mapping")) { + if (attr.getName().equalsIgnoreCase(GRID_MAPPING)) { String stName = attr.getValue(0).toString(); String auth = getAuthorityFromVariable(stName); if (auth != null && !returnList.contains(auth)) {