Changeset 15445
- Timestamp:
- Jun 22, 2017, 11:15:04 PM (6 years ago)
- Location:
- branches/2.3
- Files:
-
- 4 edited
-
NEWS (modified) (1 diff)
-
liblwgeom/lwout_x3d.c (modified) (7 diffs)
-
regress/tickets.sql (modified) (1 diff)
-
regress/tickets_expected (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/2.3/NEWS
r15442 r15445 16 16 - #3682, Strange fieldlength in result of pgsql2shp 17 17 - #3701, Escape double quotes issue in pgsql2shp 18 - #3704, ST_AsX3D crashes on empty geometry 18 19 19 20 -
branches/2.3/liblwgeom/lwout_x3d.c
r14869 r15445 62 62 int type = geom->type; 63 63 64 /* Empty string for empties */ 65 if( lwgeom_is_empty(geom) ) 66 { 67 char *ret = NULL; 68 ret = lwalloc(1); 69 ret[0] = '\0'; 70 return ret; 71 } 72 64 73 switch (type) 65 74 { … … 157 166 158 167 size = pointArray_X3Dsize(line->points, precision)*2; 159 168 160 169 if ( X3D_USE_GEOCOORDS(opts) ) { 161 170 size += ( … … 395 404 else 396 405 size = sizeof("<PointSet><Coordinate point='' /></PointSet>") + defidlen; 397 406 398 407 399 408 /* if ( srs ) size += strlen(srs) + sizeof(" srsName=.."); */ … … 526 535 if ( X3D_USE_GEOCOORDS(opts) ) size = sizeof("<IndexedFaceSet convex='false' coordIndex=''><GeoCoordinate geoSystem='\"GD\" \"WE\" \"longitude_first\"' point='' />") + defidlen; 527 536 else size = sizeof("<IndexedFaceSet convex='false' coordIndex=''><Coordinate point='' />") + defidlen; 528 537 529 538 530 539 for (i=0; i<psur->ngeoms; i++) … … 659 668 if ( X3D_USE_GEOCOORDS(opts) ) ptr += sprintf(ptr, "'><GeoCoordinate geoSystem='\"GD\" \"WE\" \"%s\"' point='", ( (opts & LW_X3D_FLIP_XY) ? "latitude_first" : "longitude_first") ); 660 669 else ptr += sprintf(ptr, "'><Coordinate point='"); 661 670 662 671 for (i=0; i<tin->ngeoms; i++) 663 672 { … … 782 791 { 783 792 ptr += asx3d3_tin_buf((LWTIN*)subgeom, srs, ptr, precision, opts, defid); 784 793 785 794 } 786 795 else if ( subgeom->type == POLYHEDRALSURFACETYPE ) 787 796 { 788 797 ptr += asx3d3_psurface_buf((LWPSURFACE*)subgeom, srs, ptr, precision, opts, defid); 789 798 790 799 } 791 800 else if ( lwgeom_is_collection(subgeom) ) … … 863 872 if ( i ) 864 873 ptr += sprintf(ptr, " "); 865 874 866 875 if ( ( opts & LW_X3D_FLIP_XY) ) 867 876 ptr += sprintf(ptr, "%s %s", y, x); -
branches/2.3/regress/tickets.sql
r15138 r15445 1013 1013 SELECT '#3627b', ST_Equals(geom, ST_LineFromEncodedPolyline(ST_AsEncodedPolyline(geom, 7), 7)) FROM (VALUES ('SRID=4326;LINESTRING (0 0, 1 1)')) AS v (geom); 1014 1014 1015 -- #3704 1016 SELECT '#3704', ST_AsX3D('LINESTRING EMPTY') = ''; 1017 1015 1018 -- Clean up 1016 1019 DELETE FROM spatial_ref_sys; -
branches/2.3/regress/tickets_expected
r15138 r15445 302 302 #3627a|o}~~|AdshNoSsBgd@eGoBlm@wKhj@~@? 303 303 #3627b|t 304 #3704|t
Note:
See TracChangeset
for help on using the changeset viewer.
