Skip to content

Commit

Permalink
Merge pull request #2251 from HSLdevcom/fix-fare-zones
Browse files Browse the repository at this point in the history 
Match fare zones with current data
  • Loading branch information
@pailakka
pailakka authored Apr 19, 2018
2 parents f92cb68 + b52b5ac commit 0cdb155
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 29 deletions.
26 changes: 13 additions & 13 deletions app/configurations/config.hsl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,19 +283,19 @@ export default {
'HSL:seu2': 'HSL:seu',
'HSL:seu3': 'HSL:seu',
'HSL:seu4': 'HSL:seu',
'HSL:lse': 'HSL:lse2',
'HSL:lse2': 'HSL:lse2',
'HSL:lse3': 'HSL:lse2',
'HSL:lse4': 'HSL:lse2',
'HSL:lse5': 'HSL:lse2',
'HSL:kse': 'HSL:lse3',
'HSL:kse2': 'HSL:lse3',
'HSL:kse3': 'HSL:lse3',
'HSL:kse4': 'HSL:lse3',
'HSL:kse5': 'HSL:lse3',
'HSL:kse6': 'HSL:lse3',
'HSL:kse7': 'HSL:lse3',
'HSL:kse8': 'HSL:lse3',
'HSL:lse': 'HSL:lse',
'HSL:lse2': 'HSL:lse',
'HSL:lse3': 'HSL:lse',
'HSL:lse4': 'HSL:lse',
'HSL:lse5': 'HSL:lse',
'HSL:kse': 'HSL:kse',
'HSL:kse2': 'HSL:kse',
'HSL:kse3': 'HSL:kse',
'HSL:kse4': 'HSL:kse',
'HSL:kse5': 'HSL:kse',
'HSL:kse6': 'HSL:kse',
'HSL:kse7': 'HSL:kse',
'HSL:kse8': 'HSL:kse',
},

staticMessages: [
Expand Down
12 changes: 6 additions & 6 deletions app/translations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,8 +724,8 @@ const translations = {
'ticket-type-HSL:hki': 'Helsinki',
'ticket-type-HSL:ker': 'Kerava-Sipoo-Tuusula',
'ticket-type-HSL:kir': 'Kirkkonummi-Siuntio',
'ticket-type-HSL:lse2': 'Region two zone',
'ticket-type-HSL:lse3': 'Region three zone',
'ticket-type-HSL:kse': 'Region three zone',
'ticket-type-HSL:lse': 'Region two zone',
'ticket-type-HSL:seu': 'Regional ticket',
'ticket-type-HSL:van': 'Vantaa',
'ticket-type-none': 'No fare zone limits',
Expand Down Expand Up @@ -1025,8 +1025,8 @@ const translations = {
'ticket-type-HSL:hki': 'Helsinki',
'ticket-type-HSL:ker': 'Kerava-Sipoo-Tuusula',
'ticket-type-HSL:kir': 'Kirkkonummi-Siuntio',
'ticket-type-HSL:lse2': 'Lähiseutu 2',
'ticket-type-HSL:lse3': 'Lähiseutu 3',
'ticket-type-HSL:kse': 'Lähiseutu 3',
'ticket-type-HSL:lse': 'Lähiseutu 2',
'ticket-type-HSL:seu': 'Seutulippu',
'ticket-type-HSL:van': 'Vantaa',
'ticket-type-none': 'Ei lippuvyöhykerajoitusta',
Expand Down Expand Up @@ -1827,8 +1827,8 @@ const translations = {
'ticket-type-HSL:hki': 'Helsingfors',
'ticket-type-HSL:ker': 'Kervo-Sibbo-Tusby',
'ticket-type-HSL:kir': 'Kyrkslätt-Sjundeå',
'ticket-type-HSL:lse2': 'Närregion 2',
'ticket-type-HSL:lse3': 'Närregion 3',
'ticket-type-HSL:kse': 'Närregion 3',
'ticket-type-HSL:lse': 'Närregion 2',
'ticket-type-HSL:seu': 'Regionbiljett',
'ticket-type-HSL:van': 'Vanda',
'ticket-type-none': 'Ingen resezonsbegränsning',
Expand Down
95 changes: 85 additions & 10 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,10 @@ [email protected]:
version "1.0.0"
resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.0.tgz#c7f85438fdd466bc7ca16ab90c81513797a5d23b"

assertion-error@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"

assign-symbols@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
Expand Down Expand Up @@ -1627,6 +1631,10 @@ [email protected]:
version "1.3.0"
resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"

[email protected]:
version "1.3.1"
resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"

browserify-aes@^1.0.0, browserify-aes@^1.0.4:
version "1.1.1"
resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
Expand Down Expand Up @@ -1987,6 +1995,17 @@ chai-nightwatch@~0.1.x:
assertion-error "1.0.0"
deep-eql "0.1.3"

chai@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c"
dependencies:
assertion-error "^1.0.1"
check-error "^1.0.1"
deep-eql "^3.0.0"
get-func-name "^2.0.0"
pathval "^1.0.0"
type-detect "^4.0.0"

chain-function@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc"
Expand Down Expand Up @@ -2047,6 +2066,10 @@ chardet@^0.4.0:
version "0.4.2"
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"

check-error@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"

check-types@^7.3.0:
version "7.3.0"
resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.3.0.tgz#468f571a4435c24248f5fd0cb0e8d87c3c341e7d"
Expand Down Expand Up @@ -2341,6 +2364,10 @@ combined-stream@~0.0.4, combined-stream@~0.0.5:
dependencies:
delayed-stream "0.0.5"

[email protected]:
version "2.11.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"

[email protected]:
version "2.9.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
Expand Down Expand Up @@ -2877,6 +2904,12 @@ [email protected]:
dependencies:
type-detect "0.1.1"

deep-eql@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
dependencies:
type-detect "^4.0.0"

deep-equal@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
Expand Down Expand Up @@ -3037,6 +3070,10 @@ [email protected]:
version "3.2.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"

[email protected]:
version "3.5.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"

diffie-hellman@^5.0.0:
version "5.0.2"
resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
Expand Down Expand Up @@ -4493,6 +4530,10 @@ get-caller-file@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"

get-func-name@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"

get-stdin@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
Expand Down Expand Up @@ -4622,24 +4663,24 @@ [email protected]:
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@^6.0.4:
version "6.0.4"
resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
version "7.1.2"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
inherits "2"
minimatch "2 || 3"
minimatch "^3.0.4"
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
version "7.1.2"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
glob@^6.0.4:
version "6.0.4"
resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
inherits "2"
minimatch "^3.0.4"
minimatch "2 || 3"
once "^1.3.0"
path-is-absolute "^1.0.0"

Expand Down Expand Up @@ -4813,6 +4854,10 @@ grim@^2.0.1:
dependencies:
event-kit "^2.0.0"

[email protected]:
version "1.10.3"
resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"

[email protected]:
version "1.9.2"
resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
Expand Down Expand Up @@ -7023,7 +7068,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"

"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
dependencies:
Expand Down Expand Up @@ -7146,6 +7191,22 @@ mocha@^3.5.3:
mkdirp "0.5.1"
supports-color "3.1.2"

mocha@^5.0.5:
version "5.1.1"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.1.1.tgz#b774c75609dac05eb48f4d9ba1d827b97fde8a7b"
dependencies:
browser-stdout "1.3.1"
commander "2.11.0"
debug "3.1.0"
diff "3.5.0"
escape-string-regexp "1.0.5"
glob "7.1.2"
growl "1.10.3"
he "1.1.1"
minimatch "3.0.4"
mkdirp "0.5.1"
supports-color "4.4.0"

module-deps@^4.0.8:
version "4.1.1"
resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.1.1.tgz#23215833f1da13fd606ccb8087b44852dcb821fd"
Expand Down Expand Up @@ -8012,6 +8073,10 @@ path-type@^3.0.0:
dependencies:
pify "^3.0.0"

pathval@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"

[email protected]:
version "0.0.11"
resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
Expand Down Expand Up @@ -10724,6 +10789,12 @@ [email protected]:
dependencies:
has-flag "^1.0.0"

[email protected]:
version "4.4.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
dependencies:
has-flag "^2.0.0"

supports-color@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
Expand Down Expand Up @@ -11101,6 +11172,10 @@ [email protected]:
version "0.1.1"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"

type-detect@^4.0.0:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"

type-is@~1.6.15:
version "1.6.16"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
Expand Down

0 comments on commit 0cdb155

Please sign in to comment.