Changeset 15145

Timestamp:

05/29/13 14:54:03 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: now use ll2mercator

File:

• issm/trunk-jpl/src/m/plot/plot_googleearth.m (modified) (2 diffs)

issm/trunk-jpl/src/m/plot/plot_googleearth.m

@@ -127 +127 @@
 end
 
-function [mx my]=latlontomercator(lat, lon),
-
-        EARTH_RADIUS = 6378137;
-        EQUATOR_CIRCUMFERENCE = 2 * pi * EARTH_RADIUS;
-        INITIAL_RESOLUTION = EQUATOR_CIRCUMFERENCE / 256.0;
-        ORIGIN_SHIFT = EQUATOR_CIRCUMFERENCE / 2.0;
-
-        mx = (lon * ORIGIN_SHIFT) / 180.0;
-        my = log(tan((90 + lat) * pi/360.0))/(pi/180.0);
-        my = (my * ORIGIN_SHIFT) /180.0;
-end
 function [px py]=latlontopixels(lat, lon, zoom),
 
@@ -175 +164 @@
         optimalsize = 1000; %Number of pixels in final image
 
-        [ulmx ulmy]=latlontomercator(ullat,ullon);
-        [lrmx lrmy]=latlontomercator(lrlat,lrlon);
+        [ulmx ulmy]=ll2mercator(ullat,ullon);
+        [lrmx lrmy]=ll2mercator(lrlat,lrlon);
         distance = sqrt((lrmx-ulmx)^2 + (lrmy-ulmy)^2);