Skip to content

Commit 23f647d

Browse files
clezagclezag
committed
feat!: #16
- add AlpsGo carsharing provider - remove HAL-API carsharing provider - update to go-netex 1.4 and fix related issues
1 parent 373e161 commit 23f647d

File tree

11 files changed

+120
-152
lines changed

11 files changed

+120
-152
lines changed

‎calls.http‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ GET https://mobility.api.opendatahub.com/v2/flat/Bicycle
3434
### Bike sharing PAPIN
3535
GET https://mobility.api.opendatahub.com/v2/flat/BikesharingStation
3636
?where=sorigin.eq.BIKE_SHARING_PAPIN,sactive.eq.true
37-
### Car sharing HAL
37+
### Car sharing AlpsGo
3838
GET https://mobility.api.opendatahub.com/v2/flat/CarsharingStation
39-
?where=sorigin.eq.HAL-API,sactive.eq.true
40-
### Car sharing HAL single cars
39+
?where=sorigin.eq.AlpsGo,sactive.eq.true
40+
### Car sharing AlpsGo single cars
4141
GET https://mobility.api.opendatahub.com/v2/flat/CarsharingCar
42-
?where=sorigin.eq.HAL-API,sactive.eq.true
42+
?where=sorigin.eq.AlpsGo,sactive.eq.true
4343
### parking station Echarging
4444
GET https://mobility.api.opendatahub.com/v2/flat/EChargingStation
4545
?where=sactive.eq.true,scoordinate.bbi.(10.368347,46.185535,12.551880,47.088826,4326)
@@ -60,7 +60,7 @@ GET https://mobility.api.opendatahub.com/v2/flat/Bicycle/availability/latest
6060

6161
### Carsharing station realtime
6262
GET https://mobility.api.opendatahub.com/v2/flat/CarsharingStation/number-available/latest
63-
?where=sorigin.eq.HAL-API,sactive.eq.true
63+
?where=sorigin.eq.AlpsGo,sactive.eq.true
6464

6565
###
6666
GET https://mobility.api.opendatahub.com/v2/flat/BikesharingStation/availability,free-bays/latest

‎src/comp/operators_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestOpsContent(t *testing.T) {
1919
assert.Equal(t, "[email protected]", bsb.Email)
2020
assert.Equal(t, "0471997111", bsb.Phone)
2121

22-
hal := mapped["HAL-API"]
23-
assert.Equal(t, "https://www.carsharing.bz.it/it/", hal.Url)
24-
assert.Equal(t, "Via Beda Weber 1", hal.Street)
22+
alpsGo := mapped["AlpsGo"]
23+
assert.Equal(t, "https://www.alpsgo.it", alpsGo.Url)
24+
assert.Equal(t, "Via Beda Weber 1", alpsGo.Street)
2525
}

‎src/config/operators.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
postcode: 39038
3636
country: Italy
3737

38-
- origin: [HAL-API]
39-
id: Car Sharing Alto Adige
40-
name: Car Sharing Alto Adige
41-
email: [email protected].it
42-
phone: 0471061319
43-
url: https://www.carsharing.bz.it/it/
38+
- origin: [AlpsGo]
39+
id: AlpsGo
40+
name: AlpsGo GmbH
41+
email: hello@alpsgo.it
42+
phone: 04711390502
43+
url: https://www.alpsgo.it
4444
street: Via Beda Weber 1
4545
town: Bolzano
4646
postcode: 39100

‎src/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.6
55
require (
66
github.com/gin-contrib/cors v1.7.5
77
github.com/gin-gonic/gin v1.10.1
8-
github.com/noi-techpark/go-netex v1.3.0
8+
github.com/noi-techpark/go-netex v1.4.0
99
github.com/samber/slog-gin v1.15.1
1010
gotest.tools/v3 v3.5.2
1111
)

‎src/go.sum‎

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
github.com/bytedance/sonic v1.12.9 h1:Od1BvK55NnewtGaJsTDeAOSnLVO2BTSLOe0+ooKokmQ=
2-
github.com/bytedance/sonic v1.12.9/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8=
31
github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
42
github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
53
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
6-
github.com/bytedance/sonic/loader v0.2.3 h1:yctD0Q3v2NOGfSWPLPvG2ggA2kV6TS6s4wioyEqssH0=
7-
github.com/bytedance/sonic/loader v0.2.3/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
84
github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
95
github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
106
github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
@@ -13,20 +9,12 @@ github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQ
139
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1410
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1511
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
16-
github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
17-
github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
1812
github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
1913
github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
20-
github.com/gin-contrib/cors v1.7.3 h1:hV+a5xp8hwJoTw7OY+a70FsL8JkVVFTXw9EcfrYUdns=
21-
github.com/gin-contrib/cors v1.7.3/go.mod h1:M3bcKZhxzsvI+rlRSkkxHyljJt1ESd93COUvemZ79j4=
2214
github.com/gin-contrib/cors v1.7.5 h1:cXC9SmofOrRg0w9PigwGlHG3ztswH6bqq4vJVXnvYMk=
2315
github.com/gin-contrib/cors v1.7.5/go.mod h1:4q3yi7xBEDDWKapjT2o1V7mScKDDr8k+jZ0fSquGoy0=
24-
github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
25-
github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
2616
github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
2717
github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
28-
github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
29-
github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
3018
github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
3119
github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
3220
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
@@ -35,14 +23,10 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
3523
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
3624
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
3725
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
38-
github.com/go-playground/validator/v10 v10.25.0 h1:5Dh7cjvzR7BRZadnsVOzPhWsrwUr0nmsZJxEAnFLNO8=
39-
github.com/go-playground/validator/v10 v10.25.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
4026
github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
4127
github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
4228
github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
4329
github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
44-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
45-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
4630
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
4731
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
4832
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -51,8 +35,6 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
5135
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
5236
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
5337
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
54-
github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
55-
github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
5638
github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
5739
github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
5840
github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
@@ -71,69 +53,55 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
7153
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
7254
github.com/noi-techpark/go-netex v1.3.0 h1:hRQABLCa8WL28MJeHC6XBXzH2CJy1xx0CW3Z0XE1KQk=
7355
github.com/noi-techpark/go-netex v1.3.0/go.mod h1:DDY9+ROb6h+/gPs97F44tVHbldaXPj3po/gavQgcay8=
74-
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
75-
github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
56+
github.com/noi-techpark/go-netex v1.3.1-0.20250522123712-12ac8ce09eb8 h1:bX0CvwtSUSNu6yV94YcsNZkGuaR4pG+/lz5Asw6x/sY=
57+
github.com/noi-techpark/go-netex v1.3.1-0.20250522123712-12ac8ce09eb8/go.mod h1:DDY9+ROb6h+/gPs97F44tVHbldaXPj3po/gavQgcay8=
58+
github.com/noi-techpark/go-netex v1.3.1-0.20250522124220-8ce27e41263d h1:6aA3EfNVZH9TDndysj5HR7mkTVpeGX/vSCwaTwVp+6U=
59+
github.com/noi-techpark/go-netex v1.3.1-0.20250522124220-8ce27e41263d/go.mod h1:DDY9+ROb6h+/gPs97F44tVHbldaXPj3po/gavQgcay8=
60+
github.com/noi-techpark/go-netex v1.3.1-0.20250522130559-247afde45d5a h1:NaHgChNH5R2Vf7pXmXgHS/yS7T5mM3kwb1mJGRmahMQ=
61+
github.com/noi-techpark/go-netex v1.3.1-0.20250522130559-247afde45d5a/go.mod h1:DDY9+ROb6h+/gPs97F44tVHbldaXPj3po/gavQgcay8=
62+
github.com/noi-techpark/go-netex v1.3.1-0.20250522130758-5742ff2801ce h1:YJf6F7KNuBw5iybeOeeHCaIqKqRCOE8qqYlpMWvevs0=
63+
github.com/noi-techpark/go-netex v1.3.1-0.20250522130758-5742ff2801ce/go.mod h1:DDY9+ROb6h+/gPs97F44tVHbldaXPj3po/gavQgcay8=
64+
github.com/noi-techpark/go-netex v1.4.0 h1:chnVv5cLO8IXAyFxE4R839FUmznQKcfUwH5suja8E8w=
65+
github.com/noi-techpark/go-netex v1.4.0/go.mod h1:DDY9+ROb6h+/gPs97F44tVHbldaXPj3po/gavQgcay8=
7666
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
7767
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
7868
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
7969
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
8070
github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
8171
github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
82-
github.com/samber/slog-gin v1.14.1 h1:6DMAcy2gBFyyztrpYIvAcXZH1sA/j75iSSXuqhirLtg=
83-
github.com/samber/slog-gin v1.14.1/go.mod h1:yS2C+cX5tRnPX0MqDby7a3tRFsJuMk7hNwAunyfDxQk=
8472
github.com/samber/slog-gin v1.15.1 h1:jsnfr+S5HQPlz9pFPA3tOmKW7wN/znyZiE6hncucrTM=
8573
github.com/samber/slog-gin v1.15.1/go.mod h1:mPAEinK/g2jPLauuWO11m3Q0Ca7aG4k9XjXjXY8IhMQ=
8674
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
8775
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
8876
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
89-
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
9077
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
9178
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
9279
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
9380
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
9481
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
95-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
9682
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
9783
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
9884
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
9985
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
10086
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
10187
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
102-
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
103-
go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
10488
go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
10589
go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
106-
go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
107-
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
10890
go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
10991
go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
110-
golang.org/x/arch v0.14.0 h1:z9JUEZWr8x4rR0OU6c4/4t6E6jOZ8/QBS2bBYBm4tx4=
111-
golang.org/x/arch v0.14.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
11292
golang.org/x/arch v0.17.0 h1:4O3dfLzd+lQewptAHqjewQZQDyEdejz3VwgeYwkZneU=
11393
golang.org/x/arch v0.17.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
114-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
115-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
11694
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
11795
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
118-
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa h1:t2QcU6V556bFjYgu4L6C+6VrCPyJZ+eyRsABUPs1mz4=
119-
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk=
12096
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 h1:y5zboxd6LQAqYIhHnB48p0ByQ/GnQx2BE33L8BOHQkI=
12197
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ=
122-
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
123-
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
12498
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
12599
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
126100
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
127-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
128-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
129101
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
130102
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
131-
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
132-
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
133103
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
134104
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
135-
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
136-
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
137105
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
138106
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
139107
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -142,8 +110,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV
142110
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
143111
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
144112
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
145-
gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
146-
gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
147113
gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
148114
gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
149115
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=

‎src/provider/bike_sharing_bz.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"opendatahub/transmodel-api/ninja"
1212
"opendatahub/transmodel-api/siri"
1313

14-
model "github.com/noi-techpark/go-netex"
14+
"github.com/noi-techpark/go-netex"
1515
"golang.org/x/exp/maps"
1616
)
1717

@@ -51,7 +51,7 @@ func NewBikeBz() *BikeBz {
5151
return &b
5252
}
5353

54-
func (b *BikeBz) GetOperator() model.Operator {
54+
func (b *BikeBz) GetOperator() netex.Operator {
5555
return comp.GetOperator(&config.Cfg, b.origin)
5656
}
5757

@@ -63,18 +63,18 @@ func (b *BikeBz) StSharing() (comp.StSharingData, error) {
6363
ret.Operators = append(ret.Operators, o)
6464

6565
// Modes of Operation
66-
m := model.VehicleSharing{}
66+
m := netex.VehicleSharing{}
6767
m.Id = comp.CreateID("VehicleSharing", b.origin)
6868
m.Version = "1"
69-
sub := model.Submode{}
69+
sub := netex.Submode{}
7070
sub.Id = comp.CreateID("Submode", b.origin)
7171
sub.Version = "1"
7272
sub.TransportMode = "bicycle"
7373
sub.SelfDriveSubmode = "hireCycle"
7474
m.Submodes = append(m.Submodes, sub)
7575
ret.Modes = append(ret.Modes, m)
7676

77-
models := make(map[string]model.CycleModelProfile)
77+
models := make(map[string]netex.CycleModelProfile)
7878

7979
cycles, err := b.cycles(b.origin)
8080
if err != nil {
@@ -85,7 +85,7 @@ func (b *BikeBz) StSharing() (comp.StSharingData, error) {
8585
p, found := models[c.Smeta.Model]
8686
if !found {
8787
// Cycle model profile
88-
p = model.CycleModelProfile{}
88+
p = netex.CycleModelProfile{}
8989
p.Id = comp.CreateID("CycleModelProfile", b.origin, c.Smeta.Model)
9090
p.Version = "1"
9191
p.ChildSeat = "none"
@@ -99,7 +99,7 @@ func (b *BikeBz) StSharing() (comp.StSharingData, error) {
9999
}
100100

101101
// Vehicles
102-
v := model.Vehicle{}
102+
v := netex.Vehicle{}
103103
v.Id = comp.CreateID("Vehicle", b.origin, c.Scode)
104104
v.Version = "1"
105105
v.ValidBetween = comp.ValidAYear()
@@ -113,7 +113,7 @@ func (b *BikeBz) StSharing() (comp.StSharingData, error) {
113113
ret.CycleModels = maps.Values(models)
114114

115115
// Fleets = all Vehicles + operator
116-
f := model.Fleet{}
116+
f := netex.Fleet{}
117117
f.Id = comp.CreateID("Fleet", b.origin)
118118
f.Version = "1"
119119
f.ValidBetween = comp.ValidAYear()
@@ -124,7 +124,7 @@ func (b *BikeBz) StSharing() (comp.StSharingData, error) {
124124
ret.Fleets = append(ret.Fleets, f)
125125

126126
// Mobility services = Fleet + mode
127-
s := model.VehicleSharingService{}
127+
s := netex.VehicleSharingService{}
128128
s.Id = comp.CreateID("VehicleSharingService", b.origin)
129129
s.Version = "1"
130130
s.VehicleSharingRef = comp.MkRef("VehicleSharing", m.Id)
@@ -135,7 +135,7 @@ func (b *BikeBz) StSharing() (comp.StSharingData, error) {
135135
ret.Services = append(ret.Services, s)
136136

137137
// Constraint zone
138-
c := model.MobilityServiceConstraintZone{}
138+
c := netex.MobilityServiceConstraintZone{}
139139
c.Id = comp.CreateID("MobilityServiceConstraintZone", b.origin)
140140
c.Version = "1"
141141
c.GmlPolygon.Id = b.origin
@@ -149,7 +149,7 @@ func (b *BikeBz) StSharing() (comp.StSharingData, error) {
149149
return ret, err
150150
}
151151
for _, s := range ss {
152-
p := model.Parking{}
152+
p := netex.Parking{}
153153
p.Id = comp.CreateID("Parking", b.origin, s.Sname)
154154
p.Version = "1"
155155
p.ShortName = s.Sname
@@ -161,9 +161,9 @@ func (b *BikeBz) StSharing() (comp.StSharingData, error) {
161161
p.ParkingType = "cycleRental"
162162
p.ParkingVehicleTypes = "cycle"
163163
p.ParkingLayout = "cycleHire"
164-
p.ProhibitedForHazardousMaterials.Ignore()
165-
p.RechargingAvailable.Set(true)
166-
p.Secure.Set(false)
164+
p.ProhibitedForHazardousMaterials = nil
165+
p.RechargingAvailable = netex.Just(true)
166+
p.Secure = netex.Just(false)
167167
p.ParkingReservation = "registrationRequired"
168168
p.ParkingProperties = nil
169169

0 commit comments

Comments
 (0)