diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py index d8d8313dbfc7..0c0d4408d127 100644 --- a/lib/matplotlib/projections/polar.py +++ b/lib/matplotlib/projections/polar.py @@ -8,7 +8,7 @@ import matplotlib.axis as maxis import matplotlib.markers as mmarkers import matplotlib.patches as mpatches -import matplotlib.path as mpath +from matplotlib.path import Path import matplotlib.ticker as mticker import matplotlib.transforms as mtransforms import matplotlib.spines as mspines @@ -50,11 +50,57 @@ def transform_non_affine(self, tr): def transform_path_non_affine(self, path): # docstring inherited - vertices = path.vertices - if len(vertices) == 2 and vertices[0, 0] == vertices[1, 0]: - return mpath.Path(self.transform(vertices), path.codes) - ipath = path.interpolated(path._interpolation_steps) - return mpath.Path(self.transform(ipath.vertices), ipath.codes) + if not len(path) or path._interpolation_steps == 1: + return Path(self.transform_non_affine(path.vertices), path.codes) + xys = [] + codes = [] + last_t = last_r = None + for trs, c in path.iter_segments(): + trs = trs.reshape((-1, 2)) + if c == Path.LINETO: + (t, r), = trs + if t == last_t: # Same angle: draw a straight line. + xys.extend(self.transform_non_affine(trs)) + codes.append(Path.LINETO) + elif r == last_r: # Same radius: draw an arc. + # The following is complicated by Path.arc() being + # "helpful" and unwrapping the angles, but we don't want + # that behavior here. + last_td, td = np.rad2deg([last_t, t]) + if self._use_rmin and self._axis is not None: + r = ((r - self._axis.get_rorigin()) + * self._axis.get_rsign()) + if last_td <= td: + while td - last_td > 360: + arc = Path.arc(last_td, last_td + 360) + xys.extend(arc.vertices[1:] * r) + codes.extend(arc.codes[1:]) + last_td += 360 + arc = Path.arc(last_td, td) + xys.extend(arc.vertices[1:] * r) + codes.extend(arc.codes[1:]) + else: + # The reverse version also relies on the fact that all + # codes but the first one are the same. + while last_td - td > 360: + arc = Path.arc(last_td - 360, last_td) + xys.extend(arc.vertices[::-1][1:] * r) + codes.extend(arc.codes[1:]) + last_td -= 360 + arc = Path.arc(td, last_td) + xys.extend(arc.vertices[::-1][1:] * r) + codes.extend(arc.codes[1:]) + else: # Interpolate. + trs = cbook.simple_linear_interpolation( + np.row_stack([(last_t, last_r), trs]), + path._interpolation_steps)[1:] + xys.extend(self.transform_non_affine(trs)) + codes.extend([Path.LINETO] * len(trs)) + else: # Not a straight line. + xys.extend(self.transform_non_affine(trs)) + codes.extend([c] * len(trs)) + last_t, last_r = trs[-1] + return Path(xys, codes) def inverted(self): # docstring inherited diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.pdf b/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.pdf index 4c93d903e17c..b69860d339e9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.png b/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.png index 97bba39958c7..6bbef89a6e2f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.png and b/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.svg b/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.svg index b0388c0c7003..19730045f101 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/markevery_polar.svg @@ -1,7 +1,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -620,56 +575,56 @@ z - - - - - - - - @@ -678,74 +633,29 @@ L 256.613217 90.850435 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -992,56 +902,56 @@ z - - - - - - - - @@ -1050,74 +960,29 @@ L 382.65557 90.850435 - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1361,56 +1226,56 @@ z - - - - - - - - @@ -1419,74 +1284,29 @@ L 130.570864 160.270956 - - - - - - + + + + @@ -1711,56 +1531,56 @@ z - - - - - - - - @@ -1769,74 +1589,29 @@ L 256.613217 160.270956 - - - - - + + + @@ -2060,56 +1835,56 @@ z - - - - - - - - @@ -2118,74 +1893,29 @@ L 382.65557 160.270956 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2441,56 +2171,56 @@ z - - - - - - - - @@ -2499,74 +2229,29 @@ L 130.570864 229.691478 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2821,56 +2506,56 @@ z - - - - - - - - @@ -2879,74 +2564,29 @@ L 256.613217 229.691478 - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -3179,56 +2819,56 @@ z - - - - - - - - @@ -3237,74 +2877,29 @@ L 382.65557 229.691478 - - - - - - + + + + @@ -3529,56 +3124,56 @@ z - - - - - - - - @@ -3587,74 +3182,29 @@ L 130.570864 299.112 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3909,56 +3459,56 @@ z - - - - - - - - @@ -3967,74 +3517,29 @@ L 256.613217 299.112 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4243,7 +3748,7 @@ C 264.337011 286.218697 265.085217 282.457207 265.085217 278.658783 - + - + - + - + - + - + - + - + - + - + - + - + - - + + - @@ -148,20 +148,20 @@ L 330.2448 80.4432 +" id="m186856ba53" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="m63fd275d26" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -183,7 +183,7 @@ L 37.796875 17.1875 L 4.890625 17.1875 L 4.890625 26.703125 z -" id="DejaVuSans-34"/> +" id="DejaVuSans-52"/> +" id="DejaVuSans-53"/> - - - + + + - @@ -226,20 +226,20 @@ L 236.16 41.472 +" id="m6903a352b4" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="m55443f503e" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -274,18 +274,18 @@ Q 16.21875 57.28125 16.21875 49.421875 Q 16.21875 41.5 20.09375 36.953125 Q 23.96875 32.421875 30.609375 32.421875 z -" id="DejaVuSans-39"/> +" id="DejaVuSans-57"/> - - - + + + - @@ -293,20 +293,20 @@ L 142.0752 80.4432 +" id="m7fd2fd55b4" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="m41a7d74be1" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -324,7 +324,7 @@ L 54.390625 8.296875 L 54.390625 0 L 12.40625 0 z -" id="DejaVuSans-31"/> +" id="DejaVuSans-49"/> +" id="DejaVuSans-51"/> - - - - + + + + - @@ -376,20 +376,20 @@ L 103.104 174.528 +" id="me7cf5cf283" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="m3b15518230" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -433,30 +433,30 @@ Q 38.140625 66.40625 31.78125 66.40625 Q 25.390625 66.40625 21.84375 63.234375 Q 18.3125 60.0625 18.3125 54.390625 z -" id="DejaVuSans-38"/> +" id="DejaVuSans-56"/> - - - - + + + + - - + - + @@ -485,35 +485,35 @@ Q 49.859375 40.875 45.40625 35.40625 Q 44.1875 33.984375 37.640625 27.21875 Q 31.109375 20.453125 19.1875 8.296875 z -" id="DejaVuSans-32"/> +" id="DejaVuSans-50"/> - - - - + + + + - - + +" id="mc00b64cc6f" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -527,39 +527,39 @@ L 18.3125 0 L 43.21875 64.59375 L 8.203125 64.59375 z -" id="DejaVuSans-37"/> +" id="DejaVuSans-55"/> - - - - + + + + - - + - + - - - - + + + + @@ -567,68 +567,23 @@ L 330.2448 268.6128 - @@ -639,214 +594,64 @@ L 21 12.40625 L 21 0 L 10.6875 0 z -" id="DejaVuSans-2e"/> +" id="DejaVuSans-46"/> - - - + + + - - - - + + + - @@ -881,408 +686,78 @@ Q 23.390625 74.21875 37.203125 74.21875 Q 40.921875 74.21875 44.703125 73.484375 Q 48.484375 72.75 52.59375 71.296875 z -" id="DejaVuSans-36"/> +" id="DejaVuSans-54"/> - - - + + + - - - - + + + - - - - + + + - - @@ -1514,10 +989,10 @@ C -2.683901 -1.55874 -3 -0.795609 -3 0 C -3 0.795609 -2.683901 1.55874 -2.12132 2.12132 C -1.55874 2.683901 -0.795609 3 0 3 z -" id="m54a9216021" style="stroke:#1f77b4;"/> +" id="me67399f059" style="stroke:#1f77b4;"/> - - + + @@ -1586,8 +1061,8 @@ Q 24.21875 56 28.609375 56 Q 40.484375 56 46.34375 49.84375 Q 52.203125 43.703125 52.203125 31.203125 z -" id="DejaVuSans-61"/> - +" id="DejaVuSans-97"/> + +" id="DejaVuSans-112"/> +" id="DejaVuSans-111"/> +" id="DejaVuSans-108"/> +" id="DejaVuSans-114"/> +" id="DejaVuSans-110"/> +" id="DejaVuSans-116"/> +" id="DejaVuSans-105"/> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - + - - + + - @@ -143,7 +143,7 @@ L 37.796875 17.1875 L 4.890625 17.1875 L 4.890625 26.703125 z -" id="DejaVuSans-34"/> +" id="DejaVuSans-52"/> +" id="DejaVuSans-53"/> - - - + + + - @@ -214,18 +214,18 @@ Q 16.21875 57.28125 16.21875 49.421875 Q 16.21875 41.5 20.09375 36.953125 Q 23.96875 32.421875 30.609375 32.421875 z -" id="DejaVuSans-39"/> +" id="DejaVuSans-57"/> - - - + + + - @@ -244,7 +244,7 @@ L 54.390625 8.296875 L 54.390625 0 L 12.40625 0 z -" id="DejaVuSans-31"/> +" id="DejaVuSans-49"/> +" id="DejaVuSans-51"/> - - - - + + + + - @@ -333,19 +333,19 @@ Q 38.140625 66.40625 31.78125 66.40625 Q 25.390625 66.40625 21.84375 63.234375 Q 18.3125 60.0625 18.3125 54.390625 z -" id="DejaVuSans-38"/> +" id="DejaVuSans-56"/> - - - - + + + + - @@ -375,19 +375,19 @@ Q 49.859375 40.875 45.40625 35.40625 Q 44.1875 33.984375 37.640625 27.21875 Q 31.109375 20.453125 19.1875 8.296875 z -" id="DejaVuSans-32"/> +" id="DejaVuSans-50"/> - - - - + + + + - @@ -402,29 +402,29 @@ L 18.3125 0 L 43.21875 64.59375 L 8.203125 64.59375 z -" id="DejaVuSans-37"/> +" id="DejaVuSans-55"/> - - - - + + + + - - - - - + + + + @@ -432,68 +432,23 @@ L 328.150441 270.550441 - @@ -504,824 +459,179 @@ L 73.1875 35.5 L 73.1875 27.203125 L 10.59375 27.203125 z -" id="DejaVuSans-2212"/> +" id="DejaVuSans-8722"/> +" id="DejaVuSans-46"/> - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - + + + - + - + - - + + - @@ -143,7 +143,7 @@ L 37.796875 17.1875 L 4.890625 17.1875 L 4.890625 26.703125 z -" id="DejaVuSans-34"/> +" id="DejaVuSans-52"/> +" id="DejaVuSans-53"/> - - - + + + - @@ -214,18 +214,18 @@ Q 16.21875 57.28125 16.21875 49.421875 Q 16.21875 41.5 20.09375 36.953125 Q 23.96875 32.421875 30.609375 32.421875 z -" id="DejaVuSans-39"/> +" id="DejaVuSans-57"/> - - - + + + - @@ -244,7 +244,7 @@ L 54.390625 8.296875 L 54.390625 0 L 12.40625 0 z -" id="DejaVuSans-31"/> +" id="DejaVuSans-49"/> +" id="DejaVuSans-51"/> - - - - + + + + - @@ -333,19 +333,19 @@ Q 38.140625 66.40625 31.78125 66.40625 Q 25.390625 66.40625 21.84375 63.234375 Q 18.3125 60.0625 18.3125 54.390625 z -" id="DejaVuSans-38"/> +" id="DejaVuSans-56"/> - - - - + + + + - @@ -375,19 +375,19 @@ Q 49.859375 40.875 45.40625 35.40625 Q 44.1875 33.984375 37.640625 27.21875 Q 31.109375 20.453125 19.1875 8.296875 z -" id="DejaVuSans-32"/> +" id="DejaVuSans-50"/> - - - - + + + + - @@ -402,29 +402,29 @@ L 18.3125 0 L 43.21875 64.59375 L 8.203125 64.59375 z -" id="DejaVuSans-37"/> +" id="DejaVuSans-55"/> - - - - + + + + - - - - - + + + + @@ -432,68 +432,23 @@ L 330.2448 268.6128 - @@ -504,214 +459,64 @@ L 21 12.40625 L 21 0 L 10.6875 0 z -" id="DejaVuSans-2e"/> +" id="DejaVuSans-46"/> - - - + + + - - - - + + + - @@ -746,402 +551,72 @@ Q 23.390625 74.21875 37.203125 74.21875 Q 40.921875 74.21875 44.703125 73.484375 Q 48.484375 72.75 52.59375 71.296875 z -" id="DejaVuSans-36"/> +" id="DejaVuSans-54"/> - - - + + + - - - - + + + - - - - + + + @@ -1169,7 +644,7 @@ C 365.774248 209.303607 369.216 192.000754 369.216 174.528 - + - + - - + + - @@ -143,7 +143,7 @@ L 37.796875 17.1875 L 4.890625 17.1875 L 4.890625 26.703125 z -" id="DejaVuSans-34"/> +" id="DejaVuSans-52"/> +" id="DejaVuSans-53"/> - - - + + + - @@ -214,18 +214,18 @@ Q 16.21875 57.28125 16.21875 49.421875 Q 16.21875 41.5 20.09375 36.953125 Q 23.96875 32.421875 30.609375 32.421875 z -" id="DejaVuSans-39"/> +" id="DejaVuSans-57"/> - - - + + + - @@ -244,7 +244,7 @@ L 54.390625 8.296875 L 54.390625 0 L 12.40625 0 z -" id="DejaVuSans-31"/> +" id="DejaVuSans-49"/> +" id="DejaVuSans-51"/> - - - - + + + + - @@ -333,19 +333,19 @@ Q 38.140625 66.40625 31.78125 66.40625 Q 25.390625 66.40625 21.84375 63.234375 Q 18.3125 60.0625 18.3125 54.390625 z -" id="DejaVuSans-38"/> +" id="DejaVuSans-56"/> - - - - + + + + - @@ -375,19 +375,19 @@ Q 49.859375 40.875 45.40625 35.40625 Q 44.1875 33.984375 37.640625 27.21875 Q 31.109375 20.453125 19.1875 8.296875 z -" id="DejaVuSans-32"/> +" id="DejaVuSans-50"/> - - - - + + + + - @@ -402,29 +402,29 @@ L 18.3125 0 L 43.21875 64.59375 L 8.203125 64.59375 z -" id="DejaVuSans-37"/> +" id="DejaVuSans-55"/> - - - - + + + + - - - - - + + + + @@ -432,53 +432,23 @@ L 328.150441 270.550441 - @@ -489,7 +459,7 @@ L 21 12.40625 L 21 0 L 10.6875 0 z -" id="DejaVuSans-2e"/> +" id="DejaVuSans-46"/> +" id="DejaVuSans-54"/> - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - + - + - - + + - @@ -143,7 +143,7 @@ L 37.796875 17.1875 L 4.890625 17.1875 L 4.890625 26.703125 z -" id="DejaVuSans-34"/> +" id="DejaVuSans-52"/> +" id="DejaVuSans-53"/> - - - + + + - @@ -214,18 +214,18 @@ Q 16.21875 57.28125 16.21875 49.421875 Q 16.21875 41.5 20.09375 36.953125 Q 23.96875 32.421875 30.609375 32.421875 z -" id="DejaVuSans-39"/> +" id="DejaVuSans-57"/> - - - + + + - @@ -244,7 +244,7 @@ L 54.390625 8.296875 L 54.390625 0 L 12.40625 0 z -" id="DejaVuSans-31"/> +" id="DejaVuSans-49"/> +" id="DejaVuSans-51"/> - - - - + + + + - @@ -333,19 +333,19 @@ Q 38.140625 66.40625 31.78125 66.40625 Q 25.390625 66.40625 21.84375 63.234375 Q 18.3125 60.0625 18.3125 54.390625 z -" id="DejaVuSans-38"/> +" id="DejaVuSans-56"/> - - - - + + + + - @@ -375,19 +375,19 @@ Q 49.859375 40.875 45.40625 35.40625 Q 44.1875 33.984375 37.640625 27.21875 Q 31.109375 20.453125 19.1875 8.296875 z -" id="DejaVuSans-32"/> +" id="DejaVuSans-50"/> - - - - + + + + - @@ -402,29 +402,29 @@ L 18.3125 0 L 43.21875 64.59375 L 8.203125 64.59375 z -" id="DejaVuSans-37"/> +" id="DejaVuSans-55"/> - - - - + + + + - - - - - + + + + @@ -432,98 +432,23 @@ L 328.150441 270.550441 - @@ -534,7 +459,7 @@ L 21 12.40625 L 21 0 L 10.6875 0 z -" id="DejaVuSans-2e"/> +" id="DejaVuSans-46"/> +" id="DejaVuSans-54"/> - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - + - + - - + + - @@ -143,7 +143,7 @@ L 37.796875 17.1875 L 4.890625 17.1875 L 4.890625 26.703125 z -" id="DejaVuSans-34"/> +" id="DejaVuSans-52"/> +" id="DejaVuSans-53"/> - - - + + + - @@ -214,18 +214,18 @@ Q 16.21875 57.28125 16.21875 49.421875 Q 16.21875 41.5 20.09375 36.953125 Q 23.96875 32.421875 30.609375 32.421875 z -" id="DejaVuSans-39"/> +" id="DejaVuSans-57"/> - - - + + + - @@ -244,7 +244,7 @@ L 54.390625 8.296875 L 54.390625 0 L 12.40625 0 z -" id="DejaVuSans-31"/> +" id="DejaVuSans-49"/> +" id="DejaVuSans-51"/> - - - - + + + + - @@ -333,19 +333,19 @@ Q 38.140625 66.40625 31.78125 66.40625 Q 25.390625 66.40625 21.84375 63.234375 Q 18.3125 60.0625 18.3125 54.390625 z -" id="DejaVuSans-38"/> +" id="DejaVuSans-56"/> - - - - + + + + - @@ -375,19 +375,19 @@ Q 49.859375 40.875 45.40625 35.40625 Q 44.1875 33.984375 37.640625 27.21875 Q 31.109375 20.453125 19.1875 8.296875 z -" id="DejaVuSans-32"/> +" id="DejaVuSans-50"/> - - - - + + + + - @@ -402,29 +402,29 @@ L 18.3125 0 L 43.21875 64.59375 L 8.203125 64.59375 z -" id="DejaVuSans-37"/> +" id="DejaVuSans-55"/> - - - - + + + + - - - - - + + + + @@ -432,68 +432,23 @@ L 110.680648 241.92 - @@ -504,723 +459,168 @@ L 21 12.40625 L 21 0 L 10.6875 0 z -" id="DejaVuSans-2e"/> +" id="DejaVuSans-46"/> - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + - + - + - - - + + + - @@ -145,20 +145,20 @@ L 141.714347 68.549453 +" id="mec8a71d5cf" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="maa4f56cfc7" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -180,12 +180,12 @@ L 37.796875 17.1875 L 4.890625 17.1875 L 4.890625 26.703125 z -" id="DejaVuSans-34"/> +" id="DejaVuSans-52"/> - - - + + + @@ -193,84 +193,77 @@ z - +" id="m4a1d0b20a6" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="m804162101a" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - - + - + - + - + - - @@ -555,20 +548,20 @@ L 259.638801 77.22034 +" id="m3460c29d29" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="m2972eaec14" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -597,18 +590,18 @@ Q 35.15625 39.890625 26.703125 39.890625 Q 22.75 39.890625 18.8125 39.015625 Q 14.890625 38.140625 10.796875 36.28125 z -" id="DejaVuSans-35"/> +" id="DejaVuSans-53"/> - - - + + + - @@ -616,20 +609,20 @@ L 225.551059 68.086557 +" id="m3d62a2e434" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="m6a9c5ca883" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -647,13 +640,13 @@ L 54.390625 8.296875 L 54.390625 0 L 12.40625 0 z -" id="DejaVuSans-31"/> +" id="DejaVuSans-49"/> - - - - + + + + @@ -661,88 +654,71 @@ z - - + - + - + - + - - + - + - + - + - - - + - + - - - - + + + + - - + - + - - - - + + + + @@ -1028,106 +1004,84 @@ L 319.776597 105.004167 - - + +" id="m2811ab0d4f" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - - + - + - + - + - - - + - + - - - - + + + + - - + - + - - - - + + + + - @@ -1421,20 +1375,20 @@ L 488.606605 119.111022 +" id="m95a39d31a1" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="mc5c899c757" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -1471,13 +1425,13 @@ Q 53.90625 64.015625 53.90625 55.328125 Q 53.90625 49.265625 50.4375 45.09375 Q 46.96875 40.921875 40.578125 39.3125 z -" id="DejaVuSans-33"/> +" id="DejaVuSans-51"/> - - - - + + + + @@ -1485,125 +1439,95 @@ z - - + - + - + - + - - + - + - + - + - - @@ -1823,34 +1747,34 @@ L 152.763169 193.403109 +" id="me8e837be91" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="m0bd2441784" style="stroke:#000000;stroke-width:0.8;"/> - + - - - + + + - @@ -1858,29 +1782,29 @@ L 94.371726 209.049049 +" id="mc27874a5c8" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="mcbf542523c" style="stroke:#000000;stroke-width:0.8;"/> - + - - - - + + + + @@ -1888,84 +1812,72 @@ L 0.607769 -3.446827 - - + +" id="m6bd397c031" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - - + - + - + - + - - - + - + - - - - + + + + - - + - + - - - - + + + + @@ -2289,79 +2201,72 @@ L 208.299348 162.807062 - +" id="m942a9502ca" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - + - - + - + - + - + - - @@ -2646,55 +2551,55 @@ L 338.475511 158.068939 +" id="m70550e892c" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="me7a67410f7" style="stroke:#000000;stroke-width:0.8;"/> - + - - - - + + + + - - + - + - - - - + + + + @@ -2702,88 +2607,71 @@ L 335.399764 193.224877 - - + - + - + - + - - + - + - + - + - - - + - + - - - - + + + + - - + - + - - - - + + + + @@ -3069,101 +2957,79 @@ L 492.672974 205.72311 - - + - + - + - + - - + - + - + - + - - @@ -3381,29 +3247,29 @@ L 156.678261 278.480117 +" id="m6bd195e879" style="stroke:#000000;stroke-width:0.8;"/> - + - + - - - + + + - @@ -3411,30 +3277,30 @@ L 121.19274 287.988433 +" id="m7d5bf6efac" style="stroke:#000000;stroke-width:0.8;"/> - + - + - - - - + + + + - @@ -3442,24 +3308,24 @@ L 91.099295 266.916776 +" id="m681a1231d8" style="stroke:#000000;stroke-width:0.8;"/> - + - + - - - - + + + + @@ -3467,105 +3333,81 @@ L -3.031089 1.75 - +" id="med685b022c" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="mc93aa48440" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - - + - + - + - + - - - + - + - - - - + + + + - @@ -3824,15 +3666,15 @@ L 201.882644 254.050495 +" id="md20b7ef80f" style="stroke:#000000;stroke-width:0.8;"/> - + - + @@ -3846,13 +3688,13 @@ L 18.3125 0 L 43.21875 64.59375 L 8.203125 64.59375 z -" id="DejaVuSans-37"/> +" id="DejaVuSans-55"/> - - - - + + + + @@ -3860,84 +3702,72 @@ z - +" id="md1a6056a41" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - + - - + - + - + - + - - @@ -4215,50 +4045,50 @@ L 319.233487 258.478248 +" id="m8ab09dde12" style="stroke:#000000;stroke-width:0.8;"/> - + - + - - - - + + + + - - + - + - - - - + + + + @@ -4266,84 +4096,77 @@ L 332.233479 280.994895 - +" id="m9f8bcc4c7d" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="mc8367a3fc8" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - - + - + - + - + - - - + - + - - - - + + + + - @@ -4654,24 +4477,24 @@ L 494.926923 276.498403 +" id="m75fa5720e3" style="stroke:#000000;stroke-width:0.8;"/> - + - + - - - - + + + + @@ -4679,93 +4502,76 @@ L 1.75 3.031089 - - + +" id="m9ab142aa91" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - - + - + - + - + - - - + - + - - - - + + + + - @@ -5031,29 +4837,29 @@ L 93.595826 336.058378 +" id="m1561665698" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="ma18dd80173" style="stroke:#000000;stroke-width:0.8;"/> - + - - - - + + + + @@ -5061,110 +4867,79 @@ L -3.288924 -1.197071 - - + - + - + - + - - + - + - + - + - - @@ -5379,61 +5154,61 @@ L 215.696055 378.273887 +" id="mcce5a49700" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="md137329986" style="stroke:#000000;stroke-width:0.8;"/> - + - - - - + + + + - - + - + - - - - + + + + - @@ -5441,29 +5216,29 @@ L 238.471391 315.699166 +" id="mfcd40be9e2" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="m65cc159af8" style="stroke:#000000;stroke-width:0.8;"/> - + - - - - + + + + @@ -5471,95 +5246,71 @@ L -1.197071 -3.288924 - - + - + - + - + - - + - + - + - + - - - + - + - - - - + + + + - @@ -5818,29 +5569,29 @@ L 373.390166 313.23221 +" id="m59ff684553" style="stroke:#000000;stroke-width:0.8;"/> - + +" id="m64c8601c66" style="stroke:#000000;stroke-width:0.8;"/> - + - - - - + + + + @@ -5848,79 +5599,67 @@ L 0.305045 -3.486681 - - + - + - + - + - - + - + - + - + - - - - - + - - + - + - - - - + + + + - - + - + - - - - + + + + @@ -6241,74 +5974,67 @@ L 498.552826 360.28859 - - + - + - + - + - - + - + - + - + - - + - + - + @@ -6568,7 +6294,7 @@ L 498.552826 360.28859 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +