diff --git a/CHANGELOG.md b/CHANGELOG.md index a2e8aab..f468ebe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ # Unreleased - Redraw diving tower icons. -- Add icon for `shop=car_parts` (#48). +- Add icons for: + - `shop=car_parts` (#48), + - `natural=spring` (#55). # 0.1.6 diff --git a/doc/grid.svg b/doc/grid.svg index e7cff86..44da07f 100644 --- a/doc/grid.svg +++ b/doc/grid.svg @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/map_machine/icons/config.json b/map_machine/icons/config.json index d47962e..15b7b7b 100644 --- a/map_machine/icons/config.json +++ b/map_machine/icons/config.json @@ -207,6 +207,7 @@ "shield_volcano": {"name": "shield volcano", "categories": ["natural"], "emoji": "🌋"}, "smoke": {"name": "smoke"}, "smoke_2": {"name": "clouds"}, + "spring": {"name": "spring", "categories": ["natural"]}, "stone": {"emoji": "🪨", "categories": ["natural"], "name": "stone"}, "stone_with_inscription": {"categories": ["natural"], "name": "stone with inscription"}, "stratovolcano": {"name": "stratovolcano", "categories": ["natural"], "emoji": "🌋"}, diff --git a/map_machine/icons/icons.svg b/map_machine/icons/icons.svg index 7680345..b80b695 100644 --- a/map_machine/icons/icons.svg +++ b/map_machine/icons/icons.svg @@ -148,12 +148,12 @@ inkscape:object-paths="true" inkscape:guide-bbox="true" showguides="false" - showgrid="false" + showgrid="true" inkscape:document-units="px" inkscape:current-layer="layer1" - inkscape:cy="658.34207" - inkscape:cx="15.454333" - inkscape:zoom="15.982573" + inkscape:cy="376.88762" + inkscape:cx="679.98746" + inkscape:zoom="6.66777" inkscape:pageshadow="2" inkscape:pageopacity="0.0" borderopacity="1.0" @@ -749,20 +749,20 @@ style="opacity:0.2;fill:none;stroke:#000000;stroke-linecap:round;stroke-linejoin:round" id="path34612" sodipodi:type="arc" - sodipodi:cx="361" + sodipodi:cx="345" sodipodi:cy="522" sodipodi:rx="1.5" sodipodi:ry="1.5" sodipodi:start="4.712389" sodipodi:end="0" sodipodi:arc-type="arc" - d="m 361,520.5 a 1.5,1.5 0 0 1 1.5,1.5" + d="m 345,520.5 a 1.5,1.5 0 0 1 1.5,1.5" sodipodi:open="true" /> + d="m 348.5,523.5 a 1,1 0 0 1 -0.5,0.86603 1,1 0 0 1 -1,0 1,1 0 0 1 -0.5,-0.86603" /> - - - - - - @@ -9837,7 +9792,7 @@ id="rect5648" width="1" height="1" - x="330" + x="331" y="516" rx="0" ry="0" /> @@ -9846,101 +9801,42 @@ id="rect5654" width="1" height="1.5" - x="330" + x="331" y="522" /> - - - - - - - - - - - - - + d="m 339,530 c -0.554,0 -1,0.446 -1,1 v 10 c 0,0.554 0.446,1 1,1 h 5 c 0.554,0 1,-0.446 1,-1 v -4 c 0.55821,0 1,0.44179 1,1 v 1.5 c 0,0.5351 0.28659,1.03128 0.75,1.29883 0.46341,0.26755 1.03659,0.26755 1.5,0 C 348.71341,540.53128 349,540.0351 349,539.5 V 535 h 1 c 0.554,0 1,-0.446 1,-1 v -1 -1 h -1 v -1.5 a 0.5,0.5 0 0 0 -0.5,-0.5 0.5,0.5 0 0 0 -0.5,0.5 v 1.5 h -1 v -1.5 a 0.5,0.5 0 0 0 -0.5,-0.5 0.5,0.5 0 0 0 -0.5,0.5 v 1.5 h -1 v 1 1 c 0,0.554 0.446,1 1,1 h 1 v 4.5 c 0,0.17943 -0.0946,0.34388 -0.25,0.43359 -0.15539,0.0897 -0.34461,0.0897 -0.5,0 C 347.09461,539.84388 347,539.67943 347,539.5 V 538 c 0,-1.09865 -0.90135,-2 -2,-2 v -5 c 0,-0.554 -0.446,-1 -1,-1 z m 0,2 h 5 v 3 h -5 z" /> + id="spring" />