Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

support for viewParams vendor parameter in GetFeature XML model #165

Merged
merged 4 commits into from
+16,284 −18,248

2 participants

Geoff Williams Andrea Aime
Geoff Williams

Support for vendor parameter: viewParams in WFS GetFeature requests to support GEOS-5160: http://jira.codehaus.org/browse/GEOS-5160

Changes:

  • Set EMF runtime for WFS 2.0 to 2.6 to allow compilation against EMF version specified in pom.xml
  • Add viewParams attribute to GetFeature model for WFS 1 & 2
  • Created a wrapper around EList to handle parsing the string parsed from the attribute into the requried List datatype by string splitting
Geoff Williams GeoffWilliams referenced this pull request in geoserver/geoserver
Merged

support for viewParams in WFS GetFeature POST requests #195

Andrea Aime
Owner

I see that you did not mark viewParams as @generated, so the manual changes you made should not be required, however, doing parsing in the EMF model sounds wrong. In GeoServer we already have a KVP parser and that should be used instead of making the model deal with a detail of the protocol (how we represent the viewparams in the request is not the business of the object model)

Geoff Williams

Hi Andrea,

I've removed the wrapper code around EList - the model code now does nothing other then provide support for the extra field.

Geoff Williams GeoffWilliams reopened this
Andrea Aime
Owner

Hi Jeff, I had a look and it looks good but... sorry to be a pest, the files were reformatted using tabs, and the GeoTools/GeoServer coding convention says you should indent with 4 spaces, not tabs. Can you fix that?

Geoff Williams
Geoff Williams

Andrea, I started doing this but I think the upstream source has tabs instead of spaces too and the formatting is a bit wonky anyway - I think because its been generated through EMF. If I do a netbeans source reformat on the files in this pull request does that solve things for you? It would reformat the comments but they're not formatted right to start with far as I can see.

Andrea Aime
Owner

Ouch, I see now that some bits in the original files do contain tabs. The best way to go imho is to reformat them with Eclipse using the official coding convention: https://github.com/geotools/geotools/tree/master/build/eclipse
(sorry we don't have a Netbeans equivalent).

Geoff Williams

Aha, I can give that a go - I think this formatting problem has come from EMF. I had such a hard time getting it to generate the code I wanted.

Andrea Aime
Owner

Ha, I hear your pain, not a fan of EMF either.

Geoff Williams

Hi Andrea, I've done an eclipse source reformat on the java files in this pull request. How does this look?

Andrea Aime aaime merged commit 573031d into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 18, 2013
Commits on Mar 28, 2013
  1. remove elist wrapper from model

    Geoff Williams authored
Commits on Apr 8, 2013
  1. Merge remote-tracking branch 'upstream/master' into getfeature_viewpa…

    Geoff Williams authored
    …rams_support
Commits on Apr 21, 2013
  1. Geoff Williams
Something went wrong with that request. Please try again.