diff options
author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2017-12-26 11:06:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-26 11:06:29 +0100 |
commit | 865942a5174ca5f311f0d3b3c0a1494562aca802 (patch) | |
tree | 9a5bb8f5561de771cbb52dbd1f4c3186366c44a2 | |
parent | 2723aba74958ec2201511737978e9d0e91a8b7a5 (diff) | |
parent | 2965884a4227f0437d384a86facc6d2a9dcc4c74 (diff) | |
download | navit-865942a5174ca5f311f0d3b3c0a1494562aca802.tar.gz |
Merge branch 'trunk' into icon_dam
-rw-r--r-- | ci/setup_common_requirements.sh | 2 | ||||
-rw-r--r-- | ci/setup_tomtom_requirements.sh | 2 | ||||
-rw-r--r-- | navit/icons/crossing.svg | 145 | ||||
-rw-r--r-- | navit/icons/drinking_water.svg | 81 | ||||
-rw-r--r-- | navit/icons/goverment_building.svg | 148 | ||||
-rw-r--r-- | navit/route.c | 30 |
6 files changed, 261 insertions, 147 deletions
diff --git a/ci/setup_common_requirements.sh b/ci/setup_common_requirements.sh index f5fa73cef..9f15dd6b1 100644 --- a/ci/setup_common_requirements.sh +++ b/ci/setup_common_requirements.sh @@ -1 +1 @@ -apt-get update && apt-get install -y wget unzip cmake build-essential gettext +apt-get update && apt-get install -y wget unzip cmake build-essential gettext imagemagick diff --git a/ci/setup_tomtom_requirements.sh b/ci/setup_tomtom_requirements.sh index 00bd33c44..98d6de3cd 100644 --- a/ci/setup_tomtom_requirements.sh +++ b/ci/setup_tomtom_requirements.sh @@ -4,7 +4,7 @@ set -e # install additional packages to build TT evitonment and navit -apt-get install -y libglib2.0-dev git autogen autoconf libtool imagemagick zip +apt-get install -y libglib2.0-dev git autogen autoconf libtool zip dpkg --add-architecture i386 apt-get update apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 diff --git a/navit/icons/crossing.svg b/navit/icons/crossing.svg index 51a5aeab6..d3c1ebc17 100644 --- a/navit/icons/crossing.svg +++ b/navit/icons/crossing.svg @@ -9,14 +9,17 @@ 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="200" id="svg2" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" sodipodi:docname="crossing.svg" sodipodi:version="0.32" version="1.0" - width="22"> + width="200" + inkscape:export-filename="C:\Users\jeremy\Pictures\svg\crossing.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> <defs id="defs22"> <inkscape:perspective @@ -49,7 +52,7 @@ guidetolerance="10.0" id="base" inkscape:current-layer="svg2" - inkscape:cx="12.599127" + inkscape:cx="7.9303017" inkscape:cy="7.2481934" inkscape:pageopacity="0.0" inkscape:pageshadow="2" @@ -57,7 +60,7 @@ inkscape:window-width="1366" inkscape:window-x="-8" inkscape:window-y="-8" - inkscape:zoom="17.933333" + inkscape:zoom="1" objecttolerance="10.0" pagecolor="#ffffff" showgrid="false" @@ -67,16 +70,16 @@ inkscape:lockguides="true" /> <g id="g1327" - transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,-1.0602338)"> + transform="matrix(0.34431731,0,0,0.34431731,-0.1767767,0.6565548)"> <path - d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z" + d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z" id="path1329" style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0" inkscape:connector-curvature="0" /> </g> <g id="g2319" - transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)"> + transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)"> <path d="" id="path2323" @@ -85,107 +88,87 @@ </g> <g id="g2325" - transform="matrix(0.04083073,0,0,0.04083073,35.725326,0.442546)"> + transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)"> <path d="" id="path2329" style="fill:#0089cd;stroke:none" inkscape:connector-curvature="0" /> </g> - <path - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:1.16406763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 11.89298,0.29824419 C 6.7920335,0.36448969 3.0245422,3.9744881 3.0160085,9.208339 c -0.00777,4.764226 8.8769715,12.089905 8.8769715,12.089905 0,0 8.399996,-7.12183 8.41325,-12.089905 C 20.3186,4.5706582 16.993926,0.29824419 11.89298,0.29824419 Z" - id="path1492" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cscsc" /> - <path - style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 11.875679,1.0590326 C 7.1553836,1.1203346 3.669036,4.4609421 3.6611391,9.3042242 3.6539491,13.712926 11.875679,20.491937 11.875679,20.491937 c 0,0 7.773159,-6.590374 7.785423,-11.1877128 0.01145,-4.2916004 -3.065128,-8.2451916 -7.785423,-8.2451916 z" - id="path1492-2" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cscsc" - inkscape:transform-center-x="-1.3165584" - inkscape:transform-center-y="3.1070785" /> - <circle - style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.25710332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="path1494" - cx="11.661134" - cy="8.7982445" - r="7" /> <rect - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.47141925;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:6.964746;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1530-1" - width="1.1041681" - height="5.7941589" - x="15.890425" - y="5.9333854" /> + width="16.312975" + height="85.602875" + x="165.07462" + y="59.240246" /> <rect - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.47141925;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:6.964746;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1530-1-1" - width="1.1041681" - height="5.7941589" - x="13.416132" - y="5.9333854" /> + width="16.312975" + height="85.602875" + x="128.51941" + y="59.240246" /> <rect - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.47141925;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:6.964746;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1530-1-1-7" - width="1.1041681" - height="5.7941589" - x="10.965008" - y="-11.597079" + width="16.312975" + height="85.602875" + x="92.306519" + y="-142.91566" transform="scale(1,-1)" /> <rect - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.47141925;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:6.964746;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1530-1-1-7-2" - width="1.1041681" - height="5.7941589" - x="8.4675465" - y="5.9333854" /> + width="16.312975" + height="85.602875" + x="55.409027" + y="59.240246" /> <rect - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.47141925;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:6.964746;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1530-1-1-7-2-7" - width="1.1041681" - height="5.7941589" - x="5.9932542" - y="5.9333854" /> + width="16.312975" + height="85.602875" + x="18.853848" + y="59.240246" /> <rect - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.18637794;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:2.75354671;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1530-1-1-7-6" - width="1" - height="1" - x="11.017092" - y="-4.9517441" + width="14.773995" + height="14.773995" + x="93.075996" + y="-44.737671" transform="scale(1,-1)" - inkscape:transform-center-x="-0.071419827" - inkscape:transform-center-y="0.50357632" /> + inkscape:transform-center-x="-1.0551502" + inkscape:transform-center-y="7.4398368" /> <rect - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.18637794;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:2.75354671;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1530-1-1-7-6-5" - width="1" - height="1" - x="11.017092" - y="-3.1005669" + width="14.773995" + height="14.773995" + x="93.075996" + y="-17.388329" transform="scale(1,-1)" - inkscape:transform-center-x="-0.071419827" - inkscape:transform-center-y="0.50357632" /> + inkscape:transform-center-x="-1.0551502" + inkscape:transform-center-y="7.4398331" /> <rect - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.18637794;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:2.75354671;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1530-1-1-7-6-5-6" - width="1" - height="1" - x="11.017092" - y="-13.448256" + width="14.773995" + height="14.773995" + x="93.075996" + y="-170.265" transform="scale(1,-1)" - inkscape:transform-center-x="-0.071419827" - inkscape:transform-center-y="0.50357632" /> + inkscape:transform-center-x="-1.0551502" + inkscape:transform-center-y="7.4398298" /> <rect - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.18637794;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:2.75354671;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1530-1-1-7-6-5-6-0" - width="1" - height="1" - x="11.017092" - y="-15.299434" + width="14.773995" + height="14.773995" + x="93.075996" + y="-197.61433" transform="scale(1,-1)" - inkscape:transform-center-x="-0.071419827" - inkscape:transform-center-y="0.50357632" /> + inkscape:transform-center-x="-1.0551502" + inkscape:transform-center-y="7.4398249" /> </svg> diff --git a/navit/icons/drinking_water.svg b/navit/icons/drinking_water.svg index b7c676fa0..d4cf5a0c4 100644 --- a/navit/icons/drinking_water.svg +++ b/navit/icons/drinking_water.svg @@ -41,7 +41,7 @@ <cc:license rdf:resource="http://web.resource.org/cc/PublicDomain" /> <dc:language>en</dc:language> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -52,15 +52,15 @@ guidetolerance="10.0" id="base" inkscape:current-layer="svg2" - inkscape:cx="11.370929" - inkscape:cy="13.89007" + inkscape:cx="24.94017" + inkscape:cy="6.5543801" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="705" inkscape:window-width="1366" inkscape:window-x="-8" inkscape:window-y="-8" - inkscape:zoom="1" + inkscape:zoom="1.2239456" objecttolerance="10.0" pagecolor="#ffffff" showgrid="false" @@ -69,15 +69,6 @@ inkscape:measure-end="0,0" inkscape:lockguides="true" /> <g - id="g1327" - transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,176.93977)"> - <path - d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z" - id="path1329" - style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0" - inkscape:connector-curvature="0" /> - </g> - <g id="g2319" transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)"> <path @@ -96,71 +87,51 @@ inkscape:connector-curvature="0" /> </g> <path - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:10.5320406px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 103.33151,6.29824 C 57.180085,6.8971924 23.093259,39.55955 23.016049,86.91343 c -0.0703,43.10485 80.315461,109.38481 80.315461,109.38481 0,0 75.99996,-64.4356 76.11988,-109.38481 C 179.56331,44.953469 149.48292,6.29824 103.33151,6.29824 Z" - id="path1492" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cscsc" /> - <path - style="fill:#0089cd;fill-opacity:1;stroke:#ffffff;stroke-width:2.71428585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 103.17497,13.181578 C 60.467538,13.736197 28.924393,43.960764 28.852945,87.780916 28.787893,127.66924 103.17497,189.00314 103.17497,189.00314 c 0,0 70.32858,-59.62724 70.43954,-101.222224 0.1036,-38.828762 -27.73211,-74.599338 -70.43954,-74.599338 z" - id="path1492-2" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cscsc" - inkscape:transform-center-x="-11.911717" - inkscape:transform-center-y="28.11166" /> - <circle - style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:11.37379169;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="path1494" - cx="101.23385" - cy="83.203079" - r="63.333332" /> - <path - style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:4.48494482;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="m 75.78481,42.116135 v 6.044172 h 6.613544 v 5.037714 H 56.097479 l -6.394551,-5.190076 v 24.527009 l 6.15366,-4.993019 h 22.096237 c 0,0 1.032332,5.948357 7.292416,5.628072 5.132345,-0.262381 5.649978,-5.628072 5.649978,-5.628072 0,0 4.88195,-0.08143 8.650166,0 1.512935,0.03619 1.881805,1.131857 1.861425,2.167991 -0.11572,5.880771 0,8.4531 0,8.4531 0,0 7.17054,-0.08143 11.56274,0 0.0416,-6.641405 0.12667,-11.843515 0,-17.672624 -0.10875,-5.017629 -7.93841,-7.188333 -12.89858,-7.292381 -4.960176,-0.104048 -12.964297,0 -12.964297,0 l 3.6e-5,-5.037714 h 7.445666 v -6.044172 z" + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:10.13824272;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 62.783034,3.5735704 V 17.236455 h 14.94995 v 11.38778 H 18.27971 L 3.8247918,16.892039 V 72.335481 L 17.735175,61.048734 h 49.948669 c 0,0 2.33359,13.446294 16.48455,12.722288 11.60169,-0.593114 12.7718,-12.722288 12.7718,-12.722288 0,0 11.035676,-0.184073 19.553746,0 3.42,0.08181 4.25383,2.558569 4.20776,4.900756 -0.26158,13.293515 0,19.108279 0,19.108279 0,0 16.20905,-0.184073 26.13764,0 0.094,-15.012933 0.28634,-26.772332 0,-39.949066 -0.24583,-11.342378 -17.94482,-16.249267 -29.15731,-16.484468 -11.21251,-0.235201 -29.305866,0 -29.305866,0 l 8e-5,-11.38778 H 105.20721 V 3.5735704 Z" id="path1679" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccscccccccccccc" /> <path - style="fill:none;stroke:#0089cd;stroke-width:1.80952382;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 84.295582,83.191692 94.891661,127.47526 H 120.88204 L 131.07827,83.191692" + style="fill:none;stroke:#0089cd;stroke-width:4.09043884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 82.021684,96.425097 105.97417,196.52835 h 58.7514 L 187.7742,96.425097" id="path1681" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" /> <path - style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:2.09227252;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.72959375;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path830-6-0-0-4" sodipodi:type="arc" - sodipodi:cx="94.43795" - sodipodi:cy="94.236076" - sodipodi:rx="6.6486578" - sodipodi:ry="5.2003613" + sodipodi:cx="104.94855" + sodipodi:cy="121.39098" + sodipodi:rx="15.029328" + sodipodi:ry="11.755445" sodipodi:start="0" sodipodi:end="3.1415927" sodipodi:open="true" - d="m 101.08661,94.236076 a 6.6486578,5.2003613 0 0 1 -3.324331,4.503645 6.6486578,5.2003613 0 0 1 -6.648658,0 6.6486578,5.2003613 0 0 1 -3.324329,-4.503645" /> + d="m 119.97788,121.39098 a 15.029328,11.755445 0 0 1 -7.51467,10.18052 15.029328,11.755445 0 0 1 -15.029327,0 15.029328,11.755445 0 0 1 -7.514664,-10.18052" /> <path - style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:2.09227252;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.72959375;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path830-0-8-2-8-2" sodipodi:type="arc" - sodipodi:cx="107.89147" - sodipodi:cy="94.236076" - sodipodi:rx="6.6486578" - sodipodi:ry="5.2003613" + sodipodi:cx="135.36032" + sodipodi:cy="121.39098" + sodipodi:rx="15.029328" + sodipodi:ry="11.755445" sodipodi:start="0" sodipodi:end="3.1415927" sodipodi:open="true" - d="m 114.54013,94.236076 a 6.6486578,5.2003613 0 0 1 -3.32433,4.503645 6.6486578,5.2003613 0 0 1 -6.64866,0 6.6486578,5.2003613 0 0 1 -3.32433,-4.503645" /> + d="m 150.38965,121.39098 a 15.029328,11.755445 0 0 1 -7.51466,10.18052 15.029328,11.755445 0 0 1 -15.02933,0 15.029328,11.755445 0 0 1 -7.51467,-10.18052" /> <path - style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:2.09227252;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:4.72959375;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path830-0-3-4-9-1-1" sodipodi:type="arc" - sodipodi:cx="121.27702" - sodipodi:cy="94.286331" - sodipodi:rx="6.6486578" - sodipodi:ry="5.2003613" + sodipodi:cx="165.61842" + sodipodi:cy="121.5046" + sodipodi:rx="15.029328" + sodipodi:ry="11.755445" sodipodi:start="6.2639059" sodipodi:end="3.1415927" sodipodi:open="true" - d="m 127.92445,94.186078 a 6.6486578,5.2003613 0 0 1 -3.24937,4.570107 6.6486578,5.2003613 0 0 1 -6.68531,0.05041 6.6486578,5.2003613 0 0 1 -3.3614,-4.520262" /> + d="m 180.64496,121.27798 a 15.029328,11.755445 0 0 1 -7.34521,10.33075 15.029328,11.755445 0 0 1 -15.11219,0.11395 15.029328,11.755445 0 0 1 -7.59846,-10.21808" /> </svg> diff --git a/navit/icons/goverment_building.svg b/navit/icons/goverment_building.svg new file mode 100644 index 000000000..d01f4842b --- /dev/null +++ b/navit/icons/goverment_building.svg @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + 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="200" + id="svg2" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + sodipodi:docname="goverment_building.svg" + sodipodi:version="0.32" + version="1.0" + width="200"> + <defs + id="defs22"> + <inkscape:perspective + id="perspective24" + inkscape:persp3d-origin="290 : 193.33333 : 1" + inkscape:vp_x="0 : 290 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="580 : 290 : 1" + sodipodi:type="inkscape:persp3d" /> + </defs> + <metadata + id="metadata10"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <cc:license + rdf:resource="http://web.resource.org/cc/PublicDomain" /> + <dc:language>en</dc:language> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + bordercolor="#666666" + borderopacity="1.0" + gridtolerance="10.0" + guidetolerance="10.0" + id="base" + inkscape:current-layer="svg2" + inkscape:cx="63.25448" + inkscape:cy="98.118112" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:window-height="705" + inkscape:window-width="1366" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:zoom="2.1796875" + objecttolerance="10.0" + pagecolor="#ffffff" + showgrid="false" + inkscape:window-maximized="1" + inkscape:measure-start="0,0" + inkscape:measure-end="0,0" + inkscape:lockguides="true" /> + <g + id="g1327" + transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,176.93977)"> + <path + d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z" + id="path1329" + style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0" + inkscape:connector-curvature="0" /> + </g> + <g + id="g2319" + transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)"> + <path + d="" + id="path2323" + style="fill:#0089cd;stroke:none" + inkscape:connector-curvature="0" /> + </g> + <g + id="g2325" + transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)"> + <path + d="" + id="path2329" + style="fill:#0089cd;stroke:none" + inkscape:connector-curvature="0" /> + </g> + <path + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:19.49269104px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 9.1798926,59.466906 H 190.52231 L 99.851101,2.7306848 Z" + id="path925" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + <rect + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.1354475;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect927" + width="160.5358" + height="10.516355" + x="19.583216" + y="61.701366" /> + <path + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.29089642;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 16.846267,171.67451 v 10.51391 H 8.0568816 v 15.54226 H 191.64467 v -15.54226 h -8.78936 v -10.51391 z" + id="rect927-7" + inkscape:connector-curvature="0" /> + <rect + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.59141922;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect960" + width="18.032125" + height="93.275604" + x="27.863939" + y="74.209015" /> + <rect + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.59141922;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect960-2" + width="18.032125" + height="93.275604" + x="154.58975" + y="74.209015" /> + <rect + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.59141922;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect960-9" + width="18.032125" + height="93.275604" + x="122.90829" + y="74.209015" /> + <rect + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.59141922;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect960-0" + width="18.032125" + height="93.275604" + x="59.545391" + y="74.209015" /> + <rect + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:9.59141922;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect960-3" + width="18.032125" + height="93.275604" + x="91.22686" + y="74.209015" /> +</svg> diff --git a/navit/route.c b/navit/route.c index c67455902..fcbbb4d13 100644 --- a/navit/route.c +++ b/navit/route.c @@ -137,13 +137,19 @@ struct size_weight_limit { #define RSD_DANGEROUS_GOODS(x) *((int *)route_segment_data_field_pos((x), attr_vehicle_dangerous_goods)) +/** + * @brief Data for a segment in the route graph + */ struct route_graph_segment_data { - struct item *item; - int offset; - int flags; - int len; - int maxspeed; - struct size_weight_limit size_weight; + struct item *item; /**< The item which this segment is part of */ + int offset; /**< If the item passed in "item" is segmented (i.e. divided + * into several segments), this indicates the position of + * this segment within the item */ + int flags; /**< Flags for this segment */ + int len; /**< The length of this segment */ + int maxspeed; /**< The maximum speed allowed on this segment in km/h, + * -1 if not known */ + struct size_weight_limit size_weight; /**< Size and weight limits for this segment */ int dangerous_goods; }; @@ -1607,6 +1613,15 @@ route_segment_data_size(int flags) } +/** + * @brief Checks if the route graph already contains a particular segment. + * + * This function compares the item IDs of both segments. If the item is segmented, the segment offset is + * also compared. + * + * @param start The starting point of the segment + * @param data The data for the segment + */ static int route_graph_segment_is_duplicate(struct route_graph_point *start, struct route_graph_segment_data *data) { @@ -1629,9 +1644,6 @@ route_graph_segment_is_duplicate(struct route_graph_point *start, struct route_g /** * @brief Inserts a new segment into the route graph * - * This function performs a check if a segment for the item specified already exists, and inserts - * a new segment representing this item if it does not. - * * @param this The route graph to insert the segment into * @param start The graph point which should be connected to the start of this segment * @param end The graph point which should be connected to the end of this segment |