1.0.3: add ellipsoids

dr-ni · Nov 26, 2021 · 975d1b1 · 975d1b1 · zvezdochiot · Nov 26, 2021
1 parent 7b52d75
commit 975d1b1
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -10,6 +10,7 @@ SRCS=src
 DOCS=/usr/share/doc/helmert3d
 BINS=bin
 EXAMPS=examples
+ELLIPS=ellipsoids
 MANS=man/man1
 
 all: helmert3d helmparms3d helmdiff3d helmblhtoxyz
@@ -48,6 +49,7 @@ install:
 	$(INSTALL) -d $(PREFIX)/$(BINS)
 	$(INSTALL) -d $(PREFIX)/$(MANS)
 	$(INSTALL) -d $(DOCS)/$(EXAMPS)
+	$(INSTALL) -d $(DOCS)/$(ELLIPS)
 	$(INSTALL) -m 0755 helmparms3d $(PREFIX)/$(BINS)
 	$(INSTALL) -m 0755 helmert3d $(PREFIX)/$(BINS)
 	$(INSTALL) -m 0755 helmdiff3d $(PREFIX)/$(BINS)
@@ -57,7 +59,12 @@ install:
 	$(INSTALL) -m 0644 $(EXAMPS)/testpoints_src.txt $(DOCS)/$(EXAMPS)
 	$(INSTALL) -m 0644 $(EXAMPS)/testpoints_dest.txt $(DOCS)/$(EXAMPS)
 	$(INSTALL) -m 0644 $(EXAMPS)/testpoints_blh.txt $(DOCS)/$(EXAMPS)
-	$(INSTALL) -m 0644 $(EXAMPS)/GRS80.txt $(DOCS)/$(EXAMPS)
+	$(INSTALL) -m 0644 $(ELLIPS)/BESSEL.txt $(DOCS)/$(ELLIPS)
+	$(INSTALL) -m 0644 $(ELLIPS)/GRS80.txt $(DOCS)/$(ELLIPS)
+	$(INSTALL) -m 0644 $(ELLIPS)/GSK2011.txt $(DOCS)/$(ELLIPS)
+	$(INSTALL) -m 0644 $(ELLIPS)/KRASOVSKIY.txt $(DOCS)/$(ELLIPS)
+	$(INSTALL) -m 0644 $(ELLIPS)/PZ90.txt $(DOCS)/$(ELLIPS)
+	$(INSTALL) -m 0644 $(ELLIPS)/WGS84.txt $(DOCS)/$(ELLIPS)
 	$(INSTALL) -m 0644 $(MANS)/helmparms3d.1 $(PREFIX)/$(MANS)
 	$(INSTALL) -m 0644 $(MANS)/helmert3d.1 $(PREFIX)/$(MANS)
 	$(INSTALL) -m 0644 $(MANS)/helmdiff3d.1 $(PREFIX)/$(MANS)

diff --git a/ellipsoids/BESSEL.txt b/ellipsoids/BESSEL.txt
@@ -0,0 +1 @@
+BESSEL 6377397.155 6356078.962822
diff --git a/examples/GRS80.txt → ellipsoids/GRS80.txt b/examples/GRS80.txt → ellipsoids/GRS80.txt
diff --git a/ellipsoids/GSK2011.txt b/ellipsoids/GSK2011.txt
@@ -0,0 +1 @@
+GSK2011 6378136.5 6356751.758
diff --git a/ellipsoids/KRASOVSKIY.txt b/ellipsoids/KRASOVSKIY.txt
@@ -0,0 +1 @@
+KRASOVSKIY 6378245.0 6356863.018773
diff --git a/ellipsoids/PZ90.txt b/ellipsoids/PZ90.txt
@@ -0,0 +1 @@
+PZ90 6378136.0 6356752.3142
diff --git a/ellipsoids/WGS84.txt b/ellipsoids/WGS84.txt
@@ -0,0 +1 @@
+WGS84 6378137.0 6356752.314245
diff --git a/man/man1/helmblhtoxyz.1 b/man/man1/helmblhtoxyz.1
@@ -39,9 +39,10 @@ xyz data file format:
 
 .SH EXAMPLE
  export EXAMP=/usr/share/doc/helmert3d/examples/
+ export ELLIPS=/usr/share/doc/helmert3d/ellipsoids/
 
- helmblhtoxyz xyz $EXAMP/testpoints_blh.txt $EXAMP/GRS80.txt xyh.txt
- helmblhtoxyz blh xyh.txt $EXAMP/GRS80.txt blh.txt
+ helmblhtoxyz xyz $EXAMP/testpoints_blh.txt $ELLIPS/GRS80.txt xyh.txt
+ helmblhtoxyz blh xyh.txt $ELLIPS/GRS80.txt blh.txt
  helmdiff3d examples/testpoints_blh.txt blh.txt
 
 .SH COPYRIGHT

diff --git a/src/helmblhtoxyz.c b/src/helmblhtoxyz.c
@@ -91,7 +91,7 @@ int main(int argc, char* argv[])
     }
     else if (!strcmp(command,"blh"))
     {
-        fprintf(stdout,"X-Y-Z -> B-H-L...\n");
+        fprintf(stdout,"X-Y-Z -> B-L-H...\n");
     }
     else
     {