Changeset 12776 in josm for trunk/src/org/openstreetmap/josm/data/projection

Timestamp:

2017-09-07T23:41:42+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - remove dependency of NTV2GridShiftFileWrapper on Main.platform

• PlatformHook bundles all application-wide platform dependent code, which is

convenient, but problematic for separating modules

• introduces lightweight tools.Platform for adding platform dependent code more locally

File:

• trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

@@ -5 +5 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.tools.Platform;
+import org.openstreetmap.josm.tools.PlatformVisitor;
 
 /**
@@ -29 +34 @@
 
     /**
+     * Lists default directories where the ntv2 shift files (NAD) for the proj4
+     * library would be located on different platforms.
+     */
+    public static final PlatformVisitor<List<File>> DEFAULT_PROJ4_NTV2_SHIFT_DIRS =
+            new PlatformVisitor<List<File>>() {
+        @Override
+        public List<File> visitUnixoid() {
+            return Arrays.asList(new File("/usr/local/share/proj"), new File("/usr/share/proj"));
+        }
+
+        @Override
+        public List<File> visitWindows() {
+            return Arrays.asList(new File("C:\\PROJ\\NAD"));
+        }
+
+        @Override
+        public List<File> visitOsx() {
+            return Collections.emptyList();
+        }
+    };
+
+    /**
      * Returns the actual {@link NTV2GridShiftFile} behind this wrapper.
      * The grid file is only loaded once, when first accessed.
@@ -38 +65 @@
             File grid = null;
             // Check is the grid is installed in default PROJ.4 directories
-            for (File dir : Main.platform.getDefaultProj4NadshiftDirectories()) {
+            for (File dir : Platform.determinePlatform().accept(DEFAULT_PROJ4_NTV2_SHIFT_DIRS)) {
                 File file = new File(dir, gridFileName);
                 if (file.exists() && file.isFile()) {