Changeset 12777 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2017-09-08T00:42:43+02:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r12770 r12777 85 85 import org.openstreetmap.josm.data.osm.UserInfo; 86 86 import org.openstreetmap.josm.data.osm.search.SearchMode; 87 import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileSource; 88 import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileWrapper; 89 import org.openstreetmap.josm.data.projection.datum.NTV2Proj4DirGridShiftFileSource; 87 90 import org.openstreetmap.josm.data.validation.OsmValidator; 88 91 import org.openstreetmap.josm.gui.ProgramArguments.Option; … … 113 116 import org.openstreetmap.josm.gui.util.WindowGeometry; 114 117 import org.openstreetmap.josm.gui.widgets.UrlLabel; 118 import org.openstreetmap.josm.io.CachedFile; 115 119 import org.openstreetmap.josm.io.CertificateAmendment; 116 120 import org.openstreetmap.josm.io.DefaultProxySelector; … … 235 239 menu.redo.setEnabled(redoSize > 0); 236 240 }; 241 242 /** 243 * Source of NTV2 shift files: Download from JOSM website. 244 * @since 12777 245 */ 246 public static final NTV2GridShiftFileSource JOSM_WEBSITE_NTV2_SOURCE = gridFileName -> { 247 String location = Main.getJOSMWebsite() + "/proj/" + gridFileName; 248 // Try to load grid file 249 CachedFile cf = new CachedFile(location); 250 try { 251 return cf.getInputStream(); 252 } catch (IOException ex) { 253 Logging.warn(ex); 254 return null; 255 } 256 }; 237 257 238 258 /** … … 902 922 Main.toolbar = toolbar; 903 923 ProjectionPreference.setProjection(); 924 NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource( 925 NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_LOCAL, 926 NTV2Proj4DirGridShiftFileSource.getInstance()); 927 NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource( 928 NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_DOWNLOAD, 929 JOSM_WEBSITE_NTV2_SOURCE); 904 930 GuiHelper.translateJavaInternalMessages(); 905 931 preConstructorInit();
Note: See TracChangeset
for help on using the changeset viewer.