Changeset 26416 in osm for applications/editors

Timestamp:

2011-07-29T10:33:36+02:00 (13 years ago)

Author:

bastik

Message:

fix problems introduced yesterday (missing resources + infinite loop)
unfortunately Gauß-Krüger still does not work, the datum conversion seems to give strange results

Location:

applications/editors/josm/plugins/proj4j

Files:

• build.xml (modified) (1 diff)
• resources/nad (added)
• resources/nad/epsg (added)
• resources/nad/esri (added)
• resources/nad/nad27 (added)
• resources/nad/nad83 (added)
• resources/nad/world (added)
• src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java (modified) (2 diffs)

applications/editors/josm/plugins/proj4j/build.xml

@@ -80 +80 @@
         <echo message="creating ${ant.project.name}.jar ... "/>
         <copy todir="${plugin.build.dir}/resources">
-            <fileset dir="resources"/>
+            <fileset dir="resources" excludes="nad/"/>
+        </copy>
+        <copy todir="${plugin.build.dir}/nad">
+            <fileset dir="resources/nad"/>
         </copy>
         <copy todir="${plugin.build.dir}/images">

applications/editors/josm/plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java

@@ -247 +247 @@
                 selectedLabel.setText(tr("Selected: {0}", crsCode));
                 setupTransformations();
+                if (actionListener != null) {
+                    actionListener.actionPerformed(new ActionEvent(selectedLabel, 0, "CRS changed"));
+                }
             }
         }
@@ -277 +280 @@
         transformToWGS84 = transFactory.createTransform(proj4jCRS, wgs84CRS);
         transformFromWGS84 = transFactory.createTransform(wgs84CRS, proj4jCRS);
-
-        if (actionListener != null) {
-            actionListener.actionPerformed(new ActionEvent(selectedLabel, 0, "CRS changed"));
-        }
     }