Skip to content

Commit 88c901a

Browse files
woshilapinwoshilapin
committed
refactor: rename CanalTP to hove-io
1 parent 54d2260 commit 88c901a

34 files changed

+122
-122
lines changed

‎fixtures/ed/ntfs/contributors.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
contributor_id,contributor_name,contributor_website,contributor_license
2-
C1,C1,http://www.canaltp.fr,LICENSE
2+
C1,C1,http://www.hove.com,LICENSE

‎fixtures/ed/ntfs/feed_infos.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ feed_end_date,20150826
55
feed_creation_date,20150415
66
feed_creation_time,15:32:34
77
feed_publisher_name,Ile de France open data
8-
feed_publisher_url,http://www.canaltp.fr
8+
feed_publisher_url,http://www.hove.com
99
feed_license,ODBL
1010
fusio_url,
1111
fusio_version,

‎fixtures/ed/ntfs_v5/feed_infos.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ feed_end_date,20150826
55
feed_creation_date,20150415
66
feed_creation_time,15:32:34
77
feed_publisher_name,Ile de France open data
8-
feed_publisher_url,http://www.canaltp.fr
8+
feed_publisher_url,http://www.hove.com
99
feed_license,ODBL
1010
fusio_url,
1111
fusio_version,

‎source/autocomplete/tests/test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1774,8 +1774,8 @@ BOOST_AUTO_TEST_CASE(synonyms_with_non_ascii) {
17741774
autocomplete_map synonyms{{"fac", "université"}, {"faculté", "université"}, {"embarcadère", "gare maritime"}};
17751775

17761776
Autocomplete<unsigned int> ac;
1777-
ac.add_string("université de canaltp", 0, ghostwords, synonyms);
1778-
ac.add_string("gare maritime de canaltp", 1, ghostwords, synonyms);
1777+
ac.add_string("université de hove", 0, ghostwords, synonyms);
1778+
ac.add_string("gare maritime de hove", 1, ghostwords, synonyms);
17791779
ac.build();
17801780

17811781
auto res0 = ac.find_complete(

‎source/ed/build_helper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ builder::builder(const std::string& date,
637637
data->loaded = true;
638638
data->meta->instance_name = "builder";
639639
data->meta->publisher_name = publisher_name;
640-
data->meta->publisher_url = "www.canaltp.fr";
640+
data->meta->publisher_url = "www.hove.com";
641641
data->meta->license = "ODBL";
642642

643643
// for the moment we can only have one timezone per dataset

‎source/ed/build_helper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ struct builder {
298298
builder(const std::string& date,
299299
std::function<void(builder&)> builder_callback = make_builder,
300300
bool no_dummy = false,
301-
const std::string& publisher_name = "canal tp",
301+
const std::string& publisher_name = "hove",
302302
const std::string& timezone_name = "UTC",
303303
navitia::type::TimeZoneHandler::dst_periods timezone = {});
304304

‎source/ed/docker_tests/ed_integration_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ BOOST_FIXTURE_TEST_CASE(fusio_test, ArgsFixture) {
203203

204204
BOOST_REQUIRE_EQUAL(data.pt_data->contributors.size(), 1);
205205
BOOST_REQUIRE_EQUAL(data.pt_data->contributors[0]->license, "LICENSE");
206-
BOOST_REQUIRE_EQUAL(data.pt_data->contributors[0]->website, "http://www.canaltp.fr");
206+
BOOST_REQUIRE_EQUAL(data.pt_data->contributors[0]->website, "http://www.hove.com");
207207

208208
// Here we check trip_short_name as well as headsign of some vjs
209209
const nt::HeadsignHandler& headsigns = data.pt_data->headsign_handler;

‎source/ed/tests/fusioparser_test.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(parse_small_ntfs_dataset) {
7171

7272
// Check website, license of contributor
7373
BOOST_REQUIRE_EQUAL(data.contributors.size(), 1);
74-
BOOST_REQUIRE_EQUAL(data.contributors[0]->website, "http://www.canaltp.fr");
74+
BOOST_REQUIRE_EQUAL(data.contributors[0]->website, "http://www.hove.com");
7575
BOOST_REQUIRE_EQUAL(data.contributors[0]->license, "LICENSE");
7676

7777
// Check datasets
@@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE(parse_small_ntfs_dataset) {
206206
std::map<std::string, std::string> feed_info_test = {{"feed_start_date", "20150325"},
207207
{"feed_end_date", "20150826"},
208208
{"feed_publisher_name", "Ile de France open data"},
209-
{"feed_publisher_url", "http://www.canaltp.fr"},
209+
{"feed_publisher_url", "http://www.hove.com"},
210210
{"feed_license", "ODBL"},
211211
{"feed_creation_datetime", "20150415T153234"}};
212212
BOOST_CHECK_EQUAL_COLLECTIONS(data.feed_infos.begin(), data.feed_infos.end(), feed_info_test.begin(),
@@ -369,7 +369,7 @@ BOOST_AUTO_TEST_CASE(ntfs_with_feed_start_end_date_1) {
369369
std::map<std::string, std::string> feed_info_test = {{"feed_start_date", "20150325"},
370370
{"feed_end_date", "20150826"},
371371
{"feed_publisher_name", "Ile de France open data"},
372-
{"feed_publisher_url", "http://www.canaltp.fr"},
372+
{"feed_publisher_url", "http://www.hove.com"},
373373
{"feed_license", "ODBL"},
374374
{"feed_creation_datetime", "20150415T153234"}};
375375
BOOST_CHECK_EQUAL_COLLECTIONS(data.feed_infos.begin(), data.feed_infos.end(), feed_info_test.begin(),
@@ -401,7 +401,7 @@ BOOST_AUTO_TEST_CASE(ntfs_with_feed_start_end_date_2) {
401401
std::map<std::string, std::string> feed_info_test = {{"feed_start_date", "20150325"},
402402
{"feed_end_date", "20150826"},
403403
{"feed_publisher_name", "Ile de France open data"},
404-
{"feed_publisher_url", "http://www.canaltp.fr"},
404+
{"feed_publisher_url", "http://www.hove.com"},
405405
{"feed_license", "ODBL"},
406406
{"feed_creation_datetime", "20150415T153234"}};
407407
BOOST_CHECK_EQUAL_COLLECTIONS(data.feed_infos.begin(), data.feed_infos.end(), feed_info_test.begin(),

‎source/jormungandr/jormungandr/realtime_schedule/tests/realtime_proxy_manager_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def multi_proxy_creation_test():
182182
"timezone": "Europe/Paris",
183183
"service_url": "https://clever_age.com",
184184
"timeout": 1,
185-
"service_args": {"X-Keolis-Api-Version": "1.0", "X-Keolis-Api-Key": "KISIO_2021"},
185+
"service_args": {"X-Keolis-Api-Version": "1.0", "X-Keolis-Api-Key": "HOVE_2021"},
186186
},
187187
},
188188
{
@@ -202,7 +202,7 @@ def mock_get_realtime_proxies_from_db():
202202
'service_url': 'https://clever_age.come',
203203
'timeout': 1,
204204
"timezone": "Europe/Paris",
205-
"service_args": {"X-Keolis-Api-Version": "1.0", "X-Keolis-Api-Key": "KISIO_2021"},
205+
"service_args": {"X-Keolis-Api-Version": "1.0", "X-Keolis-Api-Key": "HOVE_2021"},
206206
},
207207
}
208208
rt_proxies["clever_age_TBC"] = ExternalService(id='clever_age_TBC', json=json)

‎source/jormungandr/jormungandr/scenarios/ridesharing/tests/instant_system_tests.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"arrivalDate": "2017-12-25T08:25:36+01:00",
5757
"duration": 1057,
5858
"distance": 12650,
59-
"url": "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=KISIO&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResultDetail%26networkId%3D33%26journeyId%3D4bcd0b9d-2c9d-42a2-8ffb-4508c952f4fb",
59+
"url": "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=HOVE&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResultDetail%26networkId%3D33%26journeyId%3D4bcd0b9d-2c9d-42a2-8ffb-4508c952f4fb",
6060
"paths": [
6161
{
6262
"mode": "RIDESHARINGAD",
@@ -112,7 +112,7 @@
112112
"arrivalDate": "2017-12-25T08:53:09+01:00",
113113
"duration": 1047,
114114
"distance": 11686,
115-
"url": "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=KISIO&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResultDetail%26networkId%3D33%26journeyId%3D05223c04-834d-4710-905f-aa3796da5837",
115+
"url": "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=HOVE&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResultDetail%26networkId%3D33%26journeyId%3D05223c04-834d-4710-905f-aa3796da5837",
116116
"paths": [
117117
{
118118
"mode": "RIDESHARINGAD",
@@ -163,7 +163,7 @@
163163
]
164164
}
165165
],
166-
"url": "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=KISIO&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResults%26networkId%3D33%26from%3D48.109377%252C-1.682103%26to%3D48.020335%252C-1.743929%26multimodal%3Dfalse%26departureDate%3D2017-12-25T08%253A00%253A00%252B01%253A00"
166+
"url": "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=HOVE&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResults%26networkId%3D33%26from%3D48.109377%252C-1.682103%26to%3D48.020335%252C-1.743929%26multimodal%3Dfalse%26departureDate%3D2017-12-25T08%253A00%253A00%252B01%253A00"
167167
}
168168
169169
"""
@@ -264,7 +264,7 @@ def instant_system_test():
264264
assert ridesharing_journeys[0].metadata.rating_scale_max == 10
265265
assert (
266266
ridesharing_journeys[0].ridesharing_ad
267-
== 'https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=KISIO&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResultDetail%26networkId%3D33%26journeyId%3D4bcd0b9d-2c9d-42a2-8ffb-4508c952f4fb'
267+
== 'https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=HOVE&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResultDetail%26networkId%3D33%26journeyId%3D4bcd0b9d-2c9d-42a2-8ffb-4508c952f4fb'
268268
)
269269

270270
assert ridesharing_journeys[0].pickup_place.addr == "" # address is not provided in mock
@@ -306,7 +306,7 @@ def instant_system_test():
306306
assert ridesharing_journeys[1].shape
307307
assert (
308308
ridesharing_journeys[1].ridesharing_ad
309-
== "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=KISIO&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResultDetail%26networkId%3D33%26journeyId%3D05223c04-834d-4710-905f-aa3796da5837"
309+
== "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=HOVE&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResultDetail%26networkId%3D33%26journeyId%3D05223c04-834d-4710-905f-aa3796da5837"
310310
)
311311

312312
assert ridesharing_journeys[1].pickup_place.addr == ""

‎source/jormungandr/jormungandr/tests/planner_test.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
def check_basic_journeys_request(journeys_req):
3838
assert len(journeys_req.origin) == 1
39-
assert journeys_req.origin[0].place == "Kisio Digital"
39+
assert journeys_req.origin[0].place == "Hove"
4040
assert journeys_req.origin[0].access_duration == 42
4141

4242
assert len(journeys_req.destination) == 1
@@ -76,7 +76,7 @@ def check_graphical_isochrones_request(isochrone_request):
7676

7777

7878
def create_journeys_request_test():
79-
origin = {"Kisio Digital": 42}
79+
origin = {"Hove": 42}
8080
destination = {"Somewhere": 666}
8181
journey_parameters = JourneyParameters()
8282
datetime = str_to_time_stamp("20120614T080000")
@@ -90,7 +90,7 @@ def create_journeys_request_test():
9090

9191

9292
def test_journey_request_current_time():
93-
origin = {"Kisio Digital": 42}
93+
origin = {"Hove": 42}
9494
destination = {"Somewhere": 666}
9595
datetime = str_to_time_stamp("20120614T080000")
9696
journey_parameters = JourneyParameters(current_datetime=123456789)
@@ -100,7 +100,7 @@ def test_journey_request_current_time():
100100

101101

102102
def create_graphical_isochrones_request_test():
103-
origin = {"Kisio Digital": 42}
103+
origin = {"Hove": 42}
104104
destination = {"Somewhere": 666}
105105
graphical_isochrones_parameters = GraphicalIsochronesParameters()
106106
datetime = str_to_time_stamp("20120614T080000")
@@ -114,7 +114,7 @@ def create_graphical_isochrones_request_test():
114114

115115

116116
def test_journey_request_tranfer_penalties():
117-
origin = {"Kisio Digital": 42}
117+
origin = {"Hove": 42}
118118
destination = {"Somewhere": 666}
119119
journey_parameters = JourneyParameters(arrival_transfer_penalty=60, walking_transfer_penalty=240)
120120
datetime = str_to_time_stamp("20120614T080000")

‎source/jormungandr/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
setup(
3636
name='jormungandr',
3737
description='webservice d\'exposition en http de kraken',
38-
author='Kisio Digital',
38+
author='Hove',
3939
author_email='[email protected]',
4040
url='www.navitia.io',
4141
packages=find_packages(),

‎source/jormungandr/tests/here_distributed_routing_tests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def test_feed_publishers(self):
8484
assert feeds[0].get('id') == 'builder'
8585
assert feeds[0].get('name') == 'routing api data'
8686
assert feeds[0].get('license') == 'ODBL'
87-
assert feeds[0].get('url') == 'www.canaltp.fr'
87+
assert feeds[0].get('url') == 'www.hove.com'
8888

8989
assert feeds[1].get('id') == 'here'
9090
assert feeds[1].get('name') == 'here'
@@ -107,7 +107,7 @@ def test_feed_publishers(self):
107107
assert feeds[0].get('id') == 'builder'
108108
assert feeds[0].get('name') == 'routing api data'
109109
assert feeds[0].get('license') == 'ODBL'
110-
assert feeds[0].get('url') == 'www.canaltp.fr'
110+
assert feeds[0].get('url') == 'www.hove.com'
111111

112112
assert feeds[1].get('id') == 'here'
113113
assert feeds[1].get('name') == 'here'

‎source/jormungandr/tests/instant_system_new_default_routing_tests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"arrivalDate": "2017-12-25T08:25:36+01:00",
6868
"duration": 55,
6969
"distance": 224,
70-
"url": "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=KISIO&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResultDetail%26networkId%3D33%26journeyId%3D4bcd0b9d-2c9d-42a2-8ffb-4508c952f4fb",
70+
"url": "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=HOVE&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResultDetail%26networkId%3D33%26journeyId%3D4bcd0b9d-2c9d-42a2-8ffb-4508c952f4fb",
7171
"paths": [
7272
{
7373
"mode": "RIDESHARINGAD",
@@ -94,7 +94,7 @@
9494
],
9595
}
9696
],
97-
"url": "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=KISIO&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResults%26networkId%3D33%26from%3D48.109377%252C-1.682103%26to%3D48.020335%252C-1.743929%26multimodal%3Dfalse%26departureDate%3D2017-12-25T08%253A00%253A00%252B01%253A00",
97+
"url": "https://jky8k.app.goo.gl/?efr=1&apn=com.is.android.rennes&ibi=&isi=&utm_campaign=HOVE&link=https%3A%2F%2Fwww.star.fr%2Fsearch%2F%3FfeatureName%3DsearchResults%26networkId%3D33%26from%3D48.109377%252C-1.682103%26to%3D48.020335%252C-1.743929%26multimodal%3Dfalse%26departureDate%3D2017-12-25T08%253A00%253A00%252B01%253A00",
9898
}
9999

100100

‎source/jormungandr/tests/journey_common_tests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_journeys(self):
7676
assert feed_publisher["id"] == "builder"
7777
assert feed_publisher["name"] == 'routing api data'
7878
assert feed_publisher["license"] == "ODBL"
79-
assert feed_publisher["url"] == "www.canaltp.fr"
79+
assert feed_publisher["url"] == "www.hove.com"
8080

8181
self.check_context(response)
8282

@@ -1511,7 +1511,7 @@ def test_novalidjourney_on_first_call(self):
15111511
feed_publisher = next(f for f in feed_publishers if f['id'] == "base_contributor")
15121512
assert feed_publisher["name"] == "base contributor"
15131513
assert feed_publisher["license"] == "L-contributor"
1514-
assert feed_publisher["url"] == "www.canaltp.fr"
1514+
assert feed_publisher["url"] == "www.hove.com"
15151515

15161516
osm = next(f for f in feed_publishers if f['id'] == "osm")
15171517
assert osm["name"] == "openstreetmap"

‎source/jormungandr/tests/parking_places_provider_tests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ def test_journey_sections_from_to_poi_with_stands(self):
451451
'id': 'builder',
452452
'name': 'routing api data',
453453
'license': 'ODBL',
454-
'url': 'www.canaltp.fr',
454+
'url': 'www.hove.com',
455455
}
456456
# we check that the feedpublisher of the bss provider has been added
457457
bss_provider = next(f for f in feeds if f['name'] == 'mock bss provider')
@@ -489,7 +489,7 @@ def test_journey_sections_with_different_providers(self):
489489
'id': 'builder',
490490
'name': 'routing api data',
491491
'license': 'ODBL',
492-
'url': 'www.canaltp.fr',
492+
'url': 'www.hove.com',
493493
}
494494
# we check that the feedpublisher of the bss providers has been added
495495
bss_provider_1 = next(f for f in feeds if f['name'] == 'provider 1')

‎source/jormungandr/tests/proxy_realtime_cleverage_integration_tests.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838

3939
MOCKED_PROXY_CONF = [
4040
{
41-
"object_id_tag": "Kisio数字",
42-
"id": "Kisio数字",
41+
"object_id_tag": "Hove数字",
42+
"id": "Hove数字",
4343
"class": "jormungandr.realtime_schedule.cleverage.Cleverage",
4444
"args": {
45-
"destination_id_tag": "Kisio数字",
45+
"destination_id_tag": "Hove数字",
4646
"timezone": "UTC",
4747
"service_url": "http://XXXX",
4848
"timeout": 15,
@@ -71,7 +71,7 @@ def test_stop_schedule_with_realtime_only(self):
7171
[
7272
{
7373
"name": "Lianes 5",
74-
"code": "Kisio数字 A",
74+
"code": "Hove数字 A",
7575
"type": "Bus",
7676
"schedules": [
7777
{
@@ -152,7 +152,7 @@ def test_stop_schedule_with_theoric_and_realtime(self):
152152
[
153153
{
154154
"name": "Lianes 5",
155-
"code": "Kisio数字 A",
155+
"code": "Hove数字 A",
156156
"type": "Bus",
157157
"schedules": [
158158
{

‎source/jormungandr/tests/proxy_realtime_sirilite_integration_tests.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838

3939
MOCKED_PROXY_CONF = [
4040
{
41-
"object_id_tag": "Kisio数字",
42-
"id": "Kisio数字",
41+
"object_id_tag": "Hove数字",
42+
"id": "Hove数字",
4343
"class": "jormungandr.realtime_schedule.siri_lite.SiriLite",
4444
"args": {
45-
"destination_id_tag": "Kisio数字",
45+
"destination_id_tag": "Hove数字",
4646
"timezone": "Europe/Paris",
4747
"service_url": "http://siri.com?apikey=bob",
4848
"timeout": 15,

‎source/jormungandr/tests/proxy_realtime_synthese_integration_tests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838

3939
MOCKED_PROXY_CONF = [
4040
{
41-
"object_id_tag": "Kisio数字",
42-
"id": "Kisio数字",
41+
"object_id_tag": "Hove数字",
42+
"id": "Hove数字",
4343
"class": "jormungandr.realtime_schedule.synthese.Synthese",
4444
"args": {"timezone": "UTC", "service_url": "http://bob.com", "timeout": 15},
4545
}

0 commit comments

Comments
 (0)