Changeset 6488 in josm

Timestamp:

2013-12-18T02:57:18+01:00 (11 years ago)

Author:

Don-vip

Message:

cleanup in data folder

Location:

trunk

Files:

• .settings/org.eclipse.core.resources.prefs (added)
• data/projection (added)
• data/projection/BETA2007.gsb (moved) (moved from trunk/data/BETA2007.gsb )
• data/projection/epsg (moved) (moved from trunk/data/epsg )
• data/projection/ntf_r93_b.gsb (moved) (moved from trunk/data/ntf_r93_b.gsb )
• data/validator/opening_hours.js (moved) (moved from trunk/data/opening_hours.js )
• src/org/openstreetmap/josm/data/projection/Projections.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -44 +44 @@
         // Hide default constructor for utils classes
     }
-    
+
     public static EastNorth project(LatLon ll) {
         if (ll == null) return null;
@@ -134 +134 @@
         BufferedReader r = null;
         try {
-            InputStream in = new MirroredInputStream("resource://data/epsg");
+            InputStream in = new MirroredInputStream("resource://data/projection/epsg");
             r = new BufferedReader(new InputStreamReader(in));
             String line, lastline = "";

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

@@ -15 +15 @@
 
     /**
-     * Used in Germany to convert coordinates between the DHDN (<i>Deutsches Hauptdreiecksnetz</i>) 
+     * Used in Germany to convert coordinates between the DHDN (<i>Deutsches Hauptdreiecksnetz</i>)
      * and ETRS89 (<i>European Terrestrial Reference System 1989</i>) datums.
      * @see <a href="http://crs.bkg.bund.de/crseu/crs/descrtrans/eu-descrtrans.php?crs_id=REVfREhETiAvIEdLXzM=&op_id=REVfREhETiAoQmVUQSwgMjAwNykgdG8gRVRSUzg5">
      * Description of Transformation - DE_DHDN (BeTA, 2007) to ETRS89</a>
      */
-    public final static NTV2GridShiftFileWrapper BETA2007 = new NTV2GridShiftFileWrapper("resource://data/BETA2007.gsb");
-    
+    public final static NTV2GridShiftFileWrapper BETA2007 = new NTV2GridShiftFileWrapper("resource://data/projection/BETA2007.gsb");
+
     /**
-     * Used in France to convert coordinates between the NTF (<i>Nouvelle triangulation de la France</i>) 
+     * Used in France to convert coordinates between the NTF (<i>Nouvelle triangulation de la France</i>)
      * and RGF93 (<i>Réseau géodésique français 1993</i>) datums.
      * @see <a href="http://geodesie.ign.fr/contenu/fichiers/documentation/algorithmes/notice/NT111_V1_HARMEL_TransfoNTF-RGF93_FormatGrilleNTV2.pdf">
      * [French] Transformation de coordonnées NTF – RGF93 / Format de grille NTv2</a>
      */
-    public final static NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/ntf_r93_b.gsb");
+    public final static NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/projection/ntf_r93_b.gsb");
 
 

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -53 +53 @@
         super.initialize();
         if (ENGINE != null) {
-            ENGINE.eval(new InputStreamReader(new MirroredInputStream("resource://data/opening_hours.js"), "UTF-8"));
+            ENGINE.eval(new InputStreamReader(new MirroredInputStream("resource://data/validator/opening_hours.js"), "UTF-8"));
             // fake country/state to not get errors on holidays
-            ENGINE.eval("var nominatiomJSON = {address: {state: 'Bayern', country_code: 'de'}};");
+            ENGINE.eval("var nominatimJSON = {address: {state: 'Bayern', country_code: 'de'}};");
             ENGINE.eval("" +
                     "var oh = function (value, mode) {" +
                     " try {" +
-                    "    var r= new opening_hours(value, nominatiomJSON, mode);" +
+                    "    var r= new opening_hours(value, nominatimJSON, mode);" +
                     "    r.getErrors = function() {return [];};" +
                     "    return r;" +

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -44 +44 @@
  *  - Find EPSG code for the projection.
  *  - Look up the parameter string for Proj4, e.g. on http://spatialreference.org/
- *      and add it to the file 'data/epsg' in JOSM trunk
+ *      and add it to the file 'data/projection/epsg' in JOSM trunk
  *  - Search for official references and verify the parameter values. These
  *      documents are often available in the local language only.