Changeset 25469 in osm for applications/editors/josm/plugins/importvec/src

Timestamp:

2011-02-28T12:17:19+01:00 (13 years ago)

Author:

upliner

Message:

Fix Mercator scale factor in buildings_tools and importvec

File:

• applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java (modified) (4 diffs)

applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java

@@ -149 +149 @@
         }
 
-        private static final double eqlen = 40075004; // length of equator in metres
         Mercator projection = new Mercator();
         EastNorth center;
@@ -218 +217 @@
                         break;
                     case PathIterator.SEG_CLOSE:
-                        if (currentway.firstNode().getCoor().equals(nodes.getLast().getCoor())) {
+                        if (currentway.firstNode().getCoor().equalsEpsilon(nodes.getLast().getCoor())) {
                             currentway.removeNode(nodes.removeLast());
                         }
@@ -247 +246 @@
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             LatLon center = Main.proj.eastNorth2latlon(Main.map.mapView.getCenter());
-            scale = 2 * Math.PI / (Math.cos(Math.toRadians(center.lat())) * eqlen)
-                    * Settings.getScaleNumerator() / Settings.getScaleDivisor();
+            scale = Settings.getScaleNumerator() / Settings.getScaleDivisor() / Math.cos(Math.toRadians(center.lat()));
             this.center = projection.latlon2eastNorth(center);
             try {
@@ -257 +255 @@
                     rdr.setContentHandler(loader);
                     rdr.setEntityResolver(new EntityResolver() {
+                                @Override
                                 public InputSource resolveEntity(String publicId, String systemId) {
                                     //Ignore all DTDs