diff --git a/.gitignore b/.gitignore index d939eb9..259c747 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,7 @@ profiles.clj *.iml resources/docs/orig.md + +*.png + +*.svg diff --git a/project.clj b/project.clj index b200e61..6bd30e4 100644 --- a/project.clj +++ b/project.clj @@ -34,10 +34,11 @@ [org.clojure/clojurescript "1.10.597" :scope "provided"] [org.clojure/tools.cli "0.4.2"] [org.clojure/tools.logging "0.5.0"] + [org.webjars/webjars-locator "0.38"] [org.webjars.npm/bulma "0.8.0"] [org.webjars.npm/leaflet "1.6.0"] [org.webjars.npm/material-icons "0.3.1"] - [org.webjars/webjars-locator "0.38"] + [org.webjars.npm/csvtojson "2.0.10"] [re-frame "0.10.9"] [reagent "0.9.0-rc3"] [recalcitrant "0.1.2"] diff --git a/resources/public/img/map-pins/colours/Blank-pin.svg b/resources/public/img/map-pins/colours/Blank-pin.svg index 1c5e9e9..f659827 100644 --- a/resources/public/img/map-pins/colours/Blank-pin.svg +++ b/resources/public/img/map-pins/colours/Blank-pin.svg @@ -11,8 +11,8 @@ 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="31" - height="41" + width="30.000006" + height="40.014305" id="svg2" sodipodi:version="0.32" inkscape:version="0.92.3 (2405546, 2018-03-11)" @@ -34,9 +34,9 @@ objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="22.4" - inkscape:cx="22.429455" - inkscape:cy="25.063408" + inkscape:zoom="7.919596" + inkscape:cx="23.755716" + inkscape:cy="28.082932" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -52,8 +52,8 @@ + originx="0" + originy="0" /> @@ -87,7 +87,7 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-384.75,-463.12069)"> + transform="translate(-385.35304,-463.7035)"> \"%s-pin.svg\"\n", $2, $1); -} -END { - print( "mogrify -format png *.svg"); + printf( "cat Blank-pin.svg | sed 's/fill:#dddddc;/fill:%s/' > \"%s-pin.svg\"\n", tolower($2), $1); + printf( "inkscape %s-pin.svg --export-png=%s-pin.png\n", $1, $1); }