-
-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Tests and fix to read sld:Rotation when does not have ogc sub tags #4049
Conversation
test_qgssymbollayer_readsld.py | ||
======= | ||
test_qgssymbollayerv2_readsld.py | ||
>>>>>>> Tests and fix to read sld:Rotation when does not have ogc sub tags |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge conflict!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gulp! tnx
Nice work @luipir |
If you have 1 minute more, there are two minor and irrelevant typos. |
if ( elem.hasChildNodes() && | ||
elem.firstChild().nodeType() == QDomNode::TextNode ) | ||
{ | ||
function = elem.firstChild().nodeValue(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn't this need to be sent through QgsOgcUtils::expressionFromOgcFilter( ... );
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or possibly this logic should be moved into expressionFromOgcFilter
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
make sense... I supposed the expressionFromOgcFilter would manage the parsing of an aexpression logic that is more complex. I'll give a check.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
right... is simple and possibile... I'll do it! tnx @m-kuhn to point it out.
In this moment assume that the expression build does not consider a literal constant othan expressed with ogc:Literal
@m-kuhn done! I wasn't sure if it was the correct way to proceed. The OGC filter does not consider the possibility to have operators outside ogc tag. Btw I implemented as requested because IMHO there is no a correct semantic solution. |
just a note... code for 2.18/2.14 is slightly different. due to different api on QgsExpression where there is not setExpression method introduced in Master |
Added fix to read correctly sld:Rotation tags from SLD