Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Map legend and other UI #61

Merged
merged 10 commits into from
Dec 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [ master ]

jobs:
publish-site:
run-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
70 changes: 30 additions & 40 deletions config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,41 @@
"type": "object",
"properties": {
"agencies": {
"type": "object",
"propertyNames": {
"pattern": "^([A-Za-z])\\w+"
},
"patternProperties": {
"": {
"type": "object",
"properties": {
"name": { "type": "string" },
"bbox": {
"type": "array",
"minItems": 4,
"maxItems": 4,
"items": { "type": "number" }
},
"data": {
"type": "array",
"items": { "type": "string" }
}
"type": "array",
"items": {
"type": "object",
"properties": {
"name": { "type": "string" },
"bbox": {
"type": "array",
"minItems": 4,
"maxItems": 4,
"items": { "type": "number" }
},
"required": ["bbox", "data", "name"]
}
"data": {
"type": "array",
"items": { "type": "string" }
}
},
"required": ["bbox", "data", "name"]
}
},
"regions": {
"type": "object",
"propertyNames": {
"pattern": "^([A-Za-z])\\w+"
},
"patternProperties": {
"": {
"type": "object",
"properties": {
"location": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"items": { "type": "number" }
},
"title": {
"type": "string"
}
"type": "array",
"items": {
"type": "object",
"properties": {
"location": {
"type": "array",
"minItems": 2,
"maxItems": 2,
"items": { "type": "number" }
},
"required": ["location", "title"]
}
"title": {
"type": "string"
}
},
"required": ["location", "title"]
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions data/gatineau/a.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
],
"filterKey": "gatineauLrt"
},
"bbox": [
-75.86578535776559,
45.39536917415158,
-75.69585303512089,
45.42476674755017
],
"features": [
{ "type": "Feature", "properties": { "type": "alignment" }, "geometry": { "type": "LineString", "coordinates": [[-75.86578535776559, 45.407793437731854], [-75.86458774307812, 45.40840873121048], [-75.86432972337433, 45.40854362576684], [-75.8640001040213, 45.408678060180144], [-75.86373064068235, 45.408762178179266], [-75.86341179090715, 45.40884165766399], [-75.8631092023324, 45.408901363857225], [-75.86269475027446, 45.40894868430701], [-75.85896188124657, 45.409180094961016], [-75.85489884216933, 45.409367756907855], [-75.85293380329718, 45.40950061709394], [-75.84920986228795, 45.40975541706471], [-75.84518623748771, 45.41003594659068], [-75.83896904231834, 45.410466553832705], [-75.83840713860474, 45.40648941820549], [-75.83834257817304, 45.406001853092064], [-75.83824125662652, 45.40528962289015], [-75.83806371623832, 45.404039758825014], [-75.83779584988875, 45.402134840054465], [-75.83756501128553, 45.40048082548936], [-75.83748229206788, 45.3999204411143], [-75.83745385456601, 45.3996338975969], [-75.83744540763321, 45.39936318186566], [-75.83747298038463, 45.399040629933424], [-75.83753723366183, 45.39874839692758], [-75.8376256625169, 45.39848295888835], [-75.83771985827858, 45.398239943445034], [-75.83791331920713, 45.39777450559547], [-75.83810245831033, 45.39731967258592], [-75.83818698920825, 45.397109816383974], [-75.83826965115668, 45.39682194625066], [-75.83831512197277, 45.39650972616377], [-75.8383390337404, 45.396279926431276], [-75.83833625355754, 45.39597286370313], [-75.83830637097441, 45.39565326632567], [-75.83827259959912, 45.39536917415158], [-75.83567903177438, 45.395518846820984], [-75.8326994970358, 45.39568934566375], [-75.82769723614201, 45.39606190196306], [-75.8216922643724, 45.396512917698395], [-75.81773933947247, 45.39683460077723], [-75.81641436032639, 45.39695275932252], [-75.81586118171046, 45.39700835253594], [-75.81554176498061, 45.39705963517043], [-75.81520247952291, 45.39714110407301], [-75.81482047177174, 45.39725044703867], [-75.81446660015348, 45.39736771991796], [-75.81396714457483, 45.39754764786994], [-75.81197925662417, 45.39825226109415], [-75.8056962374125, 45.40049151303892], [-75.80060565603063, 45.40230040749801], [-75.79554431292252, 45.404101784645256], [-75.7919953687353, 45.40535904484652], [-75.78370584309438, 45.40834052789365], [-75.78241765375165, 45.408788517813015], [-75.77807470575269, 45.41031548920403], [-75.77409316629941, 45.411729389753894], [-75.76889267524523, 45.41357524557498], [-75.76626516210747, 45.41446508878729], [-75.76583523836061, 45.414610585135], [-75.7656130028002, 45.414693514551715], [-75.76532383393639, 45.414820369437095], [-75.7648985691449, 45.415051162150114], [-75.76200751810723, 45.416591793450635], [-75.76048304661363, 45.417436673202765]] } },
{ "type": "Feature", "properties": { "type": "alignment" }, "geometry": { "type": "LineString", "coordinates": [[-75.76048304661363, 45.41743667320275], [-75.75951756710346, 45.41799886500751], [-75.75844437356953, 45.41860389242626], [-75.75802527719424, 45.41883803823159], [-75.75767144129291, 45.41903347128316], [-75.75733807672077, 45.4192085299321], [-75.75700612006037, 45.41935027626333], [-75.7565728936196, 45.419501154624555], [-75.75606910439222, 45.419630604584555], [-75.75547361368588, 45.419754168327586], [-75.75492789339077, 45.41986010955016], [-75.75462157795047, 45.41992102452435], [-75.75381463542321, 45.419990173558396], [-75.75278059331981, 45.420019417706], [-75.75142941159463, 45.42011822166861], [-75.74967754349748, 45.42025272836231], [-75.74334827784881, 45.42064337228646], [-75.73851633169679, 45.42091103138137], [-75.73652857852419, 45.42100728438261], [-75.7349492046963, 45.42111265238697], [-75.73392693293006, 45.421172728227], [-75.73328197587585, 45.42123454314023], [-75.73252343810178, 45.42134415581894], [-75.7317228651428, 45.42154098358937], [-75.72907195921431, 45.42236668487252], [-75.7271670662252, 45.42329660680955], [-75.7264282452827, 45.42363051486991], [-75.7259651369039, 45.42382335027398], [-75.72521233792759, 45.424034315939195], [-75.72437136857344, 45.42424864453991], [-75.72383200652483, 45.424389730050954], [-75.7229474869232, 45.424489984738386], [-75.72189518118724, 45.42463170617635], [-75.72083165137732, 45.424719363533534], [-75.720228267752, 45.42476674755017], [-75.71997544244851, 45.424758119094875], [-75.71968268250589, 45.424694217401125], [-75.71952586692375, 45.424641098319796], [-75.7191650925473, 45.42454703013637], [-75.7189790201367, 45.42451593493384], [-75.71870242328087, 45.42448203733242], [-75.7184212027974, 45.4244853576233], [-75.71809346987219, 45.42452716460394], [-75.71725853205744, 45.42467096495399], [-75.7169347610576, 45.42471698329869], [-75.71670206076628, 45.424742570565726], [-75.71640781972654, 45.42475494823857], [-75.71590558478168, 45.42476513623105], [-75.71534937530033, 45.424732604491474], [-75.71450445230897, 45.424689932405975], [-75.71412944941069, 45.42466958448896], [-75.71418350542075, 45.424416545706514], [-75.71421426295628, 45.42415797406931], [-75.71421502877574, 45.424005826637845], [-75.71420662052529, 45.42388514399851], [-75.71418224913427, 45.42376581094414], [-75.71414946534874, 45.42365219025323], [-75.71409532179783, 45.42351036788277], [-75.71399298324498, 45.423279301011135], [-75.71370636573026, 45.42260869459363], [-75.71333769236746, 45.42174780391301], [-75.71323752906258, 45.42150392858234], [-75.71313450768066, 45.421301897042035], [-75.71301991590782, 45.42110038853634], [-75.71288379121108, 45.420897972133496], [-75.7127281722726, 45.420687655162986], [-75.71257773454685, 45.42050940928245], [-75.71235598216415, 45.420255349874175], [-75.71201356421561, 45.4198455315678], [-75.71176317445308, 45.419547284889596], [-75.71148414731076, 45.41920485208538]] } },
Expand Down
6 changes: 6 additions & 0 deletions data/gatineau/b.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
],
"filterKey": "gatineauLrt"
},
"bbox": [
-75.80979831416316,
45.41567920052083,
-75.69585303512089,
45.43724924103122
],
"features": [
{ "type": "Feature", "properties": { "type": "alignment" }, "geometry": { "type": "LineString", "coordinates": [[-75.80886327217118, 45.41567920052083], [-75.80900219213257, 45.41662054624581], [-75.80931642732723, 45.41867161922353], [-75.80946200775662, 45.41962488112256], [-75.80962509323206, 45.420510700420934], [-75.80976752394217, 45.42127114446378], [-75.80978557224192, 45.421369580245845], [-75.80979831416316, 45.421410265797185], [-75.80930474430683, 45.42149134182834], [-75.80858019508263, 45.4216178161614], [-75.80824806817994, 45.42169790334698], [-75.8079024651946, 45.421815773443264], [-75.80756439790873, 45.42197530756289], [-75.8073110251743, 45.422122829414434], [-75.8071452738138, 45.4222440809763], [-75.80694317905748, 45.4224309142935], [-75.80677873596164, 45.422606749540094], [-75.80665111020816, 45.42279132593613], [-75.8065043917005, 45.42307936124089], [-75.80640342123762, 45.42342145393651], [-75.80612086078945, 45.4243694821303], [-75.80585279763694, 45.425267772868885], [-75.80566326150239, 45.425896727856326], [-75.80543562659773, 45.426681655140925], [-75.8053485927456, 45.42695061450035], [-75.80530487730387, 45.42717226515882], [-75.80528333167382, 45.42736429110953], [-75.80527219848736, 45.42755435835148], [-75.80527343343223, 45.42776951181906], [-75.80531922173235, 45.428152509696005], [-75.80542390062534, 45.42886512559416], [-75.80557649698277, 45.42988591474413], [-75.80568234732381, 45.430674648475545], [-75.80574878703459, 45.431155555875655], [-75.80585169713474, 45.431848887392924], [-75.80597192137328, 45.43271907967753], [-75.80605487756426, 45.43331629337213], [-75.80609088742551, 45.43356404311508], [-75.80608672925364, 45.43377235637756], [-75.80604663813581, 45.43398155177902], [-75.80591655950653, 45.4342546542995], [-75.8057537483869, 45.43447126000446], [-75.80552841252751, 45.4346702540187], [-75.80487530892249, 45.43515916249188], [-75.80423763708782, 45.43563733410767], [-75.80397255706362, 45.43584183901805], [-75.80375892849403, 45.43598380963913], [-75.80353776422498, 45.43608412607755], [-75.80326918327502, 45.4361698645851], [-75.80305173006813, 45.436206834799854], [-75.80280591627461, 45.43620606676292], [-75.80246685101717, 45.436187592335564], [-75.80171819953497, 45.43612670548643], [-75.80113866352241, 45.436084923039516], [-75.80088499031787, 45.43605626633519], [-75.80066167004766, 45.43601211380688], [-75.80047098211101, 45.43596574118972], [-75.79988552895678, 45.43581347845101], [-75.79922662801272, 45.435651531850596], [-75.79881433852033, 45.4355508940084], [-75.79857534950638, 45.43548032046898], [-75.79832380546614, 45.43537686737607], [-75.79810019814424, 45.43526620353585], [-75.79778519488949, 45.4351061591857], [-75.79739599626508, 45.434905246571994], [-75.79661188218802, 45.43451036755638], [-75.79637781234422, 45.43437230197351], [-75.79605285717403, 45.43417888546881], [-75.79551457030895, 45.43389440581722], [-75.79496039114528, 45.43365598553223], [-75.79470275648684, 45.43354388507336], [-75.7944341987783, 45.43343971180719], [-75.79417629048667, 45.43337073516925], [-75.79390713543341, 45.43332345173769], [-75.7936345429512, 45.43329639317484], [-75.7933493087044, 45.43328737449204], [-75.79301117792173, 45.43330788053177], [-75.79156950159765, 45.433434078028654], [-75.79062232960469, 45.43351819782254], [-75.79018890493207, 45.43354487476557], [-75.78976272890725, 45.4335466945692], [-75.78940423376561, 45.433535788361944], [-75.78908859650619, 45.43351290790073], [-75.78870053266998, 45.433468404487215], [-75.78820754673995, 45.43338293611714], [-75.7877162795244, 45.433287355164616], [-75.78746655435532, 45.433232502532775], [-75.78724012036767, 45.433194806849805], [-75.786932105546, 45.43316266155344], [-75.78651857128571, 45.43314644143709], [-75.78622659899764, 45.43315631044427], [-75.78585481466834, 45.4331909758764], [-75.78554555507878, 45.43324325259734], [-75.78514695540085, 45.43333190647822], [-75.78486484828996, 45.43342606604758], [-75.78453333215043, 45.43355888353976], [-75.78418048051728, 45.433701585940504], [-75.78328238401834, 45.43406036376845], [-75.78216953758009, 45.43451433684424], [-75.78076645098672, 45.43507769688267], [-75.7802855363134, 45.43525034773249], [-75.77970481902977, 45.435431974362096], [-75.77912614417221, 45.435589723068205], [-75.77865084617049, 45.4356967098182], [-75.77819200115215, 45.435781025143], [-75.77764929590045, 45.435857614693454], [-75.77676843482686, 45.43594003069311], [-75.77593659066204, 45.43600833594051], [-75.77523283457656, 45.43606136775129], [-75.77472668465477, 45.436094865217626], [-75.77431292013043, 45.436096309074124], [-75.77399154100355, 45.436065699323215], [-75.77372510754783, 45.43603650516635], [-75.77354998574248, 45.43603272377351], [-75.77341094957384, 45.436041245684486], [-75.77329171707937, 45.436057790646636], [-75.77316976634195, 45.43608365661024], [-75.77290547301321, 45.436164184003474], [-75.77217301274273, 45.43641055679861], [-75.77162856463626, 45.43658487094701], [-75.77138079605385, 45.436659354045666], [-75.77110084650099, 45.43672079974139], [-75.77080342856206, 45.436769378437035], [-75.77034051031241, 45.436806493525864], [-75.76971055993246, 45.43685005264139], [-75.7694137301733, 45.43686181316198], [-75.76922441890966, 45.43685923140651], [-75.76899783558581, 45.43683575979405], [-75.76875911774934, 45.43679695007607], [-75.76854588285647, 45.43673719772833], [-75.76837587963578, 45.43668106336817], [-75.7680011066044, 45.43650925742713], [-75.7675861721007, 45.43677888693804], [-75.76711385770899, 45.43695578876154], [-75.76678634258846, 45.437068023716535], [-75.76605889458563, 45.43724924103122], [-75.76554671192939, 45.43655887146253], [-75.76478224131566, 45.4354802307067], [-75.7643716101547, 45.434876128002294], [-75.7639351781489, 45.43425924968743], [-75.76341889564428, 45.43354284488023], [-75.76332021260596, 45.43339400403195], [-75.76318651767804, 45.43317538958841], [-75.76302847860724, 45.432882058057075], [-75.76290307857928, 45.43264132419274], [-75.76280166723423, 45.432419573273215], [-75.76270163747361, 45.43209183529752], [-75.76254475463473, 45.431560394360616], [-75.76241206570361, 45.43101558833657], [-75.76226442877166, 45.43025625453146], [-75.76213358686468, 45.429420327714595], [-75.76201971034529, 45.42876035677933], [-75.7618960419686, 45.42785550632253], [-75.7617564947118, 45.42710635715915], [-75.76164433510918, 45.42623162459869], [-75.76147593810299, 45.42505611056396], [-75.76131400370716, 45.423700182650926], [-75.76112732945313, 45.421884771057606], [-75.76093643532822, 45.42034327903803], [-75.7607750066274, 45.41913108156191], [-75.76062349989132, 45.41808737157757], [-75.76054756879329, 45.41753763554339], [-75.76048304661363, 45.41743667320275]] } },
{ "type": "Feature", "properties": { "type": "alignment" }, "geometry": { "type": "LineString", "coordinates": [[-75.76048304661363, 45.41743667320275], [-75.75951756710346, 45.41799886500751], [-75.75844437356953, 45.41860389242626], [-75.75802527719424, 45.41883803823159], [-75.75767144129291, 45.41903347128316], [-75.75733807672077, 45.4192085299321], [-75.75700612006037, 45.41935027626333], [-75.7565728936196, 45.419501154624555], [-75.75606910439222, 45.419630604584555], [-75.75547361368588, 45.419754168327586], [-75.75492789339077, 45.41986010955016], [-75.75462157795047, 45.41992102452435], [-75.75381463542321, 45.419990173558396], [-75.75278059331981, 45.420019417706], [-75.75142941159463, 45.42011822166861], [-75.74967754349748, 45.42025272836231], [-75.74334827784881, 45.42064337228646], [-75.73851633169679, 45.42091103138137], [-75.73652857852419, 45.42100728438261], [-75.7349492046963, 45.42111265238697], [-75.73392693293006, 45.421172728227], [-75.73328197587585, 45.42123454314023], [-75.73252343810178, 45.42134415581894], [-75.7317228651428, 45.42154098358937], [-75.72907195921431, 45.42236668487252], [-75.7271670662252, 45.42329660680955], [-75.7264282452827, 45.42363051486991], [-75.7259651369039, 45.42382335027398], [-75.72521233792759, 45.424034315939195], [-75.72437136857344, 45.42424864453991], [-75.72383200652483, 45.424389730050954], [-75.7229474869232, 45.424489984738386], [-75.72189518118724, 45.42463170617635], [-75.72083165137732, 45.424719363533534], [-75.720228267752, 45.42476674755017], [-75.71997544244851, 45.424758119094875], [-75.71968268250589, 45.424694217401125], [-75.71952586692375, 45.424641098319796], [-75.7191650925473, 45.42454703013637], [-75.7189790201367, 45.42451593493384], [-75.71870242328087, 45.42448203733242], [-75.7184212027974, 45.4244853576233], [-75.71809346987219, 45.42452716460394], [-75.71725853205744, 45.42467096495399], [-75.7169347610576, 45.42471698329869], [-75.71670206076628, 45.424742570565726], [-75.71640781972654, 45.42475494823857], [-75.71590558478168, 45.42476513623105], [-75.71534937530033, 45.424732604491474], [-75.71450445230897, 45.424689932405975], [-75.71412944941069, 45.42466958448896], [-75.71418350542075, 45.424416545706514], [-75.71421426295628, 45.42415797406931], [-75.71421502877574, 45.424005826637845], [-75.71420662052529, 45.42388514399851], [-75.71418224913427, 45.42376581094414], [-75.71414946534874, 45.42365219025323], [-75.71409532179783, 45.42351036788277], [-75.71399298324498, 45.423279301011135], [-75.71370636573026, 45.42260869459363], [-75.71333769236746, 45.42174780391301], [-75.71323752906258, 45.42150392858234], [-75.71313450768066, 45.421301897042035], [-75.71301991590782, 45.42110038853634], [-75.71288379121108, 45.420897972133496], [-75.7127281722726, 45.420687655162986], [-75.71257773454685, 45.42050940928245], [-75.71235598216415, 45.420255349874175], [-75.71201356421561, 45.4198455315678], [-75.71176317445308, 45.419547284889596], [-75.71148414731076, 45.41920485208538]] } },
Expand Down
6 changes: 6 additions & 0 deletions data/go/br.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,11 @@
{ "type": "Feature", "properties": { "lines": ["go/br"], "type": "station-label", "name": "Rutherford" }, "geometry": { "type": "Point", "coordinates": [-79.4981028999999, 43.8374816] } },
{ "type": "Feature", "properties": { "lines": ["toronto/1", "go/br"], "type": "station-label", "name": "Downsview" }, "geometry": { "type": "Point", "coordinates": [-79.47834054881423, 43.753651676883024] } },
{ "type": "Feature", "properties": { "lines": ["toronto/1", "go/le", "go/st", "go/rh", "go/br"], "type": "station-label", "name": "Union" }, "geometry": { "type": "Point", "coordinates": [-79.3804274, 43.6443539000001] } }
],
"bbox": [
-79.6899175,
43.6401634000001,
-79.3733326,
44.3737523
]
}
6 changes: 6 additions & 0 deletions data/go/ki.json
Original file line number Diff line number Diff line change
Expand Up @@ -323,5 +323,11 @@
{ "type": "Feature", "properties": { "lines": ["go/up", "toronto/5", "go/ki"], "type": "station-label", "name": "Mount Dennis" }, "geometry": { "type": "Point", "coordinates": [-79.48765725883598, 43.68761259569308] } },
{ "type": "Feature", "properties": { "lines": ["go/up", "toronto/2", "go/ki"], "type": "station-label", "name": "Bloor" }, "geometry": { "type": "Point", "coordinates": [-79.45201559049785, 43.658968620556166] } },
{ "type": "Feature", "properties": { "lines": ["go/up", "toronto/1", "go/le", "go/st", "go/rh", "go/ki"], "type": "station-label", "name": "Union", "major": true }, "geometry": { "type": "Point", "coordinates": [-79.3804274, 43.6443539000001] } }
],
"bbox": [
-81.2493479999999,
42.98024840000009,
-79.3733326,
43.7069382
]
}
Loading