}
public static Sexagesimal valueOf(Double decimal, boolean isLatitude, boolean nullSecondsToNull, boolean nullMinutesToNull){
+ if(decimal == null){
+ return null;
+ }
Sexagesimal sexagesimal = new Sexagesimal();
Double decimalDegree = decimal;
if (isLatitude) {
public static Double parseLatitude(String string) throws ParseException{
CoordinateConverter converter = new CoordinateConverter();
ConversionResults result = converter.tryConvert(string);
- if (! result.conversionSuccessful || result.isLongitude ){
+ if (! result.conversionSuccessful || (result.isLongitude != null && result.isLongitude) ){
throw new ParseException("Latitude could not be parsed", 0);
}else{
return result.convertedCoord;
public static Double parseLongitude(String string) throws ParseException{
CoordinateConverter converter = new CoordinateConverter();
ConversionResults result = converter.tryConvert(string);
- if (! result.conversionSuccessful || ! result.isLongitude){
+ if (! result.conversionSuccessful || (result.isLongitude != null && ! result.isLongitude)){
throw new ParseException("Longitude could not be parsed", 0);
}else{
return result.convertedCoord;
Assert.assertNotNull("Point1 must not be null", point1);\r
Assert.assertNotNull("Point2 must not be null", point2);\r
Assert.assertEquals("", longitude1, point1.getLongitude());\r
+\r
Assert.assertEquals("", latitude1, point1.getLatitude());\r
Assert.assertEquals("", errorRadius, point1.getErrorRadius());\r
Assert.assertEquals("", referenceSystem, point1.getReferenceSystem());\r
+ \r
+ Assert.assertNull("LongitudeSexagesimal should be null", point2.getLongitudeSexagesimal());\r
+ Assert.assertNull("LatitudeSexagesimal should be null", point2.getLatitudeSexagesimal());\r
}\r
\r
@Test\r
Assert.assertTrue("Longitude can not be S", true);\r
}\r
\r
+\r
\r
\r
// Assert.assertTrue("Southern must be negative", conversionResults.convertedCoord < 0);\r
\r
}\r
\r
- \r
- \r
+ @Test\r
+ public void testStaticParsing(){\r
+ try{\r
+ Point.parseLatitude("1");\r
+ }catch (NullPointerException e){\r
+ Assert.fail("No NullPointerException should occur");\r
+ } catch (ParseException e) {\r
+ Assert.fail("No parsing error should occur");\r
+ }\r
+ }\r
\r
\r
\r