Changeset 267

Timestamp:

05/30/10 23:40:08 (21 months ago)

Author:

ol

Message:

Add reverse axis notion in ows_srs. Rewrite ows_srs_set_from_srsname function. Use Reverse axis GML3 notion in FE Enveloppe

Location:

trunk/src

Files:

• fe/fe_spatial_ops.c (modified) (6 diffs)
• ows/ows.h (modified) (1 diff)
• ows/ows_srs.c (modified) (7 diffs)
• wfs/wfs_get_feature.c (modified) (4 diffs)

trunk/src/fe/fe_spatial_ops.c

@@ -82 +82 @@
 {
     xmlChar *content, *srsname;
-    buffer *srid, *name, *tmp;
+    buffer *srid, *name, *tmp, *srsname_b;
     list *coord_min, *coord_max, *coord_pair;
     int srid_int;
+    bool ret;
     ows_bbox *bbox;
+    ows_srs *s=NULL;
 
     assert(o != NULL);
@@ -105 +107 @@
     srsname = xmlGetProp(n, (xmlChar *) "srsName");
 
+
     if (srsname != NULL) {
-        if (!check_regexp((char *) srsname, srid->buf)) {
+        srsname_b = buffer_init();
+        buffer_add_str(srsname_b, (char *) srsname);
+        s = ows_srs_init();
+
+        if (!ows_srs_set_from_srsname(o, s, srsname_b)) {
             fe->error_code = FE_ERROR_SRS;
             xmlFree(srsname);
+            buffer_free(srsname_b);
             buffer_free(name);
             buffer_free(srid);
+            ows_srs_free(s);
             return fe->sql;
         }
+
+        xmlFree(srsname);
+        buffer_free(srsname_b);
     }
 
@@ -136 +148 @@
 
         coord_max = list_explode_str(' ', (char *) content);
+
+        
     }
     /* GML2 */
@@ -153 +167 @@
 
     buffer_free(name);
-    xmlFree(srsname);
     xmlFree(content);
     buffer_free(srid);
@@ -159 +172 @@
     /* return the polygon's coordinates matching the bbox */
     bbox = ows_bbox_init();
-    if (!ows_bbox_set(o, bbox, atof(coord_min->first->value->buf),
+    if (s && s->is_reverse_axis) {
+        ret = ows_bbox_set(o, bbox,
+                          atof(coord_min->first->next->value->buf),
+                          atof(coord_min->first->value->buf),
+                          atof(coord_max->first->next->value->buf),
+                          atof(coord_max->first->value->buf),
+                          srid_int);
+    } else {
+        ret = ows_bbox_set(o, bbox,
+                          atof(coord_min->first->value->buf),
                           atof(coord_min->first->next->value->buf),
                           atof(coord_max->first->value->buf),
                           atof(coord_max->first->next->value->buf),
-                          srid_int)) {
+                          srid_int);
+    }
+
+    if (!ret) {
         fe->error_code = FE_ERROR_BBOX;
         list_free(coord_min);
         list_free(coord_max);
         ows_bbox_free(bbox);
+        if (s) ows_srs_free(s);
 
         return fe->sql;
@@ -177 +203 @@
     ows_bbox_to_query(o, bbox, fe->sql);
     ows_bbox_free(bbox);
+    if (s) ows_srs_free(s);
 
     return fe->sql;

trunk/src/ows/ows.h

@@ -123 +123 @@
 
 typedef struct Ows_srs {
-        int srid;
-        buffer * auth_name;
-        int auth_srid;
-    bool is_unit_degree;
+    int srid;
+    buffer * auth_name;
+    int auth_srid;
+    bool is_degree;
+    bool is_reverse_axis;
 } ows_srs;
 

trunk/src/ows/ows_srs.c

@@ -44 +44 @@
     c->auth_name = buffer_init();
     c->auth_srid = 0;
-    c->is_unit_degree = true;
+    c->is_degree = true;
+    c->is_reverse_axis = false;
 
     return c;
@@ -79 +80 @@
     fprintf(output, " auth_srid: %i\n", c->auth_srid);
 
-    if (c->is_unit_degree)
-        fprintf(output, " is_unit_degree: true\n]\n");
+    if (c->is_degree)
+        fprintf(output, " is_degree: true\n]\n");
     else
-        fprintf(output, " is_unit_degree: false\n]\n");
+        fprintf(output, " is_degree: false\n]\n");
+
+    if (c->is_reverse_axis)
+        fprintf(output, " is_reverse_axis: true\n]\n");
+    else
+        fprintf(output, " is_reverse_axis: false\n]\n");
 }
 #endif
@@ -126 +132 @@
     /* Such a way to know if units is meter or degree */
     if (atoi(PQgetvalue(res, 0, 1)) == 0)
-        c->is_unit_degree = true;
+        c->is_degree = true;
     else
-        c->is_unit_degree = false;
+        c->is_degree = false;
 
     PQclear(res);
@@ -150 +156 @@
         buffer_empty(s->auth_name);
         s->auth_srid = 0;
-        s->is_unit_degree = true;
+        s->is_degree = true;
+        s->is_reverse_axis=false;
 
         return true;
@@ -177 +184 @@
     /* Such a way to know if units is meter or degree */
     if (atoi(PQgetvalue(res, 0, 2)) == 0)
-        s->is_unit_degree = true;
+        s->is_degree = true;
     else
-        s->is_unit_degree = false;
+        s->is_degree = false;
 
     PQclear(res);
@@ -193 +200 @@
     int srid = -1;
     list * tokens = NULL;
+    char sep;
 
     assert(o != NULL);
@@ -198 +206 @@
     assert(srsname != NULL);
 
-    /* Severals formats are available, cf WFS 1.1.0 -> 9.2 (p36)
-     * See also RFC 5165 <http://tools.ietf.org/html/rfc5165>
-     *
-     * x-ogc should become obsolete a day, and only urn:ogc should remain
+    /* Severals srsName formats are available...
+     *  cf WFS 1.1.0 -> 9.2 (p36)
+     *  cf ISO 19142 -> 7.9.2.4.4 (p34)
+     *  cf RFC 5165 <http://tools.ietf.org/html/rfc5165>
+     *  cf CITE WFS-1.1 (GetFeature-tc17.2)
      */
-    if (strncmp(srsname->buf, "http://www.opengis.net/gml/srs/epsg.xml#", 40) == 0)
-        tokens = list_explode('#', srsname);
-    else if (strncmp(srsname->buf,   "http://www.epsg.org/", 20) == 0)
-        tokens = list_explode('/', srsname);
-    else if (strncmp(srsname->buf, "EPSG:", 5) == 0
-            || strncmp(srsname->buf, "urn:EPSG:geographicCRC:", 23) == 0
-            || strncmp(srsname->buf, "urn:ogc:def:crs:EPSG:", 21) == 0
-            || strncmp(srsname->buf, "urn:x-ogc:def:crs:EPSG:", 23) == 0) 
-        tokens = list_explode(':', srsname);
-
-    /* FIXME add here on in OWS request part, more strict regex tests, to
-     * be sure that srsname value pattern is right
-     *
-     * Remember that urn:ogc and urn:x-ogc ones could have an optional 
-     * version number
+
+     /* SRS pattern like:    EPSG:4326
+                             urn:EPSG:geographicCRS:4326
+                             urn:ogc:def:crs:EPSG:4326
+                             urn:ogc:def:crs:EPSG::4326
+                             urn:ogc:def:crs:EPSG:6.6:4326
+                             urn:x-ogc:def:crs:EPSG:6.6:4326
+                             http://www.opengis.net/gml/srs/epsg.xml#4326
+                             http://www.epsg.org/6.11.2/4326
      */
-    
+
+     if (!strncmp((char *) srsname->buf,        "EPSG:", 5)) {
+         sep = ':';
+         s->is_reverse_axis = false;
+
+     } else if (!strncmp((char *) srsname->buf, "urn:ogc:def:crs:EPSG:", 21)
+             || !strncmp((char *) srsname->buf, "urn:x-ogc:def:crs:EPSG:", 23)
+             || !strncmp((char *) srsname->buf, "urn:EPSG:geographicCRS:", 23)) {
+         sep = ':';
+         s->is_reverse_axis = true;
+
+     } else if (!strncmp((char *) srsname->buf, "http://www.opengis.net/gml/srs/epsg.xml#", 40)) {
+         sep = '#';
+         s->is_reverse_axis = false;
+
+     } else if (!strncmp((char *) srsname->buf, "http://www.epsg.org/", 20)) {
+         sep = '/';
+         s->is_reverse_axis = false;
+
+     } else return false;
+
+     tokens = list_explode(sep, srsname);
+
     if (tokens->last->value && tokens->last->value->buf)
-        srid = atoi(tokens->last->value->buf);
+        srid = atoi(tokens->last->value->buf);  /* TODO Add regexp isdigit test */
+    else return false;
 
     list_free(tokens);
+
     return ows_srs_set_from_srid(o, s, srid);
 }

trunk/src/wfs/wfs_get_feature.c

@@ -391 +391 @@
         /* execute the sql request */
         res = PQexec(o->pg, ln->value->buf);
+buffer_flush(ln->value, stderr);
 
         if (PQresultStatus(res) != PGRES_TUPLES_OK) {
@@ -482 +483 @@
                 }
 
-                if ((wr->srs != NULL && !wr->srs->is_unit_degree) || 
+                if ((wr->srs != NULL && !wr->srs->is_degree) || 
                         (wr->srs == NULL && ows_srs_meter_units(o, layer_name)))
                     buffer_add_int(select, o->meter_precision); 
@@ -510 +511 @@
                 }
 
-                if ((wr->srs != NULL && !wr->srs->is_unit_degree) || 
+                if ((wr->srs != NULL && !wr->srs->is_degree) || 
                         (wr->srs == NULL && ows_srs_meter_units(o, layer_name))) {
                     buffer_add_int(select, o->meter_precision);
@@ -539 +540 @@
                 }
 
-                if ((wr->srs != NULL && !wr->srs->is_unit_degree) || 
+                if ((wr->srs != NULL && !wr->srs->is_degree) || 
                         (wr->srs == NULL && ows_srs_meter_units(o, layer_name)))
                     buffer_add_int(select, o->meter_precision);