Changeset 16272 in josm for trunk


Ignore:
Timestamp:
2020-04-12T15:02:36+02:00 (4 years ago)
Author:
simon04
Message:

see #18729 - Do not initialize external territories data for unit tests

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/scripts/TagInfoExtract.java

    r16271 r16272  
    621621        System.setProperty("josm.home", tmpdir.toString());
    622622        DeleteCommand.setDeletionCallback(DeleteAction.defaultDeletionCallback);
    623         Territories.initialize();
     623        Territories.initializeInternalData();
    624624        RightAndLefthandTraffic.initialize();
    625625        Files.createDirectories(options.imageDir);

  • trunk/src/org/openstreetmap/josm/tools/Territories.java

    r16215 r16272  
    124124     * Initializes territories.
    125125     * TODO: Synchronization can be refined inside the {@link GeoPropertyIndex} as most look-ups are read-only.
     126     * @see #initializeInternalData()
    126127     */
    127128    public static synchronized void initialize() {
    … …  
    130131    }
    131132
    132     private static void initializeInternalData() {
     133    /**
     134     * Initializes territories using the internal data only.
     135     */
     136    public static void initializeInternalData() {
    133137        iso3166Cache = new HashMap<>();
    134138        taginfoCache = new TreeMap<>();

  • trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

    r15662 r16272  
    550550
    551551        if (territories) {
    552             Territories.initialize();
     552            Territories.initializeInternalData();
    553553        }
    554554
Note: See TracChangeset for help on using the changeset viewer.