xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'omaha_pda' into omaha_14.4.1

Browse source 
Former-commit-id: 6176578771 [formerly 1c6282503e] [formerly 1923af2aab [formerly 465a3cff39ad6f0159de561aaf6e8e89e99762ed]]
Former-commit-id: 1923af2aab
Former-commit-id: b0a481d29d
This commit is contained in:
Dave Hladky 2014-11-06 09:34:39 -06:00
commit 0cbbdd5755
4 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.viz.feature.awips.developer/feature.xml
View file

@ -185,6 +185,10 @@
id="com.raytheon.uf.viz.aviation.advisory.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.datadelivery.feature"
version="0.0.0"/>
<requires>
<import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/>
</requires>

6
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
View file

@ -162,4 +162,10 @@
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.commons.net"
download-size="0"
install-size="0"
version="0.0.0"/>
</feature>

23
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/spatial/BoundingBoxUtil.java
View file

@ -417,7 +417,7 @@ public class BoundingBoxUtil {
* @return
* @throws OgcException
*/
public static ReferencedEnvelope convert2D(BoundingBoxType bbox2d)
public static ReferencedEnvelope convert2D(net.opengis.ows.v_1_1_0.BoundingBoxType bbox2d)
throws OgcException {
List<Double> lc = bbox2d.getLowerCorner();
List<Double> uc = bbox2d.getUpperCorner();
@ -433,6 +433,27 @@ public class BoundingBoxUtil {
DirectPosition max = convert(uc);
return convert2D(min, max, bbox2d.getCrs());
}
/**
* Convert 2d jaxb bounding box to JTS envelope
*
* @param bbox2d
* @return
* @throws OgcException
*/
public static ReferencedEnvelope convert2D(net.opengis.ows.v_1_0_0.BoundingBoxType bbox2d)
throws OgcException {
List<Double> lc = bbox2d.getLowerCorner();
List<Double> uc = bbox2d.getUpperCorner();
if (lc.size() != 2 || uc.size() != 2) {
throw new OgcException(Code.InvalidParameterValue,
"2D bounding box must have 2 dimensions");
}
DirectPosition min = convert(lc);
DirectPosition max = convert(uc);
return convert2D(min, max, bbox2d.getCrs());
}
/**
* Determine altitude reference of vertical axis

3
edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
View file

@ -37,7 +37,8 @@ Require-Bundle: com.raytheon.uf.common.registry.schemas.ebxml;bundle-version="1.
com.raytheon.uf.edex.security;bundle-version="1.14.0",
org.opensaml;bundle-version="1.0.0",
com.raytheon.uf.common.security;bundle-version="1.14.0",
org.joda.time;bundle-version="1.6.2"
org.joda.time;bundle-version="1.6.2",
com.raytheon.uf.common.geospatial;bundle-version="1.14.2"
Export-Package: com.raytheon.uf.edex.registry.ebxml,
com.raytheon.uf.edex.registry.ebxml.acp,
com.raytheon.uf.edex.registry.ebxml.dao,