Changeset 25469 in osm

Timestamp:

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

Author:

upliner

Message:

Fix Mercator scale factor in buildings_tools and importvec

Location:

applications/editors/josm/plugins

Files:

• buildings_tools/build.xml (modified) (1 diff)
• buildings_tools/src/buildings_tools/Building.java (modified) (2 diffs)
• importvec/build.xml (modified) (1 diff)
• importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java (modified) (4 diffs)

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

@@ -33 +33 @@
         <property name="commit.message" value="update (23630 was committed together with the code which is not right)" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-        <property name="plugin.main.version" value="3835" />
+        <property name="plugin.main.version" value="3922" />
 
 

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java

@@ -28 +28 @@
 
 class Building {
-    private static final double eqlen = 40075004; // length of equator in metres
     private final EastNorth[] en = new EastNorth[4];
 
@@ -83 +82 @@
 
     private void updMetrics() {
-        meter = 2 * Math.PI / (Math.cos(Math.toRadians(eastNorth2latlon(en[0]).lat())) * eqlen);
+        meter = 1 / Math.cos(Math.toRadians(eastNorth2latlon(en[0]).lat()));
         len = 0;
     }

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

@@ -33 +33 @@
     <property name="commit.message" value="Commit message" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="3835" />
+    <property name="plugin.main.version" value="3922" />
 
 

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