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

Merge "Issue #2664 Fix NullPointerException when no .prj file present" into development

Browse source 
Former-commit-id: 3806a1fd05 [formerly 6b226db27c] [formerly 66929690c7 [formerly de57933506ad588c8da38a49de6a2cd5530e2091]]
Former-commit-id: 66929690c7
Former-commit-id: cacff76564
This commit is contained in:
Ron Anderson 2014-04-17 13:13:03 -05:00 • committed by Gerrit Code Review
commit 55f31328af
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java
View file

@ -119,6 +119,7 @@ import com.vividsolutions.jts.geom.Point;
* Feb 18, 2014 #2819 randerso Removed unnecessary clones of geometries * Feb 18, 2014 #2819 randerso Removed unnecessary clones of geometries
* Mar 11, 2014 #2718 randerso Changes for GeoTools 10.5 * Mar 11, 2014 #2718 randerso Changes for GeoTools 10.5
* Mar 25, 2014 #2664 randerso Added support for non-WGS84 shape files * Mar 25, 2014 #2664 randerso Added support for non-WGS84 shape files
* Apr 14, 2014 #2664 randerso Fix NullPointerException when no .prj file present
* *
* </pre> * </pre>
* *
@ -611,6 +612,13 @@ public class DataStoreResource extends
schema = dataStore.getSchema(typeName); schema = dataStore.getSchema(typeName);
CoordinateReferenceSystem incomingCrs = schema CoordinateReferenceSystem incomingCrs = schema
.getGeometryDescriptor().getCoordinateReferenceSystem(); .getGeometryDescriptor().getCoordinateReferenceSystem();
if (incomingCrs == null) {
statusHandler.warn("No projection information found for "
+ dataStore.getFeatureSource(typeName).getName()
.getURI()
+ ", assuming WGS84 unprojected lat/lon.");
incomingCrs = MapUtil.getLatLonProjection();
}
incomingToLatLon = MapUtil.getTransformToLatLon(incomingCrs); incomingToLatLon = MapUtil.getTransformToLatLon(incomingCrs);
latLonToIncoming = MapUtil.getTransformFromLatLon(incomingCrs); latLonToIncoming = MapUtil.getTransformFromLatLon(incomingCrs);