|
@@ -57,27 +57,27 @@ SAbstractGisGeometry passerGeometry():
|
|
|
}
|
|
|
{
|
|
|
(
|
|
|
- <POINT>
|
|
|
+ <POINT> "Z"?
|
|
|
{
|
|
|
geometry = passerPointArgs();
|
|
|
}
|
|
|
- | <MULTIPOINT>
|
|
|
+ | <MULTIPOINT> "Z"?
|
|
|
{
|
|
|
geometry = passerMultiPointArgs();
|
|
|
}
|
|
|
- | <LINESTRING>
|
|
|
+ | <LINESTRING> "Z"?
|
|
|
{
|
|
|
geometry = passerLineStringArgs();
|
|
|
}
|
|
|
- | <MULTILINESTRING>
|
|
|
+ | <MULTILINESTRING> "Z"?
|
|
|
{
|
|
|
geometry = passerMultiLineStringArgs();
|
|
|
}
|
|
|
- | <POLYGON>
|
|
|
+ | <POLYGON> "Z"?
|
|
|
{
|
|
|
geometry = passerPolygonArgs();
|
|
|
}
|
|
|
- | <MULTIPOLYGON>
|
|
|
+ | <MULTIPOLYGON> "Z"?
|
|
|
{
|
|
|
geometry = passerMultiPolygonArgs();
|
|
|
}
|
|
@@ -316,10 +316,10 @@ SGisPosition passerPosition():
|
|
|
return new SGisPosition(valList.get(0), valList.get(1), valList.get(2));
|
|
|
}
|
|
|
if (valList.size() >= 2) {
|
|
|
- return new SGisPosition(valList.get(0), valList.get(1), null);
|
|
|
+ return new SGisPosition(valList.get(0), valList.get(1), 0.0);
|
|
|
}
|
|
|
if (valList.size() >= 1) {
|
|
|
- return new SGisPosition(valList.get(0), 0.0, null);
|
|
|
+ return new SGisPosition(valList.get(0), 0.0, 0.0);
|
|
|
}
|
|
|
return new SGisPosition();
|
|
|
}
|