From 99787acc9fd0ca64f18b670440849fbdff0c9360 Mon Sep 17 00:00:00 2001 From: youte62 Date: Sat, 14 Oct 2017 17:51:37 +0200 Subject: add drinking_water.svg designed by me - free to use --- navit/icons/drinking_water.svg | 322 ++++++++++++++--------------------------- 1 file changed, 112 insertions(+), 210 deletions(-) diff --git a/navit/icons/drinking_water.svg b/navit/icons/drinking_water.svg index d81e92082..8aa308d8e 100644 --- a/navit/icons/drinking_water.svg +++ b/navit/icons/drinking_water.svg @@ -7,19 +7,28 @@ 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: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" height="22" id="svg2" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:version="0.91 r13725" + inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" sodipodi:docname="drinking_water.svg" sodipodi:version="0.32" version="1.0" width="22"> + + + + id="metadata10"> @@ -27,20 +36,10 @@ + rdf:resource="http://web.resource.org/cc/PublicDomain" /> en - - jfitie@gmail.com + - - - - - - - - - - - - - - - - - - - - - - - - + inkscape:window-maximized="1" + inkscape:measure-start="0,0" + inkscape:measure-end="0,0" + inkscape:lockguides="true" /> + + + + + - + 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" /> + 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" /> + + style="fill:#0089cd;fill-opacity:1;stroke:none;stroke-width:0.49570444;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 8.8483452,4.257064 V 4.9251032 H 9.5793158 V 5.4818981 H 6.672377 L 5.9656109,4.9082558 V 7.6191394 L 6.6457522,7.0672809 h 2.4422157 c 0,0 0.1140999,0.6574516 0.8060039,0.622051 0.5672592,-0.029024 0.6244712,-0.622051 0.6244712,-0.622051 0,0 0.539584,-0.00886 0.956071,0 0.167219,0.00356 0.207989,0.1251007 0.205736,0.2396228 -0.01279,0.6499752 0,0.9342866 0,0.9342866 0,0 0.792534,-0.00876 1.277988,0 0.0046,-0.734054 0.014,-1.309017 0,-1.9532883 -0.01202,-0.5545827 -0.877404,-0.7945 -1.425633,-0.8060039 -0.54823,-0.0115 -1.432896,0 -1.432896,0 l 4e-6,-0.5567949 h 0.822942 V 4.257064 Z" + id="path1679" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccscccccccccccc" /> + sodipodi:nodetypes="cccc" /> + style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.23125117;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path830-6-0-0-4" + sodipodi:type="arc" + sodipodi:cx="10.910008" + sodipodi:cy="10.017691" + sodipodi:rx="0.73485166" + sodipodi:ry="0.57477677" + sodipodi:start="0" + sodipodi:end="3.1415927" + sodipodi:open="true" + d="m 11.64486,10.017691 a 0.73485166,0.57477677 0 0 1 -0.367426,0.497771 0.73485166,0.57477677 0 0 1 -0.734851,0 0.73485166,0.57477677 0 0 1 -0.367426,-0.497771" /> - - - - - - - - + style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.23125117;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path830-0-8-2-8-2" + sodipodi:type="arc" + sodipodi:cx="12.396976" + sodipodi:cy="10.017691" + sodipodi:rx="0.73485166" + sodipodi:ry="0.57477677" + sodipodi:start="0" + sodipodi:end="3.1415927" + sodipodi:open="true" + d="m 13.131828,10.017691 a 0.73485166,0.57477677 0 0 1 -0.367426,0.497771 0.73485166,0.57477677 0 0 1 -0.734851,0 0.73485166,0.57477677 0 0 1 -0.367426,-0.497771" /> + style="fill:none;fill-opacity:1;stroke:#0089cd;stroke-width:0.23125117;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="13.876431" + sodipodi:cy="10.023232" + sodipodi:rx="0.73485166" + sodipodi:ry="0.57477677" + sodipodi:start="6.2639059" + sodipodi:end="3.1415927" + sodipodi:open="true" + d="m 14.611147,10.012152 a 0.73485166,0.57477677 0 0 1 -0.359141,0.505117 0.73485166,0.57477677 0 0 1 -0.738903,0.0056 0.73485166,0.57477677 0 0 1 -0.371523,-0.499608" /> -- cgit v1.2.1 From 40261e7e1f5d7ee1636193c4ae7297ca94551081 Mon Sep 17 00:00:00 2001 From: youte62 Date: Sat, 14 Oct 2017 19:06:55 +0200 Subject: add governement_building.svg designed by me - free to use --- navit/icons/goverment_building.svg | 168 +++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100644 navit/icons/goverment_building.svg diff --git a/navit/icons/goverment_building.svg b/navit/icons/goverment_building.svg new file mode 100644 index 000000000..af4ab28fe --- /dev/null +++ b/navit/icons/goverment_building.svg @@ -0,0 +1,168 @@ + + + + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.1 From f8e32fc8664729b90175e592753905048142aa57 Mon Sep 17 00:00:00 2001 From: youte62 Date: Sat, 14 Oct 2017 22:06:06 +0200 Subject: 200*200 --- navit/icons/drinking_water.svg | 83 ++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/navit/icons/drinking_water.svg b/navit/icons/drinking_water.svg index 8aa308d8e..b7c676fa0 100644 --- a/navit/icons/drinking_water.svg +++ b/navit/icons/drinking_water.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="drinking_water.svg" sodipodi:version="0.32" version="1.0" - width="22"> + width="200" + inkscape:export-filename="C:\Users\jeremy\Pictures\svg\drinking_water.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,176.93977)"> + transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)"> + transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)"> + inkscape:transform-center-x="-11.911717" + inkscape:transform-center-y="28.11166" /> + cx="101.23385" + cy="83.203079" + r="63.333332" /> + 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 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 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" /> -- cgit v1.2.1 From 117af2d2fe31a8ed9874cd503deb65d1996dca71 Mon Sep 17 00:00:00 2001 From: youte62 Date: Sat, 14 Oct 2017 22:12:36 +0200 Subject: 200*200 --- navit/icons/goverment_building.svg | 104 ++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/navit/icons/goverment_building.svg b/navit/icons/goverment_building.svg index af4ab28fe..de89d8594 100644 --- a/navit/icons/goverment_building.svg +++ b/navit/icons/goverment_building.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="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="22"> + width="200"> + transform="matrix(0.04083073,0,0,0.04083073,-0.1767767,176.93977)"> + transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)"> + transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)"> + inkscape:transform-center-x="-11.911717" + inkscape:transform-center-y="28.11166" /> + cx="103.23385" + cy="83.203079" + r="63.333332" /> + width="74.55722" + height="4.8783436" + x="67.087448" + y="58.93026" /> + width="8.3746138" + height="43.268837" + x="70.933243" + y="64.73233" /> + width="8.3746138" + height="43.268837" + x="129.78818" + y="64.73233" /> + width="8.3746138" + height="43.268837" + x="115.07445" + y="64.73233" /> + width="8.3746138" + height="43.268837" + x="85.646973" + y="64.73233" /> + width="8.3746138" + height="43.268837" + x="100.36071" + y="64.73233" /> -- cgit v1.2.1 From 6c2ed1fdb3f3c9270506027d98490723c95e9976 Mon Sep 17 00:00:00 2001 From: youte62 Date: Sun, 22 Oct 2017 07:18:29 +0200 Subject: modify icons designed by me - free to use --- navit/icons/drinking_water.svg | 66 +++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 40 deletions(-) diff --git a/navit/icons/drinking_water.svg b/navit/icons/drinking_water.svg index b7c676fa0..78c071b38 100644 --- a/navit/icons/drinking_water.svg +++ b/navit/icons/drinking_water.svg @@ -41,7 +41,7 @@ en - + @@ -52,15 +52,15 @@ guidetolerance="10.0" id="base" inkscape:current-layer="svg2" - inkscape:cx="11.370929" - inkscape:cy="13.89007" + inkscape:cx="63.25448" + inkscape:cy="84.317601" 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="2.1796875" objecttolerance="10.0" pagecolor="#ffffff" showgrid="false" @@ -95,20 +95,6 @@ style="fill:#0089cd;stroke:none" inkscape:connector-curvature="0" /> - - + 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" /> + 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" /> + 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" /> -- cgit v1.2.1 From 0898653cefd5b32db8646516c3bf2cce9baa4b15 Mon Sep 17 00:00:00 2001 From: youte62 Date: Sun, 22 Oct 2017 07:34:55 +0200 Subject: update:icon:update goverment_building icon --- navit/icons/goverment_building.svg | 96 +++++++++++++++----------------------- 1 file changed, 38 insertions(+), 58 deletions(-) diff --git a/navit/icons/goverment_building.svg b/navit/icons/goverment_building.svg index de89d8594..d01f4842b 100644 --- a/navit/icons/goverment_building.svg +++ b/navit/icons/goverment_building.svg @@ -38,7 +38,7 @@ en - + @@ -49,15 +49,15 @@ guidetolerance="10.0" id="base" inkscape:current-layer="svg2" - inkscape:cx="20.866535" - inkscape:cy="5.5848914" + 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="1" + inkscape:zoom="2.1796875" objecttolerance="10.0" pagecolor="#ffffff" showgrid="false" @@ -93,76 +93,56 @@ inkscape:connector-curvature="0" /> - - - + width="160.5358" + height="10.516355" + x="19.583216" + y="61.701366" /> + width="18.032125" + height="93.275604" + x="27.863939" + y="74.209015" /> + width="18.032125" + height="93.275604" + x="154.58975" + y="74.209015" /> + width="18.032125" + height="93.275604" + x="122.90829" + y="74.209015" /> + width="18.032125" + height="93.275604" + x="59.545391" + y="74.209015" /> + width="18.032125" + height="93.275604" + x="91.22686" + y="74.209015" /> -- cgit v1.2.1 From 956490241e53454e8ace4aa1ba9d0c6649f774a2 Mon Sep 17 00:00:00 2001 From: youte62 Date: Sun, 22 Oct 2017 07:18:29 +0200 Subject: modify icons designed by me - free to use --- navit/icons/drinking_water.svg | 66 +++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 40 deletions(-) diff --git a/navit/icons/drinking_water.svg b/navit/icons/drinking_water.svg index b7c676fa0..78c071b38 100644 --- a/navit/icons/drinking_water.svg +++ b/navit/icons/drinking_water.svg @@ -41,7 +41,7 @@ en - + @@ -52,15 +52,15 @@ guidetolerance="10.0" id="base" inkscape:current-layer="svg2" - inkscape:cx="11.370929" - inkscape:cy="13.89007" + inkscape:cx="63.25448" + inkscape:cy="84.317601" 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="2.1796875" objecttolerance="10.0" pagecolor="#ffffff" showgrid="false" @@ -95,20 +95,6 @@ style="fill:#0089cd;stroke:none" inkscape:connector-curvature="0" /> - - + 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" /> + 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" /> + 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" /> -- cgit v1.2.1 From 7418d576edb8ee94beb64b22b8d66e0cb66e2d81 Mon Sep 17 00:00:00 2001 From: youte62 Date: Sun, 22 Oct 2017 07:03:55 +0200 Subject: modify icons designed by me - free to use --- navit/icons/crossing.svg | 145 +++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 81 deletions(-) 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"> + transform="matrix(0.34431731,0,0,0.34431731,-0.1767767,0.6565548)"> + transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)"> + transform="matrix(0.04083073,0,0,0.04083073,35.725326,178.44255)"> - - - + width="16.312975" + height="85.602875" + x="165.07462" + y="59.240246" /> + width="16.312975" + height="85.602875" + x="128.51941" + y="59.240246" /> + width="16.312975" + height="85.602875" + x="55.409027" + y="59.240246" /> + width="16.312975" + height="85.602875" + x="18.853848" + y="59.240246" /> + inkscape:transform-center-x="-1.0551502" + inkscape:transform-center-y="7.4398368" /> + inkscape:transform-center-x="-1.0551502" + inkscape:transform-center-y="7.4398331" /> + inkscape:transform-center-x="-1.0551502" + inkscape:transform-center-y="7.4398298" /> + inkscape:transform-center-x="-1.0551502" + inkscape:transform-center-y="7.4398249" /> -- cgit v1.2.1 From f3d26a007a6c412ea1e7be00890d4c9fb3bc62c2 Mon Sep 17 00:00:00 2001 From: youte62 Date: Sun, 29 Oct 2017 18:50:05 +0100 Subject: update:icon:update drinking_water icon --- navit/icons/drinking_water.svg | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/navit/icons/drinking_water.svg b/navit/icons/drinking_water.svg index 78c071b38..d4cf5a0c4 100644 --- a/navit/icons/drinking_water.svg +++ b/navit/icons/drinking_water.svg @@ -52,15 +52,15 @@ guidetolerance="10.0" id="base" inkscape:current-layer="svg2" - inkscape:cx="63.25448" - inkscape:cy="84.317601" + 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="2.1796875" + inkscape:zoom="1.2239456" objecttolerance="10.0" pagecolor="#ffffff" showgrid="false" @@ -68,15 +68,6 @@ inkscape:measure-start="0,0" inkscape:measure-end="0,0" inkscape:lockguides="true" /> - - - @@ -95,12 +86,6 @@ style="fill:#0089cd;stroke:none" inkscape:connector-curvature="0" /> - Date: Tue, 5 Dec 2017 00:12:30 +0100 Subject: fix:ci:Install imagemagick for android build to convert images (#384) * Update setup_android.sh * Update setup_android.sh * Update setup_common_requirements.sh * Update setup_tomtom_requirements.sh --- ci/setup_common_requirements.sh | 2 +- ci/setup_tomtom_requirements.sh | 2 +- 2 files changed, 2 insertions(+), 2 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 -- cgit v1.2.1 From 2965884a4227f0437d384a86facc6d2a9dcc4c74 Mon Sep 17 00:00:00 2001 From: mvglasow Date: Wed, 6 Dec 2017 14:59:19 +0100 Subject: Refactor:route:More documentation (#385) --- navit/route.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) 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 -- cgit v1.2.1