Changeset 24313 for issm/trunk/src/m/exp/exp2shp.m

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/exp/exp2shp.m (modified) (2 diffs)

issm/trunk/src/m/exp/exp2shp.m

@@ -26 +26 @@
 
 %initialize number of profile
-count=0;
+count=1;
 
 contours=struct([]);
 for i=1:length(shp),
         if nargin < 3
-                if length(shp(1).x) == 1
+
+                %TEMP
+                %if contains(shp(i).name,'_pointcloud');
+                %       continue;
+                %end
+
+                if length(shp(i).x) == 0
+                        continue;
+                elseif contains(shp(i).name,'_pointcloud');
+                        geometry = 'MultiPoint';
+                        shp(i).name = erase(shp(i).name,'_pointcloud');
+                elseif length(shp(i).x) == 1
                         geometry = 'Point';
-                elseif length(shp(1).x) < 3
+                elseif length(shp(i).x) < 3
                         geometry = 'Line';
                 else 
-                        if (shp(1).x(end)==shp(1).x(1) && shp(1).y(end)==shp(1).y(1)),
+                        if (shp(i).x(end)==shp(i).x(1) && shp(i).y(end)==shp(i).y(1)),
                                 geometry = 'Polygon';
                         else
@@ -43 +54 @@
                 end
         end
-        contours(i).Geometry=geometry;
-        contours(i).id=i;
-        contours(i).X=shp(i).x;
-        contours(i).Y=shp(i).y;
+        contours(count).Geometry=geometry;
+        contours(count).id=i;
+        contours(count).Name=shp(i).name;
+        contours(count).X=shp(i).x;
+        contours(count).Y=shp(i).y;
+        count = count+1;
 end
-        
+
+%Make sure it is one single geometry otherwise it will yell at you
 shapewrite(contours,shpfilename);