From 0a3a59853d7ecb88ce645cd980a5197217447213 Mon Sep 17 00:00:00 2001 From: Martin Desruisseaux Date: Sat, 12 May 2018 14:59:37 +0200 Subject: After javac has generated org_proj4_PJ.h, move that file to the C source directory. --- jniwrap/build.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jniwrap/build.xml b/jniwrap/build.xml index ddd424bd..6e4703ec 100644 --- a/jniwrap/build.xml +++ b/jniwrap/build.xml @@ -23,6 +23,13 @@ includeAntRuntime = "false" includes = "org/**/*.java"/> + + + + + + + -- cgit v1.2.3 From 66cfd66f512b9c6accb3e045c7683b9df63b887d Mon Sep 17 00:00:00 2001 From: Martin Desruisseaux Date: Sat, 12 May 2018 15:01:41 +0200 Subject: Use more explicit java options in the documentation (e.g. --class-path instead of -cp). --- jniwrap/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jniwrap/README.md b/jniwrap/README.md index 3cce43c0..3a6b35be 100644 --- a/jniwrap/README.md +++ b/jniwrap/README.md @@ -42,7 +42,7 @@ Beyond the ones already put by PROJ, you need: * Ant 1.9.8+, to run the build. * For execution: * If a Java version less than the current version on the local machine is desired, - add an `release` attribute in the `javac` task of `build.xml`. + add a `release` attribute in the `javac` task of `build.xml` before to compile. @@ -107,10 +107,10 @@ we assume that PROJ was compiled with the right flag to support the bridge to Ja Therefore we have a library called `proj.jar`. Thus we compile the `Main.java` with the command: - javac -classpath /proj.jar Main.java + javac --class-path /proj.jar Main.java and execute the created test case with: - java -cp .:/proj.jar -Djava.library.path= Main + java --class-path .:/proj.jar -Djava.library.path= Main That's it, enjoy! -- cgit v1.2.3 From 1830abc903c74b228de918a2830324006df7176a Mon Sep 17 00:00:00 2001 From: Martin Desruisseaux Date: Sat, 12 May 2018 15:13:41 +0200 Subject: Add troubleshoting indication based on https://github.com/OSGeo/proj.4/issues/380 comments. --- jniwrap/README.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/jniwrap/README.md b/jniwrap/README.md index 3a6b35be..e5748cda 100644 --- a/jniwrap/README.md +++ b/jniwrap/README.md @@ -101,9 +101,9 @@ Of course, real applications would read them from a file or other data source. -### compile the Main code +### Compile the Main code -we assume that PROJ was compiled with the right flag to support the bridge to Java +We assume that PROJ was compiled with the right flag to support the bridge to Java. Therefore we have a library called `proj.jar`. Thus we compile the `Main.java` with the command: @@ -113,4 +113,15 @@ and execute the created test case with: java --class-path .:/proj.jar -Djava.library.path= Main -That's it, enjoy! + + +### Troubleshooting + +If an `java.lang.UnsatisfiedLinkError` is thrown at execution time, add the following line in the Java code: + + System.out.println(System.getProperty("java.library.path")); + +Then verify that the `libproj.so` (Linux), `libproj.dylib` (MacOS) or `libproj.dll` (Windows) file is located +in one of the directories listed by above code. If this is not the case, then try configuring the +`LD_LIBRARY_PATH` (Linux), `DYLD_LIBRARY_PATH` (MacOS) or `PATH` (Windows) environment variable. +If the problem persist, adding the `-verbose:jni` option to the `java` command may help more advanced diagnostics. -- cgit v1.2.3 From 54f0513aed8a82e75f6442b4b03900c47f1c3621 Mon Sep 17 00:00:00 2001 From: Martin Desruisseaux Date: Sat, 12 May 2018 16:25:54 +0200 Subject: Set the "PROJ bridge to JNI" version number to 3.0 and document its relationship with PROJ version number. --- jniwrap/README.md | 20 +++++++++++++++++++- jniwrap/build.xml | 7 ++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/jniwrap/README.md b/jniwrap/README.md index e5748cda..d8435725 100644 --- a/jniwrap/README.md +++ b/jniwrap/README.md @@ -3,13 +3,30 @@ This is the third release of JNI wrappers for the main PROJ functions. The first release of JNI wrappers were created by http://www.hydrologis.com. The second release of JNI wrappers were created by http://www.geoapi.org. +This release is compatible with any PROJ versions from 4.9 to 5 +provided that PROJ has been compiled as described below. ## What is "PROJ bridge to Java" -_Proj bridge to Java_ is a small library of Java classes that wrap a few PROJ functions +_PROJ bridge to Java_ is a small library of Java classes that wrap a few PROJ functions by using the Java Native Interface (JNI). The main Java class is `org.proj4.PJ`. +A Java code example is given in the _Usage & a fast example_ section below. + + + +### Versions + +The PROJ bridge to Java does not follow the same version numbers than the main PROJ library +since the same JAR file can be compatible with a range of PROJ versions. +Version compatibility is given below: + + +Java bridge | Compatible with PROJ library +----------- | ---------------------------- +2.0 and 3.0 | 4.9 to 5+ +1.0 | 4.4.9 to 4.8 @@ -43,6 +60,7 @@ Beyond the ones already put by PROJ, you need: * For execution: * If a Java version less than the current version on the local machine is desired, add a `release` attribute in the `javac` task of `build.xml` before to compile. + * Proj version 4.9 or more recent compiled with the `--with-jni` option. diff --git a/jniwrap/build.xml b/jniwrap/build.xml index 6e4703ec..62eb536d 100644 --- a/jniwrap/build.xml +++ b/jniwrap/build.xml @@ -9,7 +9,7 @@ - + -- cgit v1.2.3 From aaf0f39a048d10106bb82983c8f918270680cc34 Mon Sep 17 00:00:00 2001 From: Martin Desruisseaux Date: Sat, 12 May 2018 16:46:46 +0200 Subject: Update JNI README.md with a note that Windows users need to use a different path separator. --- jniwrap/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jniwrap/README.md b/jniwrap/README.md index d8435725..fcf0fc6f 100644 --- a/jniwrap/README.md +++ b/jniwrap/README.md @@ -127,9 +127,9 @@ Thus we compile the `Main.java` with the command: javac --class-path /proj.jar Main.java -and execute the created test case with: +and execute the created test case with (replace `:` by `;` on the Windows platform): - java --class-path .:/proj.jar -Djava.library.path= Main + java --class-path /proj.jar:. Main @@ -142,4 +142,5 @@ If an `java.lang.UnsatisfiedLinkError` is thrown at execution time, add the foll Then verify that the `libproj.so` (Linux), `libproj.dylib` (MacOS) or `libproj.dll` (Windows) file is located in one of the directories listed by above code. If this is not the case, then try configuring the `LD_LIBRARY_PATH` (Linux), `DYLD_LIBRARY_PATH` (MacOS) or `PATH` (Windows) environment variable. +Alternatively, a `-Djava.library.path=` option can be added to above `java` command. If the problem persist, adding the `-verbose:jni` option to the `java` command may help more advanced diagnostics. -- cgit v1.2.3 From 864b315f530cb26b3d9638b711c957baf0238d9e Mon Sep 17 00:00:00 2001 From: Martin Desruisseaux Date: Sat, 12 May 2018 17:18:10 +0200 Subject: Fix version history: Java bridge 2.0 was compatible with PROJ 4.8 (not 4.9) and above. The PROJ 4.8 version was compatible with both Java bridges 1.0 and 2.0. --- jniwrap/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jniwrap/README.md b/jniwrap/README.md index fcf0fc6f..5ff5a7fd 100644 --- a/jniwrap/README.md +++ b/jniwrap/README.md @@ -3,7 +3,7 @@ This is the third release of JNI wrappers for the main PROJ functions. The first release of JNI wrappers were created by http://www.hydrologis.com. The second release of JNI wrappers were created by http://www.geoapi.org. -This release is compatible with any PROJ versions from 4.9 to 5 +This release is compatible with any PROJ versions from 4.8 to 5 provided that PROJ has been compiled as described below. @@ -25,8 +25,8 @@ Version compatibility is given below: Java bridge | Compatible with PROJ library ----------- | ---------------------------- -2.0 and 3.0 | 4.9 to 5+ -1.0 | 4.4.9 to 4.8 +2.0 and 3.0 | 4.8 to 5+ +1.0 | 4.4.9 to 4.8 inclusive @@ -60,7 +60,7 @@ Beyond the ones already put by PROJ, you need: * For execution: * If a Java version less than the current version on the local machine is desired, add a `release` attribute in the `javac` task of `build.xml` before to compile. - * Proj version 4.9 or more recent compiled with the `--with-jni` option. + * Proj version 4.8 or more recent compiled with the `--with-jni` option. -- cgit v1.2.3 From 0f6b52eb186dbf813ccd3049806300c9c13931d2 Mon Sep 17 00:00:00 2001 From: Martin Desruisseaux Date: Sat, 12 May 2018 18:43:11 +0200 Subject: Be more careful about the files that we move to C 'src' directory: since there is no header files starting with "org_" except JNI files, moving the "org_*.h" file should guarantee that we will not overwrite non-JNI file. The use of wildcard is for "org_osgeo_..." which may be added in a future version. This commit also opportunistically fixes minimum Ant version number in documentation. --- jniwrap/README.md | 2 +- jniwrap/build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jniwrap/README.md b/jniwrap/README.md index 5ff5a7fd..9cc97dac 100644 --- a/jniwrap/README.md +++ b/jniwrap/README.md @@ -56,7 +56,7 @@ Beyond the ones already put by PROJ, you need: * For compilation: * Java 9+, the Java standard development kit version 9 or above - * Ant 1.9.8+, to run the build. + * Ant 1.10+, to run the build. * For execution: * If a Java version less than the current version on the local machine is desired, add a `release` attribute in the `javac` task of `build.xml` before to compile. diff --git a/jniwrap/build.xml b/jniwrap/build.xml index 62eb536d..be82d411 100644 --- a/jniwrap/build.xml +++ b/jniwrap/build.xml @@ -27,7 +27,7 @@ - + -- cgit v1.2.3 From 03011fb2989c49d938b784683a620409d5ed5779 Mon Sep 17 00:00:00 2001 From: Kurt Schwehr Date: Sun, 13 May 2018 08:00:40 -0700 Subject: ISEA_STATIC -> static (#995) As this is a part of PROJ, having these functions possibly not static is confusing. Time to declare this is just a part of PROJ. --- src/PJ_isea.c | 110 +++++++++++++++++----------------------------------------- 1 file changed, 32 insertions(+), 78 deletions(-) diff --git a/src/PJ_isea.c b/src/PJ_isea.c index 750587a3..53302a5c 100644 --- a/src/PJ_isea.c +++ b/src/PJ_isea.c @@ -12,24 +12,13 @@ # define M_PI 3.14159265358979323846 #endif -/* - * Proj 4 provides its own entry points into - * the code, so none of the library functions - * need to be global - */ -#define ISEA_STATIC static -#ifndef ISEA_STATIC -#define ISEA_STATIC -#endif - struct hex { int iso; int x, y, z; }; /* y *must* be positive down as the xy /iso conversion assumes this */ -ISEA_STATIC -void hex_xy(struct hex *h) { +static void hex_xy(struct hex *h) { if (!h->iso) return; if (h->x >= 0) { h->y = -h->y - (h->x+1)/2; @@ -40,8 +29,7 @@ void hex_xy(struct hex *h) { h->iso = 0; } -ISEA_STATIC -void hex_iso(struct hex *h) { +static void hex_iso(struct hex *h) { if (h->iso) return; if (h->x >= 0) { @@ -55,8 +43,7 @@ void hex_iso(struct hex *h) { h->iso = 1; } -ISEA_STATIC -void hexbin2(double width, double x, double y, int *i, int *j) { +static void hexbin2(double width, double x, double y, int *i, int *j) { double z, rx, ry, rz; double abs_dx, abs_dy, abs_dz; int ix, iy, iz, s; @@ -102,9 +89,6 @@ void hexbin2(double width, double x, double y, int *i, int *j) { *i = h.x; *j = h.y; } -#ifndef ISEA_STATIC -#define ISEA_STATIC -#endif enum isea_poly { ISEA_NONE, ISEA_ICOSAHEDRON = 20 }; enum isea_topology { ISEA_HEXAGON=6, ISEA_TRIANGLE=3, ISEA_DIAMOND=4 }; @@ -150,8 +134,7 @@ struct snyder_constants { }; /* TODO put these in radians to avoid a later conversion */ -ISEA_STATIC const -struct snyder_constants constants[] = { +static const struct snyder_constants constants[] = { {23.80018260, 62.15458023, 60.0, 3.75, 1.033, 0.968, 5.09, 1.195, 1.0}, {20.07675127, 55.69063953, 54.0, 2.65, 1.030, 0.983, 3.59, 1.141, 1.027}, {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}, @@ -177,8 +160,7 @@ struct snyder_constants constants[] = { #define RAD2DEG (180.0/M_PI) #define DEG2RAD (M_PI/180.0) -ISEA_STATIC -struct isea_geo vertex[] = { +static struct isea_geo vertex[] = { {0.0, DEG90}, {DEG180, V_LAT}, {-DEG108, V_LAT}, @@ -195,7 +177,7 @@ struct isea_geo vertex[] = { /* TODO make an isea_pt array of the vertices as well */ -static int tri_v1[] = {0, 0, 0, 0, 0, 0, 6, 7, 8, 9, 10, 2, 3, 4, 5, 1, 11, 11, 11, 11, 11}; +static int tri_v1[] = {0, 0, 0, 0, 0, 0, 6, 7, 8, 9, 10, 2, 3, 4, 5, 1, 11, 11, 11, 11, 11}; /* 52.62263186 */ #define E_RAD 0.91843818702186776133 @@ -228,8 +210,7 @@ static const struct isea_geo icostriangles[] = { {DEG180, -E_RAD}, }; -static double -az_adjustment(int triangle) +static double az_adjustment(int triangle) { double adj; @@ -253,9 +234,7 @@ az_adjustment(int triangle) /* H = 0.25 R tan g = */ #define TABLE_H 0.1909830056 -ISEA_STATIC -struct isea_pt -isea_triangle_xy(int triangle) +static struct isea_pt isea_triangle_xy(int triangle) { struct isea_pt c; const double Rprime = 0.91038328153090290025; @@ -290,8 +269,8 @@ isea_triangle_xy(int triangle) } /* snyder eq 14 */ -static double -sph_azimuth(double f_lon, double f_lat, double t_lon, double t_lat) +static double sph_azimuth(double f_lon, double f_lat, + double t_lon, double t_lat) { double az; @@ -309,9 +288,7 @@ sph_azimuth(double f_lon, double f_lat, double t_lon, double t_lat) #endif /* coord needs to be in radians */ -ISEA_STATIC -int -isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) +static int isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) { int i; @@ -501,9 +478,7 @@ isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) * * TODO take a result pointer */ -ISEA_STATIC -struct isea_geo -snyder_ctran(struct isea_geo * np, struct isea_geo * pt) +static struct isea_geo snyder_ctran(struct isea_geo * np, struct isea_geo * pt) { struct isea_geo npt; double alpha, phi, lambda, lambda0, beta, lambdap, phip; @@ -547,9 +522,8 @@ snyder_ctran(struct isea_geo * np, struct isea_geo * pt) return npt; } -ISEA_STATIC -struct isea_geo -isea_ctran(struct isea_geo * np, struct isea_geo * pt, double lon0) +static struct isea_geo isea_ctran(struct isea_geo * np, struct isea_geo * pt, + double lon0) { struct isea_geo npt; @@ -580,9 +554,7 @@ isea_ctran(struct isea_geo * np, struct isea_geo * pt, double lon0) /* fuller's at 5.2454 west, 2.3009 N, adjacent at 7.46658 deg */ -ISEA_STATIC -int -isea_grid_init(struct isea_dgg * g) +static int isea_grid_init(struct isea_dgg * g) { if (!g) return 0; @@ -599,9 +571,7 @@ isea_grid_init(struct isea_dgg * g) return 1; } -ISEA_STATIC -void -isea_orient_isea(struct isea_dgg * g) +static void isea_orient_isea(struct isea_dgg * g) { if (!g) return; @@ -610,9 +580,7 @@ isea_orient_isea(struct isea_dgg * g) g->o_az = 0.0; } -ISEA_STATIC -void -isea_orient_pole(struct isea_dgg * g) +static void isea_orient_pole(struct isea_dgg * g) { if (!g) return; @@ -621,10 +589,8 @@ isea_orient_pole(struct isea_dgg * g) g->o_az = 0; } -ISEA_STATIC -int -isea_transform(struct isea_dgg * g, struct isea_geo * in, - struct isea_pt * out) +static int isea_transform(struct isea_dgg * g, struct isea_geo * in, + struct isea_pt * out) { struct isea_geo i, pole; int tri; @@ -644,9 +610,7 @@ isea_transform(struct isea_dgg * g, struct isea_geo * in, #define DOWNTRI(tri) (((tri - 1) / 5) % 2 == 1) -ISEA_STATIC -void -isea_rotate(struct isea_pt * pt, double degrees) +static void isea_rotate(struct isea_pt * pt, double degrees) { double rad; @@ -663,8 +627,7 @@ isea_rotate(struct isea_pt * pt, double degrees) pt->y = y; } -ISEA_STATIC -int isea_tri_plane(int tri, struct isea_pt *pt, double radius) { +static int isea_tri_plane(int tri, struct isea_pt *pt, double radius) { struct isea_pt tc; /* center of triangle */ if (DOWNTRI(tri)) { @@ -680,9 +643,7 @@ int isea_tri_plane(int tri, struct isea_pt *pt, double radius) { } /* convert projected triangle coords to quad xy coords, return quad number */ -ISEA_STATIC -int -isea_ptdd(int tri, struct isea_pt *pt) { +static int isea_ptdd(int tri, struct isea_pt *pt) { int downtri, quad; downtri = (((tri - 1) / 5) % 2 == 1); @@ -697,9 +658,8 @@ isea_ptdd(int tri, struct isea_pt *pt) { return quad; } -ISEA_STATIC -int -isea_dddi_ap3odd(struct isea_dgg *g, int quad, struct isea_pt *pt, struct isea_pt *di) +static int isea_dddi_ap3odd(struct isea_dgg *g, int quad, struct isea_pt *pt, + struct isea_pt *di) { struct isea_pt v; double hexwidth; @@ -776,9 +736,8 @@ isea_dddi_ap3odd(struct isea_dgg *g, int quad, struct isea_pt *pt, struct isea_p return quad; } -ISEA_STATIC -int -isea_dddi(struct isea_dgg *g, int quad, struct isea_pt *pt, struct isea_pt *di) { +static int isea_dddi(struct isea_dgg *g, int quad, struct isea_pt *pt, + struct isea_pt *di) { struct isea_pt v; double hexwidth; int sidelength; /* in hexes */ @@ -849,9 +808,8 @@ isea_dddi(struct isea_dgg *g, int quad, struct isea_pt *pt, struct isea_pt *di) return quad; } -ISEA_STATIC -int isea_ptdi(struct isea_dgg *g, int tri, struct isea_pt *pt, - struct isea_pt *di) { +static int isea_ptdi(struct isea_dgg *g, int tri, struct isea_pt *pt, + struct isea_pt *di) { struct isea_pt v; int quad; @@ -862,8 +820,7 @@ int isea_ptdi(struct isea_dgg *g, int tri, struct isea_pt *pt, } /* q2di to seqnum */ -ISEA_STATIC -int isea_disn(struct isea_dgg *g, int quad, struct isea_pt *di) { +static int isea_disn(struct isea_dgg *g, int quad, struct isea_pt *di) { int sidelength; int sn, height; int hexes; @@ -898,9 +855,8 @@ int isea_disn(struct isea_dgg *g, int quad, struct isea_pt *di) { * d' = d << 4 + q, d = d' >> 4, q = d' & 0xf */ /* convert a q2di to global hex coord */ -ISEA_STATIC -int isea_hex(struct isea_dgg *g, int tri, - struct isea_pt *pt, struct isea_pt *hex) { +static int isea_hex(struct isea_dgg *g, int tri, + struct isea_pt *pt, struct isea_pt *hex) { struct isea_pt v; #ifdef FIXME int sidelength; @@ -961,9 +917,7 @@ int isea_hex(struct isea_dgg *g, int tri, #endif } -ISEA_STATIC -struct isea_pt -isea_forward(struct isea_dgg *g, struct isea_geo *in) +static struct isea_pt isea_forward(struct isea_dgg *g, struct isea_geo *in) { int tri; struct isea_pt out, coord; -- cgit v1.2.3 From 74d082a5360b4939fcbc54fb18382b723771cafe Mon Sep 17 00:00:00 2001 From: Kurt Schwehr Date: Mon, 14 May 2018 00:16:05 -0700 Subject: Partial changes for IWYU --- src/PJ_axisswap.c | 3 +++ src/PJ_bacon.c | 8 ++++---- src/PJ_bipc.c | 6 +++--- src/PJ_boggs.c | 8 ++++---- src/PJ_calcofi.c | 11 ++++------- src/PJ_cart.c | 4 ++-- src/PJ_cass.c | 10 ++++++---- src/PJ_cc.c | 5 +++-- src/PJ_cea.c | 5 +++-- src/PJ_chamb.c | 5 +++-- src/PJ_collg.c | 4 +++- src/PJ_comill.c | 7 ++++--- 12 files changed, 42 insertions(+), 34 deletions(-) diff --git a/src/PJ_axisswap.c b/src/PJ_axisswap.c index 0b81a733..d31e927e 100644 --- a/src/PJ_axisswap.c +++ b/src/PJ_axisswap.c @@ -54,6 +54,9 @@ operation: #define PJ_LIB__ #include +#include +#include + #include "proj_internal.h" #include "projects.h" diff --git a/src/PJ_bacon.c b/src/PJ_bacon.c index 4ba70db4..ae25bce1 100644 --- a/src/PJ_bacon.c +++ b/src/PJ_bacon.c @@ -1,8 +1,10 @@ # define HLFPI2 2.46740110027233965467 /* (pi/2)^2 */ # define EPS 1e-10 #define PJ_LIB__ -#include -#include "projects.h" +#include +#include + +#include "projects.h" struct pj_opaque { @@ -75,5 +77,3 @@ PJ *PROJECTION(ortel) { P->fwd = s_forward; return P; } - - diff --git a/src/PJ_bipc.c b/src/PJ_bipc.c index 2f60808d..ea7883a5 100644 --- a/src/PJ_bipc.c +++ b/src/PJ_bipc.c @@ -1,6 +1,8 @@ #define PJ_LIB__ -#include "proj.h" #include +#include + +#include "proj.h" #include "projects.h" #include "proj_math.h" @@ -170,5 +172,3 @@ PJ *PROJECTION(bipc) { P->es = 0.; return P; } - - diff --git a/src/PJ_boggs.c b/src/PJ_boggs.c index ed753505..83bafc18 100644 --- a/src/PJ_boggs.c +++ b/src/PJ_boggs.c @@ -1,6 +1,8 @@ #define PJ_LIB__ -# include -# include "projects.h" +#include + +#include "projects.h" + PROJ_HEAD(boggs, "Boggs Eumorphic") "\n\tPCyl., no inv., Sph."; # define NITER 20 # define EPS 1e-7 @@ -39,5 +41,3 @@ PJ *PROJECTION(boggs) { P->fwd = s_forward; return P; } - - diff --git a/src/PJ_calcofi.c b/src/PJ_calcofi.c index f322d2bd..ed4cfe86 100644 --- a/src/PJ_calcofi.c +++ b/src/PJ_calcofi.c @@ -1,15 +1,14 @@ #define PJ_LIB__ + +#include + #include "proj.h" #include "projects.h" +#include "proj_api.h" PROJ_HEAD(calcofi, "Cal Coop Ocean Fish Invest Lines/Stations") "\n\tCyl, Sph&Ell"; -#include -#include -#include -#include "proj_api.h" -#include /* Conversions for the California Cooperative Oceanic Fisheries Investigations Line/Station coordinate system following the algorithm of: @@ -162,5 +161,3 @@ PJ *PROJECTION(calcofi) { } return P; } - - diff --git a/src/PJ_cart.c b/src/PJ_cart.c index a4fd3254..b4fc60b2 100644 --- a/src/PJ_cart.c +++ b/src/PJ_cart.c @@ -41,11 +41,11 @@ *****************************************************************************/ #define PJ_LIB__ + #include "proj_internal.h" #include "projects.h" #include "proj_math.h" -#include -#include + PROJ_HEAD(cart, "Geodetic/cartesian conversions"); diff --git a/src/PJ_cass.c b/src/PJ_cass.c index acf779a1..4e3b4251 100644 --- a/src/PJ_cass.c +++ b/src/PJ_cass.c @@ -1,6 +1,10 @@ #define PJ_LIB__ -# include -# include "projects.h" + +#include +#include + +#include "projects.h" + PROJ_HEAD(cass, "Cassini") "\n\tCyl, Sph&Ell"; @@ -115,5 +119,3 @@ PJ *PROJECTION(cass) { return P; } - - diff --git a/src/PJ_cc.c b/src/PJ_cc.c index 4f41e3e1..152e6e4a 100644 --- a/src/PJ_cc.c +++ b/src/PJ_cc.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "proj.h" #include "projects.h" @@ -36,5 +39,3 @@ PJ *PROJECTION(cc) { return P; } - - diff --git a/src/PJ_cea.c b/src/PJ_cea.c index e7a33899..e05e524b 100644 --- a/src/PJ_cea.c +++ b/src/PJ_cea.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -96,5 +99,3 @@ PJ *PROJECTION(cea) { return P; } - - diff --git a/src/PJ_chamb.c b/src/PJ_chamb.c index 571bdf10..0d14b95e 100644 --- a/src/PJ_chamb.c +++ b/src/PJ_chamb.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -134,5 +137,3 @@ PJ *PROJECTION(chamb) { return P; } - - diff --git a/src/PJ_collg.c b/src/PJ_collg.c index 3d7f0d80..ef712905 100644 --- a/src/PJ_collg.c +++ b/src/PJ_collg.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "proj.h" #include "projects.h" @@ -48,4 +51,3 @@ PJ *PROJECTION(collg) { return P; } - diff --git a/src/PJ_comill.c b/src/PJ_comill.c index ba0744c6..ce5bb392 100644 --- a/src/PJ_comill.c +++ b/src/PJ_comill.c @@ -7,7 +7,10 @@ Port to PROJ.4 by Bojan Savric, 4 April 2016 */ #define PJ_LIB__ -#include "projects.h" + +#include + +#include "projects.h" PROJ_HEAD(comill, "Compact Miller") "\n\tCyl., Sph."; @@ -79,5 +82,3 @@ PJ *PROJECTION(comill) { return P; } - - -- cgit v1.2.3 From 325477ed0fac2c9233c2f6a2b7bb4125e04df24c Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 14 May 2018 20:57:00 +0200 Subject: Set projection plot scale to 100% for better PDF output --- docs/source/operations/projections/aea.rst | 2 +- docs/source/operations/projections/aeqd.rst | 2 +- docs/source/operations/projections/airy.rst | 2 +- docs/source/operations/projections/aitoff.rst | 2 +- docs/source/operations/projections/alsk.rst | 2 +- docs/source/operations/projections/apian.rst | 2 +- docs/source/operations/projections/august.rst | 2 +- docs/source/operations/projections/bacon.rst | 2 +- docs/source/operations/projections/bipc.rst | 2 +- docs/source/operations/projections/boggs.rst | 2 +- docs/source/operations/projections/bonne.rst | 2 +- docs/source/operations/projections/calcofi.rst | 2 +- docs/source/operations/projections/cass.rst | 2 +- docs/source/operations/projections/cc.rst | 2 +- docs/source/operations/projections/ccon.rst | 2 +- docs/source/operations/projections/cea.rst | 2 +- docs/source/operations/projections/chamb.rst | 2 +- docs/source/operations/projections/collg.rst | 2 +- docs/source/operations/projections/crast.rst | 2 +- docs/source/operations/projections/denoy.rst | 2 +- docs/source/operations/projections/eck1.rst | 2 +- docs/source/operations/projections/eck2.rst | 2 +- docs/source/operations/projections/eck3.rst | 2 +- docs/source/operations/projections/eck4.rst | 2 +- docs/source/operations/projections/eck5.rst | 2 +- docs/source/operations/projections/eck6.rst | 2 +- docs/source/operations/projections/eqc.rst | 2 +- docs/source/operations/projections/eqdc.rst | 2 +- docs/source/operations/projections/etmerc.rst | 2 +- docs/source/operations/projections/euler.rst | 2 +- docs/source/operations/projections/fahey.rst | 2 +- docs/source/operations/projections/fouc.rst | 2 +- docs/source/operations/projections/fouc_s.rst | 2 +- docs/source/operations/projections/gall.rst | 2 +- docs/source/operations/projections/geos.rst | 3 ++- docs/source/operations/projections/gins8.rst | 2 +- docs/source/operations/projections/gn_sinu.rst | 2 +- docs/source/operations/projections/gnom.rst | 2 +- docs/source/operations/projections/goode.rst | 2 +- docs/source/operations/projections/gs48.rst | 2 +- docs/source/operations/projections/gs50.rst | 2 +- docs/source/operations/projections/gstmerc.rst | 2 +- docs/source/operations/projections/hammer.rst | 2 +- docs/source/operations/projections/hatano.rst | 2 +- docs/source/operations/projections/healpix.rst | 1 + docs/source/operations/projections/igh.rst | 2 +- docs/source/operations/projections/imw_p.rst | 2 +- docs/source/operations/projections/isea.rst | 2 +- docs/source/operations/projections/kav5.rst | 2 +- docs/source/operations/projections/kav7.rst | 2 +- docs/source/operations/projections/krovak.rst | 2 +- docs/source/operations/projections/labrd.rst | 2 +- docs/source/operations/projections/laea.rst | 2 +- docs/source/operations/projections/lagrng.rst | 2 +- docs/source/operations/projections/larr.rst | 2 +- docs/source/operations/projections/lask.rst | 2 +- docs/source/operations/projections/lcc.rst | 2 +- docs/source/operations/projections/lcca.rst | 2 +- docs/source/operations/projections/leac.rst | 2 +- docs/source/operations/projections/lee_os.rst | 2 +- docs/source/operations/projections/loxim.rst | 2 +- docs/source/operations/projections/lsat.rst | 2 +- docs/source/operations/projections/mbt_fps.rst | 2 +- docs/source/operations/projections/mbt_s.rst | 2 +- docs/source/operations/projections/mbtfpp.rst | 2 +- docs/source/operations/projections/mbtfpq.rst | 2 +- docs/source/operations/projections/mbtfps.rst | 2 +- docs/source/operations/projections/merc.rst | 2 +- docs/source/operations/projections/mil_os.rst | 2 +- docs/source/operations/projections/mill.rst | 2 +- docs/source/operations/projections/moll.rst | 2 +- docs/source/operations/projections/murd1.rst | 2 +- docs/source/operations/projections/murd2.rst | 2 +- docs/source/operations/projections/murd3.rst | 2 +- docs/source/operations/projections/natearth.rst | 2 +- docs/source/operations/projections/nell.rst | 2 +- docs/source/operations/projections/nell_h.rst | 2 +- docs/source/operations/projections/nicol.rst | 2 +- docs/source/operations/projections/nsper.rst | 2 +- docs/source/operations/projections/nzmg.rst | 2 +- docs/source/operations/projections/ob_tran.rst | 2 +- docs/source/operations/projections/ocea.rst | 2 +- docs/source/operations/projections/oea.rst | 2 +- docs/source/operations/projections/omerc.rst | 2 +- docs/source/operations/projections/ortel.rst | 2 +- docs/source/operations/projections/ortho.rst | 2 +- docs/source/operations/projections/pconic.rst | 2 +- docs/source/operations/projections/poly.rst | 2 +- docs/source/operations/projections/putp1.rst | 2 +- docs/source/operations/projections/putp2.rst | 2 +- docs/source/operations/projections/putp3.rst | 2 +- docs/source/operations/projections/putp3p.rst | 2 +- docs/source/operations/projections/putp4p.rst | 2 +- docs/source/operations/projections/putp5.rst | 2 +- docs/source/operations/projections/putp5p.rst | 2 +- docs/source/operations/projections/putp6.rst | 2 +- docs/source/operations/projections/putp6p.rst | 2 +- docs/source/operations/projections/qsc.rst | 12 ++++++------ docs/source/operations/projections/qua_aut.rst | 2 +- docs/source/operations/projections/robin.rst | 2 +- docs/source/operations/projections/rouss.rst | 2 +- docs/source/operations/projections/rpoly.rst | 2 +- docs/source/operations/projections/sinu.rst | 2 +- docs/source/operations/projections/somerc.rst | 2 +- docs/source/operations/projections/stere.rst | 2 +- docs/source/operations/projections/sterea.rst | 2 +- docs/source/operations/projections/tcc.rst | 2 +- docs/source/operations/projections/tcea.rst | 2 +- docs/source/operations/projections/tissot.rst | 2 +- docs/source/operations/projections/tmerc.rst | 2 +- docs/source/operations/projections/tpeqd.rst | 2 +- docs/source/operations/projections/tpers.rst | 2 +- docs/source/operations/projections/ups.rst | 2 +- docs/source/operations/projections/urm5.rst | 2 +- docs/source/operations/projections/urmfps.rst | 2 +- docs/source/operations/projections/utm.rst | 2 +- docs/source/operations/projections/vandg.rst | 2 +- docs/source/operations/projections/vandg2.rst | 2 +- docs/source/operations/projections/vandg3.rst | 2 +- docs/source/operations/projections/vandg4.rst | 2 +- docs/source/operations/projections/vitk1.rst | 2 +- docs/source/operations/projections/wag1.rst | 2 +- docs/source/operations/projections/wag2.rst | 2 +- docs/source/operations/projections/wag3.rst | 2 +- docs/source/operations/projections/wag4.rst | 2 +- docs/source/operations/projections/wag5.rst | 2 +- docs/source/operations/projections/wag6.rst | 2 +- docs/source/operations/projections/wag7.rst | 2 +- docs/source/operations/projections/weren.rst | 2 +- docs/source/operations/projections/wink1.rst | 2 +- docs/source/operations/projections/wink2.rst | 2 +- docs/source/operations/projections/wintri.rst | 2 +- 132 files changed, 138 insertions(+), 136 deletions(-) diff --git a/docs/source/operations/projections/aea.rst b/docs/source/operations/projections/aea.rst index 4fcd3cac..c21b8236 100644 --- a/docs/source/operations/projections/aea.rst +++ b/docs/source/operations/projections/aea.rst @@ -21,7 +21,7 @@ Albers Equal Area .. image:: ./images/aea.png - :scale: 50% + :scale: 100% :alt: Albers Equal Area Options diff --git a/docs/source/operations/projections/aeqd.rst b/docs/source/operations/projections/aeqd.rst index 4663af3e..e9a3e45b 100644 --- a/docs/source/operations/projections/aeqd.rst +++ b/docs/source/operations/projections/aeqd.rst @@ -19,7 +19,7 @@ Azimuthal Equidistant .. image:: ./images/aeqd.png - :scale: 50% + :scale: 100% :alt: Azimuthal Equidistant diff --git a/docs/source/operations/projections/airy.rst b/docs/source/operations/projections/airy.rst index a6e89e30..64ce9fe3 100644 --- a/docs/source/operations/projections/airy.rst +++ b/docs/source/operations/projections/airy.rst @@ -27,7 +27,7 @@ within the small or great circle defined by an angular distance, .. image:: ./images/airy.png - :scale: 50% + :scale: 100% :alt: Airy Options diff --git a/docs/source/operations/projections/aitoff.rst b/docs/source/operations/projections/aitoff.rst index 92ef2f12..357600ec 100644 --- a/docs/source/operations/projections/aitoff.rst +++ b/docs/source/operations/projections/aitoff.rst @@ -20,7 +20,7 @@ Aitoff +---------------------+----------------------------------------------------------+ .. image:: ./images/aitoff.png - :scale: 50% + :scale: 100% :alt: Aitoff Parameters diff --git a/docs/source/operations/projections/alsk.rst b/docs/source/operations/projections/alsk.rst index d08fa827..0af63bc8 100644 --- a/docs/source/operations/projections/alsk.rst +++ b/docs/source/operations/projections/alsk.rst @@ -21,7 +21,7 @@ Modified Stererographics of Alaska .. image:: ./images/alsk.png - :scale: 50% + :scale: 100% :alt: Mod. Stererographics of Alaska Options diff --git a/docs/source/operations/projections/apian.rst b/docs/source/operations/projections/apian.rst index 6b5e247d..2a57e630 100644 --- a/docs/source/operations/projections/apian.rst +++ b/docs/source/operations/projections/apian.rst @@ -22,7 +22,7 @@ Apian Globular I .. image:: ./images/apian.png - :scale: 50% + :scale: 100% :alt: Apian Globular I Options diff --git a/docs/source/operations/projections/august.rst b/docs/source/operations/projections/august.rst index e2ad3516..1283ddd7 100644 --- a/docs/source/operations/projections/august.rst +++ b/docs/source/operations/projections/august.rst @@ -5,6 +5,6 @@ August Epicycloidal ******************************************************************************** .. image:: ./images/august.png - :scale: 50% + :scale: 100% :alt: August Epicycloidal diff --git a/docs/source/operations/projections/bacon.rst b/docs/source/operations/projections/bacon.rst index a87ea7d8..cf3bf6f8 100644 --- a/docs/source/operations/projections/bacon.rst +++ b/docs/source/operations/projections/bacon.rst @@ -5,6 +5,6 @@ Bacon Globular ******************************************************************************** .. image:: ./images/bacon.png - :scale: 50% + :scale: 100% :alt: Bacon Globular diff --git a/docs/source/operations/projections/bipc.rst b/docs/source/operations/projections/bipc.rst index 7045f04a..b7981716 100644 --- a/docs/source/operations/projections/bipc.rst +++ b/docs/source/operations/projections/bipc.rst @@ -5,6 +5,6 @@ Bipolar conic of western hemisphere ******************************************************************************** .. image:: ./images/bipc.png - :scale: 50% + :scale: 100% :alt: Bipolar conic of western hemisphere diff --git a/docs/source/operations/projections/boggs.rst b/docs/source/operations/projections/boggs.rst index 1dd7d19f..23f00c2b 100644 --- a/docs/source/operations/projections/boggs.rst +++ b/docs/source/operations/projections/boggs.rst @@ -5,6 +5,6 @@ Boggs Eumorphic ******************************************************************************** .. image:: ./images/boggs.png - :scale: 50% + :scale: 100% :alt: Boggs Eumorphic diff --git a/docs/source/operations/projections/bonne.rst b/docs/source/operations/projections/bonne.rst index ef87d7c9..d7cb5e7c 100644 --- a/docs/source/operations/projections/bonne.rst +++ b/docs/source/operations/projections/bonne.rst @@ -5,6 +5,6 @@ Bonne (Werner lat_1=90) ******************************************************************************** .. image:: ./images/bonne.png - :scale: 50% + :scale: 100% :alt: Bonne (Werner lat_1=90) diff --git a/docs/source/operations/projections/calcofi.rst b/docs/source/operations/projections/calcofi.rst index 8a240ebd..b28530c5 100644 --- a/docs/source/operations/projections/calcofi.rst +++ b/docs/source/operations/projections/calcofi.rst @@ -26,7 +26,7 @@ California Cooperative Oceanic Fisheries Investigations program, known as CalCOF .. image:: ../../../images/calcofi.png - :scale: 50% + :scale: 100% :align: center :alt: Cal Coop Ocean Fish Invest Lines/Stations diff --git a/docs/source/operations/projections/cass.rst b/docs/source/operations/projections/cass.rst index dba6a7c4..7c009c9c 100644 --- a/docs/source/operations/projections/cass.rst +++ b/docs/source/operations/projections/cass.rst @@ -24,7 +24,7 @@ Although the Cassini projection has been largely replaced by the Transverse Merc .. image:: ./images/cass.png - :scale: 50% + :scale: 100% :alt: Cassini Usage diff --git a/docs/source/operations/projections/cc.rst b/docs/source/operations/projections/cc.rst index 5b30e6c6..6bd86a7b 100644 --- a/docs/source/operations/projections/cc.rst +++ b/docs/source/operations/projections/cc.rst @@ -5,6 +5,6 @@ Central Cylindrical ******************************************************************************** .. image:: ./images/cc.png - :scale: 50% + :scale: 100% :alt: Central Cylindrical diff --git a/docs/source/operations/projections/ccon.rst b/docs/source/operations/projections/ccon.rst index f5ceed67..595af087 100644 --- a/docs/source/operations/projections/ccon.rst +++ b/docs/source/operations/projections/ccon.rst @@ -27,7 +27,7 @@ latitude, identical with ``conic()`` projection from ``mapproj`` R package. .. image:: ./images/ccon.png - :scale: 50% + :scale: 100% :alt: Central Conic diff --git a/docs/source/operations/projections/cea.rst b/docs/source/operations/projections/cea.rst index 20ebc285..0ad964ae 100644 --- a/docs/source/operations/projections/cea.rst +++ b/docs/source/operations/projections/cea.rst @@ -5,6 +5,6 @@ Equal Area Cylindrical ******************************************************************************** .. image:: ./images/cea.png - :scale: 50% + :scale: 100% :alt: Equal Area Cylindrical diff --git a/docs/source/operations/projections/chamb.rst b/docs/source/operations/projections/chamb.rst index 2ec9bffe..36d3d08f 100644 --- a/docs/source/operations/projections/chamb.rst +++ b/docs/source/operations/projections/chamb.rst @@ -5,6 +5,6 @@ Chamberlin Trimetric ******************************************************************************** .. image:: ./images/chamb.png - :scale: 50% + :scale: 100% :alt: Chamberlin Trimetric diff --git a/docs/source/operations/projections/collg.rst b/docs/source/operations/projections/collg.rst index aa16182a..7fb7269d 100644 --- a/docs/source/operations/projections/collg.rst +++ b/docs/source/operations/projections/collg.rst @@ -5,6 +5,6 @@ Collignon ******************************************************************************** .. image:: ./images/collg.png - :scale: 50% + :scale: 100% :alt: Collignon diff --git a/docs/source/operations/projections/crast.rst b/docs/source/operations/projections/crast.rst index 9d17f274..02ca4063 100644 --- a/docs/source/operations/projections/crast.rst +++ b/docs/source/operations/projections/crast.rst @@ -5,6 +5,6 @@ Craster Parabolic (Putnins P4) ******************************************************************************** .. image:: ./images/crast.png - :scale: 50% + :scale: 100% :alt: Craster Parabolic (Putnins P4) diff --git a/docs/source/operations/projections/denoy.rst b/docs/source/operations/projections/denoy.rst index a885ab0e..e879df49 100644 --- a/docs/source/operations/projections/denoy.rst +++ b/docs/source/operations/projections/denoy.rst @@ -5,6 +5,6 @@ Denoyer Semi-Elliptical ******************************************************************************** .. image:: ./images/denoy.png - :scale: 50% + :scale: 100% :alt: Denoyer Semi-Elliptical diff --git a/docs/source/operations/projections/eck1.rst b/docs/source/operations/projections/eck1.rst index 841533ec..b39b1fd3 100644 --- a/docs/source/operations/projections/eck1.rst +++ b/docs/source/operations/projections/eck1.rst @@ -5,7 +5,7 @@ Eckert I ******************************************************************************** .. image:: ./images/eck1.png - :scale: 50% + :scale: 100% :alt: Eckert I diff --git a/docs/source/operations/projections/eck2.rst b/docs/source/operations/projections/eck2.rst index b1bd3179..42b43dba 100644 --- a/docs/source/operations/projections/eck2.rst +++ b/docs/source/operations/projections/eck2.rst @@ -5,6 +5,6 @@ Eckert II ******************************************************************************** .. image:: ./images/eck2.png - :scale: 50% + :scale: 100% :alt: Eckert II diff --git a/docs/source/operations/projections/eck3.rst b/docs/source/operations/projections/eck3.rst index ecacc32d..535969d8 100644 --- a/docs/source/operations/projections/eck3.rst +++ b/docs/source/operations/projections/eck3.rst @@ -5,6 +5,6 @@ Eckert III ******************************************************************************** .. image:: ./images/eck3.png - :scale: 50% + :scale: 100% :alt: Eckert III diff --git a/docs/source/operations/projections/eck4.rst b/docs/source/operations/projections/eck4.rst index 3fc6a9fd..96118ae9 100644 --- a/docs/source/operations/projections/eck4.rst +++ b/docs/source/operations/projections/eck4.rst @@ -5,7 +5,7 @@ Eckert IV ******************************************************************************** .. image:: ./images/eck4.png - :scale: 50% + :scale: 100% :alt: Eckert IV diff --git a/docs/source/operations/projections/eck5.rst b/docs/source/operations/projections/eck5.rst index 1442d99d..20383b47 100644 --- a/docs/source/operations/projections/eck5.rst +++ b/docs/source/operations/projections/eck5.rst @@ -5,6 +5,6 @@ Eckert V ******************************************************************************** .. image:: ./images/eck5.png - :scale: 50% + :scale: 100% :alt: Eckert V diff --git a/docs/source/operations/projections/eck6.rst b/docs/source/operations/projections/eck6.rst index caeaefa6..7f30d386 100644 --- a/docs/source/operations/projections/eck6.rst +++ b/docs/source/operations/projections/eck6.rst @@ -5,6 +5,6 @@ Eckert VI ******************************************************************************** .. image:: ./images/eck6.png - :scale: 50% + :scale: 100% :alt: Eckert VI diff --git a/docs/source/operations/projections/eqc.rst b/docs/source/operations/projections/eqc.rst index de463034..766537b7 100644 --- a/docs/source/operations/projections/eqc.rst +++ b/docs/source/operations/projections/eqc.rst @@ -24,7 +24,7 @@ The simplest of all projections. Standard parallels (0° when omitted) may be sp .. image:: ./images/eqc.png - :scale: 50% + :scale: 100% :alt: Equidistant Cylindrical (Plate Carrée) Usage diff --git a/docs/source/operations/projections/eqdc.rst b/docs/source/operations/projections/eqdc.rst index 3ee5999d..f6eb1295 100644 --- a/docs/source/operations/projections/eqdc.rst +++ b/docs/source/operations/projections/eqdc.rst @@ -5,6 +5,6 @@ Equidistant Conic ******************************************************************************** .. image:: ./images/eqdc.png - :scale: 50% + :scale: 100% :alt: Equidistant Conic diff --git a/docs/source/operations/projections/etmerc.rst b/docs/source/operations/projections/etmerc.rst index b7f89032..bcdc1f18 100644 --- a/docs/source/operations/projections/etmerc.rst +++ b/docs/source/operations/projections/etmerc.rst @@ -5,6 +5,6 @@ Extended Transverse Mercator ******************************************************************************** .. image:: ./images/etmerc.png - :scale: 50% + :scale: 100% :alt: Extended Transverse Mercator diff --git a/docs/source/operations/projections/euler.rst b/docs/source/operations/projections/euler.rst index e495063f..fc7c892c 100644 --- a/docs/source/operations/projections/euler.rst +++ b/docs/source/operations/projections/euler.rst @@ -5,6 +5,6 @@ Euler ******************************************************************************** .. image:: ./images/euler.png - :scale: 50% + :scale: 100% :alt: Euler diff --git a/docs/source/operations/projections/fahey.rst b/docs/source/operations/projections/fahey.rst index 2e09337f..60c95495 100644 --- a/docs/source/operations/projections/fahey.rst +++ b/docs/source/operations/projections/fahey.rst @@ -5,6 +5,6 @@ Fahey ******************************************************************************** .. image:: ./images/fahey.png - :scale: 50% + :scale: 100% :alt: Fahey diff --git a/docs/source/operations/projections/fouc.rst b/docs/source/operations/projections/fouc.rst index 7467dcb1..e510be23 100644 --- a/docs/source/operations/projections/fouc.rst +++ b/docs/source/operations/projections/fouc.rst @@ -5,6 +5,6 @@ Foucaut ******************************************************************************** .. image:: ./images/fouc.png - :scale: 50% + :scale: 100% :alt: Foucaut diff --git a/docs/source/operations/projections/fouc_s.rst b/docs/source/operations/projections/fouc_s.rst index ac353adb..cd461794 100644 --- a/docs/source/operations/projections/fouc_s.rst +++ b/docs/source/operations/projections/fouc_s.rst @@ -5,7 +5,7 @@ Foucaut Sinusoidal ******************************************************************************** .. image:: ./images/fouc_s.png - :scale: 50% + :scale: 100% :alt: Foucaut Sinusoidal diff --git a/docs/source/operations/projections/gall.rst b/docs/source/operations/projections/gall.rst index bdb88895..f1abda48 100644 --- a/docs/source/operations/projections/gall.rst +++ b/docs/source/operations/projections/gall.rst @@ -25,7 +25,7 @@ It is neither equal-area nor conformal but instead tries to balance the distorti .. image:: ./images/gall.png - :scale: 50% + :scale: 100% :alt: Gall (Gall Stereographic) Usage diff --git a/docs/source/operations/projections/geos.rst b/docs/source/operations/projections/geos.rst index 3dc914b3..317978e2 100644 --- a/docs/source/operations/projections/geos.rst +++ b/docs/source/operations/projections/geos.rst @@ -25,7 +25,7 @@ scanning angle intervals. .. image:: ./images/geos.png - :scale: 50% + :scale: 100% :alt: Geostationary Satellite View @@ -55,6 +55,7 @@ and a E/W axis (or ``x``). .. image:: ../../..//images/geos_sweep.png :scale: 50% + :align: center :alt: Gimbal geometry In the image above, the outer-gimbal axis, or sweep-angle axis, is the N/S axis (``y``) diff --git a/docs/source/operations/projections/gins8.rst b/docs/source/operations/projections/gins8.rst index f6adb092..5f85e225 100644 --- a/docs/source/operations/projections/gins8.rst +++ b/docs/source/operations/projections/gins8.rst @@ -5,6 +5,6 @@ Ginsburg VIII (TsNIIGAiK) ******************************************************************************** .. image:: ./images/gins8.png - :scale: 50% + :scale: 100% :alt: Ginsburg VIII (TsNIIGAiK) diff --git a/docs/source/operations/projections/gn_sinu.rst b/docs/source/operations/projections/gn_sinu.rst index c1017c27..c24c3f38 100644 --- a/docs/source/operations/projections/gn_sinu.rst +++ b/docs/source/operations/projections/gn_sinu.rst @@ -5,6 +5,6 @@ General Sinusoidal Series ******************************************************************************** .. image:: ./images/gn_sinu.png - :scale: 50% + :scale: 100% :alt: General Sinusoidal Series diff --git a/docs/source/operations/projections/gnom.rst b/docs/source/operations/projections/gnom.rst index 08d0db5f..e365296d 100644 --- a/docs/source/operations/projections/gnom.rst +++ b/docs/source/operations/projections/gnom.rst @@ -5,6 +5,6 @@ Gnomonic ******************************************************************************** .. image:: ./images/gnom.png - :scale: 50% + :scale: 100% :alt: Gnomonic diff --git a/docs/source/operations/projections/goode.rst b/docs/source/operations/projections/goode.rst index c4590bf2..32d5a98b 100644 --- a/docs/source/operations/projections/goode.rst +++ b/docs/source/operations/projections/goode.rst @@ -5,6 +5,6 @@ Goode Homolosine ******************************************************************************** .. image:: ./images/goode.png - :scale: 50% + :scale: 100% :alt: Goode Homolosine diff --git a/docs/source/operations/projections/gs48.rst b/docs/source/operations/projections/gs48.rst index bdaa367c..3b083f54 100644 --- a/docs/source/operations/projections/gs48.rst +++ b/docs/source/operations/projections/gs48.rst @@ -5,6 +5,6 @@ Mod. Stererographics of 48 U.S. ******************************************************************************** .. image:: ./images/gs48.png - :scale: 50% + :scale: 100% :alt: Mod. Stererographics of 48 U.S. diff --git a/docs/source/operations/projections/gs50.rst b/docs/source/operations/projections/gs50.rst index 0d4b7e81..2e8ba5a9 100644 --- a/docs/source/operations/projections/gs50.rst +++ b/docs/source/operations/projections/gs50.rst @@ -5,6 +5,6 @@ Mod. Stererographics of 50 U.S. ******************************************************************************** .. image:: ./images/gs50.png - :scale: 50% + :scale: 100% :alt: Mod. Stererographics of 50 U.S. diff --git a/docs/source/operations/projections/gstmerc.rst b/docs/source/operations/projections/gstmerc.rst index fc587ab0..d5f1acaa 100644 --- a/docs/source/operations/projections/gstmerc.rst +++ b/docs/source/operations/projections/gstmerc.rst @@ -5,6 +5,6 @@ Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion) ******************************************************************************** .. image:: ./images/gstmerc.png - :scale: 50% + :scale: 100% :alt: Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion) diff --git a/docs/source/operations/projections/hammer.rst b/docs/source/operations/projections/hammer.rst index e795b91b..7603d704 100644 --- a/docs/source/operations/projections/hammer.rst +++ b/docs/source/operations/projections/hammer.rst @@ -5,6 +5,6 @@ Hammer & Eckert-Greifendorff ******************************************************************************** .. image:: ./images/hammer.png - :scale: 50% + :scale: 100% :alt: Hammer & Eckert-Greifendorff diff --git a/docs/source/operations/projections/hatano.rst b/docs/source/operations/projections/hatano.rst index 99e9ac3d..c461d0f1 100644 --- a/docs/source/operations/projections/hatano.rst +++ b/docs/source/operations/projections/hatano.rst @@ -26,7 +26,7 @@ Hatano Asymmetrical Equal Area .. image:: ./images/hatano.png - :scale: 50% + :scale: 100% :alt: Hatano Asymmetrical Equal Area diff --git a/docs/source/operations/projections/healpix.rst b/docs/source/operations/projections/healpix.rst index e13c5456..ae1c7781 100644 --- a/docs/source/operations/projections/healpix.rst +++ b/docs/source/operations/projections/healpix.rst @@ -22,6 +22,7 @@ HEALPix .. image:: ../../../images/healpix.png :scale: 75% + :align: center :alt: HEALPix The HEALPix projection is area preserving and can be used with a spherical and diff --git a/docs/source/operations/projections/igh.rst b/docs/source/operations/projections/igh.rst index d74e1362..0decf7b2 100644 --- a/docs/source/operations/projections/igh.rst +++ b/docs/source/operations/projections/igh.rst @@ -5,6 +5,6 @@ Interrupted Goode Homolosine ******************************************************************************** .. image:: ./images/igh.png - :scale: 50% + :scale: 100% :alt: Interrupted Goode Homolosine diff --git a/docs/source/operations/projections/imw_p.rst b/docs/source/operations/projections/imw_p.rst index 1fd3ded0..556b2cf4 100644 --- a/docs/source/operations/projections/imw_p.rst +++ b/docs/source/operations/projections/imw_p.rst @@ -5,6 +5,6 @@ International Map of the World Polyconic ******************************************************************************** .. image:: ./images/imw_p.png - :scale: 50% + :scale: 100% :alt: International Map of the World Polyconic diff --git a/docs/source/operations/projections/isea.rst b/docs/source/operations/projections/isea.rst index 1b6457af..d6af3943 100644 --- a/docs/source/operations/projections/isea.rst +++ b/docs/source/operations/projections/isea.rst @@ -5,6 +5,6 @@ Icosahedral Snyder Equal Area ******************************************************************************** .. image:: ./images/isea.png - :scale: 50% + :scale: 100% :alt: Icosahedral Snyder Equal Area diff --git a/docs/source/operations/projections/kav5.rst b/docs/source/operations/projections/kav5.rst index 2ec5d1c1..e0cc9890 100644 --- a/docs/source/operations/projections/kav5.rst +++ b/docs/source/operations/projections/kav5.rst @@ -5,6 +5,6 @@ Kavraisky V ******************************************************************************** .. image:: ./images/kav5.png - :scale: 50% + :scale: 100% :alt: Kavraisky V diff --git a/docs/source/operations/projections/kav7.rst b/docs/source/operations/projections/kav7.rst index 8371e6ea..1ada3048 100644 --- a/docs/source/operations/projections/kav7.rst +++ b/docs/source/operations/projections/kav7.rst @@ -5,6 +5,6 @@ Kavraisky VII ******************************************************************************** .. image:: ./images/kav7.png - :scale: 50% + :scale: 100% :alt: Kavraisky VII diff --git a/docs/source/operations/projections/krovak.rst b/docs/source/operations/projections/krovak.rst index 6c774825..3ebb4216 100644 --- a/docs/source/operations/projections/krovak.rst +++ b/docs/source/operations/projections/krovak.rst @@ -5,6 +5,6 @@ Krovak ******************************************************************************** .. image:: ./images/krovak.png - :scale: 50% + :scale: 100% :alt: Krovak diff --git a/docs/source/operations/projections/labrd.rst b/docs/source/operations/projections/labrd.rst index 5be58db5..0efa3e17 100644 --- a/docs/source/operations/projections/labrd.rst +++ b/docs/source/operations/projections/labrd.rst @@ -5,6 +5,6 @@ Laborde ******************************************************************************** .. image:: ./images/labrd.png - :scale: 50% + :scale: 100% :alt: Laborde diff --git a/docs/source/operations/projections/laea.rst b/docs/source/operations/projections/laea.rst index 2377f294..ee28a0d0 100644 --- a/docs/source/operations/projections/laea.rst +++ b/docs/source/operations/projections/laea.rst @@ -5,6 +5,6 @@ Lambert Azimuthal Equal Area ******************************************************************************** .. image:: ./images/laea.png - :scale: 50% + :scale: 100% :alt: Lambert Azimuthal Equal Area diff --git a/docs/source/operations/projections/lagrng.rst b/docs/source/operations/projections/lagrng.rst index de9e5640..6e4d68c2 100644 --- a/docs/source/operations/projections/lagrng.rst +++ b/docs/source/operations/projections/lagrng.rst @@ -5,6 +5,6 @@ Lagrange ******************************************************************************** .. image:: ./images/lagrng.png - :scale: 50% + :scale: 100% :alt: Lagrange diff --git a/docs/source/operations/projections/larr.rst b/docs/source/operations/projections/larr.rst index 9529f83f..23791ea7 100644 --- a/docs/source/operations/projections/larr.rst +++ b/docs/source/operations/projections/larr.rst @@ -5,6 +5,6 @@ Larrivee ******************************************************************************** .. image:: ./images/larr.png - :scale: 50% + :scale: 100% :alt: Larrivee diff --git a/docs/source/operations/projections/lask.rst b/docs/source/operations/projections/lask.rst index d34dc8a0..cbd68334 100644 --- a/docs/source/operations/projections/lask.rst +++ b/docs/source/operations/projections/lask.rst @@ -5,6 +5,6 @@ Laskowski ******************************************************************************** .. image:: ./images/lask.png - :scale: 50% + :scale: 100% :alt: Laskowski diff --git a/docs/source/operations/projections/lcc.rst b/docs/source/operations/projections/lcc.rst index a3075e76..56a7daee 100644 --- a/docs/source/operations/projections/lcc.rst +++ b/docs/source/operations/projections/lcc.rst @@ -5,6 +5,6 @@ Lambert Conformal Conic ******************************************************************************** .. image:: ./images/lcc.png - :scale: 50% + :scale: 100% :alt: Lambert Conformal Conic diff --git a/docs/source/operations/projections/lcca.rst b/docs/source/operations/projections/lcca.rst index ca87e67e..ab76334d 100644 --- a/docs/source/operations/projections/lcca.rst +++ b/docs/source/operations/projections/lcca.rst @@ -5,6 +5,6 @@ Lambert Conformal Conic Alternative ******************************************************************************** .. image:: ./images/lcca.png - :scale: 50% + :scale: 100% :alt: Lambert Conformal Conic Alternative diff --git a/docs/source/operations/projections/leac.rst b/docs/source/operations/projections/leac.rst index 2957798e..bafccafa 100644 --- a/docs/source/operations/projections/leac.rst +++ b/docs/source/operations/projections/leac.rst @@ -5,6 +5,6 @@ Lambert Equal Area Conic ******************************************************************************** .. image:: ./images/leac.png - :scale: 50% + :scale: 100% :alt: Lambert Equal Area Conic diff --git a/docs/source/operations/projections/lee_os.rst b/docs/source/operations/projections/lee_os.rst index 711dc754..3ba6fccd 100644 --- a/docs/source/operations/projections/lee_os.rst +++ b/docs/source/operations/projections/lee_os.rst @@ -5,6 +5,6 @@ Lee Oblated Stereographic ******************************************************************************** .. image:: ./images/lee_os.png - :scale: 50% + :scale: 100% :alt: Lee Oblated Stereographic diff --git a/docs/source/operations/projections/loxim.rst b/docs/source/operations/projections/loxim.rst index e50ba472..5766ef97 100644 --- a/docs/source/operations/projections/loxim.rst +++ b/docs/source/operations/projections/loxim.rst @@ -5,6 +5,6 @@ Loximuthal ******************************************************************************** .. image:: ./images/loxim.png - :scale: 50% + :scale: 100% :alt: Loximuthal diff --git a/docs/source/operations/projections/lsat.rst b/docs/source/operations/projections/lsat.rst index fb64bdb2..bc0257e5 100644 --- a/docs/source/operations/projections/lsat.rst +++ b/docs/source/operations/projections/lsat.rst @@ -5,6 +5,6 @@ Space oblique for LANDSAT ******************************************************************************** .. image:: ./images/lsat.png - :scale: 50% + :scale: 100% :alt: Space oblique for LANDSAT diff --git a/docs/source/operations/projections/mbt_fps.rst b/docs/source/operations/projections/mbt_fps.rst index 55ebcf6c..5be6634a 100644 --- a/docs/source/operations/projections/mbt_fps.rst +++ b/docs/source/operations/projections/mbt_fps.rst @@ -5,6 +5,6 @@ McBryde-Thomas Flat-Pole Sine (No. 2) ******************************************************************************** .. image:: ./images/mbt_fps.png - :scale: 50% + :scale: 100% :alt: McBryde-Thomas Flat-Pole Sine (No. 2) diff --git a/docs/source/operations/projections/mbt_s.rst b/docs/source/operations/projections/mbt_s.rst index 9a355ec8..3731e019 100644 --- a/docs/source/operations/projections/mbt_s.rst +++ b/docs/source/operations/projections/mbt_s.rst @@ -5,6 +5,6 @@ McBryde-Thomas Flat-Polar Sine (No. 1) ******************************************************************************** .. image:: ./images/mbt_s.png - :scale: 50% + :scale: 100% :alt: McBryde-Thomas Flat-Polar Sine (No. 1) diff --git a/docs/source/operations/projections/mbtfpp.rst b/docs/source/operations/projections/mbtfpp.rst index 9be309d9..b8dc4c65 100644 --- a/docs/source/operations/projections/mbtfpp.rst +++ b/docs/source/operations/projections/mbtfpp.rst @@ -5,6 +5,6 @@ McBride-Thomas Flat-Polar Parabolic ******************************************************************************** .. image:: ./images/mbtfpp.png - :scale: 50% + :scale: 100% :alt: McBride-Thomas Flat-Polar Parabolic diff --git a/docs/source/operations/projections/mbtfpq.rst b/docs/source/operations/projections/mbtfpq.rst index 295e814d..47461256 100644 --- a/docs/source/operations/projections/mbtfpq.rst +++ b/docs/source/operations/projections/mbtfpq.rst @@ -5,6 +5,6 @@ McBryde-Thomas Flat-Polar Quartic ******************************************************************************** .. image:: ./images/mbtfpq.png - :scale: 50% + :scale: 100% :alt: McBryde-Thomas Flat-Polar Quartic diff --git a/docs/source/operations/projections/mbtfps.rst b/docs/source/operations/projections/mbtfps.rst index b9365361..bae81f49 100644 --- a/docs/source/operations/projections/mbtfps.rst +++ b/docs/source/operations/projections/mbtfps.rst @@ -5,6 +5,6 @@ McBryde-Thomas Flat-Polar Sinusoidal ******************************************************************************** .. image:: ./images/mbtfps.png - :scale: 50% + :scale: 100% :alt: McBryde-Thomas Flat-Polar Sinusoidal diff --git a/docs/source/operations/projections/merc.rst b/docs/source/operations/projections/merc.rst index 2d419c02..301d7cfb 100644 --- a/docs/source/operations/projections/merc.rst +++ b/docs/source/operations/projections/merc.rst @@ -26,7 +26,7 @@ The projection is conformal which makes it suitable for navigational purposes. +---------------------+----------------------------------------------------------+ .. image:: ./images/merc.png - :scale: 50% + :scale: 100% :alt: Mercator diff --git a/docs/source/operations/projections/mil_os.rst b/docs/source/operations/projections/mil_os.rst index 5547e43c..1e0de842 100644 --- a/docs/source/operations/projections/mil_os.rst +++ b/docs/source/operations/projections/mil_os.rst @@ -5,6 +5,6 @@ Miller Oblated Stereographic ******************************************************************************** .. image:: ./images/mil_os.png - :scale: 50% + :scale: 100% :alt: Miller Oblated Stereographic diff --git a/docs/source/operations/projections/mill.rst b/docs/source/operations/projections/mill.rst index 718d4b9b..88f0382a 100644 --- a/docs/source/operations/projections/mill.rst +++ b/docs/source/operations/projections/mill.rst @@ -25,7 +25,7 @@ The latitude is scaled by a factor of :math:`\frac{4}{5}`, projected according t .. image:: ./images/mill.png - :scale: 50% + :scale: 100% :alt: Miller Cylindrical Usage diff --git a/docs/source/operations/projections/moll.rst b/docs/source/operations/projections/moll.rst index 1bd3d005..44be38ab 100644 --- a/docs/source/operations/projections/moll.rst +++ b/docs/source/operations/projections/moll.rst @@ -5,6 +5,6 @@ Mollweide ******************************************************************************** .. image:: ./images/moll.png - :scale: 50% + :scale: 100% :alt: Mollweide diff --git a/docs/source/operations/projections/murd1.rst b/docs/source/operations/projections/murd1.rst index 71cbf155..f20aae8c 100644 --- a/docs/source/operations/projections/murd1.rst +++ b/docs/source/operations/projections/murd1.rst @@ -5,6 +5,6 @@ Murdoch I ******************************************************************************** .. image:: ./images/murd1.png - :scale: 50% + :scale: 100% :alt: Murdoch I diff --git a/docs/source/operations/projections/murd2.rst b/docs/source/operations/projections/murd2.rst index b55cde35..4c9b0714 100644 --- a/docs/source/operations/projections/murd2.rst +++ b/docs/source/operations/projections/murd2.rst @@ -5,6 +5,6 @@ Murdoch II ******************************************************************************** .. image:: ./images/murd2.png - :scale: 50% + :scale: 100% :alt: Murdoch II diff --git a/docs/source/operations/projections/murd3.rst b/docs/source/operations/projections/murd3.rst index 70cc9276..94fb86e3 100644 --- a/docs/source/operations/projections/murd3.rst +++ b/docs/source/operations/projections/murd3.rst @@ -5,6 +5,6 @@ Murdoch III ******************************************************************************** .. image:: ./images/murd3.png - :scale: 50% + :scale: 100% :alt: Murdoch III diff --git a/docs/source/operations/projections/natearth.rst b/docs/source/operations/projections/natearth.rst index 4d304fab..d3c4e683 100644 --- a/docs/source/operations/projections/natearth.rst +++ b/docs/source/operations/projections/natearth.rst @@ -22,7 +22,7 @@ Natural Earth .. image:: ./images/natearth.png - :scale: 50% + :scale: 100% :alt: Natural Earth diff --git a/docs/source/operations/projections/nell.rst b/docs/source/operations/projections/nell.rst index c6a3771c..16e1eb71 100644 --- a/docs/source/operations/projections/nell.rst +++ b/docs/source/operations/projections/nell.rst @@ -5,6 +5,6 @@ Nell ******************************************************************************** .. image:: ./images/nell.png - :scale: 50% + :scale: 100% :alt: Nell diff --git a/docs/source/operations/projections/nell_h.rst b/docs/source/operations/projections/nell_h.rst index 6a3b26ba..53a3451a 100644 --- a/docs/source/operations/projections/nell_h.rst +++ b/docs/source/operations/projections/nell_h.rst @@ -5,6 +5,6 @@ Nell-Hammer ******************************************************************************** .. image:: ./images/nell_h.png - :scale: 50% + :scale: 100% :alt: Nell-Hammer diff --git a/docs/source/operations/projections/nicol.rst b/docs/source/operations/projections/nicol.rst index 995cedb5..0b3f17cc 100644 --- a/docs/source/operations/projections/nicol.rst +++ b/docs/source/operations/projections/nicol.rst @@ -5,6 +5,6 @@ Nicolosi Globular ******************************************************************************** .. image:: ./images/nicol.png - :scale: 50% + :scale: 100% :alt: Nicolosi Globular diff --git a/docs/source/operations/projections/nsper.rst b/docs/source/operations/projections/nsper.rst index d7611587..d0a7d690 100644 --- a/docs/source/operations/projections/nsper.rst +++ b/docs/source/operations/projections/nsper.rst @@ -25,7 +25,7 @@ The near-sided perspective projection simulates a view from a height .. image:: ./images/nsper.png - :scale: 50% + :scale: 100% :alt: Near-sided perspective Parameters diff --git a/docs/source/operations/projections/nzmg.rst b/docs/source/operations/projections/nzmg.rst index 926655d8..f25c5e9d 100644 --- a/docs/source/operations/projections/nzmg.rst +++ b/docs/source/operations/projections/nzmg.rst @@ -5,6 +5,6 @@ New Zealand Map Grid ******************************************************************************** .. image:: ./images/nzmg.png - :scale: 50% + :scale: 100% :alt: New Zealand Map Grid diff --git a/docs/source/operations/projections/ob_tran.rst b/docs/source/operations/projections/ob_tran.rst index 3c996336..c0110bf2 100644 --- a/docs/source/operations/projections/ob_tran.rst +++ b/docs/source/operations/projections/ob_tran.rst @@ -5,6 +5,6 @@ General Oblique Transformation ******************************************************************************** .. image:: ./images/ob_tran.png - :scale: 50% + :scale: 100% :alt: General Oblique Transformation diff --git a/docs/source/operations/projections/ocea.rst b/docs/source/operations/projections/ocea.rst index 40005d9e..d4fd0d20 100644 --- a/docs/source/operations/projections/ocea.rst +++ b/docs/source/operations/projections/ocea.rst @@ -5,6 +5,6 @@ Oblique Cylindrical Equal Area ******************************************************************************** .. image:: ./images/ocea.png - :scale: 50% + :scale: 100% :alt: Oblique Cylindrical Equal Area diff --git a/docs/source/operations/projections/oea.rst b/docs/source/operations/projections/oea.rst index 379dc157..bbc88af3 100644 --- a/docs/source/operations/projections/oea.rst +++ b/docs/source/operations/projections/oea.rst @@ -5,6 +5,6 @@ Oblated Equal Area ******************************************************************************** .. image:: ./images/oea.png - :scale: 50% + :scale: 100% :alt: Oblated Equal Area diff --git a/docs/source/operations/projections/omerc.rst b/docs/source/operations/projections/omerc.rst index 114b9fa3..682e9975 100644 --- a/docs/source/operations/projections/omerc.rst +++ b/docs/source/operations/projections/omerc.rst @@ -5,6 +5,6 @@ Oblique Mercator ******************************************************************************** .. image:: ./images/omerc.png - :scale: 50% + :scale: 100% :alt: Oblique Mercator diff --git a/docs/source/operations/projections/ortel.rst b/docs/source/operations/projections/ortel.rst index 03f132ef..a91d2e67 100644 --- a/docs/source/operations/projections/ortel.rst +++ b/docs/source/operations/projections/ortel.rst @@ -5,6 +5,6 @@ Ortelius Oval ******************************************************************************** .. image:: ./images/ortel.png - :scale: 50% + :scale: 100% :alt: Ortelius Oval diff --git a/docs/source/operations/projections/ortho.rst b/docs/source/operations/projections/ortho.rst index 5e96e2a2..fe27a11c 100644 --- a/docs/source/operations/projections/ortho.rst +++ b/docs/source/operations/projections/ortho.rst @@ -25,7 +25,7 @@ around a given latitude and longitude. +---------------------+--------------------------------------------------------+ .. image:: ./images/ortho.png - :scale: 50% + :scale: 100% :alt: Orthographic Parameters diff --git a/docs/source/operations/projections/pconic.rst b/docs/source/operations/projections/pconic.rst index 6bc0018e..c11c3b74 100644 --- a/docs/source/operations/projections/pconic.rst +++ b/docs/source/operations/projections/pconic.rst @@ -5,6 +5,6 @@ Perspective Conic ******************************************************************************** .. image:: ./images/pconic.png - :scale: 50% + :scale: 100% :alt: Perspective Conic diff --git a/docs/source/operations/projections/poly.rst b/docs/source/operations/projections/poly.rst index e252feb5..31796a94 100644 --- a/docs/source/operations/projections/poly.rst +++ b/docs/source/operations/projections/poly.rst @@ -5,6 +5,6 @@ Polyconic (American) ******************************************************************************** .. image:: ./images/poly.png - :scale: 50% + :scale: 100% :alt: Polyconic (American) diff --git a/docs/source/operations/projections/putp1.rst b/docs/source/operations/projections/putp1.rst index 68971a46..b12da0ec 100644 --- a/docs/source/operations/projections/putp1.rst +++ b/docs/source/operations/projections/putp1.rst @@ -5,6 +5,6 @@ Putnins P1 ******************************************************************************** .. image:: ./images/putp1.png - :scale: 50% + :scale: 100% :alt: Putnins P1 diff --git a/docs/source/operations/projections/putp2.rst b/docs/source/operations/projections/putp2.rst index 01ea8073..9aa96fea 100644 --- a/docs/source/operations/projections/putp2.rst +++ b/docs/source/operations/projections/putp2.rst @@ -5,6 +5,6 @@ Putnins P2 ******************************************************************************** .. image:: ./images/putp2.png - :scale: 50% + :scale: 100% :alt: Putnins P2 diff --git a/docs/source/operations/projections/putp3.rst b/docs/source/operations/projections/putp3.rst index 3aa6b9e6..f589335a 100644 --- a/docs/source/operations/projections/putp3.rst +++ b/docs/source/operations/projections/putp3.rst @@ -5,6 +5,6 @@ Putnins P3 ******************************************************************************** .. image:: ./images/putp3.png - :scale: 50% + :scale: 100% :alt: Putnins P3 diff --git a/docs/source/operations/projections/putp3p.rst b/docs/source/operations/projections/putp3p.rst index 5b87512e..f47622e5 100644 --- a/docs/source/operations/projections/putp3p.rst +++ b/docs/source/operations/projections/putp3p.rst @@ -5,6 +5,6 @@ Putnins P3' ******************************************************************************** .. image:: ./images/putp3p.png - :scale: 50% + :scale: 100% :alt: Putnins P3' diff --git a/docs/source/operations/projections/putp4p.rst b/docs/source/operations/projections/putp4p.rst index b211ad9b..ce73e1ee 100644 --- a/docs/source/operations/projections/putp4p.rst +++ b/docs/source/operations/projections/putp4p.rst @@ -5,6 +5,6 @@ Putnins P4' ******************************************************************************** .. image:: ./images/putp4p.png - :scale: 50% + :scale: 100% :alt: Putnins P4' diff --git a/docs/source/operations/projections/putp5.rst b/docs/source/operations/projections/putp5.rst index 5b60a961..65ed1509 100644 --- a/docs/source/operations/projections/putp5.rst +++ b/docs/source/operations/projections/putp5.rst @@ -5,6 +5,6 @@ Putnins P5 ******************************************************************************** .. image:: ./images/putp5.png - :scale: 50% + :scale: 100% :alt: Putnins P5 diff --git a/docs/source/operations/projections/putp5p.rst b/docs/source/operations/projections/putp5p.rst index f586b889..2014ff9b 100644 --- a/docs/source/operations/projections/putp5p.rst +++ b/docs/source/operations/projections/putp5p.rst @@ -5,6 +5,6 @@ Putnins P5' ******************************************************************************** .. image:: ./images/putp5p.png - :scale: 50% + :scale: 100% :alt: Putnins P5' diff --git a/docs/source/operations/projections/putp6.rst b/docs/source/operations/projections/putp6.rst index 94683ace..68d36ca1 100644 --- a/docs/source/operations/projections/putp6.rst +++ b/docs/source/operations/projections/putp6.rst @@ -5,6 +5,6 @@ Putnins P6 ******************************************************************************** .. image:: ./images/putp6.png - :scale: 50% + :scale: 100% :alt: Putnins P6 diff --git a/docs/source/operations/projections/putp6p.rst b/docs/source/operations/projections/putp6p.rst index 8c3add71..2a01ddd1 100644 --- a/docs/source/operations/projections/putp6p.rst +++ b/docs/source/operations/projections/putp6p.rst @@ -5,6 +5,6 @@ Putnins P6' ******************************************************************************** .. image:: ./images/putp6p.png - :scale: 50% + :scale: 100% :alt: Putnins P6' diff --git a/docs/source/operations/projections/qsc.rst b/docs/source/operations/projections/qsc.rst index 56d4ea3f..6cfb76cb 100644 --- a/docs/source/operations/projections/qsc.rst +++ b/docs/source/operations/projections/qsc.rst @@ -114,32 +114,32 @@ The resulting images can be laid out in a grid like below. .. |topside| image:: ../../../images/qsc_topside.jpg - :scale: 50% + :scale: 100% :align: middle :alt: Top side .. |leftside| image:: ../../../images/qsc_leftside.jpg - :scale: 50% + :scale: 100% :align: middle :alt: Left side .. |frontside| image:: ../../../images/qsc_frontside.jpg - :scale: 50% + :scale: 100% :align: middle :alt: Front side .. |rightside| image:: ../../../images/qsc_rightside.jpg - :scale: 50% + :scale: 100% :align: middle :alt: Right side .. |backside| image:: ../../../images/qsc_backside.jpg - :scale: 50% + :scale: 100% :align: middle :alt: Back side .. |bottomside| image:: ../../../images/qsc_bottomside.jpg - :scale: 50% + :scale: 100% :align: middle :alt: Bottom side diff --git a/docs/source/operations/projections/qua_aut.rst b/docs/source/operations/projections/qua_aut.rst index d3a0aece..514b465a 100644 --- a/docs/source/operations/projections/qua_aut.rst +++ b/docs/source/operations/projections/qua_aut.rst @@ -5,6 +5,6 @@ Quartic Authalic ******************************************************************************** .. image:: ./images/qua_aut.png - :scale: 50% + :scale: 100% :alt: Quartic Authalic diff --git a/docs/source/operations/projections/robin.rst b/docs/source/operations/projections/robin.rst index 3e58be46..a5ad9cf1 100644 --- a/docs/source/operations/projections/robin.rst +++ b/docs/source/operations/projections/robin.rst @@ -5,6 +5,6 @@ Robinson ******************************************************************************** .. image:: ./images/robin.png - :scale: 50% + :scale: 100% :alt: Robinson diff --git a/docs/source/operations/projections/rouss.rst b/docs/source/operations/projections/rouss.rst index e27fb1cf..a6e95ee5 100644 --- a/docs/source/operations/projections/rouss.rst +++ b/docs/source/operations/projections/rouss.rst @@ -5,6 +5,6 @@ Roussilhe Stereographic ******************************************************************************** .. image:: ./images/rouss.png - :scale: 50% + :scale: 100% :alt: Roussilhe Stereographic diff --git a/docs/source/operations/projections/rpoly.rst b/docs/source/operations/projections/rpoly.rst index 80e0d640..0e9f4ed6 100644 --- a/docs/source/operations/projections/rpoly.rst +++ b/docs/source/operations/projections/rpoly.rst @@ -5,6 +5,6 @@ Rectangular Polyconic ******************************************************************************** .. image:: ./images/rpoly.png - :scale: 50% + :scale: 100% :alt: Rectangular Polyconic diff --git a/docs/source/operations/projections/sinu.rst b/docs/source/operations/projections/sinu.rst index a7ebd232..762696fd 100644 --- a/docs/source/operations/projections/sinu.rst +++ b/docs/source/operations/projections/sinu.rst @@ -5,7 +5,7 @@ Sinusoidal (Sanson-Flamsteed) ******************************************************************************** .. image:: ./images/sinu.png - :scale: 50% + :scale: 100% :alt: Sinusoidal (Sanson-Flamsteed) MacBryde and Thomas developed generalized formulas for sever of the diff --git a/docs/source/operations/projections/somerc.rst b/docs/source/operations/projections/somerc.rst index c572622b..7584e63b 100644 --- a/docs/source/operations/projections/somerc.rst +++ b/docs/source/operations/projections/somerc.rst @@ -5,6 +5,6 @@ Swiss. Obl. Mercator ******************************************************************************** .. image:: ./images/somerc.png - :scale: 50% + :scale: 100% :alt: Swiss. Obl. Mercator diff --git a/docs/source/operations/projections/stere.rst b/docs/source/operations/projections/stere.rst index d4958ec9..01943c3a 100644 --- a/docs/source/operations/projections/stere.rst +++ b/docs/source/operations/projections/stere.rst @@ -5,6 +5,6 @@ Stereographic ******************************************************************************** .. image:: ./images/stere.png - :scale: 50% + :scale: 100% :alt: Stereographic diff --git a/docs/source/operations/projections/sterea.rst b/docs/source/operations/projections/sterea.rst index 4f2f8727..f331cf3b 100644 --- a/docs/source/operations/projections/sterea.rst +++ b/docs/source/operations/projections/sterea.rst @@ -5,6 +5,6 @@ Oblique Stereographic Alternative ******************************************************************************** .. image:: ./images/sterea.png - :scale: 50% + :scale: 100% :alt: Oblique Stereographic Alternative diff --git a/docs/source/operations/projections/tcc.rst b/docs/source/operations/projections/tcc.rst index 586dd3b8..6475fef6 100644 --- a/docs/source/operations/projections/tcc.rst +++ b/docs/source/operations/projections/tcc.rst @@ -5,6 +5,6 @@ Transverse Central Cylindrical ******************************************************************************** .. image:: ./images/tcc.png - :scale: 50% + :scale: 100% :alt: Transverse Central Cylindrical diff --git a/docs/source/operations/projections/tcea.rst b/docs/source/operations/projections/tcea.rst index cf5549a3..7516388e 100644 --- a/docs/source/operations/projections/tcea.rst +++ b/docs/source/operations/projections/tcea.rst @@ -5,6 +5,6 @@ Transverse Cylindrical Equal Area ******************************************************************************** .. image:: ./images/tcea.png - :scale: 50% + :scale: 100% :alt: Transverse Cylindrical Equal Area diff --git a/docs/source/operations/projections/tissot.rst b/docs/source/operations/projections/tissot.rst index 7ec1a741..73e3a185 100644 --- a/docs/source/operations/projections/tissot.rst +++ b/docs/source/operations/projections/tissot.rst @@ -5,6 +5,6 @@ Tissot ******************************************************************************** .. image:: ./images/tissot.png - :scale: 50% + :scale: 100% :alt: Tissot diff --git a/docs/source/operations/projections/tmerc.rst b/docs/source/operations/projections/tmerc.rst index cd864d13..20279dbc 100644 --- a/docs/source/operations/projections/tmerc.rst +++ b/docs/source/operations/projections/tmerc.rst @@ -26,7 +26,7 @@ The transverse Mercator projection in its various forms is the most widely used .. image:: ./images/tmerc.png - :scale: 50% + :scale: 100% :alt: Transverse Mercator Usage diff --git a/docs/source/operations/projections/tpeqd.rst b/docs/source/operations/projections/tpeqd.rst index e6d7ef29..884b0620 100644 --- a/docs/source/operations/projections/tpeqd.rst +++ b/docs/source/operations/projections/tpeqd.rst @@ -5,6 +5,6 @@ Two Point Equidistant ******************************************************************************** .. image:: ./images/tpeqd.png - :scale: 50% + :scale: 100% :alt: Two Point Equidistant diff --git a/docs/source/operations/projections/tpers.rst b/docs/source/operations/projections/tpers.rst index 1d36b07c..79ef02cb 100644 --- a/docs/source/operations/projections/tpers.rst +++ b/docs/source/operations/projections/tpers.rst @@ -22,7 +22,7 @@ Tilted perspective .. image:: ./images/tpers.png - :scale: 50% + :scale: 100% :alt: Tilted perspective diff --git a/docs/source/operations/projections/ups.rst b/docs/source/operations/projections/ups.rst index 7a9ab50b..be99c946 100644 --- a/docs/source/operations/projections/ups.rst +++ b/docs/source/operations/projections/ups.rst @@ -5,6 +5,6 @@ Universal Polar Stereographic ******************************************************************************** .. image:: ./images/ups.png - :scale: 50% + :scale: 100% :alt: Universal Polar Stereographic diff --git a/docs/source/operations/projections/urm5.rst b/docs/source/operations/projections/urm5.rst index 91d06308..fe84259b 100644 --- a/docs/source/operations/projections/urm5.rst +++ b/docs/source/operations/projections/urm5.rst @@ -5,6 +5,6 @@ Urmaev V ******************************************************************************** .. image:: ./images/urm5.png - :scale: 50% + :scale: 100% :alt: Urmaev V diff --git a/docs/source/operations/projections/urmfps.rst b/docs/source/operations/projections/urmfps.rst index 515ced84..eca1d328 100644 --- a/docs/source/operations/projections/urmfps.rst +++ b/docs/source/operations/projections/urmfps.rst @@ -5,6 +5,6 @@ Urmaev Flat-Polar Sinusoidal ******************************************************************************** .. image:: ./images/urmfps.png - :scale: 50% + :scale: 100% :alt: Urmaev Flat-Polar Sinusoidal diff --git a/docs/source/operations/projections/utm.rst b/docs/source/operations/projections/utm.rst index 7fb66cb8..d26b57e1 100644 --- a/docs/source/operations/projections/utm.rst +++ b/docs/source/operations/projections/utm.rst @@ -5,6 +5,6 @@ Universal Transverse Mercator (UTM) ******************************************************************************** .. image:: ./images/utm.png - :scale: 50% + :scale: 100% :alt: Universal Transverse Mercator (UTM) diff --git a/docs/source/operations/projections/vandg.rst b/docs/source/operations/projections/vandg.rst index cdc772bb..9acbe720 100644 --- a/docs/source/operations/projections/vandg.rst +++ b/docs/source/operations/projections/vandg.rst @@ -5,6 +5,6 @@ van der Grinten (I) ******************************************************************************** .. image:: ./images/vandg.png - :scale: 50% + :scale: 100% :alt: van der Grinten (I) diff --git a/docs/source/operations/projections/vandg2.rst b/docs/source/operations/projections/vandg2.rst index 556929e2..cc8f11ca 100644 --- a/docs/source/operations/projections/vandg2.rst +++ b/docs/source/operations/projections/vandg2.rst @@ -5,6 +5,6 @@ van der Grinten II ******************************************************************************** .. image:: ./images/vandg2.png - :scale: 50% + :scale: 100% :alt: van der Grinten II diff --git a/docs/source/operations/projections/vandg3.rst b/docs/source/operations/projections/vandg3.rst index d767c4d5..4c2cb860 100644 --- a/docs/source/operations/projections/vandg3.rst +++ b/docs/source/operations/projections/vandg3.rst @@ -5,6 +5,6 @@ van der Grinten III ******************************************************************************** .. image:: ./images/vandg3.png - :scale: 50% + :scale: 100% :alt: van der Grinten III diff --git a/docs/source/operations/projections/vandg4.rst b/docs/source/operations/projections/vandg4.rst index 097ba1d8..8b350710 100644 --- a/docs/source/operations/projections/vandg4.rst +++ b/docs/source/operations/projections/vandg4.rst @@ -5,6 +5,6 @@ van der Grinten IV ******************************************************************************** .. image:: ./images/vandg4.png - :scale: 50% + :scale: 100% :alt: van der Grinten IV diff --git a/docs/source/operations/projections/vitk1.rst b/docs/source/operations/projections/vitk1.rst index b9081547..6470ef55 100644 --- a/docs/source/operations/projections/vitk1.rst +++ b/docs/source/operations/projections/vitk1.rst @@ -5,6 +5,6 @@ Vitkovsky I ******************************************************************************** .. image:: ./images/vitk1.png - :scale: 50% + :scale: 100% :alt: Vitkovsky I diff --git a/docs/source/operations/projections/wag1.rst b/docs/source/operations/projections/wag1.rst index dd1ed39e..d085391c 100644 --- a/docs/source/operations/projections/wag1.rst +++ b/docs/source/operations/projections/wag1.rst @@ -5,6 +5,6 @@ Wagner I (Kavraisky VI) ******************************************************************************** .. image:: ./images/wag1.png - :scale: 50% + :scale: 100% :alt: Wagner I (Kavraisky VI) diff --git a/docs/source/operations/projections/wag2.rst b/docs/source/operations/projections/wag2.rst index 9c7b0edc..1f0a2682 100644 --- a/docs/source/operations/projections/wag2.rst +++ b/docs/source/operations/projections/wag2.rst @@ -5,7 +5,7 @@ Wagner II ******************************************************************************** .. image:: ./images/wag2.png - :scale: 50% + :scale: 100% :alt: Wagner II diff --git a/docs/source/operations/projections/wag3.rst b/docs/source/operations/projections/wag3.rst index fb70a0a6..43e89471 100644 --- a/docs/source/operations/projections/wag3.rst +++ b/docs/source/operations/projections/wag3.rst @@ -5,7 +5,7 @@ Wagner III ******************************************************************************** .. image:: ./images/wag3.png - :scale: 50% + :scale: 100% :alt: Wagner III diff --git a/docs/source/operations/projections/wag4.rst b/docs/source/operations/projections/wag4.rst index 7b8dac96..a68e55c4 100644 --- a/docs/source/operations/projections/wag4.rst +++ b/docs/source/operations/projections/wag4.rst @@ -5,6 +5,6 @@ Wagner IV ******************************************************************************** .. image:: ./images/wag4.png - :scale: 50% + :scale: 100% :alt: Wagner IV diff --git a/docs/source/operations/projections/wag5.rst b/docs/source/operations/projections/wag5.rst index f880290b..c6753c43 100644 --- a/docs/source/operations/projections/wag5.rst +++ b/docs/source/operations/projections/wag5.rst @@ -5,6 +5,6 @@ Wagner V ******************************************************************************** .. image:: ./images/wag5.png - :scale: 50% + :scale: 100% :alt: Wagner V diff --git a/docs/source/operations/projections/wag6.rst b/docs/source/operations/projections/wag6.rst index f74749a5..cf714133 100644 --- a/docs/source/operations/projections/wag6.rst +++ b/docs/source/operations/projections/wag6.rst @@ -5,6 +5,6 @@ Wagner VI ******************************************************************************** .. image:: ./images/wag6.png - :scale: 50% + :scale: 100% :alt: Wagner VI diff --git a/docs/source/operations/projections/wag7.rst b/docs/source/operations/projections/wag7.rst index be1401b8..cb3fc06f 100644 --- a/docs/source/operations/projections/wag7.rst +++ b/docs/source/operations/projections/wag7.rst @@ -5,6 +5,6 @@ Wagner VII ******************************************************************************** .. image:: ./images/wag7.png - :scale: 50% + :scale: 100% :alt: Wagner VII diff --git a/docs/source/operations/projections/weren.rst b/docs/source/operations/projections/weren.rst index de7c5abf..01fdb290 100644 --- a/docs/source/operations/projections/weren.rst +++ b/docs/source/operations/projections/weren.rst @@ -5,6 +5,6 @@ Werenskiold I ******************************************************************************** .. image:: ./images/weren.png - :scale: 50% + :scale: 100% :alt: Werenskiold I diff --git a/docs/source/operations/projections/wink1.rst b/docs/source/operations/projections/wink1.rst index 00346765..5f7c877b 100644 --- a/docs/source/operations/projections/wink1.rst +++ b/docs/source/operations/projections/wink1.rst @@ -5,6 +5,6 @@ Winkel I ******************************************************************************** .. image:: ./images/wink1.png - :scale: 50% + :scale: 100% :alt: Winkel I diff --git a/docs/source/operations/projections/wink2.rst b/docs/source/operations/projections/wink2.rst index 7e9b48a7..41f100c1 100644 --- a/docs/source/operations/projections/wink2.rst +++ b/docs/source/operations/projections/wink2.rst @@ -5,6 +5,6 @@ Winkel II ******************************************************************************** .. image:: ./images/wink2.png - :scale: 50% + :scale: 100% :alt: Winkel II diff --git a/docs/source/operations/projections/wintri.rst b/docs/source/operations/projections/wintri.rst index bfd5032f..270cb69c 100644 --- a/docs/source/operations/projections/wintri.rst +++ b/docs/source/operations/projections/wintri.rst @@ -5,6 +5,6 @@ Winkel Tripel ******************************************************************************** .. image:: ./images/wintri.png - :scale: 50% + :scale: 100% :alt: Winkel Tripel -- cgit v1.2.3 From 6284d19e1d2efdc60fd3752187c275e345ab423b Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 14 May 2018 22:14:01 +0200 Subject: Revert "Set projection plot scale to 100% for better PDF output" This had unexpected side-effects when building the HTML docs on Travis compared to locally. The correct solution would be to set different scaling depending on the output. This reverts commit 325477ed0fac2c9233c2f6a2b7bb4125e04df24c. --- docs/source/operations/projections/aea.rst | 2 +- docs/source/operations/projections/aeqd.rst | 2 +- docs/source/operations/projections/airy.rst | 2 +- docs/source/operations/projections/aitoff.rst | 2 +- docs/source/operations/projections/alsk.rst | 2 +- docs/source/operations/projections/apian.rst | 2 +- docs/source/operations/projections/august.rst | 2 +- docs/source/operations/projections/bacon.rst | 2 +- docs/source/operations/projections/bipc.rst | 2 +- docs/source/operations/projections/boggs.rst | 2 +- docs/source/operations/projections/bonne.rst | 2 +- docs/source/operations/projections/calcofi.rst | 2 +- docs/source/operations/projections/cass.rst | 2 +- docs/source/operations/projections/cc.rst | 2 +- docs/source/operations/projections/ccon.rst | 2 +- docs/source/operations/projections/cea.rst | 2 +- docs/source/operations/projections/chamb.rst | 2 +- docs/source/operations/projections/collg.rst | 2 +- docs/source/operations/projections/crast.rst | 2 +- docs/source/operations/projections/denoy.rst | 2 +- docs/source/operations/projections/eck1.rst | 2 +- docs/source/operations/projections/eck2.rst | 2 +- docs/source/operations/projections/eck3.rst | 2 +- docs/source/operations/projections/eck4.rst | 2 +- docs/source/operations/projections/eck5.rst | 2 +- docs/source/operations/projections/eck6.rst | 2 +- docs/source/operations/projections/eqc.rst | 2 +- docs/source/operations/projections/eqdc.rst | 2 +- docs/source/operations/projections/etmerc.rst | 2 +- docs/source/operations/projections/euler.rst | 2 +- docs/source/operations/projections/fahey.rst | 2 +- docs/source/operations/projections/fouc.rst | 2 +- docs/source/operations/projections/fouc_s.rst | 2 +- docs/source/operations/projections/gall.rst | 2 +- docs/source/operations/projections/geos.rst | 3 +-- docs/source/operations/projections/gins8.rst | 2 +- docs/source/operations/projections/gn_sinu.rst | 2 +- docs/source/operations/projections/gnom.rst | 2 +- docs/source/operations/projections/goode.rst | 2 +- docs/source/operations/projections/gs48.rst | 2 +- docs/source/operations/projections/gs50.rst | 2 +- docs/source/operations/projections/gstmerc.rst | 2 +- docs/source/operations/projections/hammer.rst | 2 +- docs/source/operations/projections/hatano.rst | 2 +- docs/source/operations/projections/healpix.rst | 1 - docs/source/operations/projections/igh.rst | 2 +- docs/source/operations/projections/imw_p.rst | 2 +- docs/source/operations/projections/isea.rst | 2 +- docs/source/operations/projections/kav5.rst | 2 +- docs/source/operations/projections/kav7.rst | 2 +- docs/source/operations/projections/krovak.rst | 2 +- docs/source/operations/projections/labrd.rst | 2 +- docs/source/operations/projections/laea.rst | 2 +- docs/source/operations/projections/lagrng.rst | 2 +- docs/source/operations/projections/larr.rst | 2 +- docs/source/operations/projections/lask.rst | 2 +- docs/source/operations/projections/lcc.rst | 2 +- docs/source/operations/projections/lcca.rst | 2 +- docs/source/operations/projections/leac.rst | 2 +- docs/source/operations/projections/lee_os.rst | 2 +- docs/source/operations/projections/loxim.rst | 2 +- docs/source/operations/projections/lsat.rst | 2 +- docs/source/operations/projections/mbt_fps.rst | 2 +- docs/source/operations/projections/mbt_s.rst | 2 +- docs/source/operations/projections/mbtfpp.rst | 2 +- docs/source/operations/projections/mbtfpq.rst | 2 +- docs/source/operations/projections/mbtfps.rst | 2 +- docs/source/operations/projections/merc.rst | 2 +- docs/source/operations/projections/mil_os.rst | 2 +- docs/source/operations/projections/mill.rst | 2 +- docs/source/operations/projections/moll.rst | 2 +- docs/source/operations/projections/murd1.rst | 2 +- docs/source/operations/projections/murd2.rst | 2 +- docs/source/operations/projections/murd3.rst | 2 +- docs/source/operations/projections/natearth.rst | 2 +- docs/source/operations/projections/nell.rst | 2 +- docs/source/operations/projections/nell_h.rst | 2 +- docs/source/operations/projections/nicol.rst | 2 +- docs/source/operations/projections/nsper.rst | 2 +- docs/source/operations/projections/nzmg.rst | 2 +- docs/source/operations/projections/ob_tran.rst | 2 +- docs/source/operations/projections/ocea.rst | 2 +- docs/source/operations/projections/oea.rst | 2 +- docs/source/operations/projections/omerc.rst | 2 +- docs/source/operations/projections/ortel.rst | 2 +- docs/source/operations/projections/ortho.rst | 2 +- docs/source/operations/projections/pconic.rst | 2 +- docs/source/operations/projections/poly.rst | 2 +- docs/source/operations/projections/putp1.rst | 2 +- docs/source/operations/projections/putp2.rst | 2 +- docs/source/operations/projections/putp3.rst | 2 +- docs/source/operations/projections/putp3p.rst | 2 +- docs/source/operations/projections/putp4p.rst | 2 +- docs/source/operations/projections/putp5.rst | 2 +- docs/source/operations/projections/putp5p.rst | 2 +- docs/source/operations/projections/putp6.rst | 2 +- docs/source/operations/projections/putp6p.rst | 2 +- docs/source/operations/projections/qsc.rst | 12 ++++++------ docs/source/operations/projections/qua_aut.rst | 2 +- docs/source/operations/projections/robin.rst | 2 +- docs/source/operations/projections/rouss.rst | 2 +- docs/source/operations/projections/rpoly.rst | 2 +- docs/source/operations/projections/sinu.rst | 2 +- docs/source/operations/projections/somerc.rst | 2 +- docs/source/operations/projections/stere.rst | 2 +- docs/source/operations/projections/sterea.rst | 2 +- docs/source/operations/projections/tcc.rst | 2 +- docs/source/operations/projections/tcea.rst | 2 +- docs/source/operations/projections/tissot.rst | 2 +- docs/source/operations/projections/tmerc.rst | 2 +- docs/source/operations/projections/tpeqd.rst | 2 +- docs/source/operations/projections/tpers.rst | 2 +- docs/source/operations/projections/ups.rst | 2 +- docs/source/operations/projections/urm5.rst | 2 +- docs/source/operations/projections/urmfps.rst | 2 +- docs/source/operations/projections/utm.rst | 2 +- docs/source/operations/projections/vandg.rst | 2 +- docs/source/operations/projections/vandg2.rst | 2 +- docs/source/operations/projections/vandg3.rst | 2 +- docs/source/operations/projections/vandg4.rst | 2 +- docs/source/operations/projections/vitk1.rst | 2 +- docs/source/operations/projections/wag1.rst | 2 +- docs/source/operations/projections/wag2.rst | 2 +- docs/source/operations/projections/wag3.rst | 2 +- docs/source/operations/projections/wag4.rst | 2 +- docs/source/operations/projections/wag5.rst | 2 +- docs/source/operations/projections/wag6.rst | 2 +- docs/source/operations/projections/wag7.rst | 2 +- docs/source/operations/projections/weren.rst | 2 +- docs/source/operations/projections/wink1.rst | 2 +- docs/source/operations/projections/wink2.rst | 2 +- docs/source/operations/projections/wintri.rst | 2 +- 132 files changed, 136 insertions(+), 138 deletions(-) diff --git a/docs/source/operations/projections/aea.rst b/docs/source/operations/projections/aea.rst index c21b8236..4fcd3cac 100644 --- a/docs/source/operations/projections/aea.rst +++ b/docs/source/operations/projections/aea.rst @@ -21,7 +21,7 @@ Albers Equal Area .. image:: ./images/aea.png - :scale: 100% + :scale: 50% :alt: Albers Equal Area Options diff --git a/docs/source/operations/projections/aeqd.rst b/docs/source/operations/projections/aeqd.rst index e9a3e45b..4663af3e 100644 --- a/docs/source/operations/projections/aeqd.rst +++ b/docs/source/operations/projections/aeqd.rst @@ -19,7 +19,7 @@ Azimuthal Equidistant .. image:: ./images/aeqd.png - :scale: 100% + :scale: 50% :alt: Azimuthal Equidistant diff --git a/docs/source/operations/projections/airy.rst b/docs/source/operations/projections/airy.rst index 64ce9fe3..a6e89e30 100644 --- a/docs/source/operations/projections/airy.rst +++ b/docs/source/operations/projections/airy.rst @@ -27,7 +27,7 @@ within the small or great circle defined by an angular distance, .. image:: ./images/airy.png - :scale: 100% + :scale: 50% :alt: Airy Options diff --git a/docs/source/operations/projections/aitoff.rst b/docs/source/operations/projections/aitoff.rst index 357600ec..92ef2f12 100644 --- a/docs/source/operations/projections/aitoff.rst +++ b/docs/source/operations/projections/aitoff.rst @@ -20,7 +20,7 @@ Aitoff +---------------------+----------------------------------------------------------+ .. image:: ./images/aitoff.png - :scale: 100% + :scale: 50% :alt: Aitoff Parameters diff --git a/docs/source/operations/projections/alsk.rst b/docs/source/operations/projections/alsk.rst index 0af63bc8..d08fa827 100644 --- a/docs/source/operations/projections/alsk.rst +++ b/docs/source/operations/projections/alsk.rst @@ -21,7 +21,7 @@ Modified Stererographics of Alaska .. image:: ./images/alsk.png - :scale: 100% + :scale: 50% :alt: Mod. Stererographics of Alaska Options diff --git a/docs/source/operations/projections/apian.rst b/docs/source/operations/projections/apian.rst index 2a57e630..6b5e247d 100644 --- a/docs/source/operations/projections/apian.rst +++ b/docs/source/operations/projections/apian.rst @@ -22,7 +22,7 @@ Apian Globular I .. image:: ./images/apian.png - :scale: 100% + :scale: 50% :alt: Apian Globular I Options diff --git a/docs/source/operations/projections/august.rst b/docs/source/operations/projections/august.rst index 1283ddd7..e2ad3516 100644 --- a/docs/source/operations/projections/august.rst +++ b/docs/source/operations/projections/august.rst @@ -5,6 +5,6 @@ August Epicycloidal ******************************************************************************** .. image:: ./images/august.png - :scale: 100% + :scale: 50% :alt: August Epicycloidal diff --git a/docs/source/operations/projections/bacon.rst b/docs/source/operations/projections/bacon.rst index cf3bf6f8..a87ea7d8 100644 --- a/docs/source/operations/projections/bacon.rst +++ b/docs/source/operations/projections/bacon.rst @@ -5,6 +5,6 @@ Bacon Globular ******************************************************************************** .. image:: ./images/bacon.png - :scale: 100% + :scale: 50% :alt: Bacon Globular diff --git a/docs/source/operations/projections/bipc.rst b/docs/source/operations/projections/bipc.rst index b7981716..7045f04a 100644 --- a/docs/source/operations/projections/bipc.rst +++ b/docs/source/operations/projections/bipc.rst @@ -5,6 +5,6 @@ Bipolar conic of western hemisphere ******************************************************************************** .. image:: ./images/bipc.png - :scale: 100% + :scale: 50% :alt: Bipolar conic of western hemisphere diff --git a/docs/source/operations/projections/boggs.rst b/docs/source/operations/projections/boggs.rst index 23f00c2b..1dd7d19f 100644 --- a/docs/source/operations/projections/boggs.rst +++ b/docs/source/operations/projections/boggs.rst @@ -5,6 +5,6 @@ Boggs Eumorphic ******************************************************************************** .. image:: ./images/boggs.png - :scale: 100% + :scale: 50% :alt: Boggs Eumorphic diff --git a/docs/source/operations/projections/bonne.rst b/docs/source/operations/projections/bonne.rst index d7cb5e7c..ef87d7c9 100644 --- a/docs/source/operations/projections/bonne.rst +++ b/docs/source/operations/projections/bonne.rst @@ -5,6 +5,6 @@ Bonne (Werner lat_1=90) ******************************************************************************** .. image:: ./images/bonne.png - :scale: 100% + :scale: 50% :alt: Bonne (Werner lat_1=90) diff --git a/docs/source/operations/projections/calcofi.rst b/docs/source/operations/projections/calcofi.rst index b28530c5..8a240ebd 100644 --- a/docs/source/operations/projections/calcofi.rst +++ b/docs/source/operations/projections/calcofi.rst @@ -26,7 +26,7 @@ California Cooperative Oceanic Fisheries Investigations program, known as CalCOF .. image:: ../../../images/calcofi.png - :scale: 100% + :scale: 50% :align: center :alt: Cal Coop Ocean Fish Invest Lines/Stations diff --git a/docs/source/operations/projections/cass.rst b/docs/source/operations/projections/cass.rst index 7c009c9c..dba6a7c4 100644 --- a/docs/source/operations/projections/cass.rst +++ b/docs/source/operations/projections/cass.rst @@ -24,7 +24,7 @@ Although the Cassini projection has been largely replaced by the Transverse Merc .. image:: ./images/cass.png - :scale: 100% + :scale: 50% :alt: Cassini Usage diff --git a/docs/source/operations/projections/cc.rst b/docs/source/operations/projections/cc.rst index 6bd86a7b..5b30e6c6 100644 --- a/docs/source/operations/projections/cc.rst +++ b/docs/source/operations/projections/cc.rst @@ -5,6 +5,6 @@ Central Cylindrical ******************************************************************************** .. image:: ./images/cc.png - :scale: 100% + :scale: 50% :alt: Central Cylindrical diff --git a/docs/source/operations/projections/ccon.rst b/docs/source/operations/projections/ccon.rst index 595af087..f5ceed67 100644 --- a/docs/source/operations/projections/ccon.rst +++ b/docs/source/operations/projections/ccon.rst @@ -27,7 +27,7 @@ latitude, identical with ``conic()`` projection from ``mapproj`` R package. .. image:: ./images/ccon.png - :scale: 100% + :scale: 50% :alt: Central Conic diff --git a/docs/source/operations/projections/cea.rst b/docs/source/operations/projections/cea.rst index 0ad964ae..20ebc285 100644 --- a/docs/source/operations/projections/cea.rst +++ b/docs/source/operations/projections/cea.rst @@ -5,6 +5,6 @@ Equal Area Cylindrical ******************************************************************************** .. image:: ./images/cea.png - :scale: 100% + :scale: 50% :alt: Equal Area Cylindrical diff --git a/docs/source/operations/projections/chamb.rst b/docs/source/operations/projections/chamb.rst index 36d3d08f..2ec9bffe 100644 --- a/docs/source/operations/projections/chamb.rst +++ b/docs/source/operations/projections/chamb.rst @@ -5,6 +5,6 @@ Chamberlin Trimetric ******************************************************************************** .. image:: ./images/chamb.png - :scale: 100% + :scale: 50% :alt: Chamberlin Trimetric diff --git a/docs/source/operations/projections/collg.rst b/docs/source/operations/projections/collg.rst index 7fb7269d..aa16182a 100644 --- a/docs/source/operations/projections/collg.rst +++ b/docs/source/operations/projections/collg.rst @@ -5,6 +5,6 @@ Collignon ******************************************************************************** .. image:: ./images/collg.png - :scale: 100% + :scale: 50% :alt: Collignon diff --git a/docs/source/operations/projections/crast.rst b/docs/source/operations/projections/crast.rst index 02ca4063..9d17f274 100644 --- a/docs/source/operations/projections/crast.rst +++ b/docs/source/operations/projections/crast.rst @@ -5,6 +5,6 @@ Craster Parabolic (Putnins P4) ******************************************************************************** .. image:: ./images/crast.png - :scale: 100% + :scale: 50% :alt: Craster Parabolic (Putnins P4) diff --git a/docs/source/operations/projections/denoy.rst b/docs/source/operations/projections/denoy.rst index e879df49..a885ab0e 100644 --- a/docs/source/operations/projections/denoy.rst +++ b/docs/source/operations/projections/denoy.rst @@ -5,6 +5,6 @@ Denoyer Semi-Elliptical ******************************************************************************** .. image:: ./images/denoy.png - :scale: 100% + :scale: 50% :alt: Denoyer Semi-Elliptical diff --git a/docs/source/operations/projections/eck1.rst b/docs/source/operations/projections/eck1.rst index b39b1fd3..841533ec 100644 --- a/docs/source/operations/projections/eck1.rst +++ b/docs/source/operations/projections/eck1.rst @@ -5,7 +5,7 @@ Eckert I ******************************************************************************** .. image:: ./images/eck1.png - :scale: 100% + :scale: 50% :alt: Eckert I diff --git a/docs/source/operations/projections/eck2.rst b/docs/source/operations/projections/eck2.rst index 42b43dba..b1bd3179 100644 --- a/docs/source/operations/projections/eck2.rst +++ b/docs/source/operations/projections/eck2.rst @@ -5,6 +5,6 @@ Eckert II ******************************************************************************** .. image:: ./images/eck2.png - :scale: 100% + :scale: 50% :alt: Eckert II diff --git a/docs/source/operations/projections/eck3.rst b/docs/source/operations/projections/eck3.rst index 535969d8..ecacc32d 100644 --- a/docs/source/operations/projections/eck3.rst +++ b/docs/source/operations/projections/eck3.rst @@ -5,6 +5,6 @@ Eckert III ******************************************************************************** .. image:: ./images/eck3.png - :scale: 100% + :scale: 50% :alt: Eckert III diff --git a/docs/source/operations/projections/eck4.rst b/docs/source/operations/projections/eck4.rst index 96118ae9..3fc6a9fd 100644 --- a/docs/source/operations/projections/eck4.rst +++ b/docs/source/operations/projections/eck4.rst @@ -5,7 +5,7 @@ Eckert IV ******************************************************************************** .. image:: ./images/eck4.png - :scale: 100% + :scale: 50% :alt: Eckert IV diff --git a/docs/source/operations/projections/eck5.rst b/docs/source/operations/projections/eck5.rst index 20383b47..1442d99d 100644 --- a/docs/source/operations/projections/eck5.rst +++ b/docs/source/operations/projections/eck5.rst @@ -5,6 +5,6 @@ Eckert V ******************************************************************************** .. image:: ./images/eck5.png - :scale: 100% + :scale: 50% :alt: Eckert V diff --git a/docs/source/operations/projections/eck6.rst b/docs/source/operations/projections/eck6.rst index 7f30d386..caeaefa6 100644 --- a/docs/source/operations/projections/eck6.rst +++ b/docs/source/operations/projections/eck6.rst @@ -5,6 +5,6 @@ Eckert VI ******************************************************************************** .. image:: ./images/eck6.png - :scale: 100% + :scale: 50% :alt: Eckert VI diff --git a/docs/source/operations/projections/eqc.rst b/docs/source/operations/projections/eqc.rst index 766537b7..de463034 100644 --- a/docs/source/operations/projections/eqc.rst +++ b/docs/source/operations/projections/eqc.rst @@ -24,7 +24,7 @@ The simplest of all projections. Standard parallels (0° when omitted) may be sp .. image:: ./images/eqc.png - :scale: 100% + :scale: 50% :alt: Equidistant Cylindrical (Plate Carrée) Usage diff --git a/docs/source/operations/projections/eqdc.rst b/docs/source/operations/projections/eqdc.rst index f6eb1295..3ee5999d 100644 --- a/docs/source/operations/projections/eqdc.rst +++ b/docs/source/operations/projections/eqdc.rst @@ -5,6 +5,6 @@ Equidistant Conic ******************************************************************************** .. image:: ./images/eqdc.png - :scale: 100% + :scale: 50% :alt: Equidistant Conic diff --git a/docs/source/operations/projections/etmerc.rst b/docs/source/operations/projections/etmerc.rst index bcdc1f18..b7f89032 100644 --- a/docs/source/operations/projections/etmerc.rst +++ b/docs/source/operations/projections/etmerc.rst @@ -5,6 +5,6 @@ Extended Transverse Mercator ******************************************************************************** .. image:: ./images/etmerc.png - :scale: 100% + :scale: 50% :alt: Extended Transverse Mercator diff --git a/docs/source/operations/projections/euler.rst b/docs/source/operations/projections/euler.rst index fc7c892c..e495063f 100644 --- a/docs/source/operations/projections/euler.rst +++ b/docs/source/operations/projections/euler.rst @@ -5,6 +5,6 @@ Euler ******************************************************************************** .. image:: ./images/euler.png - :scale: 100% + :scale: 50% :alt: Euler diff --git a/docs/source/operations/projections/fahey.rst b/docs/source/operations/projections/fahey.rst index 60c95495..2e09337f 100644 --- a/docs/source/operations/projections/fahey.rst +++ b/docs/source/operations/projections/fahey.rst @@ -5,6 +5,6 @@ Fahey ******************************************************************************** .. image:: ./images/fahey.png - :scale: 100% + :scale: 50% :alt: Fahey diff --git a/docs/source/operations/projections/fouc.rst b/docs/source/operations/projections/fouc.rst index e510be23..7467dcb1 100644 --- a/docs/source/operations/projections/fouc.rst +++ b/docs/source/operations/projections/fouc.rst @@ -5,6 +5,6 @@ Foucaut ******************************************************************************** .. image:: ./images/fouc.png - :scale: 100% + :scale: 50% :alt: Foucaut diff --git a/docs/source/operations/projections/fouc_s.rst b/docs/source/operations/projections/fouc_s.rst index cd461794..ac353adb 100644 --- a/docs/source/operations/projections/fouc_s.rst +++ b/docs/source/operations/projections/fouc_s.rst @@ -5,7 +5,7 @@ Foucaut Sinusoidal ******************************************************************************** .. image:: ./images/fouc_s.png - :scale: 100% + :scale: 50% :alt: Foucaut Sinusoidal diff --git a/docs/source/operations/projections/gall.rst b/docs/source/operations/projections/gall.rst index f1abda48..bdb88895 100644 --- a/docs/source/operations/projections/gall.rst +++ b/docs/source/operations/projections/gall.rst @@ -25,7 +25,7 @@ It is neither equal-area nor conformal but instead tries to balance the distorti .. image:: ./images/gall.png - :scale: 100% + :scale: 50% :alt: Gall (Gall Stereographic) Usage diff --git a/docs/source/operations/projections/geos.rst b/docs/source/operations/projections/geos.rst index 317978e2..3dc914b3 100644 --- a/docs/source/operations/projections/geos.rst +++ b/docs/source/operations/projections/geos.rst @@ -25,7 +25,7 @@ scanning angle intervals. .. image:: ./images/geos.png - :scale: 100% + :scale: 50% :alt: Geostationary Satellite View @@ -55,7 +55,6 @@ and a E/W axis (or ``x``). .. image:: ../../..//images/geos_sweep.png :scale: 50% - :align: center :alt: Gimbal geometry In the image above, the outer-gimbal axis, or sweep-angle axis, is the N/S axis (``y``) diff --git a/docs/source/operations/projections/gins8.rst b/docs/source/operations/projections/gins8.rst index 5f85e225..f6adb092 100644 --- a/docs/source/operations/projections/gins8.rst +++ b/docs/source/operations/projections/gins8.rst @@ -5,6 +5,6 @@ Ginsburg VIII (TsNIIGAiK) ******************************************************************************** .. image:: ./images/gins8.png - :scale: 100% + :scale: 50% :alt: Ginsburg VIII (TsNIIGAiK) diff --git a/docs/source/operations/projections/gn_sinu.rst b/docs/source/operations/projections/gn_sinu.rst index c24c3f38..c1017c27 100644 --- a/docs/source/operations/projections/gn_sinu.rst +++ b/docs/source/operations/projections/gn_sinu.rst @@ -5,6 +5,6 @@ General Sinusoidal Series ******************************************************************************** .. image:: ./images/gn_sinu.png - :scale: 100% + :scale: 50% :alt: General Sinusoidal Series diff --git a/docs/source/operations/projections/gnom.rst b/docs/source/operations/projections/gnom.rst index e365296d..08d0db5f 100644 --- a/docs/source/operations/projections/gnom.rst +++ b/docs/source/operations/projections/gnom.rst @@ -5,6 +5,6 @@ Gnomonic ******************************************************************************** .. image:: ./images/gnom.png - :scale: 100% + :scale: 50% :alt: Gnomonic diff --git a/docs/source/operations/projections/goode.rst b/docs/source/operations/projections/goode.rst index 32d5a98b..c4590bf2 100644 --- a/docs/source/operations/projections/goode.rst +++ b/docs/source/operations/projections/goode.rst @@ -5,6 +5,6 @@ Goode Homolosine ******************************************************************************** .. image:: ./images/goode.png - :scale: 100% + :scale: 50% :alt: Goode Homolosine diff --git a/docs/source/operations/projections/gs48.rst b/docs/source/operations/projections/gs48.rst index 3b083f54..bdaa367c 100644 --- a/docs/source/operations/projections/gs48.rst +++ b/docs/source/operations/projections/gs48.rst @@ -5,6 +5,6 @@ Mod. Stererographics of 48 U.S. ******************************************************************************** .. image:: ./images/gs48.png - :scale: 100% + :scale: 50% :alt: Mod. Stererographics of 48 U.S. diff --git a/docs/source/operations/projections/gs50.rst b/docs/source/operations/projections/gs50.rst index 2e8ba5a9..0d4b7e81 100644 --- a/docs/source/operations/projections/gs50.rst +++ b/docs/source/operations/projections/gs50.rst @@ -5,6 +5,6 @@ Mod. Stererographics of 50 U.S. ******************************************************************************** .. image:: ./images/gs50.png - :scale: 100% + :scale: 50% :alt: Mod. Stererographics of 50 U.S. diff --git a/docs/source/operations/projections/gstmerc.rst b/docs/source/operations/projections/gstmerc.rst index d5f1acaa..fc587ab0 100644 --- a/docs/source/operations/projections/gstmerc.rst +++ b/docs/source/operations/projections/gstmerc.rst @@ -5,6 +5,6 @@ Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion) ******************************************************************************** .. image:: ./images/gstmerc.png - :scale: 100% + :scale: 50% :alt: Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion) diff --git a/docs/source/operations/projections/hammer.rst b/docs/source/operations/projections/hammer.rst index 7603d704..e795b91b 100644 --- a/docs/source/operations/projections/hammer.rst +++ b/docs/source/operations/projections/hammer.rst @@ -5,6 +5,6 @@ Hammer & Eckert-Greifendorff ******************************************************************************** .. image:: ./images/hammer.png - :scale: 100% + :scale: 50% :alt: Hammer & Eckert-Greifendorff diff --git a/docs/source/operations/projections/hatano.rst b/docs/source/operations/projections/hatano.rst index c461d0f1..99e9ac3d 100644 --- a/docs/source/operations/projections/hatano.rst +++ b/docs/source/operations/projections/hatano.rst @@ -26,7 +26,7 @@ Hatano Asymmetrical Equal Area .. image:: ./images/hatano.png - :scale: 100% + :scale: 50% :alt: Hatano Asymmetrical Equal Area diff --git a/docs/source/operations/projections/healpix.rst b/docs/source/operations/projections/healpix.rst index ae1c7781..e13c5456 100644 --- a/docs/source/operations/projections/healpix.rst +++ b/docs/source/operations/projections/healpix.rst @@ -22,7 +22,6 @@ HEALPix .. image:: ../../../images/healpix.png :scale: 75% - :align: center :alt: HEALPix The HEALPix projection is area preserving and can be used with a spherical and diff --git a/docs/source/operations/projections/igh.rst b/docs/source/operations/projections/igh.rst index 0decf7b2..d74e1362 100644 --- a/docs/source/operations/projections/igh.rst +++ b/docs/source/operations/projections/igh.rst @@ -5,6 +5,6 @@ Interrupted Goode Homolosine ******************************************************************************** .. image:: ./images/igh.png - :scale: 100% + :scale: 50% :alt: Interrupted Goode Homolosine diff --git a/docs/source/operations/projections/imw_p.rst b/docs/source/operations/projections/imw_p.rst index 556b2cf4..1fd3ded0 100644 --- a/docs/source/operations/projections/imw_p.rst +++ b/docs/source/operations/projections/imw_p.rst @@ -5,6 +5,6 @@ International Map of the World Polyconic ******************************************************************************** .. image:: ./images/imw_p.png - :scale: 100% + :scale: 50% :alt: International Map of the World Polyconic diff --git a/docs/source/operations/projections/isea.rst b/docs/source/operations/projections/isea.rst index d6af3943..1b6457af 100644 --- a/docs/source/operations/projections/isea.rst +++ b/docs/source/operations/projections/isea.rst @@ -5,6 +5,6 @@ Icosahedral Snyder Equal Area ******************************************************************************** .. image:: ./images/isea.png - :scale: 100% + :scale: 50% :alt: Icosahedral Snyder Equal Area diff --git a/docs/source/operations/projections/kav5.rst b/docs/source/operations/projections/kav5.rst index e0cc9890..2ec5d1c1 100644 --- a/docs/source/operations/projections/kav5.rst +++ b/docs/source/operations/projections/kav5.rst @@ -5,6 +5,6 @@ Kavraisky V ******************************************************************************** .. image:: ./images/kav5.png - :scale: 100% + :scale: 50% :alt: Kavraisky V diff --git a/docs/source/operations/projections/kav7.rst b/docs/source/operations/projections/kav7.rst index 1ada3048..8371e6ea 100644 --- a/docs/source/operations/projections/kav7.rst +++ b/docs/source/operations/projections/kav7.rst @@ -5,6 +5,6 @@ Kavraisky VII ******************************************************************************** .. image:: ./images/kav7.png - :scale: 100% + :scale: 50% :alt: Kavraisky VII diff --git a/docs/source/operations/projections/krovak.rst b/docs/source/operations/projections/krovak.rst index 3ebb4216..6c774825 100644 --- a/docs/source/operations/projections/krovak.rst +++ b/docs/source/operations/projections/krovak.rst @@ -5,6 +5,6 @@ Krovak ******************************************************************************** .. image:: ./images/krovak.png - :scale: 100% + :scale: 50% :alt: Krovak diff --git a/docs/source/operations/projections/labrd.rst b/docs/source/operations/projections/labrd.rst index 0efa3e17..5be58db5 100644 --- a/docs/source/operations/projections/labrd.rst +++ b/docs/source/operations/projections/labrd.rst @@ -5,6 +5,6 @@ Laborde ******************************************************************************** .. image:: ./images/labrd.png - :scale: 100% + :scale: 50% :alt: Laborde diff --git a/docs/source/operations/projections/laea.rst b/docs/source/operations/projections/laea.rst index ee28a0d0..2377f294 100644 --- a/docs/source/operations/projections/laea.rst +++ b/docs/source/operations/projections/laea.rst @@ -5,6 +5,6 @@ Lambert Azimuthal Equal Area ******************************************************************************** .. image:: ./images/laea.png - :scale: 100% + :scale: 50% :alt: Lambert Azimuthal Equal Area diff --git a/docs/source/operations/projections/lagrng.rst b/docs/source/operations/projections/lagrng.rst index 6e4d68c2..de9e5640 100644 --- a/docs/source/operations/projections/lagrng.rst +++ b/docs/source/operations/projections/lagrng.rst @@ -5,6 +5,6 @@ Lagrange ******************************************************************************** .. image:: ./images/lagrng.png - :scale: 100% + :scale: 50% :alt: Lagrange diff --git a/docs/source/operations/projections/larr.rst b/docs/source/operations/projections/larr.rst index 23791ea7..9529f83f 100644 --- a/docs/source/operations/projections/larr.rst +++ b/docs/source/operations/projections/larr.rst @@ -5,6 +5,6 @@ Larrivee ******************************************************************************** .. image:: ./images/larr.png - :scale: 100% + :scale: 50% :alt: Larrivee diff --git a/docs/source/operations/projections/lask.rst b/docs/source/operations/projections/lask.rst index cbd68334..d34dc8a0 100644 --- a/docs/source/operations/projections/lask.rst +++ b/docs/source/operations/projections/lask.rst @@ -5,6 +5,6 @@ Laskowski ******************************************************************************** .. image:: ./images/lask.png - :scale: 100% + :scale: 50% :alt: Laskowski diff --git a/docs/source/operations/projections/lcc.rst b/docs/source/operations/projections/lcc.rst index 56a7daee..a3075e76 100644 --- a/docs/source/operations/projections/lcc.rst +++ b/docs/source/operations/projections/lcc.rst @@ -5,6 +5,6 @@ Lambert Conformal Conic ******************************************************************************** .. image:: ./images/lcc.png - :scale: 100% + :scale: 50% :alt: Lambert Conformal Conic diff --git a/docs/source/operations/projections/lcca.rst b/docs/source/operations/projections/lcca.rst index ab76334d..ca87e67e 100644 --- a/docs/source/operations/projections/lcca.rst +++ b/docs/source/operations/projections/lcca.rst @@ -5,6 +5,6 @@ Lambert Conformal Conic Alternative ******************************************************************************** .. image:: ./images/lcca.png - :scale: 100% + :scale: 50% :alt: Lambert Conformal Conic Alternative diff --git a/docs/source/operations/projections/leac.rst b/docs/source/operations/projections/leac.rst index bafccafa..2957798e 100644 --- a/docs/source/operations/projections/leac.rst +++ b/docs/source/operations/projections/leac.rst @@ -5,6 +5,6 @@ Lambert Equal Area Conic ******************************************************************************** .. image:: ./images/leac.png - :scale: 100% + :scale: 50% :alt: Lambert Equal Area Conic diff --git a/docs/source/operations/projections/lee_os.rst b/docs/source/operations/projections/lee_os.rst index 3ba6fccd..711dc754 100644 --- a/docs/source/operations/projections/lee_os.rst +++ b/docs/source/operations/projections/lee_os.rst @@ -5,6 +5,6 @@ Lee Oblated Stereographic ******************************************************************************** .. image:: ./images/lee_os.png - :scale: 100% + :scale: 50% :alt: Lee Oblated Stereographic diff --git a/docs/source/operations/projections/loxim.rst b/docs/source/operations/projections/loxim.rst index 5766ef97..e50ba472 100644 --- a/docs/source/operations/projections/loxim.rst +++ b/docs/source/operations/projections/loxim.rst @@ -5,6 +5,6 @@ Loximuthal ******************************************************************************** .. image:: ./images/loxim.png - :scale: 100% + :scale: 50% :alt: Loximuthal diff --git a/docs/source/operations/projections/lsat.rst b/docs/source/operations/projections/lsat.rst index bc0257e5..fb64bdb2 100644 --- a/docs/source/operations/projections/lsat.rst +++ b/docs/source/operations/projections/lsat.rst @@ -5,6 +5,6 @@ Space oblique for LANDSAT ******************************************************************************** .. image:: ./images/lsat.png - :scale: 100% + :scale: 50% :alt: Space oblique for LANDSAT diff --git a/docs/source/operations/projections/mbt_fps.rst b/docs/source/operations/projections/mbt_fps.rst index 5be6634a..55ebcf6c 100644 --- a/docs/source/operations/projections/mbt_fps.rst +++ b/docs/source/operations/projections/mbt_fps.rst @@ -5,6 +5,6 @@ McBryde-Thomas Flat-Pole Sine (No. 2) ******************************************************************************** .. image:: ./images/mbt_fps.png - :scale: 100% + :scale: 50% :alt: McBryde-Thomas Flat-Pole Sine (No. 2) diff --git a/docs/source/operations/projections/mbt_s.rst b/docs/source/operations/projections/mbt_s.rst index 3731e019..9a355ec8 100644 --- a/docs/source/operations/projections/mbt_s.rst +++ b/docs/source/operations/projections/mbt_s.rst @@ -5,6 +5,6 @@ McBryde-Thomas Flat-Polar Sine (No. 1) ******************************************************************************** .. image:: ./images/mbt_s.png - :scale: 100% + :scale: 50% :alt: McBryde-Thomas Flat-Polar Sine (No. 1) diff --git a/docs/source/operations/projections/mbtfpp.rst b/docs/source/operations/projections/mbtfpp.rst index b8dc4c65..9be309d9 100644 --- a/docs/source/operations/projections/mbtfpp.rst +++ b/docs/source/operations/projections/mbtfpp.rst @@ -5,6 +5,6 @@ McBride-Thomas Flat-Polar Parabolic ******************************************************************************** .. image:: ./images/mbtfpp.png - :scale: 100% + :scale: 50% :alt: McBride-Thomas Flat-Polar Parabolic diff --git a/docs/source/operations/projections/mbtfpq.rst b/docs/source/operations/projections/mbtfpq.rst index 47461256..295e814d 100644 --- a/docs/source/operations/projections/mbtfpq.rst +++ b/docs/source/operations/projections/mbtfpq.rst @@ -5,6 +5,6 @@ McBryde-Thomas Flat-Polar Quartic ******************************************************************************** .. image:: ./images/mbtfpq.png - :scale: 100% + :scale: 50% :alt: McBryde-Thomas Flat-Polar Quartic diff --git a/docs/source/operations/projections/mbtfps.rst b/docs/source/operations/projections/mbtfps.rst index bae81f49..b9365361 100644 --- a/docs/source/operations/projections/mbtfps.rst +++ b/docs/source/operations/projections/mbtfps.rst @@ -5,6 +5,6 @@ McBryde-Thomas Flat-Polar Sinusoidal ******************************************************************************** .. image:: ./images/mbtfps.png - :scale: 100% + :scale: 50% :alt: McBryde-Thomas Flat-Polar Sinusoidal diff --git a/docs/source/operations/projections/merc.rst b/docs/source/operations/projections/merc.rst index 301d7cfb..2d419c02 100644 --- a/docs/source/operations/projections/merc.rst +++ b/docs/source/operations/projections/merc.rst @@ -26,7 +26,7 @@ The projection is conformal which makes it suitable for navigational purposes. +---------------------+----------------------------------------------------------+ .. image:: ./images/merc.png - :scale: 100% + :scale: 50% :alt: Mercator diff --git a/docs/source/operations/projections/mil_os.rst b/docs/source/operations/projections/mil_os.rst index 1e0de842..5547e43c 100644 --- a/docs/source/operations/projections/mil_os.rst +++ b/docs/source/operations/projections/mil_os.rst @@ -5,6 +5,6 @@ Miller Oblated Stereographic ******************************************************************************** .. image:: ./images/mil_os.png - :scale: 100% + :scale: 50% :alt: Miller Oblated Stereographic diff --git a/docs/source/operations/projections/mill.rst b/docs/source/operations/projections/mill.rst index 88f0382a..718d4b9b 100644 --- a/docs/source/operations/projections/mill.rst +++ b/docs/source/operations/projections/mill.rst @@ -25,7 +25,7 @@ The latitude is scaled by a factor of :math:`\frac{4}{5}`, projected according t .. image:: ./images/mill.png - :scale: 100% + :scale: 50% :alt: Miller Cylindrical Usage diff --git a/docs/source/operations/projections/moll.rst b/docs/source/operations/projections/moll.rst index 44be38ab..1bd3d005 100644 --- a/docs/source/operations/projections/moll.rst +++ b/docs/source/operations/projections/moll.rst @@ -5,6 +5,6 @@ Mollweide ******************************************************************************** .. image:: ./images/moll.png - :scale: 100% + :scale: 50% :alt: Mollweide diff --git a/docs/source/operations/projections/murd1.rst b/docs/source/operations/projections/murd1.rst index f20aae8c..71cbf155 100644 --- a/docs/source/operations/projections/murd1.rst +++ b/docs/source/operations/projections/murd1.rst @@ -5,6 +5,6 @@ Murdoch I ******************************************************************************** .. image:: ./images/murd1.png - :scale: 100% + :scale: 50% :alt: Murdoch I diff --git a/docs/source/operations/projections/murd2.rst b/docs/source/operations/projections/murd2.rst index 4c9b0714..b55cde35 100644 --- a/docs/source/operations/projections/murd2.rst +++ b/docs/source/operations/projections/murd2.rst @@ -5,6 +5,6 @@ Murdoch II ******************************************************************************** .. image:: ./images/murd2.png - :scale: 100% + :scale: 50% :alt: Murdoch II diff --git a/docs/source/operations/projections/murd3.rst b/docs/source/operations/projections/murd3.rst index 94fb86e3..70cc9276 100644 --- a/docs/source/operations/projections/murd3.rst +++ b/docs/source/operations/projections/murd3.rst @@ -5,6 +5,6 @@ Murdoch III ******************************************************************************** .. image:: ./images/murd3.png - :scale: 100% + :scale: 50% :alt: Murdoch III diff --git a/docs/source/operations/projections/natearth.rst b/docs/source/operations/projections/natearth.rst index d3c4e683..4d304fab 100644 --- a/docs/source/operations/projections/natearth.rst +++ b/docs/source/operations/projections/natearth.rst @@ -22,7 +22,7 @@ Natural Earth .. image:: ./images/natearth.png - :scale: 100% + :scale: 50% :alt: Natural Earth diff --git a/docs/source/operations/projections/nell.rst b/docs/source/operations/projections/nell.rst index 16e1eb71..c6a3771c 100644 --- a/docs/source/operations/projections/nell.rst +++ b/docs/source/operations/projections/nell.rst @@ -5,6 +5,6 @@ Nell ******************************************************************************** .. image:: ./images/nell.png - :scale: 100% + :scale: 50% :alt: Nell diff --git a/docs/source/operations/projections/nell_h.rst b/docs/source/operations/projections/nell_h.rst index 53a3451a..6a3b26ba 100644 --- a/docs/source/operations/projections/nell_h.rst +++ b/docs/source/operations/projections/nell_h.rst @@ -5,6 +5,6 @@ Nell-Hammer ******************************************************************************** .. image:: ./images/nell_h.png - :scale: 100% + :scale: 50% :alt: Nell-Hammer diff --git a/docs/source/operations/projections/nicol.rst b/docs/source/operations/projections/nicol.rst index 0b3f17cc..995cedb5 100644 --- a/docs/source/operations/projections/nicol.rst +++ b/docs/source/operations/projections/nicol.rst @@ -5,6 +5,6 @@ Nicolosi Globular ******************************************************************************** .. image:: ./images/nicol.png - :scale: 100% + :scale: 50% :alt: Nicolosi Globular diff --git a/docs/source/operations/projections/nsper.rst b/docs/source/operations/projections/nsper.rst index d0a7d690..d7611587 100644 --- a/docs/source/operations/projections/nsper.rst +++ b/docs/source/operations/projections/nsper.rst @@ -25,7 +25,7 @@ The near-sided perspective projection simulates a view from a height .. image:: ./images/nsper.png - :scale: 100% + :scale: 50% :alt: Near-sided perspective Parameters diff --git a/docs/source/operations/projections/nzmg.rst b/docs/source/operations/projections/nzmg.rst index f25c5e9d..926655d8 100644 --- a/docs/source/operations/projections/nzmg.rst +++ b/docs/source/operations/projections/nzmg.rst @@ -5,6 +5,6 @@ New Zealand Map Grid ******************************************************************************** .. image:: ./images/nzmg.png - :scale: 100% + :scale: 50% :alt: New Zealand Map Grid diff --git a/docs/source/operations/projections/ob_tran.rst b/docs/source/operations/projections/ob_tran.rst index c0110bf2..3c996336 100644 --- a/docs/source/operations/projections/ob_tran.rst +++ b/docs/source/operations/projections/ob_tran.rst @@ -5,6 +5,6 @@ General Oblique Transformation ******************************************************************************** .. image:: ./images/ob_tran.png - :scale: 100% + :scale: 50% :alt: General Oblique Transformation diff --git a/docs/source/operations/projections/ocea.rst b/docs/source/operations/projections/ocea.rst index d4fd0d20..40005d9e 100644 --- a/docs/source/operations/projections/ocea.rst +++ b/docs/source/operations/projections/ocea.rst @@ -5,6 +5,6 @@ Oblique Cylindrical Equal Area ******************************************************************************** .. image:: ./images/ocea.png - :scale: 100% + :scale: 50% :alt: Oblique Cylindrical Equal Area diff --git a/docs/source/operations/projections/oea.rst b/docs/source/operations/projections/oea.rst index bbc88af3..379dc157 100644 --- a/docs/source/operations/projections/oea.rst +++ b/docs/source/operations/projections/oea.rst @@ -5,6 +5,6 @@ Oblated Equal Area ******************************************************************************** .. image:: ./images/oea.png - :scale: 100% + :scale: 50% :alt: Oblated Equal Area diff --git a/docs/source/operations/projections/omerc.rst b/docs/source/operations/projections/omerc.rst index 682e9975..114b9fa3 100644 --- a/docs/source/operations/projections/omerc.rst +++ b/docs/source/operations/projections/omerc.rst @@ -5,6 +5,6 @@ Oblique Mercator ******************************************************************************** .. image:: ./images/omerc.png - :scale: 100% + :scale: 50% :alt: Oblique Mercator diff --git a/docs/source/operations/projections/ortel.rst b/docs/source/operations/projections/ortel.rst index a91d2e67..03f132ef 100644 --- a/docs/source/operations/projections/ortel.rst +++ b/docs/source/operations/projections/ortel.rst @@ -5,6 +5,6 @@ Ortelius Oval ******************************************************************************** .. image:: ./images/ortel.png - :scale: 100% + :scale: 50% :alt: Ortelius Oval diff --git a/docs/source/operations/projections/ortho.rst b/docs/source/operations/projections/ortho.rst index fe27a11c..5e96e2a2 100644 --- a/docs/source/operations/projections/ortho.rst +++ b/docs/source/operations/projections/ortho.rst @@ -25,7 +25,7 @@ around a given latitude and longitude. +---------------------+--------------------------------------------------------+ .. image:: ./images/ortho.png - :scale: 100% + :scale: 50% :alt: Orthographic Parameters diff --git a/docs/source/operations/projections/pconic.rst b/docs/source/operations/projections/pconic.rst index c11c3b74..6bc0018e 100644 --- a/docs/source/operations/projections/pconic.rst +++ b/docs/source/operations/projections/pconic.rst @@ -5,6 +5,6 @@ Perspective Conic ******************************************************************************** .. image:: ./images/pconic.png - :scale: 100% + :scale: 50% :alt: Perspective Conic diff --git a/docs/source/operations/projections/poly.rst b/docs/source/operations/projections/poly.rst index 31796a94..e252feb5 100644 --- a/docs/source/operations/projections/poly.rst +++ b/docs/source/operations/projections/poly.rst @@ -5,6 +5,6 @@ Polyconic (American) ******************************************************************************** .. image:: ./images/poly.png - :scale: 100% + :scale: 50% :alt: Polyconic (American) diff --git a/docs/source/operations/projections/putp1.rst b/docs/source/operations/projections/putp1.rst index b12da0ec..68971a46 100644 --- a/docs/source/operations/projections/putp1.rst +++ b/docs/source/operations/projections/putp1.rst @@ -5,6 +5,6 @@ Putnins P1 ******************************************************************************** .. image:: ./images/putp1.png - :scale: 100% + :scale: 50% :alt: Putnins P1 diff --git a/docs/source/operations/projections/putp2.rst b/docs/source/operations/projections/putp2.rst index 9aa96fea..01ea8073 100644 --- a/docs/source/operations/projections/putp2.rst +++ b/docs/source/operations/projections/putp2.rst @@ -5,6 +5,6 @@ Putnins P2 ******************************************************************************** .. image:: ./images/putp2.png - :scale: 100% + :scale: 50% :alt: Putnins P2 diff --git a/docs/source/operations/projections/putp3.rst b/docs/source/operations/projections/putp3.rst index f589335a..3aa6b9e6 100644 --- a/docs/source/operations/projections/putp3.rst +++ b/docs/source/operations/projections/putp3.rst @@ -5,6 +5,6 @@ Putnins P3 ******************************************************************************** .. image:: ./images/putp3.png - :scale: 100% + :scale: 50% :alt: Putnins P3 diff --git a/docs/source/operations/projections/putp3p.rst b/docs/source/operations/projections/putp3p.rst index f47622e5..5b87512e 100644 --- a/docs/source/operations/projections/putp3p.rst +++ b/docs/source/operations/projections/putp3p.rst @@ -5,6 +5,6 @@ Putnins P3' ******************************************************************************** .. image:: ./images/putp3p.png - :scale: 100% + :scale: 50% :alt: Putnins P3' diff --git a/docs/source/operations/projections/putp4p.rst b/docs/source/operations/projections/putp4p.rst index ce73e1ee..b211ad9b 100644 --- a/docs/source/operations/projections/putp4p.rst +++ b/docs/source/operations/projections/putp4p.rst @@ -5,6 +5,6 @@ Putnins P4' ******************************************************************************** .. image:: ./images/putp4p.png - :scale: 100% + :scale: 50% :alt: Putnins P4' diff --git a/docs/source/operations/projections/putp5.rst b/docs/source/operations/projections/putp5.rst index 65ed1509..5b60a961 100644 --- a/docs/source/operations/projections/putp5.rst +++ b/docs/source/operations/projections/putp5.rst @@ -5,6 +5,6 @@ Putnins P5 ******************************************************************************** .. image:: ./images/putp5.png - :scale: 100% + :scale: 50% :alt: Putnins P5 diff --git a/docs/source/operations/projections/putp5p.rst b/docs/source/operations/projections/putp5p.rst index 2014ff9b..f586b889 100644 --- a/docs/source/operations/projections/putp5p.rst +++ b/docs/source/operations/projections/putp5p.rst @@ -5,6 +5,6 @@ Putnins P5' ******************************************************************************** .. image:: ./images/putp5p.png - :scale: 100% + :scale: 50% :alt: Putnins P5' diff --git a/docs/source/operations/projections/putp6.rst b/docs/source/operations/projections/putp6.rst index 68d36ca1..94683ace 100644 --- a/docs/source/operations/projections/putp6.rst +++ b/docs/source/operations/projections/putp6.rst @@ -5,6 +5,6 @@ Putnins P6 ******************************************************************************** .. image:: ./images/putp6.png - :scale: 100% + :scale: 50% :alt: Putnins P6 diff --git a/docs/source/operations/projections/putp6p.rst b/docs/source/operations/projections/putp6p.rst index 2a01ddd1..8c3add71 100644 --- a/docs/source/operations/projections/putp6p.rst +++ b/docs/source/operations/projections/putp6p.rst @@ -5,6 +5,6 @@ Putnins P6' ******************************************************************************** .. image:: ./images/putp6p.png - :scale: 100% + :scale: 50% :alt: Putnins P6' diff --git a/docs/source/operations/projections/qsc.rst b/docs/source/operations/projections/qsc.rst index 6cfb76cb..56d4ea3f 100644 --- a/docs/source/operations/projections/qsc.rst +++ b/docs/source/operations/projections/qsc.rst @@ -114,32 +114,32 @@ The resulting images can be laid out in a grid like below. .. |topside| image:: ../../../images/qsc_topside.jpg - :scale: 100% + :scale: 50% :align: middle :alt: Top side .. |leftside| image:: ../../../images/qsc_leftside.jpg - :scale: 100% + :scale: 50% :align: middle :alt: Left side .. |frontside| image:: ../../../images/qsc_frontside.jpg - :scale: 100% + :scale: 50% :align: middle :alt: Front side .. |rightside| image:: ../../../images/qsc_rightside.jpg - :scale: 100% + :scale: 50% :align: middle :alt: Right side .. |backside| image:: ../../../images/qsc_backside.jpg - :scale: 100% + :scale: 50% :align: middle :alt: Back side .. |bottomside| image:: ../../../images/qsc_bottomside.jpg - :scale: 100% + :scale: 50% :align: middle :alt: Bottom side diff --git a/docs/source/operations/projections/qua_aut.rst b/docs/source/operations/projections/qua_aut.rst index 514b465a..d3a0aece 100644 --- a/docs/source/operations/projections/qua_aut.rst +++ b/docs/source/operations/projections/qua_aut.rst @@ -5,6 +5,6 @@ Quartic Authalic ******************************************************************************** .. image:: ./images/qua_aut.png - :scale: 100% + :scale: 50% :alt: Quartic Authalic diff --git a/docs/source/operations/projections/robin.rst b/docs/source/operations/projections/robin.rst index a5ad9cf1..3e58be46 100644 --- a/docs/source/operations/projections/robin.rst +++ b/docs/source/operations/projections/robin.rst @@ -5,6 +5,6 @@ Robinson ******************************************************************************** .. image:: ./images/robin.png - :scale: 100% + :scale: 50% :alt: Robinson diff --git a/docs/source/operations/projections/rouss.rst b/docs/source/operations/projections/rouss.rst index a6e95ee5..e27fb1cf 100644 --- a/docs/source/operations/projections/rouss.rst +++ b/docs/source/operations/projections/rouss.rst @@ -5,6 +5,6 @@ Roussilhe Stereographic ******************************************************************************** .. image:: ./images/rouss.png - :scale: 100% + :scale: 50% :alt: Roussilhe Stereographic diff --git a/docs/source/operations/projections/rpoly.rst b/docs/source/operations/projections/rpoly.rst index 0e9f4ed6..80e0d640 100644 --- a/docs/source/operations/projections/rpoly.rst +++ b/docs/source/operations/projections/rpoly.rst @@ -5,6 +5,6 @@ Rectangular Polyconic ******************************************************************************** .. image:: ./images/rpoly.png - :scale: 100% + :scale: 50% :alt: Rectangular Polyconic diff --git a/docs/source/operations/projections/sinu.rst b/docs/source/operations/projections/sinu.rst index 762696fd..a7ebd232 100644 --- a/docs/source/operations/projections/sinu.rst +++ b/docs/source/operations/projections/sinu.rst @@ -5,7 +5,7 @@ Sinusoidal (Sanson-Flamsteed) ******************************************************************************** .. image:: ./images/sinu.png - :scale: 100% + :scale: 50% :alt: Sinusoidal (Sanson-Flamsteed) MacBryde and Thomas developed generalized formulas for sever of the diff --git a/docs/source/operations/projections/somerc.rst b/docs/source/operations/projections/somerc.rst index 7584e63b..c572622b 100644 --- a/docs/source/operations/projections/somerc.rst +++ b/docs/source/operations/projections/somerc.rst @@ -5,6 +5,6 @@ Swiss. Obl. Mercator ******************************************************************************** .. image:: ./images/somerc.png - :scale: 100% + :scale: 50% :alt: Swiss. Obl. Mercator diff --git a/docs/source/operations/projections/stere.rst b/docs/source/operations/projections/stere.rst index 01943c3a..d4958ec9 100644 --- a/docs/source/operations/projections/stere.rst +++ b/docs/source/operations/projections/stere.rst @@ -5,6 +5,6 @@ Stereographic ******************************************************************************** .. image:: ./images/stere.png - :scale: 100% + :scale: 50% :alt: Stereographic diff --git a/docs/source/operations/projections/sterea.rst b/docs/source/operations/projections/sterea.rst index f331cf3b..4f2f8727 100644 --- a/docs/source/operations/projections/sterea.rst +++ b/docs/source/operations/projections/sterea.rst @@ -5,6 +5,6 @@ Oblique Stereographic Alternative ******************************************************************************** .. image:: ./images/sterea.png - :scale: 100% + :scale: 50% :alt: Oblique Stereographic Alternative diff --git a/docs/source/operations/projections/tcc.rst b/docs/source/operations/projections/tcc.rst index 6475fef6..586dd3b8 100644 --- a/docs/source/operations/projections/tcc.rst +++ b/docs/source/operations/projections/tcc.rst @@ -5,6 +5,6 @@ Transverse Central Cylindrical ******************************************************************************** .. image:: ./images/tcc.png - :scale: 100% + :scale: 50% :alt: Transverse Central Cylindrical diff --git a/docs/source/operations/projections/tcea.rst b/docs/source/operations/projections/tcea.rst index 7516388e..cf5549a3 100644 --- a/docs/source/operations/projections/tcea.rst +++ b/docs/source/operations/projections/tcea.rst @@ -5,6 +5,6 @@ Transverse Cylindrical Equal Area ******************************************************************************** .. image:: ./images/tcea.png - :scale: 100% + :scale: 50% :alt: Transverse Cylindrical Equal Area diff --git a/docs/source/operations/projections/tissot.rst b/docs/source/operations/projections/tissot.rst index 73e3a185..7ec1a741 100644 --- a/docs/source/operations/projections/tissot.rst +++ b/docs/source/operations/projections/tissot.rst @@ -5,6 +5,6 @@ Tissot ******************************************************************************** .. image:: ./images/tissot.png - :scale: 100% + :scale: 50% :alt: Tissot diff --git a/docs/source/operations/projections/tmerc.rst b/docs/source/operations/projections/tmerc.rst index 20279dbc..cd864d13 100644 --- a/docs/source/operations/projections/tmerc.rst +++ b/docs/source/operations/projections/tmerc.rst @@ -26,7 +26,7 @@ The transverse Mercator projection in its various forms is the most widely used .. image:: ./images/tmerc.png - :scale: 100% + :scale: 50% :alt: Transverse Mercator Usage diff --git a/docs/source/operations/projections/tpeqd.rst b/docs/source/operations/projections/tpeqd.rst index 884b0620..e6d7ef29 100644 --- a/docs/source/operations/projections/tpeqd.rst +++ b/docs/source/operations/projections/tpeqd.rst @@ -5,6 +5,6 @@ Two Point Equidistant ******************************************************************************** .. image:: ./images/tpeqd.png - :scale: 100% + :scale: 50% :alt: Two Point Equidistant diff --git a/docs/source/operations/projections/tpers.rst b/docs/source/operations/projections/tpers.rst index 79ef02cb..1d36b07c 100644 --- a/docs/source/operations/projections/tpers.rst +++ b/docs/source/operations/projections/tpers.rst @@ -22,7 +22,7 @@ Tilted perspective .. image:: ./images/tpers.png - :scale: 100% + :scale: 50% :alt: Tilted perspective diff --git a/docs/source/operations/projections/ups.rst b/docs/source/operations/projections/ups.rst index be99c946..7a9ab50b 100644 --- a/docs/source/operations/projections/ups.rst +++ b/docs/source/operations/projections/ups.rst @@ -5,6 +5,6 @@ Universal Polar Stereographic ******************************************************************************** .. image:: ./images/ups.png - :scale: 100% + :scale: 50% :alt: Universal Polar Stereographic diff --git a/docs/source/operations/projections/urm5.rst b/docs/source/operations/projections/urm5.rst index fe84259b..91d06308 100644 --- a/docs/source/operations/projections/urm5.rst +++ b/docs/source/operations/projections/urm5.rst @@ -5,6 +5,6 @@ Urmaev V ******************************************************************************** .. image:: ./images/urm5.png - :scale: 100% + :scale: 50% :alt: Urmaev V diff --git a/docs/source/operations/projections/urmfps.rst b/docs/source/operations/projections/urmfps.rst index eca1d328..515ced84 100644 --- a/docs/source/operations/projections/urmfps.rst +++ b/docs/source/operations/projections/urmfps.rst @@ -5,6 +5,6 @@ Urmaev Flat-Polar Sinusoidal ******************************************************************************** .. image:: ./images/urmfps.png - :scale: 100% + :scale: 50% :alt: Urmaev Flat-Polar Sinusoidal diff --git a/docs/source/operations/projections/utm.rst b/docs/source/operations/projections/utm.rst index d26b57e1..7fb66cb8 100644 --- a/docs/source/operations/projections/utm.rst +++ b/docs/source/operations/projections/utm.rst @@ -5,6 +5,6 @@ Universal Transverse Mercator (UTM) ******************************************************************************** .. image:: ./images/utm.png - :scale: 100% + :scale: 50% :alt: Universal Transverse Mercator (UTM) diff --git a/docs/source/operations/projections/vandg.rst b/docs/source/operations/projections/vandg.rst index 9acbe720..cdc772bb 100644 --- a/docs/source/operations/projections/vandg.rst +++ b/docs/source/operations/projections/vandg.rst @@ -5,6 +5,6 @@ van der Grinten (I) ******************************************************************************** .. image:: ./images/vandg.png - :scale: 100% + :scale: 50% :alt: van der Grinten (I) diff --git a/docs/source/operations/projections/vandg2.rst b/docs/source/operations/projections/vandg2.rst index cc8f11ca..556929e2 100644 --- a/docs/source/operations/projections/vandg2.rst +++ b/docs/source/operations/projections/vandg2.rst @@ -5,6 +5,6 @@ van der Grinten II ******************************************************************************** .. image:: ./images/vandg2.png - :scale: 100% + :scale: 50% :alt: van der Grinten II diff --git a/docs/source/operations/projections/vandg3.rst b/docs/source/operations/projections/vandg3.rst index 4c2cb860..d767c4d5 100644 --- a/docs/source/operations/projections/vandg3.rst +++ b/docs/source/operations/projections/vandg3.rst @@ -5,6 +5,6 @@ van der Grinten III ******************************************************************************** .. image:: ./images/vandg3.png - :scale: 100% + :scale: 50% :alt: van der Grinten III diff --git a/docs/source/operations/projections/vandg4.rst b/docs/source/operations/projections/vandg4.rst index 8b350710..097ba1d8 100644 --- a/docs/source/operations/projections/vandg4.rst +++ b/docs/source/operations/projections/vandg4.rst @@ -5,6 +5,6 @@ van der Grinten IV ******************************************************************************** .. image:: ./images/vandg4.png - :scale: 100% + :scale: 50% :alt: van der Grinten IV diff --git a/docs/source/operations/projections/vitk1.rst b/docs/source/operations/projections/vitk1.rst index 6470ef55..b9081547 100644 --- a/docs/source/operations/projections/vitk1.rst +++ b/docs/source/operations/projections/vitk1.rst @@ -5,6 +5,6 @@ Vitkovsky I ******************************************************************************** .. image:: ./images/vitk1.png - :scale: 100% + :scale: 50% :alt: Vitkovsky I diff --git a/docs/source/operations/projections/wag1.rst b/docs/source/operations/projections/wag1.rst index d085391c..dd1ed39e 100644 --- a/docs/source/operations/projections/wag1.rst +++ b/docs/source/operations/projections/wag1.rst @@ -5,6 +5,6 @@ Wagner I (Kavraisky VI) ******************************************************************************** .. image:: ./images/wag1.png - :scale: 100% + :scale: 50% :alt: Wagner I (Kavraisky VI) diff --git a/docs/source/operations/projections/wag2.rst b/docs/source/operations/projections/wag2.rst index 1f0a2682..9c7b0edc 100644 --- a/docs/source/operations/projections/wag2.rst +++ b/docs/source/operations/projections/wag2.rst @@ -5,7 +5,7 @@ Wagner II ******************************************************************************** .. image:: ./images/wag2.png - :scale: 100% + :scale: 50% :alt: Wagner II diff --git a/docs/source/operations/projections/wag3.rst b/docs/source/operations/projections/wag3.rst index 43e89471..fb70a0a6 100644 --- a/docs/source/operations/projections/wag3.rst +++ b/docs/source/operations/projections/wag3.rst @@ -5,7 +5,7 @@ Wagner III ******************************************************************************** .. image:: ./images/wag3.png - :scale: 100% + :scale: 50% :alt: Wagner III diff --git a/docs/source/operations/projections/wag4.rst b/docs/source/operations/projections/wag4.rst index a68e55c4..7b8dac96 100644 --- a/docs/source/operations/projections/wag4.rst +++ b/docs/source/operations/projections/wag4.rst @@ -5,6 +5,6 @@ Wagner IV ******************************************************************************** .. image:: ./images/wag4.png - :scale: 100% + :scale: 50% :alt: Wagner IV diff --git a/docs/source/operations/projections/wag5.rst b/docs/source/operations/projections/wag5.rst index c6753c43..f880290b 100644 --- a/docs/source/operations/projections/wag5.rst +++ b/docs/source/operations/projections/wag5.rst @@ -5,6 +5,6 @@ Wagner V ******************************************************************************** .. image:: ./images/wag5.png - :scale: 100% + :scale: 50% :alt: Wagner V diff --git a/docs/source/operations/projections/wag6.rst b/docs/source/operations/projections/wag6.rst index cf714133..f74749a5 100644 --- a/docs/source/operations/projections/wag6.rst +++ b/docs/source/operations/projections/wag6.rst @@ -5,6 +5,6 @@ Wagner VI ******************************************************************************** .. image:: ./images/wag6.png - :scale: 100% + :scale: 50% :alt: Wagner VI diff --git a/docs/source/operations/projections/wag7.rst b/docs/source/operations/projections/wag7.rst index cb3fc06f..be1401b8 100644 --- a/docs/source/operations/projections/wag7.rst +++ b/docs/source/operations/projections/wag7.rst @@ -5,6 +5,6 @@ Wagner VII ******************************************************************************** .. image:: ./images/wag7.png - :scale: 100% + :scale: 50% :alt: Wagner VII diff --git a/docs/source/operations/projections/weren.rst b/docs/source/operations/projections/weren.rst index 01fdb290..de7c5abf 100644 --- a/docs/source/operations/projections/weren.rst +++ b/docs/source/operations/projections/weren.rst @@ -5,6 +5,6 @@ Werenskiold I ******************************************************************************** .. image:: ./images/weren.png - :scale: 100% + :scale: 50% :alt: Werenskiold I diff --git a/docs/source/operations/projections/wink1.rst b/docs/source/operations/projections/wink1.rst index 5f7c877b..00346765 100644 --- a/docs/source/operations/projections/wink1.rst +++ b/docs/source/operations/projections/wink1.rst @@ -5,6 +5,6 @@ Winkel I ******************************************************************************** .. image:: ./images/wink1.png - :scale: 100% + :scale: 50% :alt: Winkel I diff --git a/docs/source/operations/projections/wink2.rst b/docs/source/operations/projections/wink2.rst index 41f100c1..7e9b48a7 100644 --- a/docs/source/operations/projections/wink2.rst +++ b/docs/source/operations/projections/wink2.rst @@ -5,6 +5,6 @@ Winkel II ******************************************************************************** .. image:: ./images/wink2.png - :scale: 100% + :scale: 50% :alt: Winkel II diff --git a/docs/source/operations/projections/wintri.rst b/docs/source/operations/projections/wintri.rst index 270cb69c..bfd5032f 100644 --- a/docs/source/operations/projections/wintri.rst +++ b/docs/source/operations/projections/wintri.rst @@ -5,6 +5,6 @@ Winkel Tripel ******************************************************************************** .. image:: ./images/wintri.png - :scale: 100% + :scale: 50% :alt: Winkel Tripel -- cgit v1.2.3 From 08c91d2c3231b5603602b748be4f9a2e842ffafa Mon Sep 17 00:00:00 2001 From: Kurt Schwehr Date: Tue, 15 May 2018 00:02:49 -0700 Subject: IWYU: Partial PJ_aitoff.c..PJ_goode.c --- src/PJ_aitoff.c | 7 ++++--- src/PJ_august.c | 5 +++-- src/PJ_crast.c | 5 +++-- src/PJ_denoy.c | 5 +++-- src/PJ_eck1.c | 4 ++-- src/PJ_eck2.c | 5 +++-- src/PJ_eck3.c | 4 +++- src/PJ_eck4.c | 6 ++++-- src/PJ_eck5.c | 4 +++- src/PJ_eqc.c | 5 +++-- src/PJ_eqdc.c | 5 +++-- src/PJ_fahey.c | 4 +++- src/PJ_fouc_s.c | 5 +++-- src/PJ_gall.c | 5 +++-- src/PJ_geoc.c | 4 +++- src/PJ_geos.c | 5 +++-- src/PJ_gn_sinu.c | 4 +++- src/PJ_gnom.c | 4 +++- src/PJ_goode.c | 5 +++-- 19 files changed, 58 insertions(+), 33 deletions(-) diff --git a/src/PJ_aitoff.c b/src/PJ_aitoff.c index 89035f3a..82c981d5 100644 --- a/src/PJ_aitoff.c +++ b/src/PJ_aitoff.c @@ -29,8 +29,11 @@ *****************************************************************************/ #define PJ_LIB__ -#include "proj.h" + #include +#include + +#include "proj.h" #include "projects.h" @@ -192,5 +195,3 @@ PJ *PROJECTION(wintri) { Q->cosphi1 = 0.636619772367581343; return setup(P); } - - diff --git a/src/PJ_august.c b/src/PJ_august.c index ba9ea5cd..4c197114 100644 --- a/src/PJ_august.c +++ b/src/PJ_august.c @@ -1,6 +1,8 @@ #define PJ_LIB__ -#include "projects.h" +#include + +#include "projects.h" PROJ_HEAD(august, "August Epicycloidal") "\n\tMisc Sph, no inv."; #define M 1.333333333333333 @@ -30,4 +32,3 @@ PJ *PROJECTION(august) { P->es = 0.; return P; } - diff --git a/src/PJ_crast.c b/src/PJ_crast.c index dec22faf..6db617d0 100644 --- a/src/PJ_crast.c +++ b/src/PJ_crast.c @@ -1,5 +1,7 @@ #define PJ_LIB__ -# include "projects.h" +#include + +#include "projects.h" PROJ_HEAD(crast, "Craster Parabolic (Putnins P4)") "\n\tPCyl., Sph."; @@ -36,4 +38,3 @@ PJ *PROJECTION(crast) { return P; } - diff --git a/src/PJ_denoy.c b/src/PJ_denoy.c index a5fc2fe7..64de1f9f 100644 --- a/src/PJ_denoy.c +++ b/src/PJ_denoy.c @@ -1,5 +1,7 @@ #define PJ_LIB__ -#include "projects.h" +#include + +#include "projects.h" PROJ_HEAD(denoy, "Denoyer Semi-Elliptical") "\n\tPCyl., no inv., Sph."; @@ -28,4 +30,3 @@ PJ *PROJECTION(denoy) { return P; } - diff --git a/src/PJ_eck1.c b/src/PJ_eck1.c index 4a9ac06b..069aa185 100644 --- a/src/PJ_eck1.c +++ b/src/PJ_eck1.c @@ -1,4 +1,6 @@ #define PJ_LIB__ +#include + #include "projects.h" PROJ_HEAD(eck1, "Eckert I") "\n\tPCyl., Sph."; @@ -37,5 +39,3 @@ PJ *PROJECTION(eck1) { return P ; } - - diff --git a/src/PJ_eck2.c b/src/PJ_eck2.c index b87f3d97..e9ef1229 100644 --- a/src/PJ_eck2.c +++ b/src/PJ_eck2.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "proj.h" #include "projects.h" @@ -51,5 +54,3 @@ PJ *PROJECTION(eck2) { return P; } - - diff --git a/src/PJ_eck3.c b/src/PJ_eck3.c index 21353be2..674f6919 100644 --- a/src/PJ_eck3.c +++ b/src/PJ_eck3.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" PROJ_HEAD(eck3, "Eckert III") "\n\tPCyl, Sph."; @@ -105,4 +108,3 @@ PJ *PROJECTION(putp1) { return setup(P); } - diff --git a/src/PJ_eck4.c b/src/PJ_eck4.c index 7cd24720..367d9cc9 100644 --- a/src/PJ_eck4.c +++ b/src/PJ_eck4.c @@ -1,5 +1,8 @@ #define PJ_LIB__ -#include "projects.h" + +#include + +#include "projects.h" PROJ_HEAD(eck4, "Eckert IV") "\n\tPCyl, Sph."; @@ -58,4 +61,3 @@ PJ *PROJECTION(eck4) { return P; } - diff --git a/src/PJ_eck5.c b/src/PJ_eck5.c index 34a258ee..275430d8 100644 --- a/src/PJ_eck5.c +++ b/src/PJ_eck5.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(eck5, "Eckert V") "\n\tPCyl, Sph."; @@ -35,4 +38,3 @@ PJ *PROJECTION(eck5) { return P; } - diff --git a/src/PJ_eqc.c b/src/PJ_eqc.c index 9c80f82f..86845aa3 100644 --- a/src/PJ_eqc.c +++ b/src/PJ_eqc.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -47,5 +50,3 @@ PJ *PROJECTION(eqc) { return P; } - - diff --git a/src/PJ_eqdc.c b/src/PJ_eqdc.c index 5f65e7d0..8caca87a 100644 --- a/src/PJ_eqdc.c +++ b/src/PJ_eqdc.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" #include "proj_math.h" @@ -115,5 +118,3 @@ PJ *PROJECTION(eqdc) { return P; } - - diff --git a/src/PJ_fahey.c b/src/PJ_fahey.c index 90ed691f..18be5ea0 100644 --- a/src/PJ_fahey.c +++ b/src/PJ_fahey.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(fahey, "Fahey") "\n\tPcyl, Sph."; @@ -36,4 +39,3 @@ PJ *PROJECTION(fahey) { return P; } - diff --git a/src/PJ_fouc_s.c b/src/PJ_fouc_s.c index 87526265..10bd1765 100644 --- a/src/PJ_fouc_s.c +++ b/src/PJ_fouc_s.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -65,5 +68,3 @@ PJ *PROJECTION(fouc_s) { P->fwd = s_forward; return P; } - - diff --git a/src/PJ_gall.c b/src/PJ_gall.c index ca8a1bcb..a8697482 100644 --- a/src/PJ_gall.c +++ b/src/PJ_gall.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(gall, "Gall (Gall Stereographic)") "\n\tCyl, Sph"; @@ -39,5 +42,3 @@ PJ *PROJECTION(gall) { return P; } - - diff --git a/src/PJ_geoc.c b/src/PJ_geoc.c index e7a7abf1..bed0db49 100644 --- a/src/PJ_geoc.c +++ b/src/PJ_geoc.c @@ -27,8 +27,10 @@ *****************************************************************************/ #define PJ_LIB__ + +#include + #include "proj.h" -#include #include "projects.h" PROJ_HEAD(geoc, "Geocentric Latitude"); diff --git a/src/PJ_geos.c b/src/PJ_geos.c index 774a34a9..0eb25610 100644 --- a/src/PJ_geos.c +++ b/src/PJ_geos.c @@ -29,6 +29,9 @@ #define PJ_LIB__ #include +#include +#include + #include "proj.h" #include "projects.h" #include "proj_math.h" @@ -231,5 +234,3 @@ PJ *PROJECTION(geos) { return P; } - - diff --git a/src/PJ_gn_sinu.c b/src/PJ_gn_sinu.c index 36f438e7..21cba308 100644 --- a/src/PJ_gn_sinu.c +++ b/src/PJ_gn_sinu.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -182,4 +185,3 @@ PJ *PROJECTION(gn_sinu) { return P; } - diff --git a/src/PJ_gnom.c b/src/PJ_gnom.c index b4bab0e2..9c2c7106 100644 --- a/src/PJ_gnom.c +++ b/src/PJ_gnom.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" #include "proj_math.h" @@ -138,4 +141,3 @@ PJ *PROJECTION(gnom) { return P; } - diff --git a/src/PJ_goode.c b/src/PJ_goode.c index 65761c4b..4f299b54 100644 --- a/src/PJ_goode.c +++ b/src/PJ_goode.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -77,5 +80,3 @@ PJ *PROJECTION(goode) { return P; } - - -- cgit v1.2.3 From 4080bd2477c76a528394e752ee7796fdf87db07e Mon Sep 17 00:00:00 2001 From: Kurt Schwehr Date: Tue, 15 May 2018 07:25:25 -0700 Subject: IWYU: Partial PJ_gstmerc.c..PJ_molodensky.c --- src/PJ_gstmerc.c | 4 +++- src/PJ_hammer.c | 4 +++- src/PJ_hatano.c | 4 +++- src/PJ_healpix.c | 15 ++++++++------- src/PJ_helmert.c | 6 ++++-- src/PJ_hgridshift.c | 4 +++- src/PJ_horner.c | 13 ++++++++----- src/PJ_igh.c | 5 +++-- src/PJ_imw_p.c | 4 +++- src/PJ_isea.c | 3 ++- src/PJ_krovak.c | 5 +++-- src/PJ_labrd.c | 4 +++- src/PJ_lagrng.c | 4 +++- src/PJ_larr.c | 4 +++- src/PJ_lcca.c | 4 +++- src/PJ_loxim.c | 4 +++- src/PJ_lsat.c | 4 +++- src/PJ_mbt_fps.c | 4 +++- src/PJ_mbtfpp.c | 4 +++- src/PJ_mbtfpq.c | 4 +++- src/PJ_merc.c | 5 ++++- src/PJ_mill.c | 4 +++- src/PJ_misrsom.c | 4 +++- src/PJ_moll.c | 4 +++- src/PJ_molodensky.c | 4 +++- 25 files changed, 86 insertions(+), 38 deletions(-) diff --git a/src/PJ_gstmerc.c b/src/PJ_gstmerc.c index 81ec4e17..5b5109b0 100644 --- a/src/PJ_gstmerc.c +++ b/src/PJ_gstmerc.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" PROJ_HEAD(gstmerc, "Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion)") @@ -67,4 +70,3 @@ PJ *PROJECTION(gstmerc) { return P; } - diff --git a/src/PJ_hammer.c b/src/PJ_hammer.c index e7546ac0..f3e0d64e 100644 --- a/src/PJ_hammer.c +++ b/src/PJ_hammer.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -70,4 +73,3 @@ PJ *PROJECTION(hammer) { return P; } - diff --git a/src/PJ_hatano.c b/src/PJ_hatano.c index 985bf0cc..4e852888 100644 --- a/src/PJ_hatano.c +++ b/src/PJ_hatano.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "proj.h" #include "projects.h" @@ -78,4 +81,3 @@ PJ *PROJECTION(hatano) { return P; } - diff --git a/src/PJ_healpix.c b/src/PJ_healpix.c index c3eae14f..d76ca33d 100644 --- a/src/PJ_healpix.c +++ b/src/PJ_healpix.c @@ -28,16 +28,18 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. *****************************************************************************/ -# define PJ_LIB__ -# include -# include "proj_internal.h" -# include "proj.h" -# include "projects.h" +#define PJ_LIB__ + +#include +#include + +#include "proj_internal.h" +#include "proj.h" +#include "projects.h" PROJ_HEAD(healpix, "HEALPix") "\n\tSph., Ellps."; PROJ_HEAD(rhealpix, "rHEALPix") "\n\tSph., Ellps.\n\tnorth_square= south_square="; -# include /* Matrix for counterclockwise rotation by pi/2: */ # define R1 {{ 0,-1},{ 1, 0}} /* Matrix for counterclockwise rotation by pi: */ @@ -668,4 +670,3 @@ PJ *PROJECTION(rhealpix) { return P; } - diff --git a/src/PJ_helmert.c b/src/PJ_helmert.c index 59864136..8ba955bb 100644 --- a/src/PJ_helmert.c +++ b/src/PJ_helmert.c @@ -43,11 +43,14 @@ Last update: 2017-05-15 ***********************************************************************/ #define PJ_LIB__ -#include + #include +#include + #include "proj_internal.h" #include "projects.h" #include "geocent.h" + PROJ_HEAD(helmert, "3(6)-, 4(8)- and 7(14)-parameter Helmert shift"); static XYZ helmert_forward_3d (LPZ lpz, PJ *P); @@ -607,4 +610,3 @@ PJ *TRANSFORMATION(helmert, 0) { return P; } - diff --git a/src/PJ_hgridshift.c b/src/PJ_hgridshift.c index 54440822..3932ef51 100644 --- a/src/PJ_hgridshift.c +++ b/src/PJ_hgridshift.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "proj_internal.h" #include "projects.h" @@ -72,4 +75,3 @@ PJ *TRANSFORMATION(hgridshift,0) { return P; } - diff --git a/src/PJ_horner.c b/src/PJ_horner.c index 24e1cbe9..50e13850 100644 --- a/src/PJ_horner.c +++ b/src/PJ_horner.c @@ -76,13 +76,17 @@ *****************************************************************************/ #define PJ_LIB__ + +#include +#include +#include +#include +#include + #include "proj_internal.h" #include "projects.h" -#include -#include -#include -PROJ_HEAD(horner, "Horner polynomial evaluation"); +PROJ_HEAD(horner, "Horner polynomial evaluation"); /* make horner.h interface with proj's memory management */ #define horner_dealloc(x) pj_dealloc(x) @@ -503,4 +507,3 @@ PJ *PROJECTION(horner) { return P; } - diff --git a/src/PJ_igh.c b/src/PJ_igh.c index bb97a8b5..23614ac5 100644 --- a/src/PJ_igh.c +++ b/src/PJ_igh.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" PROJ_HEAD(igh, "Interrupted Goode Homolosine") "\n\tPCyl, Sph."; @@ -220,5 +223,3 @@ PJ *PROJECTION(igh) { return P; } - - diff --git a/src/PJ_imw_p.c b/src/PJ_imw_p.c index c7939d3e..4c1b5e45 100644 --- a/src/PJ_imw_p.c +++ b/src/PJ_imw_p.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -208,4 +211,3 @@ PJ *PROJECTION(imw_p) { return P; } - diff --git a/src/PJ_isea.c b/src/PJ_isea.c index 53302a5c..b982d11e 100644 --- a/src/PJ_isea.c +++ b/src/PJ_isea.c @@ -3,10 +3,11 @@ * and is in the public domain. */ +#include #include #include #include -#include +#include #ifndef M_PI # define M_PI 3.14159265358979323846 diff --git a/src/PJ_krovak.c b/src/PJ_krovak.c index ef00d715..9b269c88 100644 --- a/src/PJ_krovak.c +++ b/src/PJ_krovak.c @@ -75,9 +75,11 @@ * *****************************************************************************/ - #define PJ_LIB__ + #include +#include + #include "projects.h" PROJ_HEAD(krovak, "Krovak") "\n\tPCyl., Ellps."; @@ -218,4 +220,3 @@ PJ *PROJECTION(krovak) { return P; } - diff --git a/src/PJ_labrd.c b/src/PJ_labrd.c index 16c45a0d..502adf0f 100644 --- a/src/PJ_labrd.c +++ b/src/PJ_labrd.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" PROJ_HEAD(labrd, "Laborde") "\n\tCyl, Sph\n\tSpecial for Madagascar"; @@ -127,4 +130,3 @@ PJ *PROJECTION(labrd) { return P; } - diff --git a/src/PJ_lagrng.c b/src/PJ_lagrng.c index cf6d97d6..d2b53b09 100644 --- a/src/PJ_lagrng.c +++ b/src/PJ_lagrng.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -60,4 +63,3 @@ PJ *PROJECTION(lagrng) { return P; } - diff --git a/src/PJ_larr.c b/src/PJ_larr.c index a8d1af56..e4e39dc9 100644 --- a/src/PJ_larr.c +++ b/src/PJ_larr.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(larr, "Larrivee") "\n\tMisc Sph, no inv."; @@ -23,4 +26,3 @@ PJ *PROJECTION(larr) { return P; } - diff --git a/src/PJ_lcca.c b/src/PJ_lcca.c index efae5c7c..f0f256b1 100644 --- a/src/PJ_lcca.c +++ b/src/PJ_lcca.c @@ -46,7 +46,10 @@ *****************************************************************************/ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -157,4 +160,3 @@ PJ *PROJECTION(lcca) { return P; } - diff --git a/src/PJ_loxim.c b/src/PJ_loxim.c index 36b05b86..512bfc23 100644 --- a/src/PJ_loxim.c +++ b/src/PJ_loxim.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -70,4 +73,3 @@ PJ *PROJECTION(loxim) { return P; } - diff --git a/src/PJ_lsat.c b/src/PJ_lsat.c index 7e1567e1..810a1cba 100644 --- a/src/PJ_lsat.c +++ b/src/PJ_lsat.c @@ -1,6 +1,9 @@ /* based upon Snyder and Linck, USGS-NMD */ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -205,4 +208,3 @@ PJ *PROJECTION(lsat) { return P; } - diff --git a/src/PJ_mbt_fps.c b/src/PJ_mbt_fps.c index 2fccf3aa..b689014f 100644 --- a/src/PJ_mbt_fps.c +++ b/src/PJ_mbt_fps.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(mbt_fps, "McBryde-Thomas Flat-Pole Sine (No. 2)") "\n\tCyl., Sph."; @@ -52,4 +55,3 @@ PJ *PROJECTION(mbt_fps) { return P; } - diff --git a/src/PJ_mbtfpp.c b/src/PJ_mbtfpp.c index 9b90444b..5e5b2d50 100644 --- a/src/PJ_mbtfpp.c +++ b/src/PJ_mbtfpp.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "proj.h" #include "projects.h" @@ -60,4 +63,3 @@ PJ *PROJECTION(mbtfpp) { return P; } - diff --git a/src/PJ_mbtfpq.c b/src/PJ_mbtfpq.c index cff7fbdd..75c71708 100644 --- a/src/PJ_mbtfpq.c +++ b/src/PJ_mbtfpq.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "proj.h" #include "projects.h" @@ -69,4 +72,3 @@ PJ *PROJECTION(mbtfpq) { return P; } - diff --git a/src/PJ_merc.c b/src/PJ_merc.c index 9123eae1..b75f9b11 100644 --- a/src/PJ_merc.c +++ b/src/PJ_merc.c @@ -1,9 +1,12 @@ #define PJ_LIB__ + +#include +#include + #include "proj_internal.h" #include "proj.h" #include "proj_math.h" #include "projects.h" -#include PROJ_HEAD(merc, "Mercator") "\n\tCyl, Sph&Ell\n\tlat_ts="; PROJ_HEAD(webmerc, "Web Mercator / Pseudo Mercator") "\n\tCyl, Sph\n\t"; diff --git a/src/PJ_mill.c b/src/PJ_mill.c index fdb0b2ad..3ea9636f 100644 --- a/src/PJ_mill.c +++ b/src/PJ_mill.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(mill, "Miller Cylindrical") "\n\tCyl, Sph"; @@ -32,4 +35,3 @@ PJ *PROJECTION(mill) { return P; } - diff --git a/src/PJ_misrsom.c b/src/PJ_misrsom.c index b9b97117..0308fc42 100644 --- a/src/PJ_misrsom.c +++ b/src/PJ_misrsom.c @@ -21,7 +21,10 @@ *****************************************************************************/ /* based upon Snyder and Linck, USGS-NMD */ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -212,4 +215,3 @@ PJ *PROJECTION(misrsom) { return P; } - diff --git a/src/PJ_moll.c b/src/PJ_moll.c index 66e6315a..7c0e6f85 100644 --- a/src/PJ_moll.c +++ b/src/PJ_moll.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" PROJ_HEAD(moll, "Mollweide") "\n\tPCyl., Sph."; @@ -105,4 +108,3 @@ PJ *PROJECTION(wag5) { return P; } - diff --git a/src/PJ_molodensky.c b/src/PJ_molodensky.c index 92969d67..2db51038 100644 --- a/src/PJ_molodensky.c +++ b/src/PJ_molodensky.c @@ -43,7 +43,10 @@ * ***********************************************************************/ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "proj_internal.h" #include "projects.h" @@ -311,4 +314,3 @@ PJ *TRANSFORMATION(molodensky,1) { return P; } - -- cgit v1.2.3 From 1e8824517900d37232468b9e3d7f3724e7ffa786 Mon Sep 17 00:00:00 2001 From: Kurt Schwehr Date: Tue, 15 May 2018 13:42:20 -0700 Subject: IWYU: Partial PJ_natearth.c..rtodms.c --- src/PJ_natearth.c | 4 +++- src/PJ_natearth2.c | 4 +++- src/PJ_nell.c | 4 +++- src/PJ_nell_h.c | 4 +++- src/PJ_nocol.c | 4 +++- src/PJ_nzmg.c | 4 +++- src/PJ_ob_tran.c | 6 ++++-- src/PJ_ocea.c | 4 +++- src/PJ_omerc.c | 4 +++- src/PJ_patterson.c | 4 +++- src/PJ_pipeline.c | 8 ++++++-- src/PJ_poly.c | 4 +++- src/PJ_putp2.c | 4 +++- src/PJ_putp4p.c | 4 +++- src/PJ_putp5.c | 4 +++- src/PJ_putp6.c | 4 +++- src/PJ_qsc.c | 4 +++- src/PJ_rpoly.c | 4 +++- src/PJ_sch.c | 4 +++- src/PJ_somerc.c | 4 +++- src/PJ_sts.c | 4 +++- src/PJ_tcc.c | 4 +++- src/PJ_tcea.c | 6 ++++-- src/PJ_times.c | 4 +++- src/PJ_tmerc.c | 4 +++- src/PJ_unitconvert.c | 6 +++++- src/PJ_urm5.c | 4 +++- src/PJ_urmfps.c | 4 +++- src/PJ_vandg2.c | 4 +++- src/PJ_vandg4.c | 4 +++- src/PJ_vgridshift.c | 4 +++- src/PJ_wag2.c | 6 +++++- src/PJ_wag3.c | 6 ++++-- src/PJ_wag7.c | 6 ++++-- src/PJ_wink1.c | 6 ++++-- src/PJ_wink2.c | 6 ++++-- src/aasincos.c | 40 ++++++++++++++++++++++------------------ src/cs2cs.c | 11 ++++++----- src/dmstor.c | 8 ++++++-- src/emess.c | 6 ++++-- src/geod_set.c | 5 ++++- src/gie.c | 1 + src/nad_cvt.c | 5 +++++ src/nad_init.c | 7 +++++-- src/pj_apply_gridshift.c | 4 +++- src/pj_apply_vgridshift.c | 3 ++- src/pj_auth.c | 6 ++++++ src/pj_ctx.c | 6 ++++-- src/pj_datum_set.c | 3 ++- src/pj_datums.c | 2 ++ src/pj_deriv.c | 3 +++ src/pj_ell_set.c | 5 ++++- src/pj_ellps.c | 2 ++ src/pj_fileapi.c | 6 +++++- src/pj_fwd.c | 2 ++ src/pj_gauss.c | 4 ++++ src/pj_gc_reader.c | 8 +++++--- src/pj_gridcatalog.c | 7 +++++-- src/pj_gridinfo.c | 10 +++++++--- src/pj_gridlist.c | 5 +++-- src/pj_init.c | 12 +++++++----- src/pj_initcache.c | 5 +++-- src/pj_internal.c | 8 ++++++-- src/pj_inv.c | 1 + src/pj_log.c | 7 +++++-- src/pj_malloc.c | 7 +++++-- src/pj_mlfn.c | 3 +++ src/pj_open_lib.c | 10 +++++++--- src/pj_param.c | 3 +++ src/pj_pr_list.c | 6 +++++- src/pj_strerrno.c | 4 +++- src/pj_strtod.c | 10 +++++----- src/pj_transform.c | 5 +++-- src/pj_units.c | 2 ++ src/pj_utils.c | 5 +++-- src/proj_4D_api.c | 8 ++++++-- src/proj_api.h | 19 ++++++++++--------- src/proj_etmerc.c | 3 +-- src/proj_internal.h | 2 ++ src/proj_mdist.c | 5 +++++ src/proj_rouss.c | 4 +++- src/rtodms.c | 7 ++++++- 82 files changed, 327 insertions(+), 132 deletions(-) diff --git a/src/PJ_natearth.c b/src/PJ_natearth.c index 10abb23c..df015222 100644 --- a/src/PJ_natearth.c +++ b/src/PJ_natearth.c @@ -13,6 +13,9 @@ and designed in collaboration with Tom Patterson. Port to PROJ.4 by Bernhard Jenny, 6 June 2011 */ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(natearth, "Natural Earth") "\n\tPCyl., Sph."; @@ -95,4 +98,3 @@ PJ *PROJECTION(natearth) { return P; } - diff --git a/src/PJ_natearth2.c b/src/PJ_natearth2.c index dbdc8fed..0498f186 100644 --- a/src/PJ_natearth2.c +++ b/src/PJ_natearth2.c @@ -6,6 +6,9 @@ and Atmospheric Sciences, Oregon State University. Port to PROJ.4 by Bojan Savric, 4 April 2016 */ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(natearth2, "Natural Earth 2") "\n\tPCyl., Sph."; @@ -92,4 +95,3 @@ PJ *PROJECTION(natearth2) { return P; } - diff --git a/src/PJ_nell.c b/src/PJ_nell.c index 51f9f99a..751c01c8 100644 --- a/src/PJ_nell.c +++ b/src/PJ_nell.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(nell, "Nell") "\n\tPCyl., Sph."; @@ -46,4 +49,3 @@ PJ *PROJECTION(nell) { return P; } - diff --git a/src/PJ_nell_h.c b/src/PJ_nell_h.c index 24957786..db9e9de0 100644 --- a/src/PJ_nell_h.c +++ b/src/PJ_nell_h.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(nell_h, "Nell-Hammer") "\n\tPCyl., Sph."; @@ -48,4 +51,3 @@ PJ *PROJECTION(nell_h) { return P; } - diff --git a/src/PJ_nocol.c b/src/PJ_nocol.c index 13688a9f..93e128ea 100644 --- a/src/PJ_nocol.c +++ b/src/PJ_nocol.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(nicol, "Nicolosi Globular") "\n\tMisc Sph, no inv."; @@ -49,4 +52,3 @@ PJ *PROJECTION(nicol) { return P; } - diff --git a/src/PJ_nzmg.c b/src/PJ_nzmg.c index b30deabf..bf0862fb 100644 --- a/src/PJ_nzmg.c +++ b/src/PJ_nzmg.c @@ -26,6 +26,9 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(nzmg, "New Zealand Map Grid") "\n\tfixed Earth"; @@ -118,4 +121,3 @@ PJ *PROJECTION(nzmg) { return P; } - diff --git a/src/PJ_ob_tran.c b/src/PJ_ob_tran.c index 8b13eb65..f5a05cf9 100644 --- a/src/PJ_ob_tran.c +++ b/src/PJ_ob_tran.c @@ -1,8 +1,11 @@ #define PJ_LIB__ #include +#include +#include +#include + #include "proj.h" #include "projects.h" -#include struct pj_opaque { struct PJconsts *link; @@ -238,4 +241,3 @@ PJ *PROJECTION(ob_tran) { return P; } - diff --git a/src/PJ_ocea.c b/src/PJ_ocea.c index 4bd120e1..7a9353a6 100644 --- a/src/PJ_ocea.c +++ b/src/PJ_ocea.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" PROJ_HEAD(ocea, "Oblique Cylindrical Equal Area") "\n\tCyl, Sph" @@ -95,4 +98,3 @@ PJ *PROJECTION(ocea) { return P; } - diff --git a/src/PJ_omerc.c b/src/PJ_omerc.c index 32bf5c14..70c12e27 100644 --- a/src/PJ_omerc.c +++ b/src/PJ_omerc.c @@ -22,7 +22,10 @@ ** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -222,4 +225,3 @@ PJ *PROJECTION(omerc) { return P; } - diff --git a/src/PJ_patterson.c b/src/PJ_patterson.c index e58b49bd..a15c730f 100644 --- a/src/PJ_patterson.c +++ b/src/PJ_patterson.c @@ -39,6 +39,9 @@ */ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(patterson, "Patterson Cylindrical") "\n\tCyl."; @@ -112,4 +115,3 @@ PJ *PROJECTION(patterson) { return P; } - diff --git a/src/PJ_pipeline.c b/src/PJ_pipeline.c index 4f42faed..d623423b 100644 --- a/src/PJ_pipeline.c +++ b/src/PJ_pipeline.c @@ -95,13 +95,17 @@ Thomas Knudsen, thokn@sdfe.dk, 2016-05-20 ********************************************************************************/ #define PJ_LIB__ + +#include +#include +#include +#include + #include "geodesic.h" #include "proj.h" #include "proj_internal.h" #include "projects.h" -#include -#include PROJ_HEAD(pipeline, "Transformation pipeline manager"); /* Projection specific elements for the PJ object */ diff --git a/src/PJ_poly.c b/src/PJ_poly.c index 7cf8bce1..03fa84a4 100644 --- a/src/PJ_poly.c +++ b/src/PJ_poly.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -163,4 +166,3 @@ PJ *PROJECTION(poly) { return P; } - diff --git a/src/PJ_putp2.c b/src/PJ_putp2.c index 51cf263d..0b4397e5 100644 --- a/src/PJ_putp2.c +++ b/src/PJ_putp2.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(putp2, "Putnins P2") "\n\tPCyl., Sph."; @@ -56,4 +59,3 @@ PJ *PROJECTION(putp2) { return P; } - diff --git a/src/PJ_putp4p.c b/src/PJ_putp4p.c index 958f9681..b716060a 100644 --- a/src/PJ_putp4p.c +++ b/src/PJ_putp4p.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" struct pj_opaque { @@ -69,4 +72,3 @@ PJ *PROJECTION(weren) { return P; } - diff --git a/src/PJ_putp5.c b/src/PJ_putp5.c index 14bfea23..6836f71d 100644 --- a/src/PJ_putp5.c +++ b/src/PJ_putp5.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" struct pj_opaque { @@ -68,4 +71,3 @@ PJ *PROJECTION(putp5p) { return P; } - diff --git a/src/PJ_putp6.c b/src/PJ_putp6.c index 938cef09..68c10701 100644 --- a/src/PJ_putp6.c +++ b/src/PJ_putp6.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" struct pj_opaque { @@ -90,4 +93,3 @@ PJ *PROJECTION(putp6p) { return P; } - diff --git a/src/PJ_qsc.c b/src/PJ_qsc.c index 0f5d2299..4b463b46 100644 --- a/src/PJ_qsc.c +++ b/src/PJ_qsc.c @@ -39,7 +39,10 @@ */ #define PJ_LIB__ + #include +#include + #include "projects.h" /* The six cube faces. */ @@ -397,4 +400,3 @@ PJ *PROJECTION(qsc) { return P; } - diff --git a/src/PJ_rpoly.c b/src/PJ_rpoly.c index d7241719..57c4fc92 100644 --- a/src/PJ_rpoly.c +++ b/src/PJ_rpoly.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" struct pj_opaque { @@ -51,4 +54,3 @@ PJ *PROJECTION(rpoly) { return P; } - diff --git a/src/PJ_sch.c b/src/PJ_sch.c index e9e67ff8..64e5cdb8 100644 --- a/src/PJ_sch.c +++ b/src/PJ_sch.c @@ -31,7 +31,10 @@ ****************************************************************************/ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" #include "geocent.h" @@ -225,4 +228,3 @@ PJ *PROJECTION(sch) { return setup(P); } - diff --git a/src/PJ_somerc.c b/src/PJ_somerc.c index 02df5868..c6c3ff21 100644 --- a/src/PJ_somerc.c +++ b/src/PJ_somerc.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -87,4 +90,3 @@ PJ *PROJECTION(somerc) { P->fwd = e_forward; return P; } - diff --git a/src/PJ_sts.c b/src/PJ_sts.c index d8866b66..8409d86a 100644 --- a/src/PJ_sts.c +++ b/src/PJ_sts.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" PROJ_HEAD(kav5, "Kavraisky V") "\n\tPCyl., Sph."; @@ -102,4 +105,3 @@ PJ *PROJECTION(mbt_s) { P->opaque = Q; return setup(P, 1.48875, 1.36509, 0); } - diff --git a/src/PJ_tcc.c b/src/PJ_tcc.c index c355a602..14255325 100644 --- a/src/PJ_tcc.c +++ b/src/PJ_tcc.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "proj.h" #include "projects.h" @@ -29,4 +32,3 @@ PJ *PROJECTION(tcc) { return P; } - diff --git a/src/PJ_tcea.c b/src/PJ_tcea.c index 415b42de..d30f3df0 100644 --- a/src/PJ_tcea.c +++ b/src/PJ_tcea.c @@ -1,5 +1,8 @@ #define PJ_LIB__ -#include "projects.h" + +#include + +#include "projects.h" PROJ_HEAD(tcea, "Transverse Cylindrical Equal Area") "\n\tCyl, Sph"; @@ -31,4 +34,3 @@ PJ *PROJECTION(tcea) { P->es = 0.; return P; } - diff --git a/src/PJ_times.c b/src/PJ_times.c index 18fe7233..e8b4499f 100644 --- a/src/PJ_times.c +++ b/src/PJ_times.c @@ -30,6 +30,9 @@ *****************************************************************************/ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(times, "Times") "\n\tCyl, Sph"; @@ -74,4 +77,3 @@ PJ *PROJECTION(times) { return P; } - diff --git a/src/PJ_tmerc.c b/src/PJ_tmerc.c index f0f34c93..069cdc2c 100644 --- a/src/PJ_tmerc.c +++ b/src/PJ_tmerc.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -203,4 +206,3 @@ PJ *PROJECTION(tmerc) { return setup(P); } - diff --git a/src/PJ_unitconvert.c b/src/PJ_unitconvert.c index a076b76c..5c25a16b 100644 --- a/src/PJ_unitconvert.c +++ b/src/PJ_unitconvert.c @@ -64,8 +64,12 @@ Last update: 2017-05-16 ***********************************************************************/ #define PJ_LIB__ -#include + #include +#include +#include +#include + #include "proj_internal.h" #include "projects.h" diff --git a/src/PJ_urm5.c b/src/PJ_urm5.c index 091fe9d6..416cb866 100644 --- a/src/PJ_urm5.c +++ b/src/PJ_urm5.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -49,4 +52,3 @@ PJ *PROJECTION(urm5) { return P; } - diff --git a/src/PJ_urmfps.c b/src/PJ_urmfps.c index bbceab51..5749059b 100644 --- a/src/PJ_urmfps.c +++ b/src/PJ_urmfps.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -69,4 +72,3 @@ PJ *PROJECTION(wag1) { P->opaque->n = 0.8660254037844386467637231707; return setup(P); } - diff --git a/src/PJ_vandg2.c b/src/PJ_vandg2.c index 81f28a74..20b7601a 100644 --- a/src/PJ_vandg2.c +++ b/src/PJ_vandg2.c @@ -1,5 +1,8 @@ #define PJ_LIB__ + #include +#include + #include "projects.h" struct pj_opaque { @@ -69,4 +72,3 @@ PJ *PROJECTION(vandg3) { return P; } - diff --git a/src/PJ_vandg4.c b/src/PJ_vandg4.c index afffe41f..770594f1 100644 --- a/src/PJ_vandg4.c +++ b/src/PJ_vandg4.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "projects.h" PROJ_HEAD(vandg4, "van der Grinten IV") "\n\tMisc Sph, no inv."; @@ -50,4 +53,3 @@ PJ *PROJECTION(vandg4) { return P; } - diff --git a/src/PJ_vgridshift.c b/src/PJ_vgridshift.c index bb8b4d4d..205806b2 100644 --- a/src/PJ_vgridshift.c +++ b/src/PJ_vgridshift.c @@ -1,4 +1,7 @@ #define PJ_LIB__ + +#include + #include "proj_internal.h" #include "projects.h" @@ -74,4 +77,3 @@ PJ *TRANSFORMATION(vgridshift,0) { return P; } - diff --git a/src/PJ_wag2.c b/src/PJ_wag2.c index 059494d7..d12cade1 100644 --- a/src/PJ_wag2.c +++ b/src/PJ_wag2.c @@ -1,6 +1,11 @@ #define PJ_LIB__ + +#include + #include "projects.h" + PROJ_HEAD(wag2, "Wagner II") "\n\tPCyl., Sph."; + #define C_x 0.92483 #define C_y 1.38725 #define C_p1 0.88022 @@ -31,4 +36,3 @@ PJ *PROJECTION(wag2) { P->fwd = s_forward; return P; } - diff --git a/src/PJ_wag3.c b/src/PJ_wag3.c index 5db1e50f..6ae9ad28 100644 --- a/src/PJ_wag3.c +++ b/src/PJ_wag3.c @@ -1,6 +1,9 @@ #define PJ_LIB__ -#include "projects.h" + #include +#include + +#include "projects.h" PROJ_HEAD(wag3, "Wagner III") "\n\tPCyl., Sph.\n\tlat_ts="; @@ -43,4 +46,3 @@ PJ *PROJECTION(wag3) { return P; } - diff --git a/src/PJ_wag7.c b/src/PJ_wag7.c index a820b2cd..3cd332ad 100644 --- a/src/PJ_wag7.c +++ b/src/PJ_wag7.c @@ -1,5 +1,8 @@ #define PJ_LIB__ -#include "projects.h" + +#include + +#include "projects.h" PROJ_HEAD(wag7, "Wagner VII") "\n\tMisc Sph, no inv."; @@ -25,4 +28,3 @@ PJ *PROJECTION(wag7) { P->es = 0.; return P; } - diff --git a/src/PJ_wink1.c b/src/PJ_wink1.c index f64f97d2..10392fe9 100644 --- a/src/PJ_wink1.c +++ b/src/PJ_wink1.c @@ -1,6 +1,9 @@ #define PJ_LIB__ -#include "projects.h" + #include +#include + +#include "projects.h" PROJ_HEAD(wink1, "Winkel I") "\n\tPCyl., Sph.\n\tlat_ts="; @@ -39,4 +42,3 @@ PJ *PROJECTION(wink1) { return P; } - diff --git a/src/PJ_wink2.c b/src/PJ_wink2.c index d715074e..d02ca567 100644 --- a/src/PJ_wink2.c +++ b/src/PJ_wink2.c @@ -1,6 +1,9 @@ #define PJ_LIB__ -#include "projects.h" + #include +#include + +#include "projects.h" PROJ_HEAD(wink2, "Winkel II") "\n\tPCyl., Sph., no inv.\n\tlat_1="; @@ -47,4 +50,3 @@ PJ *PROJECTION(wink2) { return P; } - diff --git a/src/aasincos.c b/src/aasincos.c index c3915613..4f9ea25f 100644 --- a/src/aasincos.c +++ b/src/aasincos.c @@ -1,34 +1,38 @@ /* arc sin, cosine, tan2 and sqrt that will NOT fail */ + +#include + #include "projects.h" + #define ONE_TOL 1.00000000000001 #define ATOL 1e-50 - double + double aasin(projCtx ctx,double v) { - double av; - - if ((av = fabs(v)) >= 1.) { - if (av > ONE_TOL) + double av; + + if ((av = fabs(v)) >= 1.) { + if (av > ONE_TOL) pj_ctx_set_errno( ctx, PJD_ERR_ACOS_ASIN_ARG_TOO_LARGE ); - return (v < 0. ? -M_HALFPI : M_HALFPI); - } - return asin(v); + return (v < 0. ? -M_HALFPI : M_HALFPI); + } + return asin(v); } - double + double aacos(projCtx ctx, double v) { - double av; + double av; - if ((av = fabs(v)) >= 1.) { - if (av > ONE_TOL) + if ((av = fabs(v)) >= 1.) { + if (av > ONE_TOL) pj_ctx_set_errno( ctx, PJD_ERR_ACOS_ASIN_ARG_TOO_LARGE ); - return (v < 0. ? M_PI : 0.); - } - return acos(v); + return (v < 0. ? M_PI : 0.); + } + return acos(v); } - double + double asqrt(double v) { return ((v <= 0) ? 0. : sqrt(v)); } - double + double aatan2(double n, double d) { - return ((fabs(n) < ATOL && fabs(d) < ATOL) ? 0. : atan2(n,d)); + return ((fabs(n) < ATOL && fabs(d) < ATOL) ? 0. : atan2(n,d)); } diff --git a/src/cs2cs.c b/src/cs2cs.c index de3259d2..167eafa3 100644 --- a/src/cs2cs.c +++ b/src/cs2cs.c @@ -26,15 +26,16 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ -#include "proj.h" -#include "projects.h" +#include +#include +#include #include #include -#include #include -#include + +#include "proj.h" +#include "projects.h" #include "emess.h" -#include #define MAX_LINE 1000 #define MAX_PARGS 100 diff --git a/src/dmstor.c b/src/dmstor.c index 23871a85..d3496cd9 100644 --- a/src/dmstor.c +++ b/src/dmstor.c @@ -1,7 +1,11 @@ /* Convert DMS string to radians */ -#include "projects.h" -#include + #include +#include +#include +#include + +#include "projects.h" static double proj_strtod(char *nptr, char **endptr); diff --git a/src/emess.c b/src/emess.c index a645bac9..330b8412 100644 --- a/src/emess.c +++ b/src/emess.c @@ -9,14 +9,16 @@ # endif #endif +#include +#include #include #include -#include -#include #include + #include "proj_api.h" #define EMESS_ROUTINE #include "emess.h" + void emess(int code, const char *fmt, ...) { va_list args; diff --git a/src/geod_set.c b/src/geod_set.c index 571a7d20..479f18da 100644 --- a/src/geod_set.c +++ b/src/geod_set.c @@ -1,11 +1,14 @@ - #define _IN_GEOD_SET +#include +#include #include + #include "proj.h" #include "projects.h" #include "geod_interface.h" #include "emess.h" + void geod_set(int argc, char **argv) { paralist *start = 0, *curr; diff --git a/src/gie.c b/src/gie.c index 17f2cca0..e0effaa4 100644 --- a/src/gie.c +++ b/src/gie.c @@ -108,6 +108,7 @@ Thomas Knudsen, thokn@sdfe.dk, 2017-10-01/2017-10-08 #include #include #include +#include #include #include #include diff --git a/src/nad_cvt.c b/src/nad_cvt.c index d4330d54..ec4a2b47 100644 --- a/src/nad_cvt.c +++ b/src/nad_cvt.c @@ -1,6 +1,11 @@ #define PJ_LIB__ + +#include +#include + #include "projects.h" #include "proj_math.h" + #define MAX_ITERATIONS 10 #define TOL 1e-12 diff --git a/src/nad_init.c b/src/nad_init.c index 844dcad2..8b024ac7 100644 --- a/src/nad_init.c +++ b/src/nad_init.c @@ -27,11 +27,14 @@ #define PJ_LIB__ -#include "projects.h" -#include #include +#include +#include +#include #include +#include "projects.h" + /************************************************************************/ /* swap_words() */ /* */ diff --git a/src/pj_apply_gridshift.c b/src/pj_apply_gridshift.c index 424dfb11..31e0124e 100644 --- a/src/pj_apply_gridshift.c +++ b/src/pj_apply_gridshift.c @@ -30,8 +30,10 @@ #define PJ_LIB__ -#include #include +#include +#include + #include "proj_internal.h" #include "projects.h" diff --git a/src/pj_apply_vgridshift.c b/src/pj_apply_vgridshift.c index e7106b25..58605df8 100644 --- a/src/pj_apply_vgridshift.c +++ b/src/pj_apply_vgridshift.c @@ -28,7 +28,9 @@ #define PJ_LIB__ +#include #include + #include "proj_math.h" #include "proj_internal.h" #include "projects.h" @@ -292,4 +294,3 @@ double proj_vgrid_value(PJ *P, LP lp){ return value; } - diff --git a/src/pj_auth.c b/src/pj_auth.c index ed716fde..d6024671 100644 --- a/src/pj_auth.c +++ b/src/pj_auth.c @@ -1,5 +1,10 @@ /* determine latitude from authalic latitude */ + +#include +#include + #include "projects.h" + # define P00 .33333333333333333333 /* 1 / 3 */ # define P01 .17222222222222222222 /* 31 / 180 */ # define P02 .10257936507936507937 /* 517 / 5040 */ @@ -7,6 +12,7 @@ # define P11 .06640211640211640212 /* 251 / 3780 */ # define P20 .01677689594356261023 /* 761 / 45360 */ #define APA_SIZE 3 + double * pj_authset(double es) { double t, *APA; diff --git a/src/pj_ctx.c b/src/pj_ctx.c index 1b2aea27..d77bc88a 100644 --- a/src/pj_ctx.c +++ b/src/pj_ctx.c @@ -25,9 +25,11 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ -#include "projects.h" -#include #include +#include +#include + +#include "projects.h" static projCtx_t default_context; static volatile int default_context_initialized = 0; diff --git a/src/pj_datum_set.c b/src/pj_datum_set.c index e527ff84..466b56c5 100644 --- a/src/pj_datum_set.c +++ b/src/pj_datum_set.c @@ -26,9 +26,10 @@ *****************************************************************************/ #include -#include "projects.h" #include +#include "projects.h" + /* SEC_TO_RAD = Pi/180/3600 */ #define SEC_TO_RAD 4.84813681109535993589914102357e-6 diff --git a/src/pj_datums.c b/src/pj_datums.c index 4bb23f24..2011d1bb 100644 --- a/src/pj_datums.c +++ b/src/pj_datums.c @@ -25,6 +25,8 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ +#include + #include "proj.h" #define PJ_DATUMS__ diff --git a/src/pj_deriv.c b/src/pj_deriv.c index 7c1fcded..2c91e0cc 100644 --- a/src/pj_deriv.c +++ b/src/pj_deriv.c @@ -1,5 +1,8 @@ /* dervative of (*P->fwd) projection */ #define PJ_LIB__ + +#include + #include "projects.h" int pj_deriv(LP lp, double h, const PJ *P, struct DERIVS *der) { diff --git a/src/pj_ell_set.c b/src/pj_ell_set.c index fc655289..fd27bd9d 100644 --- a/src/pj_ell_set.c +++ b/src/pj_ell_set.c @@ -1,6 +1,9 @@ /* set ellipsoid parameters a and es */ + +#include +#include #include -#include + #include "proj.h" #include "proj_internal.h" #include "projects.h" diff --git a/src/pj_ellps.c b/src/pj_ellps.c index 4005d1ce..2bc1e2bb 100644 --- a/src/pj_ellps.c +++ b/src/pj_ellps.c @@ -1,5 +1,7 @@ /* definition of standard geoids */ +#include + #include "proj.h" #define PJ_ELLPS__ diff --git a/src/pj_fileapi.c b/src/pj_fileapi.c index d7d3f00b..b08a8b95 100644 --- a/src/pj_fileapi.c +++ b/src/pj_fileapi.c @@ -27,9 +27,13 @@ *****************************************************************************/ #include -#include "projects.h" +#include +#include +#include #include +#include "projects.h" + static PAFile stdio_fopen(projCtx ctx, const char *filename, const char *access); static size_t stdio_fread(void *buffer, size_t size, size_t nmemb, diff --git a/src/pj_fwd.c b/src/pj_fwd.c index 347f8334..fe04f733 100644 --- a/src/pj_fwd.c +++ b/src/pj_fwd.c @@ -27,7 +27,9 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. *****************************************************************************/ + #include +#include #include "proj_internal.h" #include "projects.h" diff --git a/src/pj_gauss.c b/src/pj_gauss.c index 108ac059..4520bb39 100644 --- a/src/pj_gauss.c +++ b/src/pj_gauss.c @@ -24,6 +24,10 @@ ** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #define PJ_LIB__ + +#include +#include + #include "projects.h" #define MAX_ITER 20 diff --git a/src/pj_gc_reader.c b/src/pj_gc_reader.c index c38cbf17..493fc075 100644 --- a/src/pj_gc_reader.c +++ b/src/pj_gc_reader.c @@ -27,10 +27,12 @@ #define PJ_LIB__ +#include #include -#include "projects.h" +#include #include -#include + +#include "projects.h" static int gc_readentry(projCtx ctx, PAFile fid, PJ_GridCatalogEntry *entry); @@ -46,7 +48,7 @@ PJ_GridCatalog *pj_gc_readcatalog( projCtx ctx, const char *catalog_name ) PJ_GridCatalog *catalog; int entry_max; char line[302]; - + fid = pj_open_lib( ctx, catalog_name, "r" ); if (fid == NULL) return NULL; diff --git a/src/pj_gridcatalog.c b/src/pj_gridcatalog.c index 45876ead..ea9c4aa1 100644 --- a/src/pj_gridcatalog.c +++ b/src/pj_gridcatalog.c @@ -27,9 +27,12 @@ #define PJ_LIB__ -#include "projects.h" -#include #include +#include +#include +#include + +#include "projects.h" static PJ_GridCatalog *grid_catalog_list = NULL; diff --git a/src/pj_gridinfo.c b/src/pj_gridinfo.c index 442b3fe6..f201f39e 100644 --- a/src/pj_gridinfo.c +++ b/src/pj_gridinfo.c @@ -28,11 +28,15 @@ #define PJ_LIB__ +#include +#include +#include +#include +#include +#include + #include "proj_internal.h" #include "projects.h" -#include -#include -#include /************************************************************************/ /* swap_words() */ diff --git a/src/pj_gridlist.c b/src/pj_gridlist.c index 9daabbe1..332de8dd 100644 --- a/src/pj_gridlist.c +++ b/src/pj_gridlist.c @@ -29,9 +29,10 @@ #define PJ_LIB__ #include -#include "projects.h" +#include #include -#include + +#include "projects.h" static PJ_GRIDINFO *grid_list = NULL; #define PJ_MAX_PATH_LENGTH 1024 diff --git a/src/pj_init.c b/src/pj_init.c index bdaf64f7..c5e92105 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -27,14 +27,16 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ - - #define PJ_LIB__ -#include "geodesic.h" + +#include +#include +#include +#include #include #include -#include -#include + +#include "geodesic.h" #include "proj.h" #include "proj_internal.h" #include "proj_math.h" diff --git a/src/pj_initcache.c b/src/pj_initcache.c index a0593138..3c347e4b 100644 --- a/src/pj_initcache.c +++ b/src/pj_initcache.c @@ -25,9 +25,10 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ -#include "projects.h" #include +#include "projects.h" + static int cache_count = 0; static int cache_alloc = 0; static char **cache_key = NULL; @@ -51,7 +52,7 @@ paralist *pj_clone_paralist( const paralist *list) newitem->used = 0; newitem->next = 0; strcpy( newitem->param, list->param ); - + if( list_copy == NULL ) list_copy = newitem; else diff --git a/src/pj_internal.c b/src/pj_internal.c index a6093c40..58ea9b48 100644 --- a/src/pj_internal.c +++ b/src/pj_internal.c @@ -28,10 +28,14 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. *****************************************************************************/ + #include -#include -#include #include +#include +#include +#include +#include +#include #include "geodesic.h" #include "proj_internal.h" diff --git a/src/pj_inv.c b/src/pj_inv.c index 327fef9f..72e06fe0 100644 --- a/src/pj_inv.c +++ b/src/pj_inv.c @@ -28,6 +28,7 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ #include +#include #include "proj_internal.h" #include "projects.h" diff --git a/src/pj_log.c b/src/pj_log.c index 19151800..6654691c 100644 --- a/src/pj_log.c +++ b/src/pj_log.c @@ -25,10 +25,13 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ +#include +#include +#include +#include + #include "proj.h" #include "projects.h" -#include -#include /************************************************************************/ /* pj_stderr_logger() */ diff --git a/src/pj_malloc.c b/src/pj_malloc.c index 2d670ae2..c45da85d 100644 --- a/src/pj_malloc.c +++ b/src/pj_malloc.c @@ -34,15 +34,18 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ - /* allocate and deallocate memory */ /* These routines are used so that applications can readily replace ** projection system memory allocation/deallocation call with custom ** application procedures. */ +#include +#include +#include +#include + #include "proj.h" #include "projects.h" -#include /**********************************************************************/ void *pj_malloc(size_t size) { diff --git a/src/pj_mlfn.c b/src/pj_mlfn.c index 24e7b63a..02e05c3a 100644 --- a/src/pj_mlfn.c +++ b/src/pj_mlfn.c @@ -1,4 +1,7 @@ +#include + #include "projects.h" + /* meridional distance for ellipsoid and inverse ** 8th degree - accurate to < 1e-5 meters when used in conjunction ** with typical major axis values. diff --git a/src/pj_open_lib.c b/src/pj_open_lib.c index 8ecbbd79..6b908360 100644 --- a/src/pj_open_lib.c +++ b/src/pj_open_lib.c @@ -29,11 +29,15 @@ *****************************************************************************/ #define PJ_LIB__ -#include "proj_internal.h" -#include "projects.h" + +#include +#include #include +#include #include -#include + +#include "proj_internal.h" +#include "projects.h" static const char *(*pj_finder)(const char *) = NULL; static int path_count = 0; diff --git a/src/pj_param.c b/src/pj_param.c index b52ac940..6cee4d1f 100644 --- a/src/pj_param.c +++ b/src/pj_param.c @@ -1,6 +1,9 @@ /* put parameters in linked list and retrieve */ + #include +#include #include +#include #include #include "projects.h" diff --git a/src/pj_pr_list.c b/src/pj_pr_list.c index baf8125f..4e71e471 100644 --- a/src/pj_pr_list.c +++ b/src/pj_pr_list.c @@ -1,7 +1,11 @@ /* print projection's list of parameters */ -#include "projects.h" + +#include #include #include + +#include "projects.h" + #define LINE_LEN 72 static int pr_list(PJ *P, int not_used) { diff --git a/src/pj_strerrno.c b/src/pj_strerrno.c index d881ae7b..e06ea58b 100644 --- a/src/pj_strerrno.c +++ b/src/pj_strerrno.c @@ -1,7 +1,9 @@ /* list of projection system pj_errno values */ + +#include #include -#include #include + #include "proj.h" #include "projects.h" diff --git a/src/pj_strtod.c b/src/pj_strtod.c index 1cf94c9b..45159d11 100644 --- a/src/pj_strtod.c +++ b/src/pj_strtod.c @@ -27,6 +27,11 @@ * DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#include +#include +#include +#include + #include "projects.h" /* Windows nmake build doesn't have a proj_config.h, but HAVE_LOCALECONV */ @@ -35,10 +40,6 @@ #include "proj_config.h" #endif -#include -#include -#include - #define PJ_STRTOD_WORK_BUFFER_SIZE 64 /************************************************************************/ @@ -193,4 +194,3 @@ double pj_strtod( const char *nptr, char **endptr ) errno = nError; return dfValue; } - diff --git a/src/pj_transform.c b/src/pj_transform.c index 3d7bd5c8..5863b39e 100644 --- a/src/pj_transform.c +++ b/src/pj_transform.c @@ -27,9 +27,10 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ -#include "projects.h" -#include #include +#include + +#include "projects.h" #include "geocent.h" diff --git a/src/pj_units.c b/src/pj_units.c index 84b8894e..59ff1ebe 100644 --- a/src/pj_units.c +++ b/src/pj_units.c @@ -1,5 +1,7 @@ /* definition of standard cartesian units */ +#include + #include "proj.h" #define PJ_UNITS__ diff --git a/src/pj_utils.c b/src/pj_utils.c index 5a1faf72..3f18cc7e 100644 --- a/src/pj_utils.c +++ b/src/pj_utils.c @@ -28,9 +28,10 @@ #define PJ_LIB__ -#include "projects.h" +#include #include -#include + +#include "projects.h" /************************************************************************/ /* pj_is_latlong() */ diff --git a/src/proj_4D_api.c b/src/proj_4D_api.c index 70110746..bd27cc17 100644 --- a/src/proj_4D_api.c +++ b/src/proj_4D_api.c @@ -26,8 +26,13 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. *****************************************************************************/ -#include + #include +#include +#include +#include +#include + #include "proj.h" #include "proj_internal.h" #include "proj_math.h" @@ -1080,4 +1085,3 @@ PJ_FACTORS proj_factors(PJ *P, PJ_COORD lp) { return factors; } - diff --git a/src/proj_api.h b/src/proj_api.h index 5bba5887..36187441 100644 --- a/src/proj_api.h +++ b/src/proj_api.h @@ -25,16 +25,16 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ - /* +/* * This version number should be updated with every release! * * This file is expected to be removed from the PROJ distribution * when a few minor-version releases has been made. * */ - #ifndef PJ_VERSION - #define PJ_VERSION 500 - #endif +#ifndef PJ_VERSION +#define PJ_VERSION 500 +#endif /* If we're not asked for PJ_VERSION only, give them everything */ @@ -43,16 +43,17 @@ #ifndef PROJ_API_H #define PROJ_API_H -#ifdef __cplusplus -extern "C" { -#endif - - /* standard inclusions */ #include +#include #include +#ifdef __cplusplus +extern "C" { +#endif + + /* pj_init() and similar functions can be used with a non-C locale */ /* Can be detected too at runtime if the symbol pj_atof exists */ #define PJ_LOCALE_SAFE 1 diff --git a/src/proj_etmerc.c b/src/proj_etmerc.c index 9a89e2b0..06da604d 100644 --- a/src/proj_etmerc.c +++ b/src/proj_etmerc.c @@ -38,10 +38,10 @@ * */ - #define PJ_LIB__ #include + #include "proj.h" #include "projects.h" #include "proj_math.h" @@ -349,4 +349,3 @@ PJ *PROJECTION(utm) { return setup (P); } - diff --git a/src/proj_internal.h b/src/proj_internal.h index 30a4a89e..bd289419 100644 --- a/src/proj_internal.h +++ b/src/proj_internal.h @@ -31,7 +31,9 @@ #define _USE_MATH_DEFINES #endif #endif + #include /* For M_PI */ +#include #include "proj.h" diff --git a/src/proj_mdist.c b/src/proj_mdist.c index 02d9ebee..777f704d 100644 --- a/src/proj_mdist.c +++ b/src/proj_mdist.c @@ -28,7 +28,12 @@ ** Precision commensurate with double precision. */ #define PJ_LIB__ + +#include +#include + #include "projects.h" + #define MAX_ITER 20 #define TOL 1e-14 diff --git a/src/proj_rouss.c b/src/proj_rouss.c index bbf6ff0f..ca4476bb 100644 --- a/src/proj_rouss.c +++ b/src/proj_rouss.c @@ -24,7 +24,10 @@ ** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #define PJ_LIB__ + #include +#include + #include "proj.h" #include "projects.h" @@ -151,4 +154,3 @@ PJ *PROJECTION(rouss) { return P; } - diff --git a/src/rtodms.c b/src/rtodms.c index 77d438b7..f0e2f675 100644 --- a/src/rtodms.c +++ b/src/rtodms.c @@ -1,7 +1,12 @@ /* Convert radian argument to DMS ascii format */ -#include "projects.h" + +#include +#include #include #include + +#include "projects.h" + /* ** RES is fractional second figures ** RES60 = 60 * RES -- cgit v1.2.3 From e9e9e72c9d36eac00e65bb137242d039891c78f5 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 19 May 2018 13:03:22 +0200 Subject: Vertical grid shift: do not interpolate node values at nodata value (fixes #1002) --- appveyor.yml | 3 ++ nad/tests/test_nodata.gtx | Bin 0 -> 104 bytes src/pj_apply_vgridshift.c | 65 ++++++++++++++++++++++++++++++---------- test/gie/4D-API_cs2cs-style.gie | 12 ++++++++ 4 files changed, 65 insertions(+), 15 deletions(-) create mode 100644 nad/tests/test_nodata.gtx diff --git a/appveyor.yml b/appveyor.yml index a6284f9e..f54155c5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,6 +47,7 @@ build_script: - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" nmake /f makefile.vc multistresstest.exe # Disabled for now as it scales badly # - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" multistresstest.exe + - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" cd .. - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64 - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" SET VS_FULL=%VS_VERSION% - if "%BUILD_TYPE%" == "cmake" echo "%VS_FULL%" @@ -57,6 +58,8 @@ test_script: - echo test_script - if "%BUILD_TYPE%" == "cmake" set PROJ_LIB=C:\projects\proj-4\nad - if "%BUILD_TYPE%" == "nmake" set PROJ_LIB=C:\PROJ\SHARE + - if "%BUILD_TYPE%" == "nmake" mkdir %PROJ_LIB%\tests + - if "%BUILD_TYPE%" == "nmake" copy nad\tests\*.* %PROJ_LIB%\tests - cd %PROJ_LIB% - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.7.zip - 7z e -aoa -y proj-datumgrid-1.7.zip diff --git a/nad/tests/test_nodata.gtx b/nad/tests/test_nodata.gtx new file mode 100644 index 00000000..e439e5f4 Binary files /dev/null and b/nad/tests/test_nodata.gtx differ diff --git a/src/pj_apply_vgridshift.c b/src/pj_apply_vgridshift.c index 58605df8..ca932674 100644 --- a/src/pj_apply_vgridshift.c +++ b/src/pj_apply_vgridshift.c @@ -35,6 +35,15 @@ #include "proj_internal.h" #include "projects.h" +static int is_nodata(float value) +{ + /* nodata? */ + /* GTX official nodata value if -88.88880f, but some grids also */ + /* use other big values for nodata (e.g naptrans2008.gtx has */ + /* nodata values like -2147479936), so test them too */ + return value > 1000 || value < -1000 || value == -88.88880f; +} + static double read_vgrid_value( PJ *defn, LP input, int *gridlist_count_p, PJ_GRIDINFO **tables, struct CTABLE *ct) { int itable = 0; double value = HUGE_VAL; @@ -112,23 +121,49 @@ static double read_vgrid_value( PJ *defn, LP input, int *gridlist_count_p, PJ_GR grid_iy2 = ct->lim.phi - 1; cvs = (float *) ct->cvs; - value = cvs[grid_ix + grid_iy * ct->lim.lam] - * (1.0-grid_x) * (1.0-grid_y) - + cvs[grid_ix2 + grid_iy * ct->lim.lam] - * (grid_x) * (1.0-grid_y) - + cvs[grid_ix + grid_iy2 * ct->lim.lam] - * (1.0-grid_x) * (grid_y) - + cvs[grid_ix2 + grid_iy2 * ct->lim.lam] - * (grid_x) * (grid_y); + { + float value_a = cvs[grid_ix + grid_iy * ct->lim.lam]; + float value_b = cvs[grid_ix2 + grid_iy * ct->lim.lam]; + float value_c = cvs[grid_ix + grid_iy2 * ct->lim.lam]; + float value_d = cvs[grid_ix2 + grid_iy2 * ct->lim.lam]; + double total_weight = 0.0; + int n_weights = 0; + value = 0.0f; + if( !is_nodata(value_a) ) + { + double weight = (1.0-grid_x) * (1.0-grid_y); + value += value_a * weight; + total_weight += weight; + n_weights ++; + } + if( !is_nodata(value_b) ) + { + double weight = (grid_x) * (1.0-grid_y); + value += value_b * weight; + total_weight += weight; + n_weights ++; + } + if( !is_nodata(value_c) ) + { + double weight = (1.0-grid_x) * (grid_y); + value += value_c * weight; + total_weight += weight; + n_weights ++; + } + if( !is_nodata(value_d) ) + { + double weight = (grid_x) * (grid_y); + value += value_d * weight; + total_weight += weight; + n_weights ++; + } + if( n_weights == 0 ) + value = HUGE_VAL; + else if( n_weights != 4 ) + value /= total_weight; + } } - /* nodata? */ - /* GTX official nodata value if -88.88880f, but some grids also */ - /* use other big values for nodata (e.g naptrans2008.gtx has */ - /* nodata values like -2147479936), so test them too */ - if( value > 1000 || value < -1000 || value == -88.88880f ) - value = HUGE_VAL; - return value; } diff --git a/test/gie/4D-API_cs2cs-style.gie b/test/gie/4D-API_cs2cs-style.gie index 6eed4faa..4f756ed1 100644 --- a/test/gie/4D-API_cs2cs-style.gie +++ b/test/gie/4D-API_cs2cs-style.gie @@ -1,3 +1,5 @@ + +------------------------------------------------------------------------------- =============================================================================== Test the 4D API handling of cs2cs style transformation options. @@ -278,4 +280,14 @@ expect 1335.8339 7522.963 ------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +Test bugfix of https://github.com/OSGeo/proj.4/issues/1002 +(do not interpolate nodata values) +------------------------------------------------------------------------------- +operation +proj=latlong +ellps=WGS84 +geoidgrids=tests/test_nodata.gtx +------------------------------------------------------------------------------- +accept 4.05 52.1 0 +expect 4.05 52.1 -10 +------------------------------------------------------------------------------- + -- cgit v1.2.3 From 905b15d4682876e306f0eb97014baa09eb1a3402 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 19 May 2018 14:10:08 +0200 Subject: Undef isnan if already defined before redefining it (typically with MSVC) --- src/proj_math.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/proj_math.h b/src/proj_math.h index 1bb0a94f..84c9b0da 100644 --- a/src/proj_math.h +++ b/src/proj_math.h @@ -44,6 +44,9 @@ int pj_isnan(double x); #define hypot pj_hypot #define log1p pj_log1p #define asinh pj_asinh +#ifdef isnan +#undef isnan +#endif #define isnan pj_isnan #endif /* !(defined(HAVE_C99_MATH) && HAVE_C99_MATH) */ -- cgit v1.2.3