Changeset 12777 in josm for trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

Timestamp:

2017-09-08T00:42:43+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - add registry for NTV2 grid file sources

removes dependency of NTV2GridShiftFileWrapper on Main

File:

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

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

@@ -8 +8 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.io.CachedFile;
-import org.openstreetmap.josm.tools.Platform;
 import org.openstreetmap.josm.tools.PlatformVisitor;
 
@@ -24 +23 @@
     private NTV2GridShiftFile instance;
     private final String gridFileName;
+
+    public static float NTV2_SOURCE_PRIORITY_LOCAL = 10f;
+    public static float NTV2_SOURCE_PRIORITY_DOWNLOAD = 5f;
+
+    private static Map<Float, NTV2GridShiftFileSource> sources =
+            new TreeMap<Float, NTV2GridShiftFileSource>(Collections.reverseOrder());
+
+    /**
+     * Register a source for NTV2 grid files.
+     * @param priority the priority, sources with higher priority are checked first;
+     * use {@link #NTV2_SOURCE_PRIORITY_LOCAL} for local files and
+     * {@link #NTV2_SOURCE_PRIORITY_DOWNLOAD} for remote downloads
+     * @param source the NTV2 grid file source
+     * @since 12777
+     */
+    public static void registerNTV2GridShiftFileSource(float priority, NTV2GridShiftFileSource source) {
+        sources.put(priority, source);
+    }
 
     /**
@@ -63 +80 @@
     public synchronized NTV2GridShiftFile getShiftFile() throws IOException {
         if (instance == null) {
-            File grid = null;
-            // Check is the grid is installed in default PROJ.4 directories
-            for (File dir : Platform.determinePlatform().accept(DEFAULT_PROJ4_NTV2_SHIFT_DIRS)) {
-                File file = new File(dir, gridFileName);
-                if (file.exists() && file.isFile()) {
-                    grid = file;
-                    break;
-                }
-            }
-            // If not, search into PROJ_LIB directory
-            if (grid == null) {
-                String projLib = System.getProperty("PROJ_LIB");
-                if (projLib != null && !projLib.isEmpty()) {
-                    File dir = new File(projLib);
-                    if (dir.exists() && dir.isDirectory()) {
-                        File file = new File(dir, gridFileName);
-                        if (file.exists() && file.isFile()) {
-                            grid = file;
-                        }
-                    }
-                }
-            }
-            // If not, retrieve it from JOSM website
-            String location = grid != null ? grid.getAbsolutePath() : (Main.getJOSMWebsite() + "/proj/" + gridFileName);
-            // Try to load grid file
-            try (CachedFile cf = new CachedFile(location); InputStream is = cf.getInputStream()) {
-                NTV2GridShiftFile ntv2 = new NTV2GridShiftFile();
-                ntv2.loadGridShiftFile(is, false);
-                instance = ntv2;
-            }
+            for (Map.Entry<Float, NTV2GridShiftFileSource> entry : sources.entrySet()) {
+                NTV2GridShiftFileSource source = entry.getValue();
+                try (InputStream is = source.getNTV2GridShiftFile(gridFileName)) {
+                    if (is != null) {
+                        NTV2GridShiftFile ntv2 = new NTV2GridShiftFile();
+                        ntv2.loadGridShiftFile(is, false);
+                        instance = ntv2;
+                        break;
+                     }
+                 }
+             }
         }
         return instance;