Changeset 15444
- Timestamp:
- Jun 22, 2017, 11:00:59 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
liblwgeom/lwout_x3d.c (modified) (7 diffs)
-
regress/tickets.sql (modified) (3 diffs)
-
regress/tickets_expected (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/liblwgeom/lwout_x3d.c
r14869 r15444 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); -
trunk/regress/tickets.sql
r15138 r15444 28 28 FROM (SELECT '01020000000200000050E8303FC2E85141B017CFC05A825541000000E0C0E85141000000205C825541'::geometry AS g) a, 29 29 (SELECT 'LINESTRING(4694792.35840419 5638508.89950758,4694793.20840419 5638506.34950758)'::geometry AS g) b; 30 30 31 31 -- #21 -- 32 32 SELECT '#21', ST_AsEWKT(ST_Locate_Along_Measure(g, 4566)) FROM … … 206 206 ST_Covers(geometry(geography(poly.the_geom)), 207 207 geometry(geography(pt.the_geom))) As gm_to_gg_gm_pca 208 208 209 209 FROM (SELECT ST_GeomFromEWKT('SRID=4326;POLYGON((-119.5434 34.9438,-119.5437 34.9445,-119.5452 34.9442,-119.5434 34.9438))') As the_geom) 210 210 As poly … … 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; -
trunk/regress/tickets_expected
r15138 r15444 302 302 #3627a|o}~~|AdshNoSsBgd@eGoBlm@wKhj@~@? 303 303 #3627b|t 304 #3704|t
Note:
See TracChangeset
for help on using the changeset viewer.
