From 93c2de853214d79b20bfb3835202eb99012b3447 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 26 Jun 2021 23:17:50 +0200 Subject: [PATCH] Remove Mapzen --- check_process | 1 - conf/config.env | 2 +- manifest.json | 17 ++++------------- scripts/install | 2 -- scripts/upgrade | 1 - 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/check_process b/check_process index 366d1ab..72f2d6b 100644 --- a/check_process +++ b/check_process @@ -5,7 +5,6 @@ is_public=1 ors_token="test" mapbox_token="test" - mapzen_token="test" maxmind_user_id="" maxmind_license_key="" user_agent="FacilMap (https://facilmap.org/, webmaster@example.org)" diff --git a/conf/config.env b/conf/config.env index 77eed0e..7ed685d 100644 --- a/conf/config.env +++ b/conf/config.env @@ -24,7 +24,7 @@ MAPBOX_TOKEN=__MAPBOX_TOKEN__ # MapZen is used for getting elevation information # Get an API key on https://mapzen.com/developers/sign_up -MAPZEN_TOKEN=__MAPZEN_TOKEN__ +#MAPZEN_TOKEN=__MAPZEN_TOKEN__ # Maxmind configuration. If specified, the maxmind GeoLite2 database will be downloaded # for Geo IP lookup (to show the initial map state) and kept in memory. diff --git a/manifest.json b/manifest.json index b71f0c6..0feacd2 100644 --- a/manifest.json +++ b/manifest.json @@ -60,8 +60,8 @@ "name": "ors_token", "type": "string", "help": { - "en": "OpenRouteService is used for calculating routes with advanced settings. You can get a token on https://go.openrouteservice.org/", - "fr": "OpenRouteService est utilisé pour calculer les routes complexes. Vous pouvez obtenir un token ici: https://go.openrouteservice.org/" + "en": "OpenRouteService is used for calculating routes with advanced settings. You can get a token on https://openrouteservice.org/", + "fr": "OpenRouteService est utilisé pour calculer les routes complexes. Vous pouvez obtenir un token ici: https://openrouteservice.org/" } }, { @@ -72,15 +72,6 @@ "fr": "MapBox est utilisé pour calcluer les routes simples. Vous pouvez obtenir une clé API ici : https://www.mapbox.com/signup/" } }, - { - "name": "mapzen_token", - "type": "string", - "help": { - "en": "MapZen is used for getting elevation information. You can get an API key on https://mapzen.com/developers/sign_up", - "fr": "MapZen est utilisé pour obtenir les informations d'élévation. Vous pouvez obtenir une clé API ici : https://mapzen.com/developers/sign_up" - }, - "optional": true - }, { "name": "maxmind_user_id", "type": "string", @@ -103,8 +94,8 @@ "name": "user_agent", "type": "string", "help": { - "en": "HTTP requests made by the backend will send this User-Agent header. Fill here the url facilmap will have and your e-mail address.", - "fr": "Les requêtes faites par le serveur enveront cette entête User-agent. Remplissez ici l'url de votre instance facilmap et votre adresse email." + "en": "HTTP requests made by the backend will send this User-Agent header. Fill here the URL facilmap will have and your e-mail address.", + "fr": "Les requêtes faites par le serveur enveront cette entête User-agent. Remplissez ici l'URL de votre instance facilmap et votre adresse email." }, "example": "FacilMap (https://facilmap.org/, webmaster@example.org)" } diff --git a/scripts/install b/scripts/install index 2eff184..08201b1 100755 --- a/scripts/install +++ b/scripts/install @@ -33,7 +33,6 @@ user_agent="$YNH_APP_ARG_USER_AGENT" # APIS TOKENS ors_token="$YNH_APP_ARG_ORS_TOKEN" mapbox_token="$YNH_APP_ARG_MAPBOX_TOKEN" -mapzen_token="$YNH_APP_ARG_MAPZEN_TOKEN" maxmind_user_id="$YNH_APP_ARG_MAXMIND_USER_ID" maxmind_license_key="$YNH_APP_ARG_MAXMIND_LICENSE_KEY" @@ -60,7 +59,6 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=user_agent --value=$user_agent ynh_app_setting_set --app=$app --key=ors_token --value=$ors_token ynh_app_setting_set --app=$app --key=mapbox_token --value=$mapbox_token -ynh_app_setting_set --app=$app --key=mapzen_token --value=$mapzen_token ynh_app_setting_set --app=$app --key=maxmind_user_id --value=$maxmind_user_id ynh_app_setting_set --app=$app --key=maxmind_license_key --value=$maxmind_license_key diff --git a/scripts/upgrade b/scripts/upgrade index f152123..2e29f94 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -28,7 +28,6 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) user_agent=$(ynh_app_setting_get --app=$app --key=user_agent) ors_token=$(ynh_app_setting_get --app=$app --key=ors_token) mapbox_token=$(ynh_app_setting_get --app=$app --key=mapbox_token) -mapzen_token=$(ynh_app_setting_get --app=$app --key=mapzen_token) maxmind_user_id=$(ynh_app_setting_get --app=$app --key=maxmind_user_id) maxmind_license_key=$(ynh_app_setting_get --app=$app --key=maxmind_license_key)