Changeset 35094 in osm for applications/editors

Timestamp:

2019-08-21T00:42:37+02:00 (5 years ago)

Author:

frederik

Message:

fix rendering for non-standard scales, fix "mile" for light radii.

File:

• applications/editors/josm/plugins/seachart/jrenderpgsql/src/jrenderpgsql/JrenderPgsql.java (modified) (2 diffs)

applications/editors/josm/plugins/seachart/jrenderpgsql/src/jrenderpgsql/JrenderPgsql.java

@@ -264 +264 @@
 
         double west = (xtile) * MERCATOR_WIDTH / pow - MERCATOR_OFFSET;
-        double east = (xtile + 1) * MERCATOR_WIDTH / pow - MERCATOR_OFFSET;
+        double east = (xtile * 1.0 + tilesize / 256 / scale) * MERCATOR_WIDTH / pow - MERCATOR_OFFSET;
         double north = (pow - ytile) * MERCATOR_WIDTH / pow - MERCATOR_OFFSET;
-        double south = (pow - ytile - 1) * MERCATOR_WIDTH / pow - MERCATOR_OFFSET;
+        double south = (pow * 1.0 - ytile * 1.0 - tilesize / 256 / scale) * MERCATOR_WIDTH / pow - MERCATOR_OFFSET;
 
         // request data from PostGIS
@@ -386 +386 @@
         // tile x/y pixel coordinates.
 
+        final double mile = 330.0 * pow / 16384.0 * scale;
+
         ChartContext context = new ChartContext() {
             public Point2D getPoint(Snode coord) {
                 double x = border + (radlon2x(coord.lon) - west) * 256 * scale * pow / MERCATOR_WIDTH;
                 double y = tilesize + border - ((radlat2y(coord.lat) - south) * scale * 256 * pow / MERCATOR_WIDTH);
-                System.out.println("point convert from " + Math.toDegrees(coord.lat)+","+Math.toDegrees(coord.lon)+" to "+x+","+y);
                 return new Point2D.Double(x, y);
             }
 
             public double mile(Feature feature) {
-                return 21600 / 256 / pow / scale;
+                return mile;
             }