Changeset 6488 in josm


Ignore:
Timestamp:
2013-12-18T02:57:18+01:00 (6 years ago)
Author:
Don-vip
Message:

cleanup in data folder

Location:
trunk
Files:
2 added
4 edited
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/projection/Projections.java

    r6463 r6488  
    4444        // Hide default constructor for utils classes
    4545    }
    46    
     46
    4747    public static EastNorth project(LatLon ll) {
    4848        if (ll == null) return null;
     
    134134        BufferedReader r = null;
    135135        try {
    136             InputStream in = new MirroredInputStream("resource://data/epsg");
     136            InputStream in = new MirroredInputStream("resource://data/projection/epsg");
    137137            r = new BufferedReader(new InputStreamReader(in));
    138138            String line, lastline = "";
  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

    r6135 r6488  
    1515
    1616    /**
    17      * Used in Germany to convert coordinates between the DHDN (<i>Deutsches Hauptdreiecksnetz</i>) 
     17     * Used in Germany to convert coordinates between the DHDN (<i>Deutsches Hauptdreiecksnetz</i>)
    1818     * and ETRS89 (<i>European Terrestrial Reference System 1989</i>) datums.
    1919     * @see <a href="http://crs.bkg.bund.de/crseu/crs/descrtrans/eu-descrtrans.php?crs_id=REVfREhETiAvIEdLXzM=&op_id=REVfREhETiAoQmVUQSwgMjAwNykgdG8gRVRSUzg5">
    2020     * Description of Transformation - DE_DHDN (BeTA, 2007) to ETRS89</a>
    2121     */
    22     public final static NTV2GridShiftFileWrapper BETA2007 = new NTV2GridShiftFileWrapper("resource://data/BETA2007.gsb");
    23    
     22    public final static NTV2GridShiftFileWrapper BETA2007 = new NTV2GridShiftFileWrapper("resource://data/projection/BETA2007.gsb");
     23
    2424    /**
    25      * Used in France to convert coordinates between the NTF (<i>Nouvelle triangulation de la France</i>) 
     25     * Used in France to convert coordinates between the NTF (<i>Nouvelle triangulation de la France</i>)
    2626     * and RGF93 (<i>Réseau géodésique français 1993</i>) datums.
    2727     * @see <a href="http://geodesie.ign.fr/contenu/fichiers/documentation/algorithmes/notice/NT111_V1_HARMEL_TransfoNTF-RGF93_FormatGrilleNTV2.pdf">
    2828     * [French] Transformation de coordonnées NTF – RGF93 / Format de grille NTv2</a>
    2929     */
    30     public final static NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/ntf_r93_b.gsb");
     30    public final static NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/projection/ntf_r93_b.gsb");
    3131
    3232
  • trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

    r6427 r6488  
    5353        super.initialize();
    5454        if (ENGINE != null) {
    55             ENGINE.eval(new InputStreamReader(new MirroredInputStream("resource://data/opening_hours.js"), "UTF-8"));
     55            ENGINE.eval(new InputStreamReader(new MirroredInputStream("resource://data/validator/opening_hours.js"), "UTF-8"));
    5656            // fake country/state to not get errors on holidays
    57             ENGINE.eval("var nominatiomJSON = {address: {state: 'Bayern', country_code: 'de'}};");
     57            ENGINE.eval("var nominatimJSON = {address: {state: 'Bayern', country_code: 'de'}};");
    5858            ENGINE.eval("" +
    5959                    "var oh = function (value, mode) {" +
    6060                    " try {" +
    61                     "    var r= new opening_hours(value, nominatiomJSON, mode);" +
     61                    "    var r= new opening_hours(value, nominatimJSON, mode);" +
    6262                    "    r.getErrors = function() {return [];};" +
    6363                    "    return r;" +
  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

    r6380 r6488  
    4444 *  - Find EPSG code for the projection.
    4545 *  - Look up the parameter string for Proj4, e.g. on http://spatialreference.org/
    46  *      and add it to the file 'data/epsg' in JOSM trunk
     46 *      and add it to the file 'data/projection/epsg' in JOSM trunk
    4747 *  - Search for official references and verify the parameter values. These
    4848 *      documents are often available in the local language only.
Note: See TracChangeset for help on using the changeset viewer.