Merge branch 'webobs-2.7'

Author: beaudu

.gitignore

@@ -16,5 +16,7 @@ PACK/*
 !PACK/fpm*
 !PACK/showi18id
 !PACK/CHECKLIST.txt
+*.swo
+*.swp
 .DS_Store
 **/.DS_Store

CODE/cgi-bin/formEXTENSO.pl

@@ -51,7 +51,7 @@ =head1 Query string parameter
 
 die "You can't edit EXTENSO reports." if (!clientHasEdit(type=>"authforms",name=>"EXTENSO"));
 
-my $FORM = new WebObs::Form('EXTENSO_LEG');
+my $FORM = new WebObs::Form('EXTENSO');
 my %Ns;
 my @NODESSelList;
 my %Ps = $FORM->procs;

CODE/cgi-bin/mailInfo_OVPF.pl

@@ -81,6 +81,8 @@ =head1 Query string parameters
 # ---- standard FORMS inits ----------------------------------
 my $QP       = $cgi->Vars;
 
+$QP->{'form'}    ||= "EXTENSO";
+
 die "You can't view EXTENSO reports." if (!clientHasRead(type=>"authforms",name=>$QP->{form}));
 my $displayOnly = clientHasEdit(type=>"authforms",name=>$QP->{form}) ? 0 : 1;
 

CODE/cgi-bin/mailInfo_REVOSIMA.pl

@@ -21,6 +21,8 @@ winston|EARTHWORM|EarthWorm Winston Wave Server data request|
 gipsy|GNSS|JPL GIPSY-OASIS .tdp file|ANTENNA,RECEIVER,XYZ,CHAR9
 gipsyx|GNSS|JPL GipsyX .tdp file|ANTENNA,RECEIVER,CHAR9
 globkval|GNSS|MIT GAMIT/GLOBK VAL file|CHAR9
+spotgins-ippp|GNSS|SPOTGINS IPPP timeseries|CHAR9
+gamit-pos|GNSS|MIT GAMIT/GLOBL POS timeseries|CHAR9
 sbe37-ascii|GNSS|sbe37 OBP text file|DATA_ERROR,DATA_DECIMATE,CHAR9
 usgs-rneu|GNSS|USGS RNEU text file|CHAR9
 ics-neu|GNSS|ICS NEU text file|CHAR9

CODE/cgi-bin/showEXTENSO.pl

@@ -24,7 +24,7 @@
 %
 %	Authors: François Beauducel, Jean-Marie Saurel, WEBOBS/IPGP
 %	Created: 2013-12-29, in Guadeloupe, French West Indies
-%	Updated: 2024-07-02
+%	Updated: 2025-01-23
 
 wofun = sprintf('WEBOBS{%s}',mfilename);
 
@@ -72,7 +72,7 @@
 		case {'miniseed','seedlink','arclink','combined','fdsnws-dataselect'}
 			D(n) = readfmtdata_miniseed(WO,P,N(n),F);
 
-		case {'globkval','gipsy','gipsyx','gipsy-tdp','usgs-rneu','ies-neu','ogc-neu','ingv-gps','sbe37-ascii'}
+		case {'globkval','gipsy','gipsyx','gipsy-tdp','usgs-rneu','ies-neu','ogc-neu','ingv-gps','sbe37-ascii','spotgins-ippp','gamit-pos'}
 			D(n) = readfmtdata_gnss(WO,P,N(n),F);
 
 		case {'hyp71sum2k','fdsnws-event','scevtlog-xml'}

CODE/etc/rawformats.conf

@@ -34,6 +34,18 @@
 %		data format: extract from SmoothFinal.tdp output file (grep "Station.SSSS.State.pos.[XYZ]" lines)
 %		node calibration: no .CLB file or 4 components (East, North, Up) in meters and (Orbit)
 %
+%	format 'gins-ippp'
+%		type: GINS IPPP solutions
+%		filename/url: P.RAWDATA (use $FID to point the right file/url)
+%		data format: yyyymmdd hhmmss yyyy.yyyyyyyyy jjjjj.jj X Y Z dX dY dZ E N V dE dN dV
+%		node calibration: no .CLB file or 4 components (East, North, Up) in meters and (Orbit)
+%
+%	format 'gamit-pos'
+%		type: GAMIT/GLOBK POS file
+%		filename/url: P.RAWDATA (use $FID to point the right file/url)
+%		data format: yyyymmdd jjjjj.jjjj E N U dE dN dU
+%		node calibration: no .CLB file or 4 components (East, North, Up) in meters and (Orbit)
+%
 %	format 'usgs-rneu'
 %		type: USGS GPS results ITRF08
 %		filename/url: P.RAWDATA (use $FID to point the right file/url)
@@ -55,10 +67,12 @@
 %
 %	Authors: François Beauducel and Jean-Bernard de Chabalier, WEBOBS/IPGP
 %	Created: 2016-07-10, in Yogyakarta (Indonesia)
-%	Updated: 2021-11-12
+%	Updated: 2025-01-23
 
 wofun = sprintf('WEBOBS{%s}',mfilename);
 
+% minimum decent error is 0.1 mm (!)
+min_error = 1e-4;
 
 switch F.fmt
 % -----------------------------------------------------------------------------
@@ -118,6 +132,50 @@
 	%end
 	%D.ITRF_YEAR = itrf;
 
+
+% -----------------------------------------------------------------------------
+case 'gamit-pos'
+	% format example
+	% yyyymmdd jjjjj.jjjj  E       N        U       dE      dN      dU
+    % 20100101 55197.4993 -0.09875 -0.11953 0.00075 0.00198 0.00161 0.00645
+
+	fdat = sprintf('%s/%s.dat',F.ptmp,N.ID);
+	wosystem(sprintf('rm -f %s',fdat),P);
+	for a = 1:length(F.raw)
+		fraw = F.raw{a};
+		cmd0 = sprintf('awk ''/^[^!]/ {print}'' >> %s',fdat); % removes header lines
+		if strncmpi('http',fraw,4)
+			s  = wosystem(sprintf('curl -s -S "%s" | %s',fraw,cmd0),P);
+			if s ~= 0
+				break;
+			end
+		else
+			s = wosystem(sprintf('cat %s | %s',fraw,cmd0),P);
+		end
+		if s ~= 0
+			fprintf('%s: ** WARNING ** Raw data "%s" not found.\n',wofun,fraw);
+		end
+	end
+
+	% load the file
+	if exist(fdat,'file')
+		dd = load(fdat);
+	else
+		dd = [];
+	end
+	if ~isempty(dd)
+		t = dd(:,2) + 678941.5007; % converts MJD to datenum
+		d = [dd(:,3:5),zeros(size(dd,1),1)];	% North(mm),East(mm),Up(mm) => E(m),N(m),U(m),Orbit
+		e = dd(:,6:8);
+		e(e<min_error) = min_error;
+		fprintf('%d data imported.\n',size(dd,1));
+	else
+		fprintf('no data found!\n')
+		t = [];
+		d = [];
+		e = [];
+	end
+
 % -----------------------------------------------------------------------------
 case {'gipsy','gipsy-tdp','gipsyx'}
 
@@ -183,8 +241,7 @@
 		% converts cartesian geocentric (X,Y,Z) to UTM, estimating errors
 		[enu,e] = cart2utm(dd(:,[2,6,10])*kmfact,dd(:,[3,7,11])*kmfact);
 		d = [enu,dd(:,4)];
-		% minimum decent error is 1 mm (!)
-		e(e<1e-3) = 1e-3;
+		e(e<min_error) = min_error;
 		fprintf(' %d data imported.\n',size(dd,1));
 	else
 		fprintf(' no data found!\n')
@@ -194,6 +251,49 @@
 	end
 	%D.ITRF_YEAR = 'ITRF08';
 
+% -----------------------------------------------------------------------------
+case 'spotgins-ippp'
+	% format example
+	% !yyyymmdd hhmmss yyyy.yyyyyyyyy  jjjjj.jj        X_position        Y_position        Z_position            dX            dY            dZ             E             N             V            dE            dN            dV
+    %  20160723  65619 2016.558521561  57592.29    4182067.152057     570976.439258    4765940.539811      0.000611      0.000218      0.000673     -0.006574     -0.008848     -0.014844      0.000205      0.000307      0.000859
+
+	fdat = sprintf('%s/%s.dat',F.ptmp,N.ID);
+	wosystem(sprintf('rm -f %s',fdat),P);
+	for a = 1:length(F.raw)
+		fraw = F.raw{a};
+		cmd0 = sprintf('awk ''/^[^!]/ {print}'' >> %s',fdat); % removes header lines
+		if strncmpi('http',fraw,4)
+			s  = wosystem(sprintf('curl -s -S "%s" | %s',fraw,cmd0),P);
+			if s ~= 0
+				break;
+			end
+		else
+			s = wosystem(sprintf('cat %s | %s',fraw,cmd0),P);
+		end
+		if s ~= 0
+			fprintf('%s: ** WARNING ** Raw data "%s" not found.\n',wofun,fraw);
+		end
+	end
+
+	% load the file
+	if exist(fdat,'file')
+		dd = load(fdat);
+	else
+		dd = [];
+	end
+	if ~isempty(dd)
+		t = datenum(dd(:,3),1,1,0,0,0);
+		d = [dd(:,11:13),zeros(size(dd,1),1)];	% North(mm),East(mm),Up(mm) => E(m),N(m),U(m),Orbit
+		e = dd(:,14:16);
+		e(e<min_error) = min_error;
+		fprintf('%d data imported.\n',size(dd,1));
+	else
+		fprintf('no data found!\n')
+		t = [];
+		d = [];
+		e = [];
+	end
+
 % -----------------------------------------------------------------------------
 case 'usgs-rneu'
 	% format example
@@ -230,8 +330,7 @@
 		t = datenum(ty,tm,td,12,0,0);	% date is YYYYMMDD and we force time to 12:00:00
 		d = [dd(:,[3,2,4])/1e3,dd(:,5)];	% North(mm),East(mm),Up(mm),Orbit => E(m),N(m),U(m),O
 		e = dd(:,[7,6,8])/1e3;
-		% minimum decent error is 1 mm (!)
-		e(e<1e-3) = 1e-3;
+		e(e<min_error) = min_error;
 		fprintf('%d data imported.\n',size(dd,1));
 	else
 		fprintf('no data found!\n')
@@ -274,8 +373,7 @@
 		t = datenum(dd(:,1),1,1,0,0,0);	% date is decimal year
 		d = [dd(:,[4,2,6]),zeros(size(dd,1),1)];	% North(mm),East(mm),Up(mm),Orbit => E(m),N(m),U(m),O
 		e = dd(:,[5,3,7]);
-		% minimum decent error is 1 mm (!)
-		e(e<1e-3) = 1e-3;
+		e(e<min_error) = min_error;
 		fprintf('%d data imported.\n',size(dd,1));
 	else
 		fprintf('no data found!\n')
@@ -318,8 +416,7 @@
 		t = datenum(dd(:,2),dd(:,3),dd(:,4),12,0,0);	% here we force time to noon
 		d = [dd(:,[6,5,7]),zeros(size(dd,1),1)];	% North(mm),East(mm),Up(mm) => E(m),N(m),U(m),Orbit
 		e = dd(:,[9,8,10]);
-		% minimum decent error is 1 mm (!)
-		e(e<1e-3) = 1e-3;
+		e(e<min_error) = min_error;
 		fprintf('%d data imported.\n',size(dd,1));
 	else
 		fprintf('no data found!\n')
@@ -367,8 +464,7 @@
 		t = datenum(dd(:,1),1,1);	% here we force time to January 1st!
 		d = [dd(:,2:4),zeros(size(dd,1),1)];
 		e = dd(:,5:7);
-		% minimum decent error is 1 mm (!)
-		e(e<1e-3) = 1e-3;
+		e(e<min_error) = min_error;
 		fprintf('%d data imported.\n',size(dd,1));
 	else
 		fprintf('no data found!\n')

CODE/matlab/readfmtdata.m

@@ -40,7 +40,7 @@ function gridmaps(grids,outd,varargin)
 %
 %   Author: F. Beauducel, C. Brunet, WEBOBS/IPGP
 %   Created: 2013-09-13 in Paris, France
-%   Updated: 2024-12-04
+%   Updated: 2025-01-23
 
 
 WO = readcfg;
@@ -211,11 +211,11 @@ function gridmaps(grids,outd,varargin)
 
 	% looks for supplementary maps (MAP*_XYLIM|LON1,LON2,LAT1,LAT2 keys)
 	if merge
-		maps(1,:) = {'MAP',mmaplim};
+		maps = {'MAP',mmaplim};
 	else
 		fd = fieldnames(G);
 		k = find(~cellfun(@isempty,regexp(fd,'^MAP\d+_XYLIM$')));
-		maps(1,:) = {'MAP',[]};
+		maps = {'MAP',[]};
 		for ii = 1:length(k)
 			x = split(fd{k(ii)},'_');
 			v = G.(fd{k(ii)});