[openstreetmap] Update config file style/name

pull/778/head
Hypolite Petovan 2018-11-25 02:14:54 -05:00
parent 0b8e0fa8c9
commit 524937a830
4 changed files with 48 additions and 39 deletions

View File

@ -1,10 +1,12 @@
____ OpenStreetMap Addon ____ OpenStreetMap Addon
by Mike Macgirvin ===
Klaus Weidenbach
by Mike Macgirvin
Klaus Weidenbach
This addon allows you to use OpenStreetMap for displaying locations. This addon allows you to use OpenStreetMap for displaying locations.
___ Requirements ___ ## Requirements
To use this addon you need a tile Server that provides the maps. To use this addon you need a tile Server that provides the maps.
OpenStreetMap data is free for everyone to use. Their tile servers are not. OpenStreetMap data is free for everyone to use. Their tile servers are not.
@ -14,7 +16,7 @@ You can run your own tile server or choose one from their list of public
tile servers: http://wiki.openstreetmap.org/wiki/TMS tile servers: http://wiki.openstreetmap.org/wiki/TMS
Support the OpenStreetMap community and share the load. Support the OpenStreetMap community and share the load.
___ Configuration ___ ## Configuration
If you for any reason prefer to use a configuration file instead If you for any reason prefer to use a configuration file instead
of the admin panels, please refer to the Alternative Configuration below. of the admin panels, please refer to the Alternative Configuration below.
@ -30,21 +32,28 @@ level on the map in the Default Zoom box. 1 will show the whole world and 18 is
zoom level available. zoom level available.
___ Alternative Configuration ___ ## Alternative Configuration
Open the config/local.ini.php file and add "openstreetmap" to the list of activated Open the `config/local.config.php` file and add "openstreetmap" to the list of activated addons.
addons.
[system] 'system' => [
addon = ...,openstreetmap ...
'addon' => '...,openstreetmap'
...
]
You can change two configuration variables for the addon in the config/addon.ini.php file: You can set configuration variables for the addon in the `config/addon.config.php` file:
[openstreetmap] 'openstreetmap' => [
tmsserver = https://www.openstreetmap.org 'tmsserver' => 'https://www.openstreetmap.org',
zoom = 18 'nomserver' => 'https://nominatim.openstreetmap.org/search.php',
'zoom' => 16,
'marker' => 0,
],
The *tmsserver* points to the tile server you want to use. Use the full URL, The *tmsserver* points to the tile server you want to use. Use the full URL,
with protocol (http/s) and trailing slash. You can configure the default zoom with protocol (http/s) and trailing slash. You can configure the default zoom
level on the map with *zoom*. 1 will show the whole world and 18 is the highest level on the map with *zoom*. 1 will show the whole world and 18 is the highest
zoom level available. zoom level available.
Please see provided `config/openstreetmap.php` file for explanation on the additional configuration keys.

View File

@ -0,0 +1,23 @@
<?php
// Warning: Don't change this file! It only holds the default config values for this addon.
// Instead overwrite these config values in config/addon.config.php in your Friendica directory
return [
'openstreetmap' => [
// tmsserver (String)
// This points to the tile server you want to use. Use the full URL, with protocol (http/s) and trailing slash.
'tmsserver' => 'https://www.openstreetmap.org',
// nomserver (String)
'nomserver' => 'https://nominatim.openstreetmap.org/search.php',
// zoom (Integer)
// The default zoom level on the map.
// 1 will show the whole world and 18 is the highest zoom level available.
'zoom' => 16,
// marker (Integer)
'marker' => 0,
],
];

View File

@ -1,23 +0,0 @@
<?php return <<<INI
; Warning: Don't change this file! It only holds the default config values for this addon.
; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
[openstreetmap]
; tmsserver (String)
; This points to the tile server you want to use. Use the full URL, with protocol (http/s) and trailing slash.
tmsserver = https://www.openstreetmap.org
; nomserver (String)
nomserver = https://nominatim.openstreetmap.org/search.php
; zoom (Integer)
; The default zoom level on the map.
; 1 will show the whole world and 18 is the highest zoom level available.
zoom = 16
; marker (Integer)
marker = 0
INI;
//Keep this line

View File

@ -49,7 +49,7 @@ function openstreetmap_uninstall()
function openstreetmap_load_config(\Friendica\App $a) function openstreetmap_load_config(\Friendica\App $a)
{ {
$a->loadConfigFile(__DIR__. '/config/openstreetmap.ini.php'); $a->loadConfigFile(__DIR__ . '/config/openstreetmap.config.php');
} }
function openstreetmap_alterheader($a, &$navHtml) function openstreetmap_alterheader($a, &$navHtml)