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.

Sign up for GitHub

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 TaxHub URL with GeoNature 2.15 #48

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Update TaxHub URL with GeoNature 2.15 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
94c08ee
Update taxhub_url in DataSyncSettingsJsonReader.kt
camillemonchicourt Dec 11, 2024
43f2d0f
Update taxhub_url in README.md
camillemonchicourt Dec 11, 2024
d4e925f
Update taxhub_url in t_mobile_app.json
camillemonchicourt Dec 11, 2024
775b3f5
Update taxhub_url in t_mobile_apps.json
camillemonchicourt Dec 11, 2024
94cd944
Update taxhub_url in AppPackageJsonReaderTest.kt
camillemonchicourt Dec 11, 2024
66e3abd
Update taxhub_url in settings_datasync.json
camillemonchicourt Dec 11, 2024
032b80a
Update taxhub_url in settings_sync.json
camillemonchicourt Dec 11, 2024
211085f
Update taxhub_url in settings_datasync_legacy.json
camillemonchicourt Dec 11, 2024
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
4 changes: 2 additions & 2 deletions datasync/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Module settings can be loaded from JSON as follow:
{
"sync": {
"geonature_url": "https://demo.geonature/geonature",
"taxhub_url": "https://demo.geonature/taxhub",
"taxhub_url": "https://demo.geonature.fr/geonature/api/taxhub",
"gn_application_id": 3,
"observers_list_id": 1,
"taxa_list_id": 100,
Expand All @@ -59,7 +59,7 @@ or
```json
{
"geonature_url": "https://demo.geonature/geonature",
"taxhub_url": "https://demo.geonature/taxhub",
"taxhub_url": "https://demo.geonature.fr/geonature/api/taxhub",
"gn_application_id": 3,
"observers_list_id": 1,
"taxa_list_id": 100,
Expand Down
6 changes: 3 additions & 3 deletions datasync/src/main/java/fr/geonature/datasync/settings/io/DataSyncSettingsJsonReader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import java.io.StringReader
* ```json
* {
* "geonature_url": "https://demo.geonature/geonature",
* "taxhub_url": "https://demo.geonature/taxhub",
* "taxhub_url": "https://demo.geonature.fr/geonature/api/taxhub",
* "gn_application_id": 3,
* "observers_list_id": 1,
* "taxa_list_id": 100,
Expand All @@ -33,7 +33,7 @@ import java.io.StringReader
* {
* "sync": {
* "geonature_url": "https://demo.geonature/geonature",
* "taxhub_url": "https://demo.geonature/taxhub",
* "taxhub_url": "https://demo.geonature.fr/geonature/api/taxhub",
* "gn_application_id": 3,
* "observers_list_id": 1,
* "taxa_list_id": 100,
Expand Down Expand Up @@ -169,4 +169,4 @@ class DataSyncSettingsJsonReader(private val fromExistingDataSyncSettings: DataS
)
}
.getOrThrow()
}
}
4 changes: 2 additions & 2 deletions datasync/src/test/java/fr/geonature/datasync/packageinfo/io/AppPackageJsonReaderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class AppPackageJsonReaderTest {
"area_observation_duration" to 365.0,
"sync" to mapOf(
"geonature_url" to "https://demo.geonature.fr/geonature",
"taxhub_url" to "https://demo.geonature.fr/taxhub",
"taxhub_url" to "https://demo.geonature.fr/geonature/api/taxhub",
"gn_application_id" to 1.0,
"observers_list_id" to 1.0,
"taxa_list_id" to 100.0,
Expand Down Expand Up @@ -195,4 +195,4 @@ class AppPackageJsonReaderTest {

assertTrue(appPackages.isEmpty())
}
}
}
4 changes: 2 additions & 2 deletions datasync/src/test/resources/fixtures/settings_datasync.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"geonature_url": "https://demo.geonature.fr/geonature",
"taxhub_url": "https://demo.geonature.fr/taxhub",
"taxhub_url": "https://demo.geonature.fr/geonature/api/taxhub",
"gn_application_id": 3,
"observers_list_id": 1,
"taxa_list_id": 100,
"code_area_type": "M10",
"page_size": 1000,
"sync_periodicity_data_essential": "20m",
"sync_periodicity_data": "30m"
}
}
4 changes: 2 additions & 2 deletions datasync/src/test/resources/fixtures/settings_datasync_legacy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"geonature_url": "https://demo.geonature.fr/geonature",
"taxhub_url": "https://demo.geonature.fr/taxhub",
"taxhub_url": "https://demo.geonature.fr/geonature/api/taxhub",
"uh_application_id": 3,
"observers_list_id": 1,
"taxa_list_id": 100,
"code_area_type": "M10",
"page_size": 1000,
"sync_periodicity_data_essential": "20m",
"sync_periodicity_data": "30m"
}
}
4 changes: 2 additions & 2 deletions datasync/src/test/resources/fixtures/settings_sync.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sync": {
"geonature_url": "https://demo.geonature.fr/geonature",
"taxhub_url": "https://demo.geonature.fr/taxhub",
"taxhub_url": "https://demo.geonature.fr/geonature/api/taxhub",
"gn_application_id": 3,
"observers_list_id": 1,
"taxa_list_id": 100,
Expand All @@ -10,4 +10,4 @@
"sync_periodicity_data_essential": "20m",
"sync_periodicity_data": "30m"
}
}
}
2 changes: 1 addition & 1 deletion datasync/src/test/resources/fixtures/t_mobile_app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"area_observation_duration": 365,
"sync": {
"geonature_url": "https://demo.geonature.fr/geonature",
"taxhub_url": "https://demo.geonature.fr/taxhub",
"taxhub_url": "https://demo.geonature.fr/geonature/api/taxhub",
"gn_application_id": 1,
"observers_list_id": 1,
"taxa_list_id": 100,
Expand Down
4 changes: 2 additions & 2 deletions datasync/src/test/resources/fixtures/t_mobile_apps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"area_observation_duration": 365,
"sync": {
"geonature_url": "https://demo.geonature.fr/geonature",
"taxhub_url": "https://demo.geonature.fr/taxhub",
"taxhub_url": "https://demo.geonature.fr/geonature/api/taxhub",
"gn_application_id": 1,
"observers_list_id": 1,
"taxa_list_id": 100,
Expand Down Expand Up @@ -63,4 +63,4 @@
}
}
}
]
]