Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Several changes, mostly for lyrx->geostyler conversion #55

Merged
merged 62 commits into from
Dec 8, 2021
Merged

Several changes, mostly for lyrx->geostyler conversion #55

merged 62 commits into from
Dec 8, 2021

Conversation

volaya
Copy link
Contributor

@volaya volaya commented Dec 6, 2021 •
edited
Loading

These changes come from work done at C2C for a customer that needed converting a large set of styles from lyr to SLD. Problems found in that work have been fixed in the commits in this PR, and they make the library more robust and better capable of converting sstyles from the ArcGIS format into geostyler and SLD

There are also some minor changes to other parts of the library.

More details about the changes in this PR can be found here:

https://github.com/camptocamp/bridge-style/wiki

vuilleumierc and others added 30 commits April 9, 2021 10:33
@vuilleumierc
Install submodules in setup.py
05ffd78
@volaya
Merge pull request #1 from camptocamp/install-submodules
123a890 
Install submodules in setup.py
@vuilleumierc
Create worflow to notify camptocamp/lyrx2sld on updates
ec512bb
@vuilleumierc
Merge pull request #2 from camptocamp/ci-notify-lyrx2sld
ddaf9e8 
CI: notify lyrx2sld on updates
@vuilleumierc
Add custom event type
52ef8b9
@vuilleumierc
Merge pull request #3 from camptocamp/ci-notify-lyrx2sld
c4b8bb3 
Add custom event type (CI: notify lyrx2sld on updates)
@volaya
added support for HSV colors in arcgis format
1a8f278
@volaya
added library version
ae558e1
@volaya
some changes to style2style
b36edcc
@volaya
add version to SLD output
b4df9a4
@volaya
added mapping for esri fonts markers
b570abe
@vuilleumierc
Delete notify.yaml
5c9314a
@vuilleumierc
Add GitHub Action to notify lyrx2sld on updates
7639f78
@vuilleumierc
Merge pull request #5 from camptocamp/ci-notify-lyrx2sld
c5c9b0e 
CI: Add Action to notify lyrx2sld on updates
@vuilleumierc
Update notify.yaml
4542a5f
@vuilleumierc
Update notify.yaml
7b824ec
@volaya
fix for hatch fill from arcgis format
a282ecd
@vuilleumierc
Merge pull request #4 from volaya/fixes
ed4f7cc 
Fixes for arcgis format
@vuilleumierc
Update mapping of ESRI symbols
7665b10
@volaya
Merge pull request #6 from camptocamp/esri-font-mapping
9c1ee9b 
Update mapping of ESRI symbols
@volaya
fixed case of no color value in arcgis format
245eb24
@volaya
handle case of possible missing fieldValues in arcgis format
60d67a0
@volaya
fixed case of missing halo symbol in arcgis format
432bba5
@volaya
correctly handle case of CIMUniqueValueRenderer with no groups
6a3d4c4
@volaya
support for CIMPictureMarker
0eac2b4
@volaya
handle icons on style2style.py
5122214 
This changes the return from togeostyler and fromgestyler methods for all formts
@volaya
handle case of missing label property in arcgis format
58b42e4
@volaya
show error on empty geostyler result
4b9184f
@volaya
added support for CIMClassBreaksRenderer
ebfaa0f
@volaya
prevent exception if rgb values are float in arcgis format
1b3a7f2
volaya and others added 22 commits June 7, 2021 14:52
@volaya
removed unused method
907b612
@volaya
LYRX: don't convert outline of polygons to line symbolizer
71e5692
@vuilleumierc
Merge pull request #8 from volaya/master
bf1e69b 
correctly convert polygon outlines
@volaya
fixed dashed outlines and hatched fills in lyrx2geostyler conversion
e505732
@volaya
added support for concatenated strings from lyrx format
9a15360
@volaya
removed unused code
fe07a3f
@volaya
fixed concatenation of strings in labels in arcgis format
11e7072
@volaya
added support for rotation in lyrx to geostyler conversion
0b4bb94 
Also, this commit fixes the handling of min/max scale denominators
@vuilleumierc
Fix rotation sign
f508314
@volaya
Merge pull request #9 from camptocamp/fix-rotation
e84de18 
Fix rotation sign
@vuilleumierc
Add support for symbol transparency (#10)
c099511
@volaya
support whereClause in conversion of labels from lyrx (#11)
e2df76e
@vuilleumierc
Improve symbol support (#13)
32d94b5 
* Use symbol fill color, refine opacity support

* Use stroke width, default to 0

* Default symbol fill color to white
@vuilleumierc
Add support for null value comparison (#14)
dbb4a47 
GEO-4833
@volaya
do not add polygon fill if not present in lyrx source
c9038d2
@volaya
added support for CIMGrayColor in lyrx
6a76520
@volaya
added partial support for CIMVectorMarker
dfe09a9
@volaya
correctly add 'group' vendor option in sld output
063b47b
@vuilleumierc
Merge pull request #15 from volaya/fixes
d265d20 
Fixes (GEO-4953, GEO-4951, GEO-4950, GEO-4949)
@volaya
fixed halos and class breaks in lyrx->geostyler conversion
4d79991
@volaya
Merge branch 'master' of https://github.com/GeoCat/bridge-style
2b358fa 
# Conflicts:
#	bridgestyle/sld/fromgeostyler.py
#	bridgestyle/style2style.py
#	setup.py
@volaya
removed workflows
f770958
@GeoSander
Copy link
Member

GeoSander commented Dec 7, 2021 •
edited
Loading

Nice work @volaya and @vuilleumierc! And thanks for contributing back!

Since bridge-style is a dependency for QGIS Bridge, I'll test this work as soon as possible. Seems that there may be some breaking changes, but all easy to fix, I suppose.

Q: The PR consists of a lot of tiny commits. Would you mind if I do a Squash & Merge? Alternatively, you could perhaps squash some commits yourself.

@GeoSander GeoSander self-requested a review December 7, 2021 10:54
@GeoSander GeoSander self-assigned this Dec 7, 2021
@volaya
Copy link
Contributor Author

volaya commented Dec 7, 2021

Yes, feel free to squash them, or at least the ones that affect the module that perfomrs the lyrx to geostyler conversion.

Thanks!

@GeoSander
Copy link
Member

Well, for a PR, I can only squash everything into one commit or keep all the commits. So if you wish to squash the lyrx->geostyler-related commits, please do so and force push your changes to the camptocamp:pr_c2c branch. Then I'll start the review and merge as-is!

@volaya
Copy link
Contributor Author

volaya commented Dec 8, 2021

No need to worry about that, let's squash all the PR

GeoSander
GeoSander approved these changes Dec 8, 2021
View reviewed changes
Copy link
Member

@GeoSander GeoSander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, seems good to me! I only need to change some calls to the SLD converter in QGIS Bridge I see.
Thanks again!

@GeoSander GeoSander merged commit 3836958 into GeoCat:master Dec 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GeoSander GeoSander GeoSander approved these changes

Assignees

@GeoSander GeoSander

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@volaya @GeoSander @vuilleumierc