Ignore:
Timestamp:
2017-02-28T22:54:27+01:00 (3 years ago)
Author:
Don-vip
Message:

fix #14422 - Dynamic NTV2 grids

Location:
trunk/src/org/openstreetmap/josm/tools
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

    r11156 r11642  
    99import java.security.NoSuchAlgorithmException;
    1010import java.security.cert.CertificateException;
     11import java.util.List;
    1112
    1213/**
     
    172173     */
    173174    File getDefaultUserDataDirectory();
     175
     176    /**
     177     * Returns the list of platform-dependent default datum shifting directories for the PROJ.4 library.
     178     * @return the list of platform-dependent default datum shifting directories for the PROJ.4 library
     179     * @since 11642
     180     */
     181    List<File> getDefaultProj4NadshiftDirectories();
    174182}
  • trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

    r11535 r11642  
    1515import java.lang.reflect.Proxy;
    1616import java.util.Arrays;
     17import java.util.Collections;
    1718import java.util.List;
    1819
     
    382383                Main.pref.getJOSMDirectoryBaseName());
    383384    }
     385
     386    @Override
     387    public List<File> getDefaultProj4NadshiftDirectories() {
     388        return Collections.emptyList();
     389    }
    384390}
  • trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

    r11613 r11642  
    1818import java.nio.file.Paths;
    1919import java.util.Arrays;
     20import java.util.List;
    2021import java.util.Locale;
    2122
     
    433434    }
    434435
     436    @Override
     437    public List<File> getDefaultProj4NadshiftDirectories() {
     438        return Arrays.asList(new File("/usr/local/share/proj"), new File("/usr/share/proj"));
     439    }
    435440}
  • trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

    r11218 r11642  
    5353import java.security.spec.X509EncodedKeySpec;
    5454import java.util.ArrayList;
     55import java.util.Arrays;
    5556import java.util.Collection;
    5657import java.util.Enumeration;
     
    572573        return def;
    573574    }
     575
     576    @Override
     577    public List<File> getDefaultProj4NadshiftDirectories() {
     578        return Arrays.asList(new File("C:\\PROJ\\NAD"));
     579    }
    574580}
Note: See TracChangeset for help on using the changeset viewer.