Changeset 9950 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-03-07T23:29:14+01:00 (9 years ago)

Author:

simon04

Message:

see #11516 - Add Sinusoidal projection

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• coor/LatLon.java (modified) (1 diff)
• projection/Projections.java (modified) (2 diffs)
• projection/proj/Sinusoidal.java (added)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -63 +63 @@
 
     private static DecimalFormat cDmsMinuteFormatter = new DecimalFormat("00");
-    private static DecimalFormat cDmsSecondFormatter = new DecimalFormat(Main.pref.get("latlon.dms.decimal-format", "00.0"));
-    private static DecimalFormat cDmMinuteFormatter = new DecimalFormat(Main.pref.get("latlon.dm.decimal-format", "00.000"));
+    private static DecimalFormat cDmsSecondFormatter = new DecimalFormat(
+            Main.pref == null ? "00.0" : Main.pref.get("latlon.dms.decimal-format", "00.0"));
+    private static DecimalFormat cDmMinuteFormatter = new DecimalFormat(
+            Main.pref == null ? "00.000" : Main.pref.get("latlon.dm.decimal-format", "00.000"));
     public static final DecimalFormat cDdFormatter;
     public static final DecimalFormat cDdHighPecisionFormatter;

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -41 +41 @@
 import org.openstreetmap.josm.data.projection.proj.Proj;
 import org.openstreetmap.josm.data.projection.proj.ProjFactory;
+import org.openstreetmap.josm.data.projection.proj.Sinusoidal;
 import org.openstreetmap.josm.data.projection.proj.SwissObliqueMercator;
 import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
@@ -95 +96 @@
         registerBaseProjection("omerc", ObliqueMercator.class, "core");
         registerBaseProjection("somerc", SwissObliqueMercator.class, "core");
+        registerBaseProjection("sinu", Sinusoidal.class, "core");
         registerBaseProjection("stere", PolarStereographic.class, "core");
         registerBaseProjection("sterea", DoubleStereographic.class, "core");