-
-
Notifications
You must be signed in to change notification settings - Fork 375
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gml_[item]_type: modify Date semantics, and add Time and DateTime
Currently, for vector features, we have a Date datatype that is used indifferently for Date, Time, DateTime, which can cause approximations in GML or other output formats (such as OGR GeoJSON), since the output doesn't really know the exact input. This change modifies the semantics of Date to mean date, without time, and add Time (time, without date) and DateTime. The type autodetection is modified in the MSSQL2008, OGR, Oracle and PostGIS backends. On the output side, the WFS/GML and OGR output are modified to take into account those 3 separate types.
- Loading branch information
Showing
25 changed files
with
329 additions
and
149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
aint,str,areal,adate | ||
1,a,2.4,"2013/10/26 12:00:00" | ||
aint,str,areal,adatetime,adate,atime | ||
1,a,2.4,"2013/10/26 12:00:00","2013/10/26","12:00:00" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
Integer,String,Real,DateTime | ||
Integer,String,Real,DateTime,Date,Time |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
msautotest/wxs/expected/wfs_time_postgis_date_getfeature.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
Content-Type: text/xml; subtype="gml/3.2.1"; charset=UTF-8 | ||
|
||
<?xml version='1.0' encoding="UTF-8" ?> | ||
<wfs:FeatureCollection | ||
xmlns:ms="http://mapserver.gis.umn.edu/mapserver" | ||
xmlns:gml="http://www.opengis.net/gml/3.2" | ||
xmlns:wfs="http://www.opengis.net/wfs/2.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?myparam=something&SERVICE=WFS&VERSION=2.0.0&REQUEST=DescribeFeatureType&TYPENAME=date&OUTPUTFORMAT=application%2Fgml%2Bxml%3B%20version%3D3.2 http://www.opengis.net/wfs/2.0 http://schemas.opengis.net/wfs/2.0/wfs.xsd http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/gml.xsd" | ||
timeStamp="" numberMatched="unknown" numberReturned="1" | ||
next="http://localhost/path/to/wfs_simple?myparam=something&SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&TYPENAMES=date&MAXFEATURES=1&STARTINDEX=1"> | ||
<wfs:boundedBy> | ||
<gml:Envelope srsName="urn:ogc:def:crs:EPSG::4326"> | ||
<gml:lowerCorner>37.98000 -130.00000</gml:lowerCorner> | ||
<gml:upperCorner>37.98000 -130.00000</gml:upperCorner> | ||
</gml:Envelope> | ||
</wfs:boundedBy> | ||
<wfs:member> | ||
<ms:date gml:id="date.1"> | ||
<gml:boundedBy> | ||
<gml:Envelope srsName="urn:ogc:def:crs:EPSG::4326"> | ||
<gml:lowerCorner>37.98000 -130.00000</gml:lowerCorner> | ||
<gml:upperCorner>37.98000 -130.00000</gml:upperCorner> | ||
</gml:Envelope> | ||
</gml:boundedBy> | ||
<ms:msGeometry> | ||
<gml:Point gml:id="date.1.1" srsName="urn:ogc:def:crs:EPSG::4326"> | ||
<gml:pos>37.98000 -130.00000</gml:pos> | ||
</gml:Point> | ||
</ms:msGeometry> | ||
<ms:date gml:id="date.1.date"><gml:timePosition>2004-01-01</gml:timePosition></ms:date> | ||
</ms:date> | ||
</wfs:member> | ||
</wfs:FeatureCollection> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.