Commit 6845c018 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

Preparing infrastructure for maps matching, fixed bug in initial GEO 

generation (wrong Y sign)
parent 0de865d9

src/main/java/com/elphel/imagej/ims/Imx5.java

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ public class Imx5 { 
	/*

	 * Offset Latitude, Longitude, Altitude by North, East, Up (in meters) 

	 */

	public static double [] offsetLla(double [] lla, double [] ned) {

	public static double [] offsetLlaNED(double [] lla, double [] ned) {

		double [] offset_lla = new double [] {

				lla[0] + (ned[0]/EARTH_RADIUS / Math.PI * 180 / Math.cos(lla[0])), // degrees

				lla[1] + (ned[1]/EARTH_RADIUS / Math.PI * 180), // degrees

src/main/java/com/elphel/imagej/orthomosaic/ComboMap.java

+306 −63

File changed.

Preview size limit exceeded, changes collapsed.

src/main/java/com/elphel/imagej/orthomosaic/ComboMatch.java

+120 −12

File changed.

Preview size limit exceeded, changes collapsed.

src/main/java/com/elphel/imagej/readers/ElphelTiffReader.java

+8 −0
Original line number Diff line number Diff line
@@ -743,6 +743,14 @@ public class ElphelTiffReader extends TiffReader{ // BaseTiffReader { 
		return xy_pixel_in_meters; 

	}

	

	public static int getWidth(Properties properties) {

		return Integer.parseInt(properties.getProperty("ImageWidth"));

	}

	

	public static int getHeight(Properties properties) {

		return Integer.parseInt(properties.getProperty("ImageLength"));

	}



	public static double [] getXYOffsetMeters(Properties properties) {

		int res_unit = Integer.parseInt(properties.getProperty("ResolutionUnit"));

		double unit_size = 0;

src/main/java/com/elphel/imagej/tileprocessor/Interscene.java

+59 −4

File changed.

Preview size limit exceeded, changes collapsed.