From ff333e83a39fd1ff4c0aea42a27dba3b6213637d Mon Sep 17 00:00:00 2001 From: Sergey Vartanov Date: Sun, 6 Sep 2020 11:40:24 +0300 Subject: [PATCH] Add frame icon, ridge, scree, rock. --- data/tags.yml | 16 + icons/icons.svg | 15513 +++++++++++++++++++++++---------------------- roentgen/util.py | 8 + 3 files changed, 7841 insertions(+), 7696 deletions(-) create mode 100644 roentgen/util.py diff --git a/data/tags.yml b/data/tags.yml index 0629e12..3e7570b 100644 --- a/data/tags.yml +++ b/data/tags.yml @@ -38,8 +38,11 @@ colors: primary_border_color: "888888" # "AA8800" primary_color: "FFFFFF" # "FFDD66" private_access_color: "884444" + ridge_color: "000000" road_border_color: "CCCCCC" + rock_color: "DDDDDD" sand_color: "F0E0D0" + scree_color: "CCCCCC" water_color: "AACCFF" water_border_color: "6688BB" wood_color: "B8CC84" @@ -255,6 +258,10 @@ tags: icon: [gift] - tags: {shop: watches} icon: [watches] + - tags: {craft: watchmaker} + icon: [watches] + - tags: {shop: frame} + icon: [frame] # Place of worship @@ -583,6 +590,15 @@ ways: stroke: water_border_color stroke-width: 1 layer: 21 + - tags: {natural: ridge} + stroke-width: 2 + opacity: 0.3 + stroke: ridge_color + layer: 21 + - tags: {natural: bare_rock} + fill: rock_color + - tags: {natural: scree} + fill: scree_color - tags: {landuse: grass} fill: grass_color diff --git a/icons/icons.svg b/icons/icons.svg index 11f9ac1..e8ec0c3 100644 --- a/icons/icons.svg +++ b/icons/icons.svg @@ -1,6 +1,4 @@ - - + id="svg2987" + height="600px" + width="800px"> + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="Arrow1Lstart"> + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + id="path9833" /> + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="Arrow1Lstart"> + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + id="path9781" /> + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="Arrow1Lstart"> + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + id="path9735" /> + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="Arrow1Lstart"> + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + id="path9695" /> + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="Arrow1Lstart"> + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + id="path9661" /> + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="Arrow1Lstart"> + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + id="path9633" /> + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="Arrow1Lstart"> + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + id="path9611" /> + id="Arrow1Lstart" + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="Arrow1Lstart"> + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " + id="path9339" /> + inkscape:snap-smooth-nodes="true" + inkscape:snap-intersection-paths="true" + inkscape:object-nodes="true" + inkscape:window-maximized="0" + inkscape:window-y="23" + inkscape:window-x="0" + inkscape:window-height="1035" + inkscape:window-width="1600" + inkscape:snap-bbox="true" + inkscape:object-paths="true" + inkscape:guide-bbox="true" + showguides="false" + showgrid="true" + inkscape:document-units="px" + inkscape:current-layer="layer1" + inkscape:cy="303.79432" + inkscape:cx="117.11681" + inkscape:zoom="22.4" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base"> + visible="true" + empspacing="8" + id="grid2995" + type="xygrid" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="0,1" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="1,0" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> + orientation="0,1" /> @@ -530,7836 +529,7958 @@ image/svg+xml - + + id="layer1"> + cx="136" + cy="264" + r="5" /> + inkscape:label="#circle11427" + id="tfl" + d="m 136,275 c -2.37429,0.002 -4.41967,1.67368 -4.89453,4 L 130,279 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 c 0,0.277 0.223,0.5 0.5,0.5 l 1.10156,0 c 0.47515,2.32776 2.52268,3.99974 4.89844,4 2.37429,-0.002 4.41967,-1.67368 4.89453,-4 L 142,281 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -1.10156,0 c -0.47515,-2.32776 -2.52268,-3.99974 -4.89844,-4 z m 0,2 c 1.27052,9.6e-4 2.40266,0.80214 2.82617,2 l -5.65039,0 c 0.42327,-1.19718 1.55442,-1.99822 2.82422,-2 z m -2.82617,4 5.65039,0 c -0.42327,1.19718 -1.55442,1.99822 -2.82422,2 -1.27052,-9.6e-4 -2.40266,-0.80214 -2.82617,-2 z" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.09999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + y="139" + x="101" + height="2" + width="10" + id="rect11378" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - + d="M 216 19 C 215.446 19 215 19.446 215 20 L 215 24 C 215 24.554 215.446 25 216 25 L 217 25 C 217.554 25 218 24.554 218 24 L 218 20 C 218 19.446 217.554 19 217 19 L 216 19 z M 213.5 21.5 C 213.223 21.5 213 21.723 213 22 L 213 24 A 3 3 0 0 0 213.87891 26.121094 A 3 3 0 0 0 216 27 L 216 29 C 216 29.277 216.223 29.5 216.5 29.5 C 216.777 29.5 217 29.277 217 29 L 217 27 A 3 3 0 0 0 219.12109 26.121094 A 3 3 0 0 0 220 24 L 220 22 C 220 21.723 219.777 21.5 219.5 21.5 C 219.223 21.5 219 21.723 219 22 L 219 24 A 2 2 0 0 1 218.41406 25.414062 A 2 2 0 0 1 217 26 L 216 26 A 2 2 0 0 1 214.58594 25.414062 A 2 2 0 0 1 214 24 L 214 22 C 214 21.723 213.777 21.5 213.5 21.5 z " + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="path11299" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.10000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" + d="m 58.5,162.5 -2,2" + id="path4241" + inkscape:connector-curvature="0" /> + + + style="fill:none;stroke:#cccccc;stroke-linecap:round;stroke-opacity:1" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csccscc" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + sodipodi:nodetypes="cccccc" + style="fill:none;stroke:#cccccc" + d="m 314,36.5 2,0 c 0.82843,0 1.5,0.671573 1.5,1.5 l 0,4 c 0,0.828427 -0.68284,1.636193 -1.5,1.5 -0.85269,0 -4.22413,0 -2,0" + id="path4405" + inkscape:connector-curvature="0" /> + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="rect3763" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + r="4" + cy="230" + cx="216" + id="path4808" + style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + + + + - - + rx="1" + ry="1" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect3079" + width="8" + height="6" + x="52" + y="40" /> + + + + + + - - - - - - + + + + + + + - + rx="1" + ry="1" + y="3" + x="215" + height="6" + width="3" + id="rect3149" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" /> + id="fast_food" + d="m 38,20 c -1.662,0 -3,1.338 -3,3 l 10,0 c 0,-1.662 -1.338,-3 -3,-3 z m -3.5,4 c -0.276142,0 -0.5,0.223858 -0.5,0.5 0,0.276142 0.223858,0.5 0.5,0.5 l 1.5,0 4,2 4,-2 1.5,0 C 45.776142,25 46,24.776142 46,24.5 46,24.223858 45.776142,24 45.5,24 Z M 35,25.625 C 35,27.287 36.338,29 38,29 l 4,0 c 1.662,0 3,-1.713 3,-3.375 l -5,2.5 z" + style="fill:#000000;stroke:none" /> + + + + + + - - + id="path4107" + d="m 119,68 -1.5,0 -1,1 0.5,1 1,-1 1,0" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" /> + - - - - - - - - - - - - - - - + id="path4113" + d="m 123,74 -1.5,0 -0.5,0.5 0,1.5 1,-1 1,0" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" /> - film - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + inkscape:label="#rect3276" + id="restaurant" + d="m 36.5,114 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,5 0,1.5 c 0,0.277 0.223,0.5 0.5,0.5 0.82843,0 1.5,0.67157 1.5,1.5 l 0,2.5 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2.5 c 0,-0.82843 0.67157,-1.5 1.5,-1.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1.5 0,-5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.223 -0.5,0.5 l 0,4.5 -1,0 0,-4.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.223 -0.5,0.5 l 0,4.5 -1,0 0,-4.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 6.5,0 c -0.554,0 -1,0.446 -1,1 l 0,7 c 0,0.554 0.446,1 1,1 l 0,2.5 c 0,0.277 0.23166,0.5 0.5,0.5 0.26834,0 0.5,-0.223 0.5,-0.5 l 0,-3.5 0,-5.5 0,-1.5 c 0,-0.554 -0.446,-1 -1,-1 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" /> + inkscape:connector-curvature="0" + inkscape:label="#path3275" + id="pole_lamp" + d="m 35,82 0,1 c 0,0.554 0.446,1 1,1 l 1,0 c 0.543137,0 0.98298,-0.42989 1,-0.96875 0.636908,0.0664 1.100578,0.25683 1.40625,0.5625 C 39.788399,83.9759 40,84.58333 40,85.5 l 0,9.5 1,0 0,-9.5 C 41,84.41667 40.711601,83.5241 40.09375,82.90625 39.475899,82.2884 38.583333,82 37.5,82 l -0.5,0 -1,0 -1,0 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate" /> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="path3307" + d="m 87.5,68.5 c -7,0 0,-7 0,0 z" + style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - + id="path3315" + d="m 24,41 c 0,0 0,0 0,0 0,-0.828427 0.671573,-1.5 1.5,-1.5 0.828427,0 1.5,0.671573 1.5,1.5 l 0,1" + style="fill:none;stroke:#cccccc" /> - + inkscape:connector-curvature="0" + id="path3317" + d="m 24,41 c 0,-0.828427 -0.671573,-1.5 -1.5,-1.5 -0.828427,0 -1.5,0.671573 -1.5,1.5 0,0 0,0 0,0 l 0,1 0,0" + style="fill:none;stroke:#cccccc" /> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + id="rect4307" + style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none" /> + + + + + + + + + + + + + + - - - - - - - - - + id="path4370" + d="m 38.90625,162 a 0.50005,0.50005 0 0 0 -0.25,0.15625 l -2,2 a 0.50005,0.50005 0 1 0 0.6875,0.6875 l 2,-2 A 0.50005,0.50005 0 0 0 38.90625,162 Z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate" /> - - - - - + inkscape:connector-curvature="0" + inkscape:label="#rect4376" + id="bus" + d="m 20,179 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 0,0.65625 C 20,189.84092 20.159083,190 20.34375,190 l 0.3125,0 C 20.840917,190 21,189.84092 21,189.65625 L 21,189 l 6,0 0,0.65625 C 27,189.84092 27.159083,190 27.34375,190 l 0.3125,0 C 27.840917,190 28,189.84092 28,189.65625 L 28,189 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z m 0.75,1 6.5,0 c 0.4155,0 0.75,0.3345 0.75,0.75 l 0,4.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 l -6.5,0 C 20.3345,186 20,185.6655 20,185.25 l 0,-4.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z m -0.25,7 1,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -1,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 6,0 1,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -1,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z" + style="fill:#000000;stroke:none" /> - - - - - - - - - - - + inkscape:connector-curvature="0" + inkscape:label="#rect4388" + id="trolleybus" + d="m 38.84375,177 a 0.50005,0.50005 0 0 0 -0.1875,0.15625 L 36.8125,179 36,179 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 0,0.65625 C 36,189.84092 36.159083,190 36.34375,190 l 0.3125,0 C 36.840917,190 37,189.84092 37,189.65625 L 37,189 l 6,0 0,0.65625 C 43,189.84092 43.159083,190 43.34375,190 l 0.3125,0 C 43.840917,190 44,189.84092 44,189.65625 L 44,189 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -1.8125,0 1.15625,-1.15625 A 0.50005,0.50005 0 0 0 42.90625,177 a 0.50005,0.50005 0 0 0 -0.25,0.15625 L 40.8125,179 l -2.625,0 1.15625,-1.15625 A 0.50005,0.50005 0 0 0 38.90625,177 a 0.50005,0.50005 0 0 0 -0.0625,0 z m -2.09375,3 6.5,0 c 0.4155,0 0.75,0.3345 0.75,0.75 l 0,4.5 c 0,0.4155 -0.3345,0.75 -0.75,0.75 l -6.5,0 C 36.3345,186 36,185.6655 36,185.25 l 0,-4.5 c 0,-0.4155 0.3345,-0.75 0.75,-0.75 z m -0.25,7 1,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -1,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 6,0 1,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -1,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z" + style="fill:#000000;stroke:none" /> + inkscape:label="#rect4452" + id="tree" + d="m 199,81 c -0.554,0 -1,0.446 -1,1 -0.554,0 -1,0.446 -1,1 l 0,1 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 0,0.554 0.446,1 1,1 l 1,2 0,4 2,0 0,-4 1,-2 c 0.554,0 1,-0.446 1,-1 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l 0,-1 c 0,-0.554 -0.446,-1 -1,-1 0,-0.554 -0.446,-1 -1,-1 z m 0,8 2,0 -1,1.5 z" + style="fill:#000000;stroke:none" /> + id="path4462" + d="m 168,79 0,-9" + style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /> - - - - - - - - - + id="path4499" + d="m 171,74 c -2,0 -3,1 -3,3" + style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" + sodipodi:nodetypes="cc" /> + sodipodi:nodetypes="cc" + style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" + d="m 165,72 c 2,0 3,1 3,3" + id="path4501" + inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:connector-curvature="0" + inkscape:label="#rect4472" + id="russian_orthodox" + d="m 183.5,241 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1.5 -1.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 c 0,0.277 0.223,0.5 0.5,0.5 l 1.5,0 0,1 -3.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 c 0,0.277 0.223,0.5 0.5,0.5 l 3.5,0 0,2.1875 -1.15625,-0.3125 c -0.26756,-0.0717 -0.55331,0.10744 -0.625,0.375 l -0.25,0.96875 c -0.0717,0.26756 0.0762,0.52206 0.34375,0.59375 L 183,252.28125 183,254.5 c 0,0.277 0.223,0.5 0.5,0.5 l 1,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1.6875 1.15625,0.3125 c 0.26756,0.0717 0.55331,-0.10744 0.625,-0.375 l 0.25,-0.96875 c 0.0717,-0.26756 -0.0762,-0.52206 -0.34375,-0.59375 L 185,250.71875 185,248 l 3.5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -3.5,0 0,-1 1.5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -1.5,0 0,-1.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -1,0 z" + style="fill:#000000;fill-opacity:1;stroke:none" /> + + + + + + + + + + + + + + + + + + + + + id="clockwise" + d="m 7.90625,211 c -0.523599,0.0245 -0.977668,0.52328 -0.953125,1.04687 C 6.977665,212.57047 7.476401,213.02454 8,213 c 1.668699,0 3,1.3313 3,3 0,1.6687 -1.331301,3 -3,3 -1.668699,0 -3,-1.3313 -3,-3 2,0 2,0 2,0 l -3,-3 -3,3 c 0,0 0,0 2,0 0,2.74958 2.250421,5 5,5 2.749579,0 5,-2.25042 5,-5 0,-2.74958 -2.250421,-5 -5,-5 -0.03123,-0.001 -0.06252,-0.001 -0.09375,0 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> + + rx="2" + ry="2" + y="70" + x="99" + height="9" + width="9" + id="rect3492" + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="rect3494" + style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + film + + + + + + + + + height="2" + x="91" + y="108" + rx="0.5" + ry="0.5" /> + + + + + + + + + + + + + + + + x="206" + y="138" + rx="0.5" + ry="0.5" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect5196" + width="4" + height="4" + x="249" + y="138" + rx="2" + ry="2" /> + x="244" + y="139" + rx="1" /> - - + ry="1" + style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect5200" + width="2" + height="2" + x="250" + y="139" + rx="1" /> + + + - + id="rect5245" + style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + + + id="rect4631" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + y="-56.5" + x="43" + height="1" + width="2" + id="rect4601" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + inkscape:label="#rect4603" + id="private" + d="m 56,51 c -1.650932,0 -3,1.349068 -3,3 a 0.50004999,0.50004997 0 0 0 0,0.15625 L 53,56 c -0.554,0 -1,0.446 -1,1 l 0,4 c 0,0.554 0.446,1 1,1 l 6,0 c 0.554,0 1,-0.446 1,-1 l 0,-4 c 0,-0.554 -0.446,-1 -1,-1 l 0,-1.84375 0,-0.03125 a 0.50004999,0.50004997 0 0 0 0,-0.0625 l 0,-0.03125 A 0.50004999,0.50004997 0 0 0 59,54 c 0,-1.650932 -1.349068,-3 -3,-3 z m 0,1 c 1.110492,0 2,0.889508 2,2 l 0,0.0625 a 0.50004999,0.50004997 0 0 0 0,0.03125 l 0,0.0625 L 58,56 54,56 54,54.15625 54,54.125 a 0.50004999,0.50004997 0 0 0 0,-0.0625 l 0,-0.03125 A 0.50004999,0.50004997 0 0 0 54,54 c 0,-1.110492 0.889508,-2 2,-2 z m 0,5.5 c 0.552285,0 1,0.447715 1,1 0,0.374639 -0.226327,0.672456 -0.53125,0.84375 C 56.486764,59.395479 56.5,59.44198 56.5,59.5 l 0,1 c 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-1 c 0,-0.05802 0.01324,-0.104521 0.03125,-0.15625 C 55.226327,59.172456 55,58.874639 55,58.5 c 0,-0.552285 0.447715,-1 1,-1 z" + style="fill:#000000;fill-rule:evenodd;stroke:none" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + id="rect9376" + width="1" + height="13.999955" + x="109" + y="-143.00002" + ry="0.5" + rx="0.484375" /> - - + d="m 130,109 c 3,0 2,-3 6,-3 4,0 3,3 6,3 l -6,0.5 z" + id="path9378" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csccc" /> + y="109" + x="148" + height="1" + width="8" + id="rect9380" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + r="1" + cy="238" + cx="118" + id="path4555" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + r="1" + cy="238" + cx="123" + id="path4557" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + r="1" + cy="229" + cx="133" + id="path4563" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + cx="149.5" + style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4605" /> + + + + + + + + + + + + id="rect9422" + style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d="m 9,100 1,2 2,0 0,5 -8,0 0,-5 2,0 1,-2 z" + style="fill:none;stroke:#cccccc;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" /> + cx="8" + cy="104" + r="2" /> + x="3" + height="1" + width="2" + id="rect5518" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + d="M 3.5 115 C 3.223 115 3 115.223 3 115.5 C 3 115.777 3.223 116 3.5 116 L 4.5 116 C 4.777 116 5 115.777 5 115.5 C 5 115.223 4.777 115 4.5 115 L 3.5 115 z M 7 115 C 6.6212097 114.99997 6.2749113 115.21395 6.1054688 115.55273 L 5.3828125 117 L 4 117 C 3.4477381 117.00006 3.0000552 117.44774 3 118 L 3 123 C 3.0000552 123.55226 3.4477381 123.99994 4 124 L 12 124 C 12.552262 123.99994 12.999945 123.55226 13 123 L 13 118 C 12.999945 117.44774 12.552262 117.00006 12 117 L 10.617188 117 L 9.8945312 115.55273 C 9.7250888 115.21395 9.3787903 114.99997 9 115 L 7 115 z M 8 118 A 2 2 0 0 1 10 120 A 2 2 0 0 1 8 122 A 2 2 0 0 1 6 120 A 2 2 0 0 1 8 118 z " + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + cx="40.5" + id="path5532" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + + + + inkscape:label="#rect5647" + id="pharmacy" + d="M 308.5 18 C 308.223 18 308 18.223 308 18.5 L 308 20 L 316 20 L 316 18.5 C 316 18.223 315.777 18 315.5 18 L 308.5 18 z M 308 21 L 308 29.5 C 308 29.777 308.223 30 308.5 30 L 315.5 30 C 315.777 30 316 29.777 316 29.5 L 316 21 L 308 21 z M 311 22 L 313 22 L 313 24 L 315 24 L 315 26 L 313 26 L 313 28 L 311 28 L 311 26 L 309 26 L 309 24 L 311 24 L 311 22 z " + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + - - - - - + id="rect5662" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.10000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + + + width="12" + id="rect5712" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sodipodi:nodetypes="ccccccccccc" + inkscape:connector-curvature="0" + id="rect9213" + d="m 41,259 2,0 0,5 0,3 1,1 0,1 -4,0 0,-1 1,-1 0,-3 z" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + - - - - - - - - - + height="1" + x="34" + y="264" /> + + sodipodi:nodetypes="cccccccccccccccc" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + height="14" + width="3" + id="rect9299" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - - - - - - - - - - - - + id="rect9301" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - - - - - - - - - - - - - - - - - - + id="rect9307" + d="m 77,258 1,1 0,7.5 -1,-1 z" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + - - - - + id="rect9320" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + - + + + + + + + + + + + + + + + + + + + y="46" + x="243" + height="1" + width="11" + id="rect11223" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + - + cx="120.5" + id="path11240" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0" /> + + + + + + + + + + + sodipodi:start="1.5707963" + sodipodi:end="3.1415927" + d="M -217,10 A 2,2 0 0 1 -218.41421,9.4142136 2,2 0 0 1 -219,8 l 2,0 z" /> + + + + + + + + + + + + + + + + r="3" + cy="264" + cx="136" + id="path11419" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.10000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="rect13235" + width="4" + height="10" + x="278" + y="258" + ry="1" + rx="1" /> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + id="circle13249" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + cx="105" + id="circle13429" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0" /> + y="44.5" + x="37" + height="2" + width="7" + id="rect13453" + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + + + + + + + + diff --git a/roentgen/util.py b/roentgen/util.py new file mode 100644 index 0000000..932ab9e --- /dev/null +++ b/roentgen/util.py @@ -0,0 +1,8 @@ +class MinMax: + def __init__(self): + self.min_ = None + self.max_ = None + + def add(self, value): + self.min_ = value if not self.min_ or value < self.min_ else self.min_ + self.max_ = value if not self.max_ or value > self.max_ else self.max_ \ No newline at end of file