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

Merge "Omaha #3243 Update AWIPS2 references to remove deprecated lambert conformal creation." into omaha_14.4.1

Browse source 
Former-commit-id: d8f063c6f8 [formerly a8c8602f651e082d6eeeab1973d98546429b8ceb]
Former-commit-id: b9caf16088
This commit is contained in:
Ron Anderson 2014-06-11 07:59:30 -05:00 • committed by Gerrit Code Review
commit 746272ac9a
10 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
View file

@ -13,7 +13,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.0.0",
com.raytheon.uf.common.serialization;bundle-version="1.12.1174", 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.serialization.comm;bundle-version="1.12.1174",
com.raytheon.uf.common.geospatial;bundle-version="1.14.0", com.raytheon.uf.common.geospatial;bundle-version="1.14.1",
com.raytheon.uf.common.dataquery;bundle-version="1.0.0", com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
com.raytheon.uf.common.datastorage;bundle-version="1.12.1174", com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
com.raytheon.uf.common.localization;bundle-version="1.12.1174", com.raytheon.uf.common.localization;bundle-version="1.12.1174",

4
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
View file

@ -43,6 +43,8 @@ import com.vividsolutions.jts.geom.Envelope;
* Sep 30, 2013 2333 mschenke Refactored to store points in crs space * Sep 30, 2013 2333 mschenke Refactored to store points in crs space
* Apr 15, 2014 3017 bsteffen Add new getCoverage methods to support * Apr 15, 2014 3017 bsteffen Add new getCoverage methods to support
* either one corner + dx/dy or two corners. * either one corner + dx/dy or two corners.
* Jun 05, 2014 3243 bsteffen Remove deprecated lambert conformal call.
*
* *
* </pre> * </pre>
*/ */
@ -327,7 +329,7 @@ public class SatSpatialFactory {
private static ProjectedCRS createLambertCrs(double latin, double lov) { private static ProjectedCRS createLambertCrs(double latin, double lov) {
return MapUtil.constructLambertConformal(MapUtil.AWIPS_EARTH_RADIUS, return MapUtil.constructLambertConformal(MapUtil.AWIPS_EARTH_RADIUS,
MapUtil.AWIPS_EARTH_RADIUS, latin, latin, lov); MapUtil.AWIPS_EARTH_RADIUS, latin, latin, lov, latin);
} }
private static ProjectedCRS createEqCylCrs(double latin, double lov) { private static ProjectedCRS createEqCylCrs(double latin, double lov) {

16
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java
View file

@ -46,12 +46,14 @@ import com.vividsolutions.jts.geom.Coordinate;
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* May 18, 2011 mnash Initial creation * May 18, 2011 mnash Initial creation
* Sep 10, 2012 15337 kshresth Changed sector on OCONUS:Products under * Sep 10, 2012 15337 kshresth Changed sector on OCONUS:Products under
* Derived Products Imagery Display * Derived Products Imagery Display
* Nov 01, 2012 15346 kshresth Added Satellite Products for OCONUS * Nov 01, 2012 15346 kshresth Added Satellite Products for OCONUS
* Jun 05, 2014 3243 bsteffen Remove deprecated lambert conformal call.
*
* *
* </pre> * </pre>
* *
@ -65,7 +67,7 @@ public class SatelliteMenuUtil extends AbstractMenuUtil {
private static final CoordinateReferenceSystem conusCRS = MapUtil private static final CoordinateReferenceSystem conusCRS = MapUtil
.constructLambertConformal(MapUtil.AWIPS_EARTH_RADIUS, .constructLambertConformal(MapUtil.AWIPS_EARTH_RADIUS,
MapUtil.AWIPS_EARTH_RADIUS, 25, 25, -95); MapUtil.AWIPS_EARTH_RADIUS, 25, 25, -95, 25);
// The western edge of the west conus satellite image in conusCRS // The western edge of the west conus satellite image in conusCRS
private static final double westConusWestEdge = -4226066.525608903; private static final double westConusWestEdge = -4226066.525608903;

2
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/META-INF/MANIFEST.MF
View file

@ -18,7 +18,7 @@ Require-Bundle: org.geotools,
com.raytheon.uf.common.dataaccess;bundle-version="1.0.0", com.raytheon.uf.common.dataaccess;bundle-version="1.0.0",
com.raytheon.uf.common.dataquery;bundle-version="1.0.0", com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
com.raytheon.uf.common.datastorage;bundle-version="1.12.1174", com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
com.raytheon.uf.common.geospatial;bundle-version="1.14.0", com.raytheon.uf.common.geospatial;bundle-version="1.14.1",
com.raytheon.uf.common.numeric;bundle-version="1.14.0" com.raytheon.uf.common.numeric;bundle-version="1.14.0"
Export-Package: com.raytheon.uf.common.dataplugin.gfe, Export-Package: com.raytheon.uf.common.dataplugin.gfe,
com.raytheon.uf.common.dataplugin.gfe.config, com.raytheon.uf.common.dataplugin.gfe.config,

6
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/config/ProjectionData.java
View file

@ -61,6 +61,8 @@ import com.vividsolutions.jts.geom.Coordinate;
* 05/14/2014 #3069 randerso Changed to store math transforms and CRS instead of * 05/14/2014 #3069 randerso Changed to store math transforms and CRS instead of
* GridGeometry2D since GeoTools now changes the supplied * GridGeometry2D since GeoTools now changes the supplied
* math transform when creating GridGeometry2D * math transform when creating GridGeometry2D
* 06/05/2014 #3243 bsteffen Remove deprecated lambert conformal call.
*
* *
* </pre> * </pre>
* *
@ -93,7 +95,7 @@ public class ProjectionData {
/** Lat/Lon (implemented as Equidistant Cylindrical) map projection */ /** Lat/Lon (implemented as Equidistant Cylindrical) map projection */
LATLON LATLON
}; }
@Column(length = 32, nullable = false) @Column(length = 32, nullable = false)
@DynamicSerializeElement @DynamicSerializeElement
@ -311,7 +313,7 @@ public class ProjectionData {
crs = MapUtil.constructLambertConformal( crs = MapUtil.constructLambertConformal(
MapUtil.AWIPS_EARTH_RADIUS, MapUtil.AWIPS_EARTH_RADIUS, MapUtil.AWIPS_EARTH_RADIUS, MapUtil.AWIPS_EARTH_RADIUS,
this.stdParallelOne, this.stdParallelTwo, this.stdParallelOne, this.stdParallelTwo,
this.latLonOrigin.x); this.latLonOrigin.x, this.latLonOrigin.y);
break; break;
case MERCATOR: case MERCATOR:

14
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/LambertConformalGridCoverage.java
View file

@ -52,11 +52,13 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* 4/7/09 1994 bphillip Initial Creation * Apr 07, 2009 1994 bphillip Initial Creation
* 09/10/2012 DR 15270 D. Friedman Fix subgrid model name handling. * Sep 10, 2012 15270 D. Friedman Fix subgrid model name handling.
* Jan 17, 2014 2125 rjpeter Removed invalid @Table annotation. * Jan 17, 2014 2125 rjpeter Removed invalid @Table annotation.
* Jun 05, 2014 3243 bsteffen Remove deprecated lambert conformal call.
*
* </pre> * </pre>
* *
* @author bphillip * @author bphillip
@ -121,7 +123,7 @@ public class LambertConformalGridCoverage extends GridCoverage {
@Override @Override
public void initialize() throws GridCoverageException { public void initialize() throws GridCoverageException {
crs = MapUtil.constructLambertConformal(majorAxis, minorAxis, latin1, crs = MapUtil.constructLambertConformal(majorAxis, minorAxis, latin1,
latin2, lov); latin2, lov, latin1);
crsWKT = crs.toWKT(); crsWKT = crs.toWKT();
generateGeometry(); generateGeometry();
} }

4
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasSpatialFactory.java
View file

@ -11,6 +11,7 @@
* 12/2009 144 T. Lee Migrated to TO11D6 * 12/2009 144 T. Lee Migrated to TO11D6
* 11/2013 1066 G. Hull constructCRSfromWKT (from McidasMapCoverage) * 11/2013 1066 G. Hull constructCRSfromWKT (from McidasMapCoverage)
* 03/2014 TTR957 B. Yin Moved constructCRSfromWKT to McidasCRSBuilder * 03/2014 TTR957 B. Yin Moved constructCRSfromWKT to McidasCRSBuilder
* 06/2014 3243 bsteffen Remove deprecated lambert conformal call.
* *
* </pre> * </pre>
* *
@ -174,7 +175,7 @@ public class McidasSpatialFactory {
clon); clon);
} else if (mapProjection == 3) { } else if (mapProjection == 3) {
crs = MapUtil.constructLambertConformal(earthRadius, earthRadius, crs = MapUtil.constructLambertConformal(earthRadius, earthRadius,
stdlat1, stdlat2, clon); stdlat1, stdlat2, clon, stdlat1);
} else { } else {
if (stdlat1 >= 0.) if (stdlat1 >= 0.)
crs = MapUtil.constructNorthPolarStereo(earthRadius, crs = MapUtil.constructNorthPolarStereo(earthRadius,
@ -342,7 +343,6 @@ public class McidasSpatialFactory {
// Check the database to see if a coverage already exists // Check the database to see if a coverage already exists
mapCoverage = satDao.getSatCoverage(iproj, nx, ny, mapCoverage = satDao.getSatCoverage(iproj, nx, ny,
upperLeftElement, upperLeftLine, xres, yres, encodedNav); upperLeftElement, upperLeftLine, xres, yres, encodedNav);
// TODO
// If the database does not contain an existing sat map coverage for // If the database does not contain an existing sat map coverage for
// the given values, create one // the given values, create one

18
ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/area/StationDbAreaProviderFactory.java
View file

@ -9,13 +9,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.geotools.coverage.grid.GeneralGridGeometry; import org.geotools.coverage.grid.GeneralGridGeometry;
import org.geotools.referencing.operation.DefaultMathTransformFactory;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.crs.ProjectedCRS;
import com.raytheon.uf.common.geospatial.MapUtil; import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.catalog.DirectDbQuery; import com.raytheon.uf.viz.core.catalog.DirectDbQuery;
import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.map.MapDescriptor; import com.raytheon.uf.viz.core.map.MapDescriptor;
@ -25,20 +21,22 @@ import com.vividsolutions.jts.io.ParseException;
import com.vividsolutions.jts.io.WKBReader; import com.vividsolutions.jts.io.WKBReader;
/** /**
* generate a PredefinedArea (IGridGeometryProvider) from a station in common_obs_spatial. * generate a PredefinedArea (IGridGeometryProvider) from a station in
* * common_obs_spatial.
* TODO : allow user to set/override the projection and/or the extents. *
* * TODO : allow user to set/override the projection and/or the extents.
*
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* 05/20/14 #862 Greg Hull Created. * 05/20/14 #862 Greg Hull Created.
* 06/06/14 #3243 bsteffen Remove deprecated lambert conformal call.
* *
* </pre> * </pre>
* *
* @author * @author
* @version 1 * @version 1
*/ */
public class StationDbAreaProviderFactory implements INcAreaProviderFactory { public class StationDbAreaProviderFactory implements INcAreaProviderFactory {
@ -274,7 +272,7 @@ public class StationDbAreaProviderFactory implements INcAreaProviderFactory {
else if( proj.equals( "Lambert_Conformal_Conic_1SP" ) ) { else if( proj.equals( "Lambert_Conformal_Conic_1SP" ) ) {
return MapUtil.constructLambertConformal( return MapUtil.constructLambertConformal(
MapUtil.AWIPS_EARTH_RADIUS, MapUtil.AWIPS_EARTH_RADIUS, MapUtil.AWIPS_EARTH_RADIUS, MapUtil.AWIPS_EARTH_RADIUS,
loc.y, loc.y, loc.x ); loc.y, loc.y, loc.x, loc.y);
} }
else { else {
return null; return null;

12
ncep/gov.noaa.nws.ncep.viz.gempak/src/gov/noaa/nws/ncep/viz/gempak/util/GempakGrid.java
View file

@ -1,10 +1,5 @@
package gov.noaa.nws.ncep.viz.gempak.util; package gov.noaa.nws.ncep.viz.gempak.util;
import java.util.ArrayList;
import com.raytheon.uf.common.gridcoverage.LambertConformalGridCoverage;
import com.raytheon.uf.common.gridcoverage.LatLonGridCoverage;
import com.raytheon.uf.common.gridcoverage.PolarStereoGridCoverage;
import gov.noaa.nws.ncep.viz.gempak.grid.jna.GridDiag; import gov.noaa.nws.ncep.viz.gempak.grid.jna.GridDiag;
import javax.measure.converter.UnitConverter; import javax.measure.converter.UnitConverter;
@ -18,7 +13,9 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import com.raytheon.uf.common.geospatial.ISpatialObject; import com.raytheon.uf.common.geospatial.ISpatialObject;
import com.raytheon.uf.common.geospatial.MapUtil; import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.viz.core.comm.Connector; import com.raytheon.uf.common.gridcoverage.LambertConformalGridCoverage;
import com.raytheon.uf.common.gridcoverage.LatLonGridCoverage;
import com.raytheon.uf.common.gridcoverage.PolarStereoGridCoverage;
import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.exception.VizException;
import com.sun.jna.Native; import com.sun.jna.Native;
import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.IntByReference;
@ -269,8 +266,7 @@ public class GempakGrid {
CharSequence spacingUnit = "km"; CharSequence spacingUnit = "km";
double dx = 12.191; double dx = 12.191;
double dy = 12.191; double dy = 12.191;
crs = MapUtil.constructLambertConformal(majorAxis, minorAxis, latin1, crs = MapUtil.constructLambertConformal(majorAxis, minorAxis, latin1, latin2, lov, latin1);
latin2, lov);
crsWKT = crs.toWKT(); crsWKT = crs.toWKT();
try { try {
Unit<?> spacingUnitObj = Unit.valueOf(spacingUnit); Unit<?> spacingUnitObj = Unit.valueOf(spacingUnit);

2
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/customCoverage/CustomLambertConformalCoverage.java
View file

@ -51,7 +51,7 @@ public class CustomLambertConformalCoverage extends CustomCoverage {
public boolean build() { public boolean build() {
crs = MapUtil.constructLambertConformal(majorAxis, minorAxis, latin1, crs = MapUtil.constructLambertConformal(majorAxis, minorAxis, latin1,
latin2, lov); latin2, lov, latin1);
try { try {
Unit<?> spacingUnitObj = Unit.valueOf(spacingUnit); Unit<?> spacingUnitObj = Unit.valueOf(spacingUnit);
if (spacingUnitObj.isCompatible(SI.METRE)) { if (spacingUnitObj.isCompatible(SI.METRE)) {