This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit eaffa46df17fa8eaff578bfc6f2333463c0de5f2 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Jul 20 14:05:38 2016 +0200 ref #8007, create double legend for pelagic trawl catch --- .../gis/templates/EchoBaseLizmapTemplate.qgs.cfg | 2 +- .../gis/templates/EchoBaseQGisTemplate.qgs | 159 +++++++++++++++++---- 2 files changed, 136 insertions(+), 25 deletions(-) diff --git a/echobase-services/src/main/resources/gis/templates/EchoBaseLizmapTemplate.qgs.cfg b/echobase-services/src/main/resources/gis/templates/EchoBaseLizmapTemplate.qgs.cfg index 5b8021b..cb2a383 100644 --- a/echobase-services/src/main/resources/gis/templates/EchoBaseLizmapTemplate.qgs.cfg +++ b/echobase-services/src/main/resources/gis/templates/EchoBaseLizmapTemplate.qgs.cfg @@ -163,7 +163,7 @@ "abstract": "", "displayInLegend": "True", "baseLayer": "False", - "noLegendImage": "True", + "noLegendImage": "False", "id": "totalcatchspopwide{{voyageId}}", "title": "Pelagic trawl catch", "singleTile": "True", diff --git a/echobase-services/src/main/resources/gis/templates/EchoBaseQGisTemplate.qgs b/echobase-services/src/main/resources/gis/templates/EchoBaseQGisTemplate.qgs index 22c265f..932f1fc 100644 --- a/echobase-services/src/main/resources/gis/templates/EchoBaseQGisTemplate.qgs +++ b/echobase-services/src/main/resources/gis/templates/EchoBaseQGisTemplate.qgs @@ -5093,32 +5093,143 @@ <widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/> </edittype> </edittypes> - <renderer-v2 symbollevels="0" type="singleSymbol"> + <renderer-v2 forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0"> + <rules key="{efcbc026-c9e9-4ef3-9355-75ff390328a6}"> + <rule checkstate="0" key="{2bb281b0-c7d8-4504-9501-4d58ff9db73e}" symbol="0" label=""totalcatchengrenc""/> + <rule checkstate="0" key="{45ba255f-e81f-4cb1-bd12-7f4b4a514965}" symbol="1" label=""totalcatchsardpil""/> + <rule checkstate="0" key="{4104bbc3-85b0-4dd3-a74e-c1328565696d}" symbol="2" label=""totalcatchspraspr""/> + <rule checkstate="0" key="{68b45acf-f033-4928-aedc-414bc56c5d30}" symbol="3" label=""totalcatchmicrpou""/> + <rule checkstate="0" key="{a689facc-2d86-49c6-b657-ba6f9e287d6c}" symbol="4" label=""totalcatchscomsco""/> + <rule checkstate="0" key="{9db5daa1-9b1a-4ecc-a367-1a69d635b2f5}" symbol="5" label=""totalcatchtractru""/> + </rules> <symbols> - <symbol alpha="1" type="marker" name="0"> - <layer pass="0" class="SimpleMarker" locked="0"> - <prop k="angle" v="0"/> - <prop k="color" v="92,179,189,255"/> - <prop k="horizontal_anchor_point" v="1"/> - <prop k="name" v="circle"/> - <prop k="offset" v="0,0"/> - <prop k="offset_map_unit_scale" v="0,0"/> - <prop k="offset_unit" v="MM"/> - <prop k="outline_color" v="0,0,0,255"/> - <prop k="outline_style" v="solid"/> - <prop k="outline_width" v="0"/> - <prop k="outline_width_map_unit_scale" v="0,0"/> - <prop k="outline_width_unit" v="MM"/> - <prop k="scale_method" v="area"/> - <prop k="size" v="0"/> - <prop k="size_map_unit_scale" v="0,0"/> - <prop k="size_unit" v="MM"/> - <prop k="vertical_anchor_point" v="1"/> - </layer> - </symbol> + <symbol alpha="1" clip_to_extent="1" type="marker" name="0"> + <layer pass="0" class="SimpleMarker" locked="0"> + <prop k="angle" v="0"/> + <prop k="color" v="0,170,0,255"/> + <prop k="horizontal_anchor_point" v="1"/> + <prop k="name" v="circle"/> + <prop k="offset" v="0,0"/> + <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="offset_unit" v="MM"/> + <prop k="outline_color" v="0,0,0,255"/> + <prop k="outline_style" v="solid"/> + <prop k="outline_width" v="0"/> + <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="outline_width_unit" v="MM"/> + <prop k="scale_method" v="area"/> + <prop k="size" v="2"/> + <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="size_unit" v="MM"/> + <prop k="vertical_anchor_point" v="1"/> + </layer> + </symbol> + <symbol alpha="1" clip_to_extent="1" type="marker" name="1"> + <layer pass="0" class="SimpleMarker" locked="0"> + <prop k="angle" v="0"/> + <prop k="color" v="24,10,238,255"/> + <prop k="horizontal_anchor_point" v="1"/> + <prop k="name" v="circle"/> + <prop k="offset" v="0,0"/> + <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="offset_unit" v="MM"/> + <prop k="outline_color" v="0,0,0,255"/> + <prop k="outline_style" v="solid"/> + <prop k="outline_width" v="0"/> + <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="outline_width_unit" v="MM"/> + <prop k="scale_method" v="diameter"/> + <prop k="size" v="2"/> + <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="size_unit" v="MM"/> + <prop k="vertical_anchor_point" v="1"/> + </layer> + </symbol> + <symbol alpha="1" clip_to_extent="1" type="marker" name="2"> + <layer pass="0" class="SimpleMarker" locked="0"> + <prop k="angle" v="0"/> + <prop k="color" v="0,0,0,255"/> + <prop k="horizontal_anchor_point" v="1"/> + <prop k="name" v="circle"/> + <prop k="offset" v="0,0"/> + <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="offset_unit" v="MM"/> + <prop k="outline_color" v="0,0,0,255"/> + <prop k="outline_style" v="solid"/> + <prop k="outline_width" v="0"/> + <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="outline_width_unit" v="MM"/> + <prop k="scale_method" v="diameter"/> + <prop k="size" v="2"/> + <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="size_unit" v="MM"/> + <prop k="vertical_anchor_point" v="1"/> + </layer> + </symbol> + <symbol alpha="1" clip_to_extent="1" type="marker" name="3"> + <layer pass="0" class="SimpleMarker" locked="0"> + <prop k="angle" v="0"/> + <prop k="color" v="255,208,208,255"/> + <prop k="horizontal_anchor_point" v="1"/> + <prop k="name" v="circle"/> + <prop k="offset" v="0,0"/> + <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="offset_unit" v="MM"/> + <prop k="outline_color" v="0,0,0,255"/> + <prop k="outline_style" v="solid"/> + <prop k="outline_width" v="0"/> + <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="outline_width_unit" v="MM"/> + <prop k="scale_method" v="diameter"/> + <prop k="size" v="2"/> + <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="size_unit" v="MM"/> + <prop k="vertical_anchor_point" v="1"/> + </layer> + </symbol> + <symbol alpha="1" clip_to_extent="1" type="marker" name="4"> + <layer pass="0" class="SimpleMarker" locked="0"> + <prop k="angle" v="0"/> + <prop k="color" v="255,0,0,255"/> + <prop k="horizontal_anchor_point" v="1"/> + <prop k="name" v="circle"/> + <prop k="offset" v="0,0"/> + <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="offset_unit" v="MM"/> + <prop k="outline_color" v="0,0,0,255"/> + <prop k="outline_style" v="solid"/> + <prop k="outline_width" v="0"/> + <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="outline_width_unit" v="MM"/> + <prop k="scale_method" v="diameter"/> + <prop k="size" v="2"/> + <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="size_unit" v="MM"/> + <prop k="vertical_anchor_point" v="1"/> + </layer> + </symbol> + <symbol alpha="1" clip_to_extent="1" type="marker" name="5"> + <layer pass="0" class="SimpleMarker" locked="0"> + <prop k="angle" v="0"/> + <prop k="color" v="255,255,0,255"/> + <prop k="horizontal_anchor_point" v="1"/> + <prop k="name" v="circle"/> + <prop k="offset" v="0,0"/> + <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="offset_unit" v="MM"/> + <prop k="outline_color" v="0,0,0,255"/> + <prop k="outline_style" v="solid"/> + <prop k="outline_width" v="0"/> + <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="outline_width_unit" v="MM"/> + <prop k="scale_method" v="diameter"/> + <prop k="size" v="2"/> + <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/> + <prop k="size_unit" v="MM"/> + <prop k="vertical_anchor_point" v="1"/> + </layer> + </symbol> </symbols> - <rotation/> - <sizescale scalemethod="area"/> </renderer-v2> <customproperties> <property key="labeling" value="pal"/> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.