Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 82afafa294 | |||
| 90400d967f | |||
| 208df9e6af |
@@ -8,4 +8,4 @@ npx road-compiler --input /absolute/path/road-compiler.input.json
|
|||||||
|
|
||||||
The compiler does not read host area configuration. The caller owns configuration normalization and creates the input JSON. Successful compilation writes exactly one `NATIVE_ROAD_COMPILE_DONE` JSON marker to stdout.
|
The compiler does not read host area configuration. The caller owns configuration normalization and creates the input JSON. Successful compilation writes exactly one `NATIVE_ROAD_COMPILE_DONE` JSON marker to stdout.
|
||||||
|
|
||||||
Run `npm test` and `npm run test:road-parity` after `npm ci` to validate the package without the host repository.
|
Run `npm test` after `npm ci` to validate the package and its two self-contained area fixtures without the host repository. The migrated baselines remain upgrade corpus; the host repository owns the strict path-normalized parity gate.
|
||||||
|
|||||||
24
assets/lane-icons/manifest.json
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
{
|
||||||
|
"upstream": {
|
||||||
|
"repository": "https://github.com/openstreetmap/lane-icons",
|
||||||
|
"revision": "db3cab321da93a757c2cf3cdb4f1f1db6b1a091c",
|
||||||
|
"license": "CC0-1.0",
|
||||||
|
"license_file": "upstream/LICENSE.md"
|
||||||
|
},
|
||||||
|
"assets": [
|
||||||
|
{"id":"through","source":"upstream/through.svg","anchor_x":12.5,"supported":true,"tested":true,"template":"through"},
|
||||||
|
{"id":"left","source":"upstream/left.svg","anchor_x":17,"supported":true,"tested":true,"template":"left"},
|
||||||
|
{"id":"right","source":"upstream/left.svg","derived_from":"left","mirror_x":true,"anchor_x":17,"supported":true,"tested":true,"template":"right"},
|
||||||
|
{"id":"through;left","source":"upstream/left-through.svg","anchor_x":17,"supported":true,"tested":true,"template":"through_left"},
|
||||||
|
{"id":"through;right","source":"upstream/left-through.svg","derived_from":"through;left","mirror_x":true,"anchor_x":17,"supported":true,"tested":true,"template":"through_right"},
|
||||||
|
{"id":"through;left;right","source":"upstream/left-slight_left-through.svg","derived_from":"through;left + through;right","anchor_x":17,"supported":true,"tested":true,"template":"through_left_right"},
|
||||||
|
{"id":"slight_left","source":"upstream/slight_left.svg","supported":false,"tested":false},
|
||||||
|
{"id":"slight_left;through","source":"upstream/slight_left-through.svg","supported":false,"tested":false},
|
||||||
|
{"id":"left;slight_left;through","source":"upstream/left-slight_left-through.svg","supported":false,"tested":false},
|
||||||
|
{"id":"sharp_left","source":"upstream/sharp_left.svg","supported":false,"tested":false},
|
||||||
|
{"id":"sharp_left;through","source":"upstream/sharp_left-through.svg","supported":false,"tested":false},
|
||||||
|
{"id":"reverse_left","source":"upstream/reverse_left.svg","supported":false,"tested":false},
|
||||||
|
{"id":"reverse_left;through","source":"upstream/reverse_left-through.svg","supported":false,"tested":false},
|
||||||
|
{"id":"reverse_left;left;slight_left;through","source":"upstream/reverse_left-left-slight_left-through.svg","supported":false,"tested":false}
|
||||||
|
]
|
||||||
|
}
|
||||||
98
assets/lane-icons/upstream/DESIGN.md
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
## Design Guidelines
|
||||||
|
|
||||||
|
The icons in this project follow closely the design guidelines established in the
|
||||||
|
[MUTCD Standard Highway Signs guide](http://mutcd.fhwa.dot.gov/ser-shs_millennium.htm),
|
||||||
|
2009 edition published by the US Federal Highway Administration.
|
||||||
|
|
||||||
|
The MUTCD is [in the public domain](http://mutcd.fhwa.dot.gov/knowledge/faqs/faq_general.htm#printq5)
|
||||||
|
and as such it is not copyrighted.
|
||||||
|
|
||||||
|
Each icon should be
|
||||||
|
|
||||||
|
* 25px x 25px
|
||||||
|
* SVG
|
||||||
|
* Single color fill
|
||||||
|
* Path outline only, no stroke
|
||||||
|
* Pixel grid aligned (where possible)
|
||||||
|
|
||||||
|
### Arrows
|
||||||
|
|
||||||
|
Arrows use the "Standard Arrow" described in MUTCD Standard Highway Signs
|
||||||
|
[Appendix](http://mutcd.fhwa.dot.gov/ser-shs_millennium.htm).
|
||||||
|
|
||||||
|
An upward facing Standard Arrow is included in this icon pack, and forms the basis of all turn
|
||||||
|
lane arrows.
|
||||||
|
|
||||||
|
<img alt='Standard Arrow' width='300px' src='docs/standard_arrow.png'/>
|
||||||
|
|
||||||
|
|
||||||
|
Arrowhead rotation angles are chosen based on the turn lane indication:
|
||||||
|
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<th>Through</th>
|
||||||
|
<th>Slight Left</th>
|
||||||
|
<th>Left</th>
|
||||||
|
<th>Sharp Left</th>
|
||||||
|
<th>Reverse Left</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>no rotation<br/>
|
||||||
|
<img alt='Through' width='100px' src='https://cdn.rawgit.com/openstreetmap/lane-icons/master/docs/through.svg'/>
|
||||||
|
</td>
|
||||||
|
<td>45 degrees<br/>
|
||||||
|
<img alt='Slight Left' width='100px' src='https://cdn.rawgit.com/openstreetmap/lane-icons/master/docs/slight_left.svg'/>
|
||||||
|
</td>
|
||||||
|
<td>70 or 90 degrees<br/>
|
||||||
|
<img alt='Left' width='100px' src='https://cdn.rawgit.com/openstreetmap/lane-icons/master/docs/left.svg'/>
|
||||||
|
</td>
|
||||||
|
<td>135 degrees<br/>
|
||||||
|
<img alt='Sharp Left' width='100px' src='https://cdn.rawgit.com/openstreetmap/lane-icons/master/docs/sharp_left.svg'/>
|
||||||
|
</td>
|
||||||
|
<td>180 degrees<br/>
|
||||||
|
<img alt='Reverse Left' width='100px' src='https://cdn.rawgit.com/openstreetmap/lane-icons/master/docs/reverse_left.svg'/>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
As the number of arrows increases, the arrows scale down:
|
||||||
|
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<th>1 Arrow</th>
|
||||||
|
<th>2 Arrows</th>
|
||||||
|
<th>3 Arrows</th>
|
||||||
|
<th>4 Arrows</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<ul><li>3px stroke</li><li>standard arrowhead</li></ul>
|
||||||
|
<img alt='Through' width='100px' src='https://cdn.rawgit.com/openstreetmap/lane-icons/master/docs/through.svg'/>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<ul><li>2.5px stroke</li><li>83% scaled arrowhead</li></ul>
|
||||||
|
<img alt='Left, Through' width='100px' src='https://cdn.rawgit.com/openstreetmap/lane-icons/master/docs/left-through.svg'/>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<ul><li>2.25px stroke</li><li>75% scaled arrowhead</li></ul>
|
||||||
|
<img alt='Left, Slight Left, Through' width='100px' src='https://cdn.rawgit.com/openstreetmap/lane-icons/master/docs/left-slight_left-through.svg'/>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<ul><li>2px stroke</li><li>66% scaled arrowhead</li></ul>
|
||||||
|
<img alt='Reverse Left, Left, Slight Left, Through' width='100px' src='https://cdn.rawgit.com/openstreetmap/lane-icons/master/docs/reverse_left-left-slight_left-through.svg'/>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
|
||||||
|
Other important rules for arrows:
|
||||||
|
* Bottom aligned with each other, 2px from icon bottom edge
|
||||||
|
* Left-right centered
|
||||||
|
* Smooth curves, no kinks
|
||||||
|
* Arrow shaft path connects to the arrowhead anchor point
|
||||||
|
|
||||||
|
|
||||||
|
### Other Icons
|
||||||
|
|
||||||
|
Other non-arrow icons (bus, hov, pedestrian, tram, etc) also imitiate the icons found
|
||||||
|
in the MUTCD Standard Highway Signs [Appendix](http://mutcd.fhwa.dot.gov/ser-shs_millennium.htm).
|
||||||
118
assets/lane-icons/upstream/LICENSE.md
Normal file
@@ -0,0 +1,118 @@
|
|||||||
|
[](http://creativecommons.org/publicdomain/zero/1.0/)
|
||||||
|
|
||||||
|
### CC0 1.0 Universal
|
||||||
|
|
||||||
|
#### Statement of Purpose
|
||||||
|
|
||||||
|
The laws of most jurisdictions throughout the world automatically confer
|
||||||
|
exclusive Copyright and Related Rights (defined below) upon the creator and
|
||||||
|
subsequent owner(s) (each and all, an "owner") of an original work of
|
||||||
|
authorship and/or a database (each, a "Work").
|
||||||
|
|
||||||
|
Certain owners wish to permanently relinquish those rights to a Work for the
|
||||||
|
purpose of contributing to a commons of creative, cultural and scientific
|
||||||
|
works ("Commons") that the public can reliably and without fear of later
|
||||||
|
claims of infringement build upon, modify, incorporate in other works, reuse
|
||||||
|
and redistribute as freely as possible in any form whatsoever and for any
|
||||||
|
purposes, including without limitation commercial purposes. These owners may
|
||||||
|
contribute to the Commons to promote the ideal of a free culture and the
|
||||||
|
further production of creative, cultural and scientific works, or to gain
|
||||||
|
reputation or greater distribution for their Work in part through the use and
|
||||||
|
efforts of others.
|
||||||
|
|
||||||
|
For these and/or other purposes and motivations, and without any expectation
|
||||||
|
of additional consideration or compensation, the person associating CC0 with a
|
||||||
|
Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
|
||||||
|
and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
|
||||||
|
and publicly distribute the Work under its terms, with knowledge of his or her
|
||||||
|
Copyright and Related Rights in the Work and the meaning and intended legal
|
||||||
|
effect of CC0 on those rights.
|
||||||
|
|
||||||
|
**1. Copyright and Related Rights.** A Work made available under CC0 may be
|
||||||
|
protected by copyright and related or neighboring rights ("Copyright and
|
||||||
|
Related Rights"). Copyright and Related Rights include, but are not limited
|
||||||
|
to, the following:
|
||||||
|
|
||||||
|
i. the right to reproduce, adapt, distribute, perform, display, communicate,
|
||||||
|
and translate a Work;
|
||||||
|
|
||||||
|
ii. moral rights retained by the original author(s) and/or performer(s);
|
||||||
|
|
||||||
|
iii. publicity and privacy rights pertaining to a person's image or likeness
|
||||||
|
depicted in a Work;
|
||||||
|
|
||||||
|
iv. rights protecting against unfair competition in regards to a Work,
|
||||||
|
subject to the limitations in paragraph 4(a), below;
|
||||||
|
|
||||||
|
v. rights protecting the extraction, dissemination, use and reuse of data in
|
||||||
|
a Work;
|
||||||
|
|
||||||
|
vi. database rights (such as those arising under Directive 96/9/EC of the
|
||||||
|
European Parliament and of the Council of 11 March 1996 on the legal
|
||||||
|
protection of databases, and under any national implementation thereof,
|
||||||
|
including any amended or successor version of such directive); and
|
||||||
|
|
||||||
|
vii. other similar, equivalent or corresponding rights throughout the world
|
||||||
|
based on applicable law or treaty, and any national implementations thereof.
|
||||||
|
|
||||||
|
**2. Waiver.** To the greatest extent permitted by, but not in contravention of,
|
||||||
|
applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
|
||||||
|
unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
|
||||||
|
and Related Rights and associated claims and causes of action, whether now
|
||||||
|
known or unknown (including existing as well as future claims and causes of
|
||||||
|
action), in the Work (i) in all territories worldwide, (ii) for the maximum
|
||||||
|
duration provided by applicable law or treaty (including future time
|
||||||
|
extensions), (iii) in any current or future medium and for any number of
|
||||||
|
copies, and (iv) for any purpose whatsoever, including without limitation
|
||||||
|
commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
|
||||||
|
the Waiver for the benefit of each member of the public at large and to the
|
||||||
|
detriment of Affirmer's heirs and successors, fully intending that such Waiver
|
||||||
|
shall not be subject to revocation, rescission, cancellation, termination, or
|
||||||
|
any other legal or equitable action to disrupt the quiet enjoyment of the Work
|
||||||
|
by the public as contemplated by Affirmer's express Statement of Purpose.
|
||||||
|
|
||||||
|
**3. Public License Fallback.** Should any part of the Waiver for any reason be
|
||||||
|
judged legally invalid or ineffective under applicable law, then the Waiver
|
||||||
|
shall be preserved to the maximum extent permitted taking into account
|
||||||
|
Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
|
||||||
|
is so judged Affirmer hereby grants to each affected person a royalty-free,
|
||||||
|
non transferable, non sublicensable, non exclusive, irrevocable and
|
||||||
|
unconditional license to exercise Affirmer's Copyright and Related Rights in
|
||||||
|
the Work (i) in all territories worldwide, (ii) for the maximum duration
|
||||||
|
provided by applicable law or treaty (including future time extensions), (iii)
|
||||||
|
in any current or future medium and for any number of copies, and (iv) for any
|
||||||
|
purpose whatsoever, including without limitation commercial, advertising or
|
||||||
|
promotional purposes (the "License"). The License shall be deemed effective as
|
||||||
|
of the date CC0 was applied by Affirmer to the Work. Should any part of the
|
||||||
|
License for any reason be judged legally invalid or ineffective under
|
||||||
|
applicable law, such partial invalidity or ineffectiveness shall not
|
||||||
|
invalidate the remainder of the License, and in such case Affirmer hereby
|
||||||
|
affirms that he or she will not (i) exercise any of his or her remaining
|
||||||
|
Copyright and Related Rights in the Work or (ii) assert any associated claims
|
||||||
|
and causes of action with respect to the Work, in either case contrary to
|
||||||
|
Affirmer's express Statement of Purpose.
|
||||||
|
|
||||||
|
**4. Limitations and Disclaimers.**
|
||||||
|
|
||||||
|
a. No trademark or patent rights held by Affirmer are waived, abandoned,
|
||||||
|
surrendered, licensed or otherwise affected by this document.
|
||||||
|
|
||||||
|
b. Affirmer offers the Work as-is and makes no representations or warranties
|
||||||
|
of any kind concerning the Work, express, implied, statutory or otherwise,
|
||||||
|
including without limitation warranties of title, merchantability, fitness
|
||||||
|
for a particular purpose, non infringement, or the absence of latent or
|
||||||
|
other defects, accuracy, or the present or absence of errors, whether or not
|
||||||
|
discoverable, all to the greatest extent permissible under applicable law.
|
||||||
|
|
||||||
|
c. Affirmer disclaims responsibility for clearing rights of other persons
|
||||||
|
that may apply to the Work or any use thereof, including without limitation
|
||||||
|
any person's Copyright and Related Rights in the Work. Further, Affirmer
|
||||||
|
disclaims responsibility for obtaining any necessary consents, permissions
|
||||||
|
or other rights required for any use of the Work.
|
||||||
|
|
||||||
|
d. Affirmer understands and acknowledges that Creative Commons is not a
|
||||||
|
party to this document and has no duty or obligation with respect to this
|
||||||
|
CC0 or use of the Work.
|
||||||
|
|
||||||
|
For more information, please see
|
||||||
|
<http://creativecommons.org/publicdomain/zero/1.0/>
|
||||||
1
assets/lane-icons/upstream/left-slight_left-through.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg id="left-slight_left-through" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><title>icons</title><line x1="18.1" y1="5.17" x2="18.11" y2="23" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2.25"/><path d="M18.11,19.69c0-3.65-5.82-6.62-9.2-6.62" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2.25"/><path d="M11.89,7.16S18.11,12.74,18.11,19" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2.25"/><path d="M18.16,1.09a0.07,0.07,0,0,0-.12,0L15.26,5.36a0.42,0.42,0,0,0,.48.62l2.36-.81L20.47,6A0.42,0.42,0,0,0,21,5.37Z"/><path d="M4.83,13a0.07,0.07,0,0,0,0,.12L9.1,15.91a0.42,0.42,0,0,0,.62-0.48L8.91,13.07,9.72,10.7a0.42,0.42,0,0,0-.62-0.48Z"/><path d="M9.05,4.24A0.07,0.07,0,0,0,9,4.32l1,5a0.42,0.42,0,0,0,.78.1l1.1-2.24,2.25-1.1A0.42,0.42,0,0,0,14,5.28Z"/></svg>
|
||||||
|
After Width: | Height: | Size: 822 B |
1
assets/lane-icons/upstream/left-through.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg id="left-through" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><title>icons</title><line x1="17" y1="23" x2="17" y2="6.81" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2.5"/><path d="M17,19c0-5.32-4.66-8.23-7.83-9.1" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2.5"/><path d="M17.06,2.3a0.08,0.08,0,0,0-.13,0L13.85,7a0.47,0.47,0,0,0,.53.69L17,6.81l2.62,0.9A0.46,0.46,0,0,0,20.15,7Z"/><path d="M5,8.29a0.08,0.08,0,0,0,0,.12l3.38,4.51a0.47,0.47,0,0,0,.83-0.27L9.17,9.9l1.74-2.16A0.46,0.46,0,0,0,10.45,7Z"/></svg>
|
||||||
|
After Width: | Height: | Size: 562 B |
1
assets/lane-icons/upstream/left.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg id="left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><title>icons</title><path d="M17,23V18c0-6.78-3.24-8.11-5.85-8.86" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="3"/><path d="M6.07,7.21A0.1,0.1,0,0,0,6,7.36l4.08,5.44a0.56,0.56,0,0,0,1-.32l0.06-3.33,2.1-2.6a0.56,0.56,0,0,0-.55-0.88Z"/></svg>
|
||||||
|
After Width: | Height: | Size: 329 B |
@@ -0,0 +1 @@
|
|||||||
|
<svg id="reverse_left-left-slight_left-through" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><title>icons</title><line x1="19" y1="4" x2="19" y2="23" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/><path d="M7.21,12h5.5A15.61,15.61,0,0,1,19,13" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/><path d="M13.7,5.85S19,9.23,19,15" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/><path d="M19.05,0.43a0.07,0.07,0,0,0-.1,0L16.49,4.18a0.37,0.37,0,0,0,.42.55L19,4l2.09,0.71a0.37,0.37,0,0,0,.42-0.54Z"/><path d="M11.2,3.28a0.07,0.07,0,0,0-.07.07l0.92,4.39a0.37,0.37,0,0,0,.68.09l1-2,2-1A0.37,0.37,0,0,0,15.6,4.2Z"/><path d="M3.68,11.95a0.07,0.07,0,0,0,0,.1L7.44,14.5A0.37,0.37,0,0,0,8,14.08L7.21,12,8,9.91a0.37,0.37,0,0,0-.54-0.42Z"/><path d="M10,23.06a0.07,0.07,0,0,0,.1,0l2.45-3.76a0.37,0.37,0,0,0-.42-0.55L10,19.48l-2.09-.71a0.37,0.37,0,0,0-.42.54Z"/><path d="M19,16c0-5.42-9-4.84-9,0l0,3.48" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2"/></svg>
|
||||||
|
After Width: | Height: | Size: 1.0 KiB |
1
assets/lane-icons/upstream/reverse_left-through.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg id="reverse_left-through" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><title>icons</title><path d="M8.36,23a0.08,0.08,0,0,0,.13,0l3.08-4.72A0.47,0.47,0,0,0,11,17.56l-2.62.9-2.62-.9a0.46,0.46,0,0,0-.53.68Z"/><line x1="17" y1="23.19" x2="17" y2="6.08" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2.5"/><path d="M17.06,1.57a0.08,0.08,0,0,0-.13,0L13.85,6.29a0.47,0.47,0,0,0,.53.69L17,6.08,19.62,7a0.46,0.46,0,0,0,.53-0.68Z"/><path d="M17,16c0-5-8.58-5.08-8.58,0v2.46" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2.5"/></svg>
|
||||||
|
After Width: | Height: | Size: 574 B |
1
assets/lane-icons/upstream/reverse_left.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg id="reverse_left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><title>icons</title><path d="M7.8,23A0.1,0.1,0,0,0,8,23l3.72-5.69A0.56,0.56,0,0,0,11,16.45L7.88,17.53,4.72,16.44a0.56,0.56,0,0,0-.64.82Z"/><path d="M18,23V13c0-8-10.08-7.77-10.12.1v5.42" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="3"/></svg>
|
||||||
|
After Width: | Height: | Size: 338 B |
1
assets/lane-icons/upstream/sharp_left-through.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg id="sharp_left-through" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><title>icons</title><path d="M5.38,17.17a0.08,0.08,0,0,0,.09.09L11,16.1a0.47,0.47,0,0,0,.11-0.86L8.62,14,7.4,11.53a0.46,0.46,0,0,0-.86.11Z"/><line x1="17" y1="23.19" x2="17" y2="6.08" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2.5"/><path d="M17.06,1.57a0.08,0.08,0,0,0-.13,0L13.85,6.29a0.47,0.47,0,0,0,.53.69L17,6.08,19.62,7a0.46,0.46,0,0,0,.53-0.68Z"/><path d="M17,15.65c0-4.75-5.12-5.25-8.38-1.63" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2.5"/></svg>
|
||||||
|
After Width: | Height: | Size: 580 B |
1
assets/lane-icons/upstream/sharp_left.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg id="sharp_left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><title>icons</title><path d="M4.1,15.8a0.1,0.1,0,0,0,.11.11l6.65-1.4a0.56,0.56,0,0,0,.13-1L8,12,6.53,9a0.56,0.56,0,0,0-1,.13Z"/><path d="M18,23V15c0-5.78-4-7.79-8.61-4.11L8,12" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="3"/></svg>
|
||||||
|
After Width: | Height: | Size: 326 B |
1
assets/lane-icons/upstream/slight_left-through.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg id="slight_left-through" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><title>icons</title><line x1="17" y1="23.19" x2="17" y2="6.08" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2.5"/><path d="M17.06,1.57a0.08,0.08,0,0,0-.13,0L13.85,6.29a0.47,0.47,0,0,0,.53.69L17,6.08,19.62,7a0.46,0.46,0,0,0,.53-0.68Z"/><path d="M17,19c0-4.22-4.84-9.36-6.54-10.68" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2.5"/><path d="M7.3,5.09a0.08,0.08,0,0,0-.09.09L8.37,10.7a0.47,0.47,0,0,0,.86.11l1.22-2.48,2.49-1.22a0.46,0.46,0,0,0-.11-0.86Z"/></svg>
|
||||||
|
After Width: | Height: | Size: 581 B |
1
assets/lane-icons/upstream/slight_left.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg id="slight_left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><title>icons</title><path d="M15,23V20c0-4.12-.1-9.29-3-12.74" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="3"/><path d="M8.26,3.36a0.1,0.1,0,0,0-.11.11l1.4,6.65a0.56,0.56,0,0,0,1,.13l1.46-3,3-1.47a0.56,0.56,0,0,0-.13-1Z"/></svg>
|
||||||
|
After Width: | Height: | Size: 324 B |
1
assets/lane-icons/upstream/through.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg id="through" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><title>icons</title><line x1="12.5" y1="23" x2="12.5" y2="8.47" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="3"/><path d="M12.58,3a0.1,0.1,0,0,0-.16,0L8.7,8.73a0.56,0.56,0,0,0,.64.83L12.5,8.47l3.16,1.08a0.56,0.56,0,0,0,.64-0.82Z"/></svg>
|
||||||
|
After Width: | Height: | Size: 328 B |
@@ -1,4 +1,8 @@
|
|||||||
# Native Road Package v1
|
# Native Road Package v1.1
|
||||||
|
|
||||||
|
`native-road-package/v1.1` adds a required `manifest.json` to the v1 output.
|
||||||
|
Consumers may ignore this file when reading legacy v1 packages, but v1.1
|
||||||
|
consumers must validate and consume it.
|
||||||
|
|
||||||
`native-road-package/v1` defines the boundary between the host area pipeline
|
`native-road-package/v1` defines the boundary between the host area pipeline
|
||||||
and the native road compiler. The compiler accepts only the input below; it
|
and the native road compiler. The compiler accepts only the input below; it
|
||||||
@@ -35,6 +39,12 @@ shape and owns all path derivation.
|
|||||||
|
|
||||||
`outDir` contains these JSON documents:
|
`outDir` contains these JSON documents:
|
||||||
|
|
||||||
|
- `manifest.json`: `{ contract: "native-road-package/v1.1", areaId, layers }`.
|
||||||
|
`layers` declares exactly the twelve GeoJSON sources. Renderable entries have
|
||||||
|
`role` (`surface` or `marking`) and `materialLayer`; semantic entries have
|
||||||
|
`role: "semantic"` and no material. Optional `splitBy` contains one property
|
||||||
|
and exact-match cases plus one default case.
|
||||||
|
|
||||||
- `compiled.json`: top-level keys are `schema`, `areaId`, `source`, `model`,
|
- `compiled.json`: top-level keys are `schema`, `areaId`, `source`, `model`,
|
||||||
`movements`, `trafficSignals`, `diagnostics`, and `layers`. `source` has
|
`movements`, `trafficSignals`, `diagnostics`, and `layers`. `source` has
|
||||||
`osm`, `overrides`, and `trafficSignals` paths.
|
`osm`, `overrides`, and `trafficSignals` paths.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@osm-asset/road-compiler",
|
"name": "@osm-asset/road-compiler",
|
||||||
"version": "0.1.0",
|
"version": "0.2.0",
|
||||||
"private": false,
|
"private": false,
|
||||||
"type": "commonjs",
|
"type": "commonjs",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
@@ -8,8 +8,7 @@
|
|||||||
"road-compiler": "bin/road-compiler.js"
|
"road-compiler": "bin/road-compiler.js"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "node test/index.js",
|
"test": "node test/index.js && node test/fixtures.js",
|
||||||
"test:road-parity": "node test/road-parity.js",
|
|
||||||
"road:workbench": "node bin/road-workbench.js"
|
"road:workbench": "node bin/road-workbench.js"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const { compileRoadModel, compileGeometry, loadOverrides, validateOverrides, writeJsonAtomic } = require("./native-road");
|
const { compileRoadModel, compileGeometry, loadOverrides, validateOverrides, writeJsonAtomic } = require("./native-road");
|
||||||
|
const { LAYER_REGISTRY, manifestForArea, validatePublishedLayers } = require("./layer-manifest");
|
||||||
const { loadOrGenerate, runtime } = require("../native-traffic-signals");
|
const { loadOrGenerate, runtime } = require("../native-traffic-signals");
|
||||||
|
|
||||||
function compileInput(input) {
|
function compileInput(input) {
|
||||||
@@ -53,7 +54,7 @@ function compileInput(input) {
|
|||||||
movements: compiled.movements,
|
movements: compiled.movements,
|
||||||
trafficSignals: { assemblies: "traffic-signal-assemblies.json", runtime: "traffic-signals.json", count: signalRuntime.signals.length },
|
trafficSignals: { assemblies: "traffic-signal-assemblies.json", runtime: "traffic-signals.json", count: signalRuntime.signals.length },
|
||||||
diagnostics: compiled.diagnostics,
|
diagnostics: compiled.diagnostics,
|
||||||
layers: { roadSurface: "layers/road_surface.geojson", edgeLines: "layers/edge_lines.geojson", sidewalkSurface: "layers/sidewalk_surface.geojson", intersectionSurface: "layers/intersection_surface.geojson", laneCenterlines: "layers/lane_centerlines.geojson", laneSeparators: "layers/lane_separators.geojson", centerLines: "layers/center_lines.geojson", directionArrows: "layers/direction_arrows.geojson", turnArrows: "layers/turn_arrows.geojson", crosswalks: "layers/crosswalks.geojson", vehicleStopLines: "layers/vehicle_stop_lines.geojson", connectors: "layers/connectors.geojson" },
|
layers: Object.fromEntries(LAYER_REGISTRY.map((layer) => [layer.key, `layers/${layer.source}.geojson`])),
|
||||||
};
|
};
|
||||||
const comparison = compareOsm2Streets(area, result.model, compiled);
|
const comparison = compareOsm2Streets(area, result.model, compiled);
|
||||||
writeJsonAtomic(path.join(staging, "compiled.json"), result);
|
writeJsonAtomic(path.join(staging, "compiled.json"), result);
|
||||||
@@ -61,18 +62,10 @@ function compileInput(input) {
|
|||||||
writeJsonAtomic(path.join(staging, "comparison.json"), comparison);
|
writeJsonAtomic(path.join(staging, "comparison.json"), comparison);
|
||||||
writeJsonAtomic(path.join(staging, "traffic-signal-assemblies.json"), signalDocument.assemblies);
|
writeJsonAtomic(path.join(staging, "traffic-signal-assemblies.json"), signalDocument.assemblies);
|
||||||
writeJsonAtomic(path.join(staging, "traffic-signals.json"), signalRuntime);
|
writeJsonAtomic(path.join(staging, "traffic-signals.json"), signalRuntime);
|
||||||
writeJsonAtomic(path.join(staging, "layers", "road_surface.geojson"), compiled.roadSurface);
|
for (const layer of LAYER_REGISTRY) writeJsonAtomic(path.join(staging, "layers", `${layer.source}.geojson`), compiled[layer.key]);
|
||||||
writeJsonAtomic(path.join(staging, "layers", "edge_lines.geojson"), compiled.edgeLines);
|
const manifest = manifestForArea(area.id);
|
||||||
writeJsonAtomic(path.join(staging, "layers", "sidewalk_surface.geojson"), compiled.sidewalkSurface);
|
validatePublishedLayers(staging, manifest);
|
||||||
writeJsonAtomic(path.join(staging, "layers", "intersection_surface.geojson"), compiled.intersectionSurface);
|
writeJsonAtomic(path.join(staging, "manifest.json"), manifest);
|
||||||
writeJsonAtomic(path.join(staging, "layers", "lane_centerlines.geojson"), compiled.laneCenterlines);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "lane_separators.geojson"), compiled.laneSeparators);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "center_lines.geojson"), compiled.centerLines);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "direction_arrows.geojson"), compiled.directionArrows);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "turn_arrows.geojson"), compiled.turnArrows);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "crosswalks.geojson"), compiled.crosswalks);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "vehicle_stop_lines.geojson"), compiled.vehicleStopLines);
|
|
||||||
writeJsonAtomic(path.join(staging, "layers", "connectors.geojson"), compiled.connectors);
|
|
||||||
fs.rmSync(area.outputs.nativeRoadDir, { recursive: true, force: true });
|
fs.rmSync(area.outputs.nativeRoadDir, { recursive: true, force: true });
|
||||||
fs.renameSync(staging, area.outputs.nativeRoadDir);
|
fs.renameSync(staging, area.outputs.nativeRoadDir);
|
||||||
return { area, result, comparison };
|
return { area, result, comparison };
|
||||||
|
|||||||
49
src/compile/layer-manifest.js
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
"use strict";
|
||||||
|
|
||||||
|
// The compiler's layer registry is the single source of truth for published
|
||||||
|
// GeoJSON files and the Blender-facing manifest. Keep rendering details limited
|
||||||
|
// to material slot names; the host owns the actual material definitions.
|
||||||
|
const LAYER_REGISTRY = Object.freeze([
|
||||||
|
{ key: "roadSurface", source: "road_surface", role: "surface", materialLayer: "road_surface" },
|
||||||
|
{ key: "intersectionSurface", source: "intersection_surface", role: "surface", materialLayer: "intersection_surface" },
|
||||||
|
{ key: "sidewalkSurface", source: "sidewalk_surface", role: "surface", materialLayer: "sidewalks" },
|
||||||
|
{ key: "edgeLines", source: "edge_lines", role: "marking", materialLayer: "lane_separators" },
|
||||||
|
{ key: "laneSeparators", source: "lane_separators", role: "marking", materialLayer: "lane_separators", splitBy: { prop: "color", cases: [{ match: "yellow", material: "native_lane_separator_yellow" }, { default: true, material: "lane_separators" }] } },
|
||||||
|
{ key: "centerLines", source: "center_lines", role: "marking", materialLayer: "center_lines", splitBy: { prop: "color", cases: [{ match: "white", material: "native_center_line_white" }, { default: true, material: "center_lines" }] } },
|
||||||
|
{ key: "crosswalks", source: "crosswalks", role: "marking", materialLayer: "crosswalks" },
|
||||||
|
{ key: "vehicleStopLines", source: "vehicle_stop_lines", role: "marking", materialLayer: "vehicle_stop_lines" },
|
||||||
|
{ key: "directionArrows", source: "direction_arrows", role: "marking", materialLayer: "lane_arrows_webscale" },
|
||||||
|
{ key: "turnArrows", source: "turn_arrows", role: "marking", materialLayer: "lane_arrows_webscale" },
|
||||||
|
{ key: "laneCenterlines", source: "lane_centerlines", role: "semantic" },
|
||||||
|
{ key: "connectors", source: "connectors", role: "semantic" },
|
||||||
|
]);
|
||||||
|
|
||||||
|
function manifestForArea(areaId) {
|
||||||
|
return {
|
||||||
|
contract: "native-road-package/v1.1",
|
||||||
|
areaId,
|
||||||
|
layers: LAYER_REGISTRY.map(({ source, role, materialLayer, splitBy }) => ({
|
||||||
|
source,
|
||||||
|
role,
|
||||||
|
...(materialLayer ? { materialLayer } : {}),
|
||||||
|
...(splitBy ? { splitBy } : {}),
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function validatePublishedLayers(directory, manifest) {
|
||||||
|
const declared = new Set();
|
||||||
|
for (const layer of manifest.layers) {
|
||||||
|
if (!layer || typeof layer.source !== "string" || declared.has(layer.source)) throw new Error("Manifest has duplicate or invalid source.");
|
||||||
|
declared.add(layer.source);
|
||||||
|
const file = require("path").join(directory, "layers", `${layer.source}.geojson`);
|
||||||
|
if (!require("fs").existsSync(file)) throw new Error(`Manifest source is missing: ${layer.source}`);
|
||||||
|
}
|
||||||
|
const files = require("fs").existsSync(require("path").join(directory, "layers"))
|
||||||
|
? require("fs").readdirSync(require("path").join(directory, "layers")).filter((name) => name.endsWith(".geojson")).map((name) => name.slice(0, -8))
|
||||||
|
: [];
|
||||||
|
const extras = files.filter((source) => !declared.has(source));
|
||||||
|
if (extras.length) throw new Error(`Unmanifested GeoJSON source: ${extras.join(", ")}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { LAYER_REGISTRY, manifestForArea, validatePublishedLayers };
|
||||||
@@ -4,7 +4,7 @@ const fs = require("fs");
|
|||||||
const path = require("path");
|
const path = require("path");
|
||||||
const { laneCenterline } = require("../geometry/lane-geometry");
|
const { laneCenterline } = require("../geometry/lane-geometry");
|
||||||
|
|
||||||
const ASSET_MANIFEST = path.resolve(__dirname, "..", "..", "..", "..", "assets", "lane-icons", "manifest.json");
|
const ASSET_MANIFEST = path.resolve(__dirname, "..", "..", "assets", "lane-icons", "manifest.json");
|
||||||
const LANE_WIDTH_METERS = 3.2;
|
const LANE_WIDTH_METERS = 3.2;
|
||||||
const PLACEMENT_DISTANCE_METERS = 9;
|
const PLACEMENT_DISTANCE_METERS = 9;
|
||||||
const SPATIAL_MATCH_MAX_DISTANCE_METERS = 18;
|
const SPATIAL_MATCH_MAX_DISTANCE_METERS = 18;
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ module.exports = {
|
|||||||
trafficSignals: require("./traffic-signals"),
|
trafficSignals: require("./traffic-signals"),
|
||||||
nativeTrafficSignals: require("./native-traffic-signals"),
|
nativeTrafficSignals: require("./native-traffic-signals"),
|
||||||
nativeRoad: require("./compile/native-road"),
|
nativeRoad: require("./compile/native-road"),
|
||||||
|
layerManifest: require("./compile/layer-manifest"),
|
||||||
compiler: require("./compile/compiler"),
|
compiler: require("./compile/compiler"),
|
||||||
check: require("./check"),
|
check: require("./check"),
|
||||||
};
|
};
|
||||||
|
|||||||
27
test/fixtures.js
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
"use strict";
|
||||||
|
|
||||||
|
const assert = require("assert/strict");
|
||||||
|
const fs = require("fs");
|
||||||
|
const path = require("path");
|
||||||
|
const { compiler } = require("../src");
|
||||||
|
|
||||||
|
const root = path.resolve(__dirname, "..");
|
||||||
|
for (const areaId of ["fengshu-er-road", "nantaizi-lake-innovation-valley"]) {
|
||||||
|
const isFengshu = areaId === "fengshu-er-road";
|
||||||
|
const outputRoot = path.join(root, "outputs", areaId);
|
||||||
|
const input = {
|
||||||
|
areaId,
|
||||||
|
osmFile: path.join(root, "inputs", "osm", isFengshu ? "枫树二路.osm" : "南台子湖创新谷OSM.osm"),
|
||||||
|
outDir: path.join(outputRoot, "native-road"),
|
||||||
|
stagingDir: path.join(outputRoot, "_pipeline"),
|
||||||
|
overridesFile: path.join(outputRoot, "native-road-overrides.json"),
|
||||||
|
trafficSignalsFile: path.join(outputRoot, "native-traffic-signals.json"),
|
||||||
|
comparisonDir: path.join(outputRoot, "osm2streets_web_out"),
|
||||||
|
options: { edgeLines: false, junctionTemplates: { enabled: false, references: [] } },
|
||||||
|
};
|
||||||
|
assert.ok(fs.existsSync(path.join(root, "test", "baseline", `${areaId}.json`)));
|
||||||
|
const { result } = compiler.compileInput(input);
|
||||||
|
assert.equal(result.areaId, areaId);
|
||||||
|
assert.ok(fs.existsSync(path.join(input.outDir, "compiled.json")));
|
||||||
|
}
|
||||||
|
console.log("road compiler fixture tests passed");
|
||||||
@@ -11,6 +11,12 @@ assert.equal(typeof compiler.turnLaneArrows.buildCustomTurnLaneArrows, "function
|
|||||||
assert.equal(typeof compiler.complexJunction.buildComplexJunctionGeometry, "function");
|
assert.equal(typeof compiler.complexJunction.buildComplexJunctionGeometry, "function");
|
||||||
assert.equal(typeof compiler.nativeRoad.compileRoadModel, "function");
|
assert.equal(typeof compiler.nativeRoad.compileRoadModel, "function");
|
||||||
assert.equal(typeof compiler.check.checkOutput, "function");
|
assert.equal(typeof compiler.check.checkOutput, "function");
|
||||||
|
assert.equal(typeof compiler.layerManifest.manifestForArea, "function");
|
||||||
|
const manifest = compiler.layerManifest.manifestForArea("fixture");
|
||||||
|
assert.equal(manifest.contract, "native-road-package/v1.1");
|
||||||
|
assert.equal(manifest.layers.length, 12);
|
||||||
|
assert.deepEqual(manifest.layers.filter((layer) => layer.role === "semantic").map((layer) => layer.source), ["lane_centerlines", "connectors"]);
|
||||||
|
assert.equal(manifest.layers.find((layer) => layer.source === "center_lines").splitBy.cases[0].match, "white");
|
||||||
const fixture = path.join(__dirname, "fixtures", "fengshu-er-road.osm");
|
const fixture = path.join(__dirname, "fixtures", "fengshu-er-road.osm");
|
||||||
assert.ok(fs.existsSync(fixture));
|
assert.ok(fs.existsSync(fixture));
|
||||||
assert.throws(() => compiler.compiler.validateInput({ id: "area" }), /RoadCompilerInput/);
|
assert.throws(() => compiler.compiler.validateInput({ id: "area" }), /RoadCompilerInput/);
|
||||||
|
|||||||