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

remove edex.decodertools from common.satellite because p2 builds RPMs with circular dependencies and FUBARs on install

Browse source 
Former-commit-id: 12656d917a [formerly 82f188d650] [formerly 10d6b1649f] [formerly 216f4411e0f1741005b4e5f54f0c66bced2e21a2 [formerly 6e1c8328cba83f4359842c05d2c366614ac5f6aa] [formerly 10d6b1649f [formerly 0e38b0a31b]]]
Former-commit-id: 7e3880e476e84ade1c22338d231b69bbf15ced34 [formerly 0090599e3a946192c519e02518edfb7da10523fb] [formerly 7c494d525b [formerly eaf14651ef]]
Former-commit-id: c663be72e34248a3fadd49105dd3afb0549f1a07 [formerly 7c494d525b]
Former-commit-id: cb4abfe96c
This commit is contained in:
AWIPS User 2015-07-14 09:17:58 -06:00
parent 164380ff76
commit 82f4d79b7a
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/META-INF/MANIFEST.MF
View file

@ -15,8 +15,7 @@ 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.0.0",
com.raytheon.uf.edex.decodertools;bundle-version="1.0.0"
com.raytheon.uf.common.numeric;bundle-version="1.0.0"
Export-Package: com.raytheon.uf.common.dataplugin.satellite,
com.raytheon.uf.common.dataplugin.satellite.units,
com.raytheon.uf.common.dataplugin.satellite.units.counts,

14
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatMapCoverage.java
View file

@ -20,10 +20,6 @@
package com.raytheon.uf.common.dataplugin.satellite;
//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;
@ -113,6 +109,8 @@ public class SatMapCoverage extends PersistableDataObject<Object> implements
public static final int PROJ_GVAR = 7585;
private static final long serialVersionUID = 1L;
public static final Integer VAL_MISSING = new Integer(-9999998);
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SATELLITE_SPATIAL_GENERATOR")
@ -241,10 +239,10 @@ public class SatMapCoverage extends PersistableDataObject<Object> implements
this.ny = ny;
this.dx = dx;
this.dy = dy;
this.upperLeftElement = IDecoderConstants.VAL_MISSING;
this.upperLeftLine = IDecoderConstants.VAL_MISSING;
this.elementRes = IDecoderConstants.VAL_MISSING;
this.lineRes = IDecoderConstants.VAL_MISSING;
this.upperLeftElement = VAL_MISSING;
this.upperLeftLine = VAL_MISSING;
this.elementRes = VAL_MISSING;
this.lineRes = VAL_MISSING;
this.crsObject = crs;
Geometry latLonGeometry = null;
try {