Changeset 12777 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-09-08T00:42:43+02:00 (3 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/gui/MainApplication.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -85 +85 @@
 import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.data.osm.search.SearchMode;
+import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileSource;
+import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileWrapper;
+import org.openstreetmap.josm.data.projection.datum.NTV2Proj4DirGridShiftFileSource;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.gui.ProgramArguments.Option;
@@ -113 +116 @@
 import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.gui.widgets.UrlLabel;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.CertificateAmendment;
 import org.openstreetmap.josm.io.DefaultProxySelector;
@@ -235 +239 @@
             menu.redo.setEnabled(redoSize > 0);
         };
+
+    /**
+     * Source of NTV2 shift files: Download from JOSM website.
+     * @since 12777
+     */
+    public static final NTV2GridShiftFileSource JOSM_WEBSITE_NTV2_SOURCE = gridFileName -> {
+        String location = Main.getJOSMWebsite() + "/proj/" + gridFileName;
+        // Try to load grid file
+        CachedFile cf = new CachedFile(location);
+        try {
+            return cf.getInputStream();
+        } catch (IOException ex) {
+            Logging.warn(ex);
+            return null;
+        }
+    };
 
     /**
@@ -902 +922 @@
         Main.toolbar = toolbar;
         ProjectionPreference.setProjection();
+        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
+                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_LOCAL,
+                NTV2Proj4DirGridShiftFileSource.getInstance());
+        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
+                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_DOWNLOAD,
+                JOSM_WEBSITE_NTV2_SOURCE);
         GuiHelper.translateJavaInternalMessages();
         preConstructorInit();