Merge branch 'master_14.4.1' of github.com:Unidata/awips2 into master_14.4.1
Former-commit-id: 1fac5ef7c82abb428e56991d0f57d40dc03249de [formerly 76df417e74948215af2eb917e802a00943e26275] [formerlya495092273
[formerly8cbd80c0ef
]] Former-commit-id:a495092273
Former-commit-id:a50a9a28c4
This commit is contained in:
commit
3e1d3155ce
14 changed files with 140 additions and 53 deletions
|
@ -27,7 +27,7 @@
|
|||
<loadProperties loadWithoutData="true">
|
||||
<capabilities>
|
||||
<capability xsi:type="colorableCapability"
|
||||
colorAsString="#ffffff" />
|
||||
colorAsString="#b0e2f9" />
|
||||
</capabilities>
|
||||
<resourceType>PLAN_VIEW</resourceType>
|
||||
</loadProperties>
|
||||
|
@ -53,7 +53,7 @@
|
|||
<loadProperties loadWithoutData="true">
|
||||
<capabilities>
|
||||
<capability xsi:type="colorableCapability"
|
||||
colorAsString="#ffff9c" />
|
||||
colorAsString="#7da1df" />
|
||||
</capabilities>
|
||||
<resourceType>PLAN_VIEW</resourceType>
|
||||
</loadProperties>
|
||||
|
@ -79,7 +79,7 @@
|
|||
<loadProperties loadWithoutData="true">
|
||||
<capabilities>
|
||||
<capability xsi:type="colorableCapability"
|
||||
colorAsString="#ffff00" />
|
||||
colorAsString="#0365c8" />
|
||||
</capabilities>
|
||||
<resourceType>PLAN_VIEW</resourceType>
|
||||
</loadProperties>
|
||||
|
@ -105,7 +105,7 @@
|
|||
<loadProperties loadWithoutData="true">
|
||||
<capabilities>
|
||||
<capability xsi:type="colorableCapability"
|
||||
colorAsString="#ffa600" />
|
||||
colorAsString="#0635a7" />
|
||||
</capabilities>
|
||||
<resourceType>PLAN_VIEW</resourceType>
|
||||
</loadProperties>
|
||||
|
@ -131,7 +131,7 @@
|
|||
<loadProperties loadWithoutData="true">
|
||||
<capabilities>
|
||||
<capability xsi:type="colorableCapability"
|
||||
colorAsString="#ff7900" />
|
||||
colorAsString="#0c2780" />
|
||||
</capabilities>
|
||||
<resourceType>PLAN_VIEW</resourceType>
|
||||
</loadProperties>
|
||||
|
@ -157,7 +157,7 @@
|
|||
<loadProperties loadWithoutData="true">
|
||||
<capabilities>
|
||||
<capability xsi:type="colorableCapability"
|
||||
colorAsString="#ff0000" />
|
||||
colorAsString="#191180" />
|
||||
</capabilities>
|
||||
<resourceType>PLAN_VIEW</resourceType>
|
||||
</loadProperties>
|
||||
|
|
|
@ -28,5 +28,7 @@
|
|||
<substitute key="blendedTimeMatchMode" value="ALL_IMAGES"/>
|
||||
</contribute>
|
||||
<contribute xsi:type="separator" id="baseCompositeSeparator"/>
|
||||
<!--
|
||||
<contribute xsi:type="subinclude" fileName="menus/satellite/basePOESImagery.xml" />
|
||||
-->
|
||||
</menuTemplate>
|
|
@ -10,7 +10,7 @@
|
|||
<property name="build.arch"
|
||||
value="x86_64" />
|
||||
<property name="lightning"
|
||||
value="false" />
|
||||
value="true" />
|
||||
|
||||
<property name="pde.build.script"
|
||||
value="./org.eclipse.pde.build_3.8.2.v20121114-140810/scripts/build.xml" />
|
||||
|
@ -125,16 +125,10 @@
|
|||
value="com.raytheon.uf.edex.remote.script.feature" />
|
||||
</antcall>
|
||||
|
||||
<!-- SPECIAL CASE -->
|
||||
<if>
|
||||
<equals arg1="${lightning}" arg2="true" />
|
||||
<then>
|
||||
<antcall target="build">
|
||||
<param name="feature"
|
||||
value="com.raytheon.uf.edex.binlightning.feature" />
|
||||
</antcall>
|
||||
</then>
|
||||
</if>
|
||||
</target>
|
||||
|
||||
<!--
|
||||
|
|
|
@ -9,7 +9,7 @@ Export-Package: com.raytheon.edex.plugin.satellite,
|
|||
com.raytheon.edex.util.satellite
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
|
||||
com.raytheon.uf.common.dataplugin.satellite;bundle-version="1.0.0",
|
||||
com.raytheon.uf.common.dataplugin.satellite;bundle-version="1.14.0",
|
||||
com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
|
||||
com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174",
|
||||
com.raytheon.uf.common.geospatial;bundle-version="1.14.1",
|
||||
|
@ -23,6 +23,3 @@ Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
|
|||
com.raytheon.uf.edex.database;bundle-version="1.0.0",
|
||||
com.raytheon.uf.edex.menus;bundle-version="1.0.0",
|
||||
com.raytheon.uf.common.numeric;bundle-version="1.14.0"
|
||||
Import-Package: gov.noaa.nws.ncep.common.tools,
|
||||
gov.noaa.nws.ncep.edex.util,
|
||||
org.apache.commons.codec.binary
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
package com.raytheon.edex.util.satellite;
|
||||
|
||||
import java.awt.geom.Rectangle2D;
|
||||
import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
|
||||
|
||||
import org.geotools.geometry.DirectPosition2D;
|
||||
import org.opengis.referencing.crs.ProjectedCRS;
|
||||
|
@ -376,9 +375,9 @@ public class SatSpatialFactory {
|
|||
int upperLeftLine, int xres, int yres, ProjectedCRS crs,
|
||||
Geometry geometry) {
|
||||
|
||||
// do your shit here.
|
||||
float dx = IDecoderConstantsN.FLOAT_MISSING;
|
||||
float dy = IDecoderConstantsN.FLOAT_MISSING;
|
||||
// do your stuff here.
|
||||
float dx = 999999.f;
|
||||
float dy = 999999.f;
|
||||
|
||||
double minX, minY;
|
||||
//if (crsType == PROJ_GVAR) { // for native projection
|
||||
|
|
|
@ -21,5 +21,7 @@
|
|||
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<contribute xsi:type="subinclude" fileName="" />
|
||||
<contribute xsi:type="separator" id="baseCompositeSeparator"/>
|
||||
<!--
|
||||
<contribute xsi:type="subinclude" fileName="menus/satellite/basePOESImagery.xml" />
|
||||
-->
|
||||
</menuTemplate>
|
|
@ -15,7 +15,8 @@ Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
|
|||
com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
|
||||
com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
|
||||
org.hibernate;bundle-version="1.0.0",
|
||||
com.raytheon.uf.common.numeric;bundle-version="1.14.0"
|
||||
com.raytheon.uf.common.numeric;bundle-version="1.14.0",
|
||||
com.raytheon.uf.edex.decodertools;bundle-version="1.14.0"
|
||||
Export-Package: com.raytheon.uf.common.dataplugin.satellite,
|
||||
com.raytheon.uf.common.dataplugin.satellite.units,
|
||||
com.raytheon.uf.common.dataplugin.satellite.units.counts,
|
||||
|
@ -24,5 +25,3 @@ Export-Package: com.raytheon.uf.common.dataplugin.satellite,
|
|||
com.raytheon.uf.common.dataplugin.satellite.units.goes.convert,
|
||||
com.raytheon.uf.common.dataplugin.satellite.units.ir,
|
||||
com.raytheon.uf.common.dataplugin.satellite.units.water
|
||||
Import-Package: gov.noaa.nws.ncep.common.dataplugin.mcidas,
|
||||
gov.noaa.nws.ncep.common.tools
|
||||
|
|
|
@ -20,12 +20,13 @@
|
|||
|
||||
package com.raytheon.uf.common.dataplugin.satellite;
|
||||
|
||||
import gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasMapCoverage;
|
||||
import gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasRecord;
|
||||
import gov.noaa.nws.ncep.common.dataplugin.mcidas.McidasSpatialFactory;
|
||||
import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
|
||||
//import gov.noaa.nws.ncep.edex.util.McidasCRSBuilder;
|
||||
|
||||
import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
|
||||
|
||||
import java.awt.geom.Rectangle2D;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
|
@ -48,16 +49,21 @@ import org.geotools.coverage.grid.GridGeometry2D;
|
|||
import org.geotools.geometry.Envelope2D;
|
||||
import org.geotools.geometry.GeneralEnvelope;
|
||||
import org.geotools.referencing.crs.DefaultGeographicCRS;
|
||||
import org.geotools.referencing.operation.DefaultMathTransformFactory;
|
||||
import org.hibernate.annotations.Type;
|
||||
import org.opengis.coverage.grid.GridEnvelope;
|
||||
import org.opengis.geometry.Envelope;
|
||||
import org.opengis.parameter.ParameterValueGroup;
|
||||
import org.opengis.referencing.FactoryException;
|
||||
import org.opengis.referencing.NoSuchIdentifierException;
|
||||
import org.opengis.referencing.crs.CoordinateReferenceSystem;
|
||||
import org.opengis.referencing.crs.ProjectedCRS;
|
||||
|
||||
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
|
||||
import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
|
||||
import com.raytheon.uf.common.geospatial.CRSCache;
|
||||
import com.raytheon.uf.common.geospatial.IGridGeometryProvider;
|
||||
import com.raytheon.uf.common.geospatial.MapUtil;
|
||||
import com.raytheon.uf.common.geospatial.adapter.GeometryAdapter;
|
||||
import com.raytheon.uf.common.geospatial.util.EnvelopeIntersection;
|
||||
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
|
||||
|
@ -90,6 +96,8 @@ import com.vividsolutions.jts.geom.Polygon;
|
|||
* May 19, 2015 mjames@ucar Added decoding of GVAR native projection products,
|
||||
* increased crsWKT to 5120 for GVAR the_geom
|
||||
* May 21, 2015 mjames@ucar Added display capability for GVAR projection products
|
||||
* Jun 23, 2015 mjames@ucar Copied constructCRSfromWKT and constructCRS from
|
||||
* McidasCRSBuilder because PDE build dependency failed
|
||||
* </pre>
|
||||
*/
|
||||
@Entity
|
||||
|
@ -233,10 +241,10 @@ public class SatMapCoverage extends PersistableDataObject<Object> implements
|
|||
this.ny = ny;
|
||||
this.dx = dx;
|
||||
this.dy = dy;
|
||||
this.upperLeftElement = IDecoderConstantsN.INTEGER_MISSING;
|
||||
this.upperLeftLine = IDecoderConstantsN.INTEGER_MISSING;
|
||||
this.elementRes = IDecoderConstantsN.INTEGER_MISSING;
|
||||
this.lineRes = IDecoderConstantsN.INTEGER_MISSING;
|
||||
this.upperLeftElement = IDecoderConstants.VAL_MISSING;
|
||||
this.upperLeftLine = IDecoderConstants.VAL_MISSING;
|
||||
this.elementRes = IDecoderConstants.VAL_MISSING;
|
||||
this.lineRes = IDecoderConstants.VAL_MISSING;
|
||||
this.crsObject = crs;
|
||||
Geometry latLonGeometry = null;
|
||||
try {
|
||||
|
@ -483,8 +491,7 @@ public class SatMapCoverage extends PersistableDataObject<Object> implements
|
|||
if (crsObject == null && crsWKT != null) {
|
||||
try {
|
||||
if (this.projection == PROJ_GVAR) {
|
||||
crsObject = McidasSpatialFactory.getInstance()
|
||||
.constructCRSfromWKT(crsWKT);
|
||||
crsObject = constructCRSfromWKT(crsWKT);
|
||||
|
||||
} else {
|
||||
crsObject = CRSCache.getInstance()
|
||||
|
@ -585,4 +592,57 @@ public class SatMapCoverage extends PersistableDataObject<Object> implements
|
|||
return true;
|
||||
}
|
||||
|
||||
public static ProjectedCRS constructCRSfromWKT(String crsWKT) {
|
||||
Pattern p = Pattern.compile("PROJCS\\[\"MCIDAS\\sAREA\\s(.*)\"");
|
||||
Matcher m = p.matcher(crsWKT);
|
||||
m.find();
|
||||
ProjectedCRS crsObject = null;
|
||||
|
||||
if (m.groupCount() == 1) {
|
||||
String type = m.group(1);
|
||||
p = Pattern.compile("\\[\"NAV_BLOCK_BASE64\",\\s\"(.*)\"\\],");
|
||||
m = p.matcher(crsWKT);
|
||||
boolean found = m.find();
|
||||
if (found) {
|
||||
String navBlock = m.group(1);
|
||||
crsObject = constructCRS(type, navBlock);
|
||||
}
|
||||
}
|
||||
|
||||
return crsObject;
|
||||
}
|
||||
|
||||
public static ProjectedCRS constructCRS(String type, String encoded) {
|
||||
|
||||
ParameterValueGroup pvg = null;
|
||||
|
||||
DefaultMathTransformFactory dmtFactory = new DefaultMathTransformFactory();
|
||||
try {
|
||||
pvg = dmtFactory.getDefaultParameters("MCIDAS_AREA_NAV");
|
||||
} catch (NoSuchIdentifierException e1) {
|
||||
e1.printStackTrace();
|
||||
}
|
||||
/*
|
||||
* semi_major and semi_minor parameters are set to 1, so that no global
|
||||
* scaling is performed during coordinate transforms by
|
||||
* org.geotools.referencing.operation.projection.MapProjection based on
|
||||
* the radius of earth
|
||||
*/
|
||||
pvg.parameter("semi_major").setValue(1.0);
|
||||
pvg.parameter("semi_minor").setValue(1.0);
|
||||
pvg.parameter("central_meridian").setValue(0.0);
|
||||
pvg.parameter("NAV_BLOCK_BASE64").setValue(encoded);
|
||||
|
||||
String projectionName = "MCIDAS AREA " + type;
|
||||
ProjectedCRS mcidasCRS = null;
|
||||
try {
|
||||
mcidasCRS = MapUtil.constructProjection(projectionName, pvg);
|
||||
} catch (NoSuchIdentifierException e) {
|
||||
e.printStackTrace();
|
||||
} catch (FactoryException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return mcidasCRS;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,11 +5,11 @@ Bundle-SymbolicName: com.raytheon.uf.edex.plugin.satellite.gini
|
|||
Bundle-Version: 1.14.0.qualifier
|
||||
Bundle-Vendor: RAYTHEON
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Require-Bundle: com.raytheon.edex.plugin.satellite;bundle-version="1.14.1",
|
||||
Require-Bundle: com.raytheon.edex.plugin.satellite,
|
||||
com.raytheon.uf.common.status;bundle-version="1.14.1",
|
||||
com.raytheon.uf.common.time;bundle-version="1.14.0",
|
||||
com.raytheon.uf.common.dataplugin;bundle-version="1.14.0",
|
||||
com.raytheon.uf.common.dataplugin.satellite;bundle-version="1.14.0",
|
||||
com.raytheon.uf.common.dataplugin.satellite,
|
||||
com.raytheon.uf.common.serialization;bundle-version="1.14.2",
|
||||
com.raytheon.uf.common.localization;bundle-version="1.14.1",
|
||||
com.raytheon.uf.common.util;bundle-version="1.14.1",
|
||||
|
|
|
@ -10,8 +10,8 @@ Require-Bundle: com.raytheon.edex.common,
|
|||
javax.measure,
|
||||
org.apache.commons.lang,
|
||||
javax.persistence,
|
||||
com.raytheon.uf.common.dataplugin.satellite;bundle-version="1.0.0",
|
||||
com.raytheon.edex.plugin.satellite;bundle-version="1.12.1174"
|
||||
com.raytheon.uf.common.dataplugin.satellite,
|
||||
com.raytheon.edex.plugin.satellite
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
||||
Import-Package: com.raytheon.uf.common.localization,
|
||||
com.raytheon.uf.common.menus,
|
||||
|
|
|
@ -19,21 +19,53 @@
|
|||
further_licensing_information.
|
||||
-->
|
||||
<mapScales>
|
||||
<mapScale displayName="N. Hemisphere" fileName="NHemisphere.xml">
|
||||
<mapScale displayName="N Hemisphere" fileName="NHemisphere.xml" areaScale="false">
|
||||
<partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView1"/>
|
||||
</mapScale>
|
||||
<mapScale displayName="North American" fileName="NorthAmerican.xml">
|
||||
<mapScale displayName="N America" fileName="NorthAmerican.xml" areaScale="false">
|
||||
<partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView2"/>
|
||||
</mapScale>
|
||||
<mapScale displayName="CONUS" fileName="CONUS.xml">
|
||||
<mapScale displayName="CONUS" fileName="CONUS.xml" areaScale="false">
|
||||
<partId view="false" id="com.raytheon.viz.ui.glmap.GLMapEditor"/>
|
||||
</mapScale>
|
||||
<mapScale displayName="Regional" fileName="Regional.xml">
|
||||
<mapScale displayName="Regional" fileName="Regional.xml" areaScale="false">
|
||||
<partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView3"/>
|
||||
</mapScale>
|
||||
<mapScale displayName="State(s)" fileName="States.xml">
|
||||
<mapScale displayName="State" fileName="States.xml" areaScale="false">
|
||||
<partId id="com.raytheon.uf.viz.d2d.ui.map.SideView:sideView4"/>
|
||||
</mapScale>
|
||||
<mapScale displayName="WFO" fileName="WFO.xml">
|
||||
<mapScale displayName="WFO" fileName="WFO.xml" areaScale="false">
|
||||
</mapScale>
|
||||
<mapScale displayName="World" fileName="World.xml" areaScale="false">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/Arctic" fileName="Arctic.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/Antarctic" fileName="Antarctic.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/NEXRCOMP" fileName="NEXRAD.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/Alaska National" fileName="Alaska-National.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/Alaska Regional" fileName="Alaska-Regional.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/East CONUS" fileName="East-CONUS.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/West CONUS" fileName="West-CONUS.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/Hawaii National" fileName="Hawaii-National.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/Hawaii Regional" fileName="Hawaii-Regional.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/Puerto Rico National" fileName="Puerto-Rico-National.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/Puerto Rico Regional" fileName="Puerto-Rico-Regional.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/Supernational" fileName="Supernational.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/GOES-Sounder" fileName="SOUNDER.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/Mollweide" fileName="Mollweide.xml" areaScale="true">
|
||||
</mapScale>
|
||||
<mapScale displayName="SAT/GOES-East-West" fileName="GEWCOMP.xml" areaScale="true">
|
||||
</mapScale>
|
||||
</mapScales>
|
|
@ -19,8 +19,8 @@ CONDUIT ^data/nccf/com/nam/.*nam.*(awip3d).*!(grib2)/ncep/(NAM_84)/#([^/]*)/([0-
|
|||
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/conduit/GRID\4/\3/\5_\6Z_\7_\8-(seq).\1.\2.%Y%m%d
|
||||
|
||||
# GEFS
|
||||
CONDUIT (data/nccf|data2/TIGGE).*/(ge[cp][0-9][0-9])\.t[0-2][0-9]z\.pgrb2.* !grib2/ncep/GEFS/#000/([0-9]{8})([0-9]{4})(F[0-1]..)/([^/]*)/.*! (......)
|
||||
FILE -overwrite -log -close -edex /awips2/data_store/grib2/conduit/GEFS/gefs_\3_\4_\5\6_\2.grib2
|
||||
#CONDUIT (data/nccf|data2/TIGGE).*/(ge[cp][0-9][0-9])\.t[0-2][0-9]z\.pgrb2.* !grib2/ncep/GEFS/#000/([0-9]{8})([0-9]{4})(F[0-1]..)/([^/]*)/.*! (......)
|
||||
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/conduit/GEFS/gefs_\3_\4_\5\6_\2.grib2
|
||||
|
||||
# NDFD
|
||||
CONDUIT grib2/nwstg/NWS_0/..../(........)(....)
|
||||
|
|
|
@ -326,6 +326,8 @@ edex_stop() { # stop all edex services
|
|||
su -c "service qpidd stop"
|
||||
su -c "service httpd-pypies stop"
|
||||
su -c "service edex_postgres stop"
|
||||
sleep 5
|
||||
su -c "service qpidd stop"
|
||||
edex_status;
|
||||
}
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
|
|||
# baseline is...
|
||||
export BASELINE="${JENKINS_WORKSPACE}"
|
||||
export AWIPSII_VERSION="14.4.1"
|
||||
export BUILD_NUMBER="8"
|
||||
export BUILD_NUMBER="11"
|
||||
export AWIPSII_RELEASE="1n${BUILD_NUMBER}"
|
||||
|
||||
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"
|
||||
|
|
Loading…
Add table
Reference in a new issue