Changeset 21651

Timestamp:

03/30/17 10:27:08 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: pass shp as first argument + added check on extension

File:

• issm/trunk-jpl/src/m/shp/shp2exp.m (modified) (1 diff)

issm/trunk-jpl/src/m/shp/shp2exp.m

@@ -1 @@
-function Shp2Exp(expfilename,shapefilename)
+function shp2exp(shpfilename,expfilename)
 %SHP2EXP- transform shape file to Argus .exp file
 %
 %   Usage:
-%      Shp2Exp(expfilename,shapefilename);
+%      shp2exp(shpfilename,expfilename);
 %
 %   Example:
-%      Shp2Exp('Domain.exp','Domain.shp');
+%      shp2exp('Domain.shp','Domain.exp');
 %
 %   See also EXPMASTER, EXPDOC
 
-        if ~exist(shapefilename,'file'),
-                error(['Shapefile ' shapefilename ' does not exist']);
+%check file extensions
+[pathstr,name,ext] = fileparts(shpfilename);
+if ~strcmp(ext,'.shp'),
+        error(['Shapefile ' shpfilename ' does not have an extension .shp']);
+end
+
+[pathstr,name,ext] = fileparts(expfilename);
+if ~strcmp(ext,'.exp'),
+        error(['Exp file ' expfilename ' does not have an extension .exp']);
+end
+
+if ~exist(shpfilename,'file'),
+        error(['Shapefile ' shpfilename ' does not exist']);
+end
+shp=shaperead(shpfilename);
+
+expstruct=struct([]);
+for i=1:length(shp),
+        if strcmpi(shp(i).Geometry,'Polygon'),
+                x=shp(i).X; y=shp(i).Y;
+                ids=find(isnan(x));
+                x(ids)=[]; y(ids)=[];
+                expstruct(end+1).x=x;
+                expstruct(end).y=y;
+                expstruct(end).nods=length(x);
+                expstruct(end).density=1;
+                expstruct(end).closed=1;
+                expstruct(end).name=num2str(shp(i).id);
+        elseif strcmpi(shp(i).Geometry,'Point'),
+                x=shp(i).X; y=shp(i).Y;
+                expstruct(end+1).x=x;
+                expstruct(end).y=y;
+                expstruct(end).nods=length(x);
+                expstruct(end).density=1;
+                expstruct(end).closed=0;
+                %exp(end).name=num2str(shp(i).id);
+        elseif strcmpi(shp(i).Geometry,'Line'),
+                x=shp(i).X; y=shp(i).Y;
+                expstruct(end+1).x=x;
+                expstruct(end).y=y;
+                expstruct(end).nods=length(x);
+                expstruct(end).density=1;
+                expstruct(end).closed=0;
         end
-        shp=shaperead(shapefilename);
+end
 
-        expstruct=struct([]);
-        for i=1:length(shp),
-                if strcmpi(shp(i).Geometry,'Polygon'),
-                        x=shp(i).X; y=shp(i).Y;
-                        ids=find(isnan(x));
-                        x(ids)=[]; y(ids)=[];
-                        expstruct(end+1).x=x;
-                        expstruct(end).y=y;
-                        expstruct(end).nods=length(x);
-                        expstruct(end).density=1;
-                        expstruct(end).closed=1;
-                        expstruct(end).name=num2str(shp(i).id);
-                elseif strcmpi(shp(i).Geometry,'Point'),
-                        x=shp(i).X; y=shp(i).Y;
-                        expstruct(end+1).x=x;
-                        expstruct(end).y=y;
-                        expstruct(end).nods=length(x);
-                        expstruct(end).density=1;
-                        expstruct(end).closed=0;
-                        %exp(end).name=num2str(shp(i).id);
-                elseif strcmpi(shp(i).Geometry,'Line'),
-                        x=shp(i).X; y=shp(i).Y;
-                        expstruct(end+1).x=x;
-                        expstruct(end).y=y;
-                        expstruct(end).nods=length(x);
-                        expstruct(end).density=1;
-                        expstruct(end).closed=0;
-                end
-        end
-
-        expwrite(expstruct,expfilename);
+expwrite(expstruct,expfilename);