From f03982195873564036f5ded10ee8b5084d27d0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Fiti=C3=A9?= Date: Fri, 14 Jul 2017 14:01:10 +0200 Subject: [POI] Improve Bar, Beer, Bus stop, Fountain, Level crossing, Library, Memorial, Post, Repair service, Shopping and Stadium icons (#286) * [POI] Improve Bar, Beer, Bus stop, Fountain, Level crossing, Library, Memorial, Post, Repair service, Shopping and Stadium icons * Delete level_crossing.xpm --- navit/xpm/bar.svg | 177 +++++++++------- navit/xpm/beer.svg | 177 +++++++++------- navit/xpm/bus_stop.svg | 125 +++++++++--- navit/xpm/fountain.svg | 466 ++++++++++++++++++++++++++++++------------- navit/xpm/level_crossing.svg | 165 +++++++++++++++ navit/xpm/level_crossing.xpm | 46 ----- navit/xpm/library.svg | 110 +++++----- navit/xpm/memorial.svg | 290 +++++++++++++++------------ navit/xpm/post.svg | 79 +++++--- navit/xpm/repair_service.svg | 69 ++++--- navit/xpm/shopping.svg | 164 ++++++++------- navit/xpm/stadium.svg | 132 +++++++----- 12 files changed, 1282 insertions(+), 718 deletions(-) create mode 100644 navit/xpm/level_crossing.svg delete mode 100644 navit/xpm/level_crossing.xpm diff --git a/navit/xpm/bar.svg b/navit/xpm/bar.svg index 44c6083dc..9e4767e5f 100644 --- a/navit/xpm/bar.svg +++ b/navit/xpm/bar.svg @@ -1,5 +1,6 @@ + + inkscape:snap-global="false" + inkscape:window-maximized="0"> image/svg+xml + + jfitie@gmail.com + + + + + + - - - - - - - - - - + id="layer1" + transform="translate(0,78)"> + + + + + + + + + + + + + diff --git a/navit/xpm/beer.svg b/navit/xpm/beer.svg index 44c6083dc..9e4767e5f 100644 --- a/navit/xpm/beer.svg +++ b/navit/xpm/beer.svg @@ -1,5 +1,6 @@ + + inkscape:snap-global="false" + inkscape:window-maximized="0"> image/svg+xml + + jfitie@gmail.com + + + + + + - - - - - - - - - - + id="layer1" + transform="translate(0,78)"> + + + + + + + + + + + + + diff --git a/navit/xpm/bus_stop.svg b/navit/xpm/bus_stop.svg index b8dfaffbd..a4215906a 100644 --- a/navit/xpm/bus_stop.svg +++ b/navit/xpm/bus_stop.svg @@ -9,14 +9,14 @@ 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" - height="22" + height="100" id="svg2" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:version="0.48.1 r9760" + inkscape:version="0.91 r13725" sodipodi:docname="bus_stop.svg" sodipodi:version="0.32" version="1.0" - width="22"> + width="100"> @@ -26,9 +26,20 @@ + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> en + + jfitie@gmail.com + + + + + + d="M 10,0 0,5 10,10 Z" + id="path2111" + inkscape:connector-curvature="0" /> + d="M 0,0 10,5 0,10 Z" + id="path2108" + inkscape:connector-curvature="0" /> + + + + + + transform="matrix(0.15820969,0,0,0.15820969,4.1,3.9151693)"> + transform="matrix(0.18945668,0,0,0.18945668,16.777059,9.3854048)"> @@ -131,27 +173,54 @@ + ry="3.1780853" + style="fill:none;stroke:#0089cd;stroke-width:2.37314558;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + width="46.735485" + x="27.293623" + y="6.3752542" /> + + + + + + + + + + diff --git a/navit/xpm/fountain.svg b/navit/xpm/fountain.svg index 5b0d91599..ff9adf84d 100644 --- a/navit/xpm/fountain.svg +++ b/navit/xpm/fountain.svg @@ -10,13 +10,13 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="22" - height="22" + width="100" + height="100" inkscape:export-xdpi="90" inkscape:export-ydpi="90" id="svg2" sodipodi:version="0.32" - inkscape:version="0.47 r22583" + inkscape:version="0.91 r13725" version="1.0" sodipodi:docname="fountain.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" @@ -59,7 +59,7 @@ width="1.1563566" y="-0.10603384" height="1.2120677" - color-interpolation-filters="sRGB"> + style="color-interpolation-filters:sRGB"> + style="color-interpolation-filters:sRGB"> + + + + + + + + + + + + + + image/svg+xml + + jfitie@gmail.com + + + + + + + style="display:inline" + transform="translate(0,78)" /> + style="display:inline" + transform="translate(0,78)"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g4718" + transform="matrix(0.9640793,0,0,0.96407804,-0.64632703,-10.612771)"> + inkscape:connector-curvature="0" + id="path3113-1" + d="m 46.439876,-59.730311 c -7.795023,-0.214318 -10.633793,8.892516 -9.855473,15.179688 -4.0867,2.608509 -6.85392,7.405111 -12.25781,7.318359 -9.527618,2.74314 -17.9167778,10.248464 -20.2988278,20.011719 -6.18109,7.134065 -1.23265,19.1329663 7.7578198,20.8945313 6.68714,3.046502 16.569168,3.493629 18.874998,11.7597657 12.579054,11.248143 32.713028,9.237235 46.271481,0.65039 3.767772,-0.476671 -2.937971,-5.777465 1.753906,-6.1093747 11.081116,-3.53992 24.13919,-11.050115 25.20898,-23.9765623 0.15537,-13.594754 -12.929566,-22.673618 -25.132808,-24.867188 -3.297129,-1.335905 -5.758684,-4.309833 -8.326172,-6.546875 1.104232,-8.256997 -9.012791,-14.747678 -16.158203,-10.96875 -2.046502,-2.070732 -4.914717,-3.346708 -7.837891,-3.345703 z" + style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/navit/xpm/level_crossing.svg b/navit/xpm/level_crossing.svg new file mode 100644 index 000000000..abf7b4899 --- /dev/null +++ b/navit/xpm/level_crossing.svg @@ -0,0 +1,165 @@ + + + + + + + + image/svg+xml + + + en + + jfitie@gmail.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/navit/xpm/level_crossing.xpm b/navit/xpm/level_crossing.xpm deleted file mode 100644 index e01a48568..000000000 --- a/navit/xpm/level_crossing.xpm +++ /dev/null @@ -1,46 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"16 16 27 1", -". c None", -"a c #cb0000", -"# c #cc0000", -"w c #cf1818", -"b c #d01a1a", -"y c #d85151", -"d c #db5656", -"x c #df7676", -"c c #e07b7b", -"s c #e19090", -"e c #e49898", -"v c #ecb8b8", -"j c #ecbcbc", -"p c #f0f0f0", -"r c #f4f4f4", -"o c #f5f5f5", -"q c #f6f6f6", -"l c #f7f7f7", -"h c #f8f8f8", -"k c #f9f9f9", -"t c #faefef", -"u c #fbfbfb", -"f c #fcf3f3", -"g c #fcfcfc", -"m c #fdfdfd", -"n c #fefefe", -"i c #ffffff", -"....#......#....", -"...a#.....###...", -"...a##...###....", -"....#bc..d##....", -"....efg.hij.....", -".....kilmno.....", -"......niig......", -"......gin.......", -"......gin.......", -".....pniih......", -".....kiqgir.....", -"....stu.hnv.....", -"....#wx..ya#....", -"...###...###....", -"...##.....a##...", -"....a......#...."}; diff --git a/navit/xpm/library.svg b/navit/xpm/library.svg index 5b57157ea..46ede8a00 100644 --- a/navit/xpm/library.svg +++ b/navit/xpm/library.svg @@ -9,14 +9,14 @@ 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" - height="22" + height="100" id="svg2" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:version="0.48.1 r9760" + inkscape:version="0.91 r13725" sodipodi:docname="library.svg" sodipodi:version="0.32" version="1.0" - width="22"> + width="100"> @@ -26,9 +26,20 @@ + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> en + + jfitie@gmail.com + + + + + + id="g3426" + transform="matrix(1.0049937,0,0,1.0049937,1.4992955,-1.7895917)"> + inkscape:connector-curvature="0" + id="path3470-1" + d="M 48.317007,3.8909439 C 35.009448,11.670562 20.47631,17.945425 8.1012018,27.005544 c -0.313453,1.941972 0.01053,3.498768 -1.745198,4.136804 -2.001536,6.637013 -1.809974,14.654813 -0.41096,21.572413 13.6633812,14.82479 26.0847112,31.205862 40.7823652,44.879851 2.734144,0.784245 3.737744,-2.958498 6.486083,-1.670465 8.512264,-3.257939 15.609769,-9.577354 23.949047,-13.376506 4.902434,-3.350092 12.043198,-5.625712 14.435718,-11.246541 0.04356,-2.731297 -3.741051,-3.57982 -0.260089,-5.588799 1.957113,-2.576537 -3.568957,-4.678406 -0.486005,-5.97956 2.661639,-2.626109 -2.420404,-5.161967 0.754324,-7.064834 C 90.161799,45.994288 83.470262,40.941722 79.216051,35.567519 69.613061,25.375089 61.567851,13.515556 51.07482,4.0686779 50.155568,4.0115179 49.229988,3.2588139 48.317007,3.8909439 Z" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.71303189;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + - - - - - diff --git a/navit/xpm/memorial.svg b/navit/xpm/memorial.svg index a464643c8..645b9d1ac 100644 --- a/navit/xpm/memorial.svg +++ b/navit/xpm/memorial.svg @@ -9,14 +9,14 @@ 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" - height="22" + height="100" id="svg2" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:version="0.48.1 r9760" + inkscape:version="0.91 r13725" sodipodi:docname="memorial.svg" sodipodi:version="0.32" version="1.0" - width="22"> + width="100"> @@ -26,10 +26,20 @@ + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> en + jfitie@gmail.com + + + + + @@ -72,23 +82,24 @@ id="symbol-university" viewBox="244.5 110 489 219.9"> + d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z" + id="path4460" + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" + style="fill:none;stroke:#000000;stroke-width:20" /> + d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z" + id="path4464" + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" + style="stroke:#000000;stroke-width:20" /> + refX="0" + refY="0" + style="overflow:visible"> + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + transform="matrix(-1.1,0,0,-1.1,-1.1,0)" + inkscape:connector-curvature="0" /> + refX="0" + refY="0" + style="overflow:visible"> + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="matrix(-0.4,0,0,-0.4,-4,0)" + inkscape:connector-curvature="0" /> + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> + refX="0" + refY="0" + style="overflow:visible"> + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + transform="scale(-1.2,-1.2)"> + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" + inkscape:connector-curvature="0" /> + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" + inkscape:connector-curvature="0" /> + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" + inkscape:connector-curvature="0" /> + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" + inkscape:connector-curvature="0" /> + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" + inkscape:connector-curvature="0" /> + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" + inkscape:connector-curvature="0" /> + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="matrix(0.2,0,0,0.2,1.2,0)" + inkscape:connector-curvature="0" /> + refX="0" + refY="0" + style="overflow:visible"> + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="matrix(-0.2,0,0,-0.2,-1.2,0)" + inkscape:connector-curvature="0" /> + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none" + transform="matrix(0.6,0,0,0.6,4.2752958,0.4580676)" + inkscape:connector-curvature="0" /> + refX="0" + refY="0" + style="overflow:visible"> + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + transform="matrix(-0.3,0,0,-0.3,0.69,0)" + inkscape:connector-curvature="0" /> + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="scale(0.2,0.2)" + inkscape:connector-curvature="0" /> + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none" + transform="scale(0.6,0.6)" + inkscape:connector-curvature="0" /> + r="0.80000001" /> + r="0.80000001" /> + r="0.80000001" /> + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt" + transform="scale(0.2,0.2)" + inkscape:connector-curvature="0" /> + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + transform="matrix(0.3,0,0,0.3,-0.69,0)" + inkscape:connector-curvature="0" /> + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="scale(0.2,0.2)" + inkscape:connector-curvature="0" /> style="overflow:visible"> + transform="scale(0.8,0.8)" + inkscape:connector-curvature="0" /> - + id="g4445" + style="stroke:none" + transform="matrix(0.95819341,0,0,0.95819341,1.0023618,2.441202)"> + + + diff --git a/navit/xpm/post.svg b/navit/xpm/post.svg index 437bd2a69..996046082 100644 --- a/navit/xpm/post.svg +++ b/navit/xpm/post.svg @@ -1,5 +1,6 @@ + + inkscape:window-x="114" + inkscape:window-y="134" + inkscape:window-maximized="0"> image/svg+xml + + jfitie@gmail.com + + + + + + - - - + id="layer1" + transform="translate(0,78)"> + + + + + + diff --git a/navit/xpm/repair_service.svg b/navit/xpm/repair_service.svg index 106bef807..e38ad74ef 100644 --- a/navit/xpm/repair_service.svg +++ b/navit/xpm/repair_service.svg @@ -10,15 +10,15 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="23.466667" - height="23.466667" + width="100" + height="100" id="svg1875" sodipodi:version="0.32" - inkscape:version="0.92.1 r15371" + inkscape:version="0.91 r13725" version="1.0" sodipodi:docname="repair_service.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - viewBox="0 0 22 22"> + viewBox="0 0 93.749998 93.749998"> @@ -117,24 +117,19 @@ Map; Symbol; Wikivoyage; Shop - Symbol for Wikivoyage maps:Shop + Symbol for Wikivoyage maps:Shop +jfitie@gmail.com + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + rdf:resource="http://creativecommons.org/ns#Reproduction" /> - - + rdf:resource="http://creativecommons.org/ns#Distribution" /> - + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> @@ -142,17 +137,27 @@ inkscape:label="Hintergrund" inkscape:groupmode="layer" id="layer1" - transform="translate(836.281,-94.5055)"> - + transform="translate(836.281,-22.755502)"> + + + + + transform="translate(0,-52.250002)" /> diff --git a/navit/xpm/shopping.svg b/navit/xpm/shopping.svg index 3d15dee44..27af3bff1 100644 --- a/navit/xpm/shopping.svg +++ b/navit/xpm/shopping.svg @@ -1,5 +1,6 @@ + + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(4.7556227,0,0,4.7556227,-4.1619844,-78.614112)" /> + inkscape:window-x="86" + inkscape:window-y="97" + inkscape:window-maximized="0"> image/svg+xml + + jfitie@gmail.com + + + + + + - - - - - - - - - + id="layer1" + transform="translate(0,78)"> + + + + + + + + + + + + diff --git a/navit/xpm/stadium.svg b/navit/xpm/stadium.svg index b89a7f69b..fed86de46 100644 --- a/navit/xpm/stadium.svg +++ b/navit/xpm/stadium.svg @@ -1,5 +1,6 @@ + + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="scale(-0.2,-0.2)" + inkscape:connector-curvature="0" /> + d="m 5.77,0 -8.65,5 0,-10 8.65,5 z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="scale(-0.8,-0.8)" + inkscape:connector-curvature="0" /> + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="matrix(0.3,0,0,0.3,-0.69,0)" + inkscape:connector-curvature="0" /> + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="scale(0.6,0.6)" + inkscape:connector-curvature="0" /> + d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + transform="matrix(0.8,0,0,0.8,10,0)" + inkscape:connector-curvature="0" /> @@ -135,14 +141,14 @@ + inkscape:guide-bbox="true" + inkscape:window-maximized="0"> image/svg+xml + + jfitie@gmail.com + + + + + + + id="layer1" + transform="translate(0,78)"> + + cx="49.969875" + cy="-28.073755" + rx="41.472557" + ry="40.28664" /> + d="m 20.866546,-49.546331 12.269985,-6.953025 9.815989,11.861042 -7.93459,16.278258 -15.787383,-2.372208 -0.817999,-16.76906 2.453998,-2.045007 z" + id="path2436" + inkscape:connector-curvature="0" /> + d="m 78.845238,-51.25251 -16.359979,-4.090014 -7.770992,12.270042 12.269988,14.315049 15.132981,-5.317017 -3.271998,-17.17806 z" + id="path3238" + inkscape:connector-curvature="0" /> + d="m 38.763285,-17.23522 20.449977,0 8.179989,15.9510573 L 51.851269,8.2864719 33.037292,-2.5111664 38.763285,-17.23522 Z" + id="path3240" + inkscape:connector-curvature="0" /> + d="m 86.207232,-14.37221 -7.770991,-2.454008 4.498996,13.0880479 3.271995,-10.6340399 z" + id="path3242" + inkscape:connector-curvature="0" /> + d="m 20.767306,-13.554204 -1.635999,9.8160339 -6.543993,-10.2250369 8.179992,0.409021 z" + id="path3244" + inkscape:connector-curvature="0" /> -- cgit v1.2.1