diff --git a/doc/grid.png b/doc/grid.png index e594ad5..66fe67c 100644 Binary files a/doc/grid.png and b/doc/grid.png differ diff --git a/icons/config.json b/icons/config.json index 0056aab..cba2644 100644 --- a/icons/config.json +++ b/icons/config.json @@ -714,6 +714,9 @@ "t_shirt": { "name": "t-shirt" }, + "t_shirt_and_scissors": { + "name": "t-shirt and scissors" + }, "table": {}, "table_and_two_chairs": { "name": "table and two chairs" diff --git a/icons/icons.svg b/icons/icons.svg index 535ae45..d57000d 100644 --- a/icons/icons.svg +++ b/icons/icons.svg @@ -131,7 +131,7 @@ @@ -1439,7 +1439,7 @@ inkscape:connector-curvature="0" inkscape:label="#path4362" id="statue" - d="m 343.5,369 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,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 z m -1,3 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 0.5,0 0,4.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,-4.5 0.5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m -2.5,9 -1,1 0,1 10,0 0,-1 -1,-1 z" + d="m 311.5,369 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,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 z m -1,3 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 0.5,0 0,4.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,-4.5 0.5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m -2.5,9 -1,1 0,1 10,0 0,-1 -1,-1 z" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate"> statue @@ -1448,7 +1448,7 @@ inkscape:connector-curvature="0" inkscape:label="#rect4373" id="tomb" - d="m 358,372 c -1.108,0 -2,0.892 -2,2 l 0,3 0,2 0,2 2,0 3,0 2,0 0,-2 0,-2 0,-3 c 0,-1.108 -0.892,-2 -2,-2 z m -4,10 0,1 11,0 0,-1 z" + d="m 326,372 c -1.108,0 -2,0.892 -2,2 l 0,3 0,2 0,2 2,0 3,0 2,0 0,-2 0,-2 0,-3 c 0,-1.108 -0.892,-2 -2,-2 z m -4,10 0,1 11,0 0,-1 z" style="fill:#000000;fill-opacity:1;stroke:none" /> @@ -5117,7 +5117,7 @@ ry="0.5" rx="0.5" y="355" - x="312" + x="408" height="4" width="1" id="rect8749" @@ -5127,7 +5127,7 @@ id="rect8751" width="1" height="2" - x="314" + x="410" y="357" rx="0.5" ry="0.5" /> @@ -5137,7 +5137,7 @@ id="rect8753" width="1" height="2" - x="-315" + x="-411" y="-362" rx="0.5" ry="0.5" /> @@ -5146,7 +5146,7 @@ ry="0.5" rx="0.5" y="-364" - x="-313" + x="-409" height="4" width="1" id="rect8755" @@ -5157,7 +5157,7 @@ id="rect8757" width="1" height="4" - x="-311" + x="-407" y="-364" rx="0.5" ry="0.5" /> @@ -5166,7 +5166,7 @@ ry="0.5" rx="0.5" y="-362" - x="-309" + x="-405" height="2" width="1" id="rect8759" @@ -5175,7 +5175,7 @@ inkscape:connector-curvature="0" inkscape:label="#path8761" id="manhole_drain" - d="m 311.5,370 a 5.5,5.5 0 0 0 -5.5,5.5 5.5,5.5 0 0 0 5.5,5.5 5.5,5.5 0 0 0 5.5,-5.5 5.5,5.5 0 0 0 -5.5,-5.5 z m -1,1 c 0.277,0 0.5,0.223 0.5,0.5 l 0,3 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,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 2,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,3 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,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m -4,2 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 -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 z m 6,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 -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 z m -6,3 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 -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 z m 2,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,3 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,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 2,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,3 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,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 2,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 -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 z" + d="m 407.5,370 a 5.5,5.5 0 0 0 -5.5,5.5 5.5,5.5 0 0 0 5.5,5.5 5.5,5.5 0 0 0 5.5,-5.5 5.5,5.5 0 0 0 -5.5,-5.5 z m -1,1 c 0.277,0 0.5,0.223 0.5,0.5 l 0,3 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,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 2,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,3 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,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m -4,2 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 -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 z m 6,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 -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 z m -6,3 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 -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 z m 2,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,3 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,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 2,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,3 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,-3 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 2,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 -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 z" style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"> drain manhole cover @@ -7421,7 +7421,7 @@ ry="0.5" rx="0.5" y="353" - x="343" + x="311" height="2" width="2" id="rect11213" @@ -7430,7 +7430,7 @@ ry="0.5" rx="0.5" y="356" - x="342" + x="310" height="3" width="4" id="rect11215" @@ -7439,7 +7439,7 @@ ry="0.49999997" rx="0.5" y="358" - x="343" + x="311" height="6" width="2" id="rect11217" @@ -7448,13 +7448,13 @@ sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" id="path11219" - d="m 339,367 10,0 0,-1 -1,-1 -8,0 -1,1 z" + d="m 307,367 10,0 0,-1 -1,-1 -8,0 -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" /> @@ -9219,13 +9219,13 @@ id="rect9513" width="5" height="2" - x="421" + x="389" y="361" ry="0.9375" rx="0.9375" /> @@ -9234,7 +9234,7 @@ id="rect9519" width="11" height="3" - x="418" + x="386" y="355" /> @@ -11713,7 +11713,7 @@ id="rect6915" width="4" height="2" - x="406" + x="374" y="364" rx="0.5" ry="0.5" /> @@ -11722,7 +11722,7 @@ id="rect6917" width="2" height="11" - x="407" + x="375" y="354" rx="0.5" ry="0.5" /> @@ -11731,13 +11731,13 @@ id="rect6919" width="4" height="2" - x="406" + x="374" y="354" rx="0.5" ry="0.5" /> @@ -12147,19 +12147,19 @@ id="rect6122" width="1" height="12" - x="388" + x="356" y="354" ry="0.5" rx="0.5" /> @@ -12534,13 +12534,13 @@ id="rect5971" width="13.046524" height="2.9484253" - x="416.95349" + x="384.95349" y="354.05157" ry="0.47421265" rx="0.52326202" /> + d="M 427.62132,258.37868 A 3,3 0 0 1 428.5,260.5 a 3,3 0 0 1 -0.87868,2.12132" /> + inkscape:label="#path7177" + inkscape:connector-curvature="0" /> + inkscape:label="#path7181" + inkscape:connector-curvature="0" /> + d="M 376.62132,229.37868 A 3,3 0 0 1 377.5,231.5 a 3,3 0 0 1 -0.87868,2.12132" /> + inkscape:label="#path7354" + inkscape:connector-curvature="0" /> + inkscape:label="#path7358" + inkscape:connector-curvature="0" /> + inkscape:label="#rect7640" + inkscape:connector-curvature="0"> phone @@ -21169,21 +21174,21 @@ style="opacity:0.2;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path7148" sodipodi:type="arc" - sodipodi:cx="433" + sodipodi:cx="441" sodipodi:cy="326" sodipodi:rx="6" sodipodi:ry="6" sodipodi:start="0.78539816" sodipodi:end="3.9269908" - d="m 437.24264,330.24264 a 6,6 0 0 1 -8.48528,0 6,6 0 0 1 0,-8.48528 L 433,326 Z" /> + d="m 445.24264,330.24264 a 6,6 0 0 1 -8.48528,0 6,6 0 0 1 0,-8.48528 L 441,326 Z" /> @@ -21192,7 +21197,7 @@ id="rect7152" width="5" height="8" - x="428" + x="436" y="327" rx="0.5" ry="0.5" /> @@ -21201,26 +21206,26 @@ id="rect7169" width="7" height="1" - x="427" + x="435" y="334" rx="0.5" ry="0.46875" /> - + sodipodi:cx="456.5" /> + d="m 422,325 a 3,3 0 0 1 3,3" /> + d="m 422,326 a 2,2 0 0 1 2,2" /> + d="m 422,324 a 4,4 0 0 1 4,4" /> + d="m 422.5,335 a 1.5,1.5 0 0 1 1.5,1.5" /> + d="m 422.5,333 a 3.5,3.5 0 0 1 3.5,3.5" /> + sodipodi:cx="472.5" /> @@ -21371,20 +21376,21 @@ id="rect7263" width="7" height="1" - x="459" + x="467" y="334" rx="0.5" ry="0.46875" /> + d="m 476.50586,338 a 0.50005,0.50005 0 0 0 -0.0762,0.006 l -6.13281,0.87695 0.88085,0.88086 4.73438,-0.67578 -0.67578,4.73438 0.88086,0.88085 0.87695,-6.13281 A 0.50005,0.50005 0 0 0 476.50586,338 Z m -7.89453,0.61133 a 5.5,5.5 0 0 0 0,7.77734 5.5,5.5 0 0 0 7.77734,0 L 472.5,342.5 468.61133,338.61133 Z M 468,347.18164 468,350 l -0.5,0 c -0.277,0 -0.5,0.20906 -0.5,0.46875 l 0,0.0625 c 0,0.25969 0.223,0.46875 0.5,0.46875 l 1,0 4,0 1,0 c 0.277,0 0.5,-0.20906 0.5,-0.46875 l 0,-0.0625 C 474,350.20906 473.777,350 473.5,350 l -0.5,0 0,-1.03125 c -1.78773,0.13656 -3.61811,-0.4588 -5,-1.78711 z" + id="circle7296" + inkscape:connector-curvature="0" /> wretch and hammer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + t-shirt and scissors + diff --git a/scheme/default.yml b/scheme/default.yml index 3720b13..18b860b 100644 --- a/scheme/default.yml +++ b/scheme/default.yml @@ -407,6 +407,10 @@ node_icons: shapes: [shop_convenience] - tags: {shop: ticket} shapes: [ticket] + - tags: {shop: tailor} + shapes: [t_shirt_and_scissors] + - tags: {craft: tailor} + shapes: [t_shirt_and_scissors] - tags: {shop: video} shapes: [{shape: film, color: sell_color}] - tags: {shop: video_games}