Changeset: 182a0720bdb3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=182a0720bdb3
Modified Files:
geom/monetdb5/geom.mal
Branch: geo
Log Message:
adapt type ids to handle also linearRing
diffs (61 lines):
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -92,23 +92,23 @@ function LineFromText{unsafe}(wkt:str, s
return x;
end LineFromText;
function PolygonFromText{unsafe}(wkt:str, srid:int) :wkb;
- x := wkb.FromText(wkt,srid,3);
+ x := wkb.FromText(wkt,srid,4);
return x;
end PolygonFromText;
function MPointFromText{unsafe}(wkt:str, srid:int) :wkb;
- x := wkb.FromText(wkt,srid,4);
+ x := wkb.FromText(wkt,srid,5);
return x;
end MPointFromText;
function MLineFromText{unsafe}(wkt:str, srid:int) :wkb;
- x := wkb.FromText(wkt,srid,5);
+ x := wkb.FromText(wkt,srid,6);
return x;
end MLineFromText;
function MPolyFromText{unsafe}(wkt:str, srid:int) :wkb;
- x := wkb.FromText(wkt,srid,6);
+ x := wkb.FromText(wkt,srid,7);
return x;
end MPolyFromText;
function GeomCollFromText{unsafe}(wkt:str, srid:int) :wkb;
- x := wkb.FromText(wkt,srid,7);
+ x := wkb.FromText(wkt,srid,8);
return x;
end GeomCollFromText;
@@ -125,23 +125,23 @@ function LineFromText{unsafe}(wkt:str) :
return x;
end LineFromText;
function PolygonFromText{unsafe}(wkt:str) :wkb;
- x := wkb.FromText(wkt,0,3);
+ x := wkb.FromText(wkt,0,4);
return x;
end PolygonFromText;
function MPointFromText{unsafe}(wkt:str) :wkb;
- x := wkb.FromText(wkt,0,4);
+ x := wkb.FromText(wkt,0,5);
return x;
end MPointFromText;
function MLineFromText{unsafe}(wkt:str) :wkb;
- x := wkb.FromText(wkt,0,5);
+ x := wkb.FromText(wkt,0,6);
return x;
end MLineFromText;
function MPolyFromText{unsafe}(wkt:str) :wkb;
- x := wkb.FromText(wkt,0,6);
+ x := wkb.FromText(wkt,0,7);
return x;
end MPolyFromText;
function GeomCollFromText{unsafe}(wkt:str) :wkb;
- x := wkb.FromText(wkt,0,7);
+ x := wkb.FromText(wkt,0,8);
return x;
end GeomCollFromText;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list