From 18e16c197551b6502e67b29423d2f7f470e78584 Mon Sep 17 00:00:00 2001
From: Jouski <arnaud.champollion@linux-alpes.org>
Date: Wed, 10 Mar 2021 18:11:32 +0100
Subject: [PATCH] MAJ style caliec

---
 style_caliec/styles/multipolygon.qml |  98 +++++++++++---
 style_caliec/symboles/basket.svg     | 191 +++++++++++++++++++++++----
 style_caliec/symboles/tennis.svg     |  97 ++++++++++++--
 3 files changed, 326 insertions(+), 60 deletions(-)

diff --git a/style_caliec/styles/multipolygon.qml b/style_caliec/styles/multipolygon.qml
index c49b608..fc39484 100644
--- a/style_caliec/styles/multipolygon.qml
+++ b/style_caliec/styles/multipolygon.qml
@@ -24,6 +24,7 @@
       <rule symbol="14" label="jardin" filter="&quot;leisure&quot;='garden'" key="{94f96529-7b1e-4ee8-9751-a52e1c01b8fd}"/>
       <rule symbol="15" label="chemin" filter="&quot;area:highway&quot;='path'" key="{59fe37ca-9fe0-452d-b1ff-0bbb47e2c5f4}"/>
       <rule symbol="16" label="sable" filter="&quot;surface&quot;='sand'" key="{c2d5ee3a-b2f3-4d9d-beea-539050495632}"/>
+      <rule symbol="17" label="terrain de tennis" scalemaxdenom="3000" scalemindenom="1" filter="&quot;leisure&quot;='pitch' and &quot;sport&quot;~'tennisl'" key="{c2564818-a4cb-4f7a-a4ff-2cb0787426c7}"/>
     </rules>
     <symbols>
       <symbol clip_to_extent="1" type="fill" name="0" force_rhr="0" alpha="1">
@@ -612,6 +613,67 @@
           </symbol>
         </layer>
       </symbol>
+      <symbol clip_to_extent="1" type="fill" name="17" force_rhr="0" alpha="1">
+        <layer locked="0" enabled="1" class="SimpleFill" pass="10">
+          <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
+          <prop v="222,236,255,255" k="color"/>
+          <prop v="bevel" k="joinstyle"/>
+          <prop v="0,0" k="offset"/>
+          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+          <prop v="MM" k="offset_unit"/>
+          <prop v="35,35,35,255" k="outline_color"/>
+          <prop v="solid" k="outline_style"/>
+          <prop v="0.3" k="outline_width"/>
+          <prop v="MM" k="outline_width_unit"/>
+          <prop v="solid" k="style"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+        <layer locked="0" enabled="1" class="CentroidFill" pass="11">
+          <prop v="1" k="point_on_all_parts"/>
+          <prop v="0" k="point_on_surface"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+          <symbol clip_to_extent="1" type="marker" name="@17@1" force_rhr="0" alpha="1">
+            <layer locked="0" enabled="1" class="SvgMarker" pass="0">
+              <prop v="0" k="angle"/>
+              <prop v="255,0,0,255" k="color"/>
+              <prop v="0" k="fixedAspectRatio"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_caliec/symboles/tennis.svg" k="name"/>
+              <prop v="0,0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MapUnit" k="offset_unit"/>
+              <prop v="35,35,35,255" k="outline_color"/>
+              <prop v="0" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MapUnit" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="10" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="MapUnit" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </layer>
+      </symbol>
       <symbol clip_to_extent="1" type="fill" name="2" force_rhr="0" alpha="1">
         <layer locked="0" enabled="1" class="SimpleFill" pass="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
@@ -871,7 +933,7 @@
             </Option>
           </data_defined_properties>
         </layer>
-        <layer locked="0" enabled="1" class="CentroidFill" pass="0">
+        <layer locked="0" enabled="1" class="CentroidFill" pass="11">
           <prop v="1" k="point_on_all_parts"/>
           <prop v="0" k="point_on_surface"/>
           <data_defined_properties>
@@ -890,14 +952,14 @@
               <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_caliec/symboles/basket.svg" k="name"/>
               <prop v="0,0" k="offset"/>
               <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
+              <prop v="MapUnit" k="offset_unit"/>
               <prop v="35,35,35,255" k="outline_color"/>
               <prop v="0" k="outline_width"/>
               <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
+              <prop v="MapUnit" k="outline_width_unit"/>
               <prop v="diameter" k="scale_method"/>
-              <prop v="7" k="size"/>
-              <prop v="3x:0,0,1,5,0,0" k="size_map_unit_scale"/>
+              <prop v="10" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
               <prop v="MapUnit" k="size_unit"/>
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
@@ -1143,8 +1205,8 @@
     </symbols>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="{75310562-a0b0-4a4d-a098-988c321a7c39}">
-      <rule description="parking" filter="&quot;amenity&quot;='parking'" key="{e7a3809d-29b3-428d-857d-226d3d16baf5}">
+    <rules key="{b44fda25-9bec-4407-8399-91dfa1c1e75e}">
+      <rule description="parking" filter="&quot;amenity&quot;='parking'" key="{8a26e424-d993-4f3e-a2c2-829f0e4a3b02}">
         <settings calloutType="simple">
           <text-style fieldName="'P'" fontWordSpacing="0" namedStyle="Bold" fontKerning="1" fontSizeUnit="MapUnit" textOrientation="horizontal" fontFamily="Liberation Sans" fontCapitals="0" fontItalic="0" isExpression="1" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" blendMode="0" textOpacity="1" fontWeight="75" fontStrikeout="0" textColor="0,149,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" useSubstitutions="0">
             <text-buffer bufferDraw="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferBlendMode="0" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
@@ -1604,14 +1666,14 @@
         </config>
       </editWidget>
     </field>
-    <field name="wall">
+    <field name="roof:shape">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="roof:shape">
+    <field name="wall">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1753,8 +1815,8 @@
     <alias index="39" name="" field="access"/>
     <alias index="40" name="" field="surface"/>
     <alias index="41" name="" field="highway"/>
-    <alias index="42" name="" field="wall"/>
-    <alias index="43" name="" field="roof:shape"/>
+    <alias index="42" name="" field="roof:shape"/>
+    <alias index="43" name="" field="wall"/>
     <alias index="44" name="" field="roof:levels"/>
     <alias index="45" name="" field="description"/>
     <alias index="46" name="" field="building:levels"/>
@@ -1814,8 +1876,8 @@
     <default applyOnUpdate="0" expression="" field="access"/>
     <default applyOnUpdate="0" expression="" field="surface"/>
     <default applyOnUpdate="0" expression="" field="highway"/>
-    <default applyOnUpdate="0" expression="" field="wall"/>
     <default applyOnUpdate="0" expression="" field="roof:shape"/>
+    <default applyOnUpdate="0" expression="" field="wall"/>
     <default applyOnUpdate="0" expression="" field="roof:levels"/>
     <default applyOnUpdate="0" expression="" field="description"/>
     <default applyOnUpdate="0" expression="" field="building:levels"/>
@@ -1873,8 +1935,8 @@
     <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="access"/>
     <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="surface"/>
     <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="highway"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="wall"/>
     <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="roof:shape"/>
+    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="wall"/>
     <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="roof:levels"/>
     <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="description"/>
     <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="building:levels"/>
@@ -1932,8 +1994,8 @@
     <constraint exp="" desc="" field="access"/>
     <constraint exp="" desc="" field="surface"/>
     <constraint exp="" desc="" field="highway"/>
-    <constraint exp="" desc="" field="wall"/>
     <constraint exp="" desc="" field="roof:shape"/>
+    <constraint exp="" desc="" field="wall"/>
     <constraint exp="" desc="" field="roof:levels"/>
     <constraint exp="" desc="" field="description"/>
     <constraint exp="" desc="" field="building:levels"/>
@@ -1951,22 +2013,22 @@
   <expressionfields/>
   <attributeactions>
     <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{7b365e8b-5e79-4ded-8c34-ffa925dc8e1f}" icon="" shortTitle="OpenStreetMap Browser" capture="0" type="5" name="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" notificationMessage="">
+    <actionsetting isEnabledOnlyWhenEditable="0" id="{f010491e-f6c8-413f-903b-40e98293c922}" icon="" shortTitle="OpenStreetMap Browser" capture="0" type="5" name="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" notificationMessage="">
       <actionScope id="Canvas"/>
       <actionScope id="Feature"/>
       <actionScope id="Field"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{037dc2df-5e84-45ac-a107-066512d984cb}" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" shortTitle="Mapillary" capture="0" type="1" name="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" notificationMessage="">
+    <actionsetting isEnabledOnlyWhenEditable="0" id="{6d15eaa3-7d9a-4159-98ae-76d3018120f2}" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" shortTitle="Mapillary" capture="0" type="1" name="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" notificationMessage="">
       <actionScope id="Canvas"/>
       <actionScope id="Feature"/>
       <actionScope id="Field"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{c5ef4238-70c9-48ba-a9c6-796e26e76631}" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" shortTitle="JOSM" capture="0" type="1" name="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" notificationMessage="">
+    <actionsetting isEnabledOnlyWhenEditable="0" id="{34ef0178-7a98-4c9d-9ed7-fa5c5a5c7422}" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" shortTitle="JOSM" capture="0" type="1" name="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" notificationMessage="">
       <actionScope id="Canvas"/>
       <actionScope id="Feature"/>
       <actionScope id="Field"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{fd115ac9-eaa2-4079-87bf-52710802a197}" icon="" shortTitle="User default editor" capture="0" type="5" name="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" notificationMessage="">
+    <actionsetting isEnabledOnlyWhenEditable="0" id="{8a407cbb-92da-4afb-a089-b42aadc7729f}" icon="" shortTitle="User default editor" capture="0" type="5" name="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" notificationMessage="">
       <actionScope id="Canvas"/>
       <actionScope id="Feature"/>
       <actionScope id="Field"/>
diff --git a/style_caliec/symboles/basket.svg b/style_caliec/symboles/basket.svg
index 916328d..80fb27e 100644
--- a/style_caliec/symboles/basket.svg
+++ b/style_caliec/symboles/basket.svg
@@ -1,41 +1,174 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg2" sodipodi:version="0.32" inkscape:version="0.45" sodipodi:docbase="/home/gioppo/Disegni" sodipodi:docname="basketball2.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/gioppo/Disegni/basketball2.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:modified="TRUE">
-  <defs id="defs4">
-    <linearGradient id="linearGradient2189">
-      <stop style="stop-color:#ffd52a;stop-opacity:1;" offset="0" id="stop2191"/>
-      <stop style="stop-color:#ff7f2a;stop-opacity:1;" offset="1" id="stop2193"/>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="252.24365"
+   height="251.86287"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="basket.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/gioppo/Disegni/basketball2.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:modified="TRUE"
+   version="1.1">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient2189">
+      <stop
+         style="stop-color:#ffd52a;stop-opacity:1;"
+         offset="0"
+         id="stop2191" />
+      <stop
+         style="stop-color:#ff7f2a;stop-opacity:1;"
+         offset="1"
+         id="stop2193" />
     </linearGradient>
-    <linearGradient id="linearGradient17099">
-      <stop style="stop-color:#f09700;stop-opacity:1;" offset="0" id="stop17101"/>
-      <stop id="stop17107" offset="1" style="stop-color:#f6f700;stop-opacity:0.49803922;"/>
-      <stop style="stop-color:#f6f700;stop-opacity:0;" offset="1" id="stop17103"/>
+    <linearGradient
+       id="linearGradient17099">
+      <stop
+         style="stop-color:#f09700;stop-opacity:1;"
+         offset="0"
+         id="stop17101" />
+      <stop
+         id="stop17107"
+         offset="1"
+         style="stop-color:#f6f700;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#f6f700;stop-opacity:0;"
+         offset="1"
+         id="stop17103" />
     </linearGradient>
-    <linearGradient id="linearGradient4180">
-      <stop style="stop-color:#ffe92a;stop-opacity:1;" offset="0" id="stop4182"/>
-      <stop id="stop4188" offset="0.5" style="stop-color:#fff22a;stop-opacity:0.49803922;"/>
-      <stop style="stop-color:#ff7f2a;stop-opacity:0;" offset="1" id="stop4184"/>
+    <linearGradient
+       id="linearGradient4180">
+      <stop
+         style="stop-color:#ffe92a;stop-opacity:1;"
+         offset="0"
+         id="stop4182" />
+      <stop
+         id="stop4188"
+         offset="0.5"
+         style="stop-color:#fff22a;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#ff7f2a;stop-opacity:0;"
+         offset="1"
+         id="stop4184" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4180" id="radialGradient5277" cx="378.40622" cy="466.38931" fx="378.40622" fy="466.38931" r="171.71356" gradientTransform="matrix(1,0,0,0.9950338,0,2.3161611)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient17099" id="radialGradient17105" cx="129.15811" cy="738.49413" fx="129.15811" fy="738.49413" r="483.95964" gradientTransform="matrix(1,0,0,0.9994274,0,0.4228264)" gradientUnits="userSpaceOnUse"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient2189" id="radialGradient2197" cx="362.17661" cy="386.00372" fx="362.17661" fy="386.00372" r="126.13136" gradientTransform="matrix(1.137734,0.8803895,-0.611057,0.7896716,185.98624,-237.57876)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient2189" id="linearGradient3172" x1="481.63095" y1="537.79144" x2="274.91696" y2="486.54004" gradientUnits="userSpaceOnUse"/>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4180"
+       id="radialGradient5277"
+       cx="378.40622"
+       cy="466.38931"
+       fx="378.40622"
+       fy="466.38931"
+       r="171.71356"
+       gradientTransform="matrix(1,0,0,0.9950338,0,2.3161611)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient17099"
+       id="radialGradient17105"
+       cx="129.15811"
+       cy="738.49414"
+       fx="129.15811"
+       fy="738.49414"
+       r="483.95963"
+       gradientTransform="matrix(1,0,0,0.9994274,0,0.4228264)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2189"
+       id="linearGradient3172"
+       x1="481.63095"
+       y1="537.79144"
+       x2="274.91696"
+       y2="486.54004"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.58534981" inkscape:cx="676.72069" inkscape:cy="496.62837" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1152" inkscape:window-height="821" inkscape:window-x="0" inkscape:window-y="25"/>
-  <metadata id="metadata7">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.1706996"
+     inkscape:cx="1.7660124"
+     inkscape:cy="31.551992"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1878"
+     inkscape:window-height="1031"
+     inkscape:window-x="42"
+     inkscape:window-y="25"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g inkscape:label="Livello 1" inkscape:groupmode="layer" id="layer1">
-    <path style="fill:url(#radialGradient2197);fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:4.9243083;stroke-miterlimit:4;stroke-opacity:1" d="M 290.0785,500.00544 C 259.96555,438.84531 285.24054,364.80661 346.49588,334.74047 C 407.75122,304.67433 481.90518,329.91004 512.01812,391.07016 C 542.13106,452.23029 516.85608,526.269 455.60074,556.33513 C 394.4012,586.37388 320.32972,561.22529 290.15667,500.16393" id="path2236"/>
-    <path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.73245698px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 277.39495,430.72241 L 277.39495,430.72241 z " id="path9163"/>
-    <path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.39474154;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 278.66319,433.19164 C 298.10952,385.86469 514.13298,432.36856 523.43341,457.88397" id="path9165" sodipodi:nodetypes="cc"/>
-    <path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.39474154;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 430.85192,324.54541 C 534.84755,361.17236 486.65446,555.83018 389.00002,567.76481" id="path10136" sodipodi:nodetypes="cc"/>
-    <path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.39474154;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 349.6846,333.18772 C 408.86911,338.12619 447.76178,427.01856 510.75101,394.91854" id="path12150" sodipodi:nodetypes="cc"/>
-    <path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.39474154;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 295.15031,510.97246 C 380.12235,523.73016 492.99566,405.61854 500.60509,519.61478" id="path13121" sodipodi:nodetypes="cc"/>
+  <g
+     inkscape:label="Livello 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-274.92648,-319.60744)">
+    <path
+       style="fill:#ee6900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.9243083;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 290.0785,500.00544 c -30.11295,-61.16013 -4.83796,-135.19883 56.41738,-165.26497 61.25534,-30.06614 135.4093,-4.83043 165.52224,56.32969 30.11294,61.16013 4.83796,135.19884 -56.41738,165.26497 -61.19954,30.03875 -135.27102,4.89016 -165.44407,-56.1712"
+       id="path2236"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.73245698px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 277.39495,430.72241 Z"
+       id="path9163"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.39474154;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 278.66319,433.19164 c 19.44633,-47.32695 235.46979,-0.82308 244.77022,24.69233"
+       id="path9165"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.39474154;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 430.85192,324.54541 c 103.99563,36.62695 55.80254,231.28477 -41.8519,243.2194"
+       id="path10136"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.39474154;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 349.6846,333.18772 c 59.18451,4.93847 98.07718,93.83084 161.06641,61.73082"
+       id="path12150"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.39474154;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 295.15031,510.97246 c 84.97204,12.7577 197.84535,-105.35392 205.45478,8.64232"
+       id="path13121"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/style_caliec/symboles/tennis.svg b/style_caliec/symboles/tennis.svg
index bbfd588..10d14c2 100644
--- a/style_caliec/symboles/tennis.svg
+++ b/style_caliec/symboles/tennis.svg
@@ -1,14 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="123.547" height="123.539" xmlns="http://www.w3.org/2000/svg">
- <title>SQUASH YELLOW</title>
-
- <g>
-  <title>Layer 1</title>
-  <g id="svg_1">
-   <path stroke-width="0" id="svg_3" fill="none" d="m15.242,2.918c-7.108999,0 -12.898,5.789 -12.898,12.898l0,92.827997c0,7.117004 5.789001,12.898003 12.898,12.898003l92.804997,0c7.133003,0 12.922005,-5.780998 12.922005,-12.898003l0,-92.827997c0,-7.109 -5.789001,-12.898 -12.922005,-12.898l-92.804997,0z"/>
-   <path fill="black" id="svg_4" d="m18.375,68.449005c-2.031006,0 -3.688004,1.655991 -3.688004,3.687996c0,2.023003 1.656006,3.655998 3.688004,3.655998c2.022995,0 3.664001,-1.632996 3.664001,-3.655998c0,-2.032005 -1.641006,-3.687996 -3.664001,-3.687996z"/>
-   <path fill="black" id="svg_5" d="m72.476997,35.762001c4.398003,0 7.984001,-3.57 7.984001,-7.984001c0,-4.422001 -3.585999,-8.007999 -7.984001,-8.007999c-4.413994,0 -8,3.585999 -8,8.007999c0,4.413002 3.584999,7.984001 8,7.984001z"/>
-   <path fill="black" id="svg_6" d="m109.828003,105.973l-12.984001,-15.328003c0,0 -4.055,-23.68 -4.055,-23.734001c0,-0.022995 -0.609001,-2.679993 -0.609001,-2.679993c0.023003,0.022995 -1.640999,-7.477001 -2.905998,-13.336002c2.022995,1.172001 3.859001,2.227001 3.952995,2.272999c0.102005,0.219002 6.883003,13.132996 6.883003,13.132996c0.515999,0.953003 1.366997,1.664001 2.398003,1.977005c1.046997,0.32 2.147995,0.219002 3.101997,-0.289001c0.945,-0.491997 1.655998,-1.343994 1.976997,-2.390999c0.335999,-1.030998 0.242004,-2.125 -0.272995,-3.077995l-7.445,-14.188004c0,0 -0.289001,-0.507999 -0.68,-0.898003c-0.539001,-0.538998 -1.711006,-1.202999 -1.711006,-1.202999l-14.452995,-8.227001c-1.835999,-0.921997 -3.859001,-1.241997 -5.883003,-0.805c-0.827995,0.172005 -1.609001,0.492004 -2.491997,0.977005c-0.102005,0.022995 -3.289001,1.444996 -5.148003,5.788998l-7.421997,14.938c0,0 -11.296997,2.203003 -11.688004,2.272995c-0.101997,0.02301 -0.195,0.047005 -0.272995,0.094009l-10.555008,-7.469006c-2.375,-1.655998 -2.663994,-6.640999 -2.687996,-6.835999c-0.297005,-3.414001 -2.25,-6.640999 -5.374992,-8.858997c-2.828003,-2 -6.25,-2.859001 -9.375,-2.344002c-2.438004,0.414001 -4.516006,1.68 -5.836014,3.538998c-1.022995,1.438 -1.561996,3.172001 -1.561996,5.031002c0,0.022999 0.14801,1.609001 0.14801,1.609001c0.538986,3.147999 2.468994,6.077999 5.296997,8.101997c2.858994,2.031002 6.25,2.882999 9.375,2.344002l0.733994,-0.141003c0.070007,-0.054996 4.758003,-1.491997 7.055008,0.070004c0,0.022999 7.897995,5.594002 10,7.077995c-0.219009,0.344002 -0.609009,1.102005 -0.586006,1.883003c0,0.241997 0.023003,0.484001 0.07,0.734001c0.414001,2.195 2.561996,3.655998 4.766006,3.218994l14.007996,-2.733994c0,0 1.203003,-0.367004 1.710999,-0.734001c0.664001,-0.461006 1.148003,-1.437996 1.148003,-1.437996l3.687996,-7.422005c0,0 2.530998,11.984001 2.578003,12.210999c-0.289001,0.289001 -11.492004,12.18 -11.492004,12.18l-0.194992,0.242004c-1.094009,1 -1.703003,2.32 -1.703003,3.710999l0,25.195c0,2.687996 2.195,4.859001 4.882996,4.859001c2.656006,0 4.852005,-2.172005 4.852005,-4.859001c0,0 0,-20.703003 0,-21.047005c1.030998,-1.07 9.616997,-10.125 11.913994,-12.522995c0.242004,1.421997 2.461006,14.187996 2.461006,14.187996c0.195,1.125 0.734001,2.148003 1.538994,2.977005c0,0.022995 15.43,18.241997 15.43,18.241997c0.859001,0.976997 2.031006,1.585999 3.32,1.703003c1.297005,0.101997 2.539001,-0.312004 3.539001,-1.148003c1.125,-0.945 1.710999,-2.344002 1.710999,-3.710999c-0.001999,-1.118004 -0.369995,-2.220001 -1.150993,-3.149002zm-77.007996,-54.93c-0.852005,1.195 -2.172012,1.977001 -3.805008,2.273003c-2.296997,0.390999 -4.858994,-0.273003 -7.007996,-1.836002c-2.172012,-1.538998 -3.641006,-3.734001 -4.031006,-6.030998l-0.093994,-1.141003c0,-1.202999 0.311996,-2.272999 0.97699,-3.202999c2.117004,-2.977001 6.977005,-3.172001 10.836014,-0.438c3.835999,2.735001 5.249992,7.399002 3.125,10.375999z"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="118.625"
+   height="118.624"
+   version="1.1"
+   id="svg13"
+   sodipodi:docname="tennis.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata19">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>SQUASH YELLOW</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs17" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1878"
+     inkscape:window-height="1031"
+     id="namedview15"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="3.8206558"
+     inkscape:cx="23.516536"
+     inkscape:cy="72.818296"
+     inkscape:window-x="42"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg13" />
+  <title
+     id="title2">SQUASH YELLOW</title>
+  <g
+     id="g11"
+     transform="translate(-2.344,-2.918)">
+    <title
+       id="title4">Layer 1</title>
+    <g
+       id="svg_1">
+      <path
+         id="svg_3"
+         d="M 15.242,2.918 C 8.133001,2.918 2.344,8.707 2.344,15.816 v 92.828 c 0,7.117 5.789001,12.898 12.898,12.898 h 92.805 c 7.133,0 12.922,-5.781 12.922,-12.898 V 15.816 c 0,-7.109 -5.789,-12.898 -12.922,-12.898 z"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke-width:0" />
+      <path
+         id="svg_4"
+         d="m 18.375,68.449005 c -2.031006,0 -3.688004,1.655991 -3.688004,3.687996 0,2.023003 1.656006,3.655998 3.688004,3.655998 2.022995,0 3.664001,-1.632996 3.664001,-3.655998 0,-2.032005 -1.641006,-3.687996 -3.664001,-3.687996 z"
+         inkscape:connector-curvature="0"
+         style="fill:#000000" />
+      <path
+         id="svg_5"
+         d="m 72.476997,35.762001 c 4.398003,0 7.984001,-3.57 7.984001,-7.984001 0,-4.422001 -3.585999,-8.007999 -7.984001,-8.007999 -4.413994,0 -8,3.585999 -8,8.007999 0,4.413002 3.584999,7.984001 8,7.984001 z"
+         inkscape:connector-curvature="0"
+         style="fill:#000000" />
+      <path
+         id="svg_6"
+         d="M 109.828,105.973 96.844002,90.644997 c 0,0 -4.055,-23.68 -4.055,-23.734001 0,-0.02299 -0.609001,-2.679993 -0.609001,-2.679993 0.023,0.02299 -1.640999,-7.477001 -2.905998,-13.336002 2.022995,1.172001 3.859001,2.227001 3.952995,2.272999 0.102005,0.219002 6.883002,13.132996 6.883002,13.132996 0.516,0.953003 1.367,1.664001 2.398,1.977005 1.047,0.32 2.148,0.219002 3.102,-0.289001 0.945,-0.491997 1.656,-1.343994 1.977,-2.390999 0.336,-1.030998 0.242,-2.125 -0.273,-3.077995 L 99.869003,48.332002 c 0,0 -0.289001,-0.507999 -0.68,-0.898003 C 98.650002,46.895001 97.477997,46.231 97.477997,46.231 L 83.025002,38.003999 c -1.835999,-0.921997 -3.859001,-1.241997 -5.883003,-0.805 -0.827995,0.172005 -1.609001,0.492004 -2.491997,0.977005 -0.102005,0.023 -3.289001,1.444996 -5.148003,5.788998 l -7.421997,14.938 c 0,0 -11.296997,2.203003 -11.688004,2.272995 -0.101997,0.02301 -0.195,0.047 -0.272995,0.09401 L 39.563995,53.801 c -2.375,-1.655998 -2.663994,-6.640999 -2.687996,-6.835999 -0.297005,-3.414001 -2.25,-6.640999 -5.374992,-8.858997 -2.828003,-2 -6.25,-2.859001 -9.375,-2.344002 -2.438004,0.414001 -4.516006,1.68 -5.836014,3.538998 -1.022995,1.438 -1.561996,3.172001 -1.561996,5.031002 0,0.023 0.14801,1.609001 0.14801,1.609001 0.538986,3.147999 2.468994,6.077999 5.296997,8.101997 2.858994,2.031002 6.25,2.882999 9.375,2.344002 l 0.733994,-0.141003 c 0.07001,-0.055 4.758003,-1.491997 7.055008,0.07 0,0.023 7.897995,5.594002 10,7.077995 -0.219009,0.344002 -0.609009,1.102005 -0.586006,1.883003 0,0.241997 0.023,0.484001 0.07,0.734001 0.414001,2.195 2.561996,3.655998 4.766006,3.218994 l 14.007996,-2.733994 c 0,0 1.203003,-0.367004 1.710999,-0.734001 0.664001,-0.461006 1.148003,-1.437996 1.148003,-1.437996 L 72.142,56.902 c 0,0 2.530998,11.984001 2.578003,12.210999 -0.289001,0.289001 -11.492004,12.18 -11.492004,12.18 l -0.194992,0.242004 c -1.094009,1 -1.703003,2.32 -1.703003,3.710999 V 110.441 c 0,2.688 2.195,4.859 4.882996,4.859 2.656006,0 4.852005,-2.172 4.852005,-4.859 0,0 0,-20.703001 0,-21.047003 1.030998,-1.07 9.616997,-10.125 11.913994,-12.522995 0.242004,1.421997 2.461006,14.187996 2.461006,14.187996 0.195,1.125 0.734001,2.148003 1.538994,2.977005 0,0.023 15.430001,18.241997 15.430001,18.241997 0.859,0.977 2.03101,1.586 3.32,1.703 1.297,0.102 2.539,-0.312 3.539,-1.148 1.125,-0.945 1.711,-2.344 1.711,-3.711 -0.002,-1.118 -0.37,-2.22 -1.15099,-3.149 z M 32.820007,51.043 c -0.852005,1.195 -2.172012,1.977001 -3.805008,2.273003 C 26.718002,53.707002 24.156005,53.043 22.007003,51.480001 19.834991,49.941003 18.365997,47.746 17.975997,45.449003 L 17.882003,44.308 c 0,-1.202999 0.311996,-2.272999 0.97699,-3.202999 2.117004,-2.977001 6.977005,-3.172001 10.836014,-0.438 3.835999,2.735001 5.249992,7.399002 3.125,10.375999 z"
+         inkscape:connector-curvature="0"
+         style="fill:#000000" />
+    </g>
   </g>
- </g>
-</svg>
\ No newline at end of file
+</svg>