[openstreetmaps] Add addon config

- Update mentions of .htconfig.php

diff --git a/openstreetmap/README b/openstreetmap/README
index 93f231c64c949114c11caf88751b7525a9a68914..86ec4318132e4a326accc2efdfbf380e4b644dad 100644 (file)
--- a/openstreetmap/README
+++ b/openstreetmap/README
@@ -16,10 +16,10 @@ Support the OpenStreetMap community and share the load.
 
 ___ Configuration ___
 
-If you for any reason prefer to use a configuration file instead 
-of the admin panels, please refer to the Alternative Configuration below. 
+If you for any reason prefer to use a configuration file instead
+of the admin panels, please refer to the Alternative Configuration below.
 
-Activate the addon from your admin panel.  
+Activate the addon from your admin panel.
 
 You can now add a Tile Server and default zoom level in the addon settings
 page of your admin panel.
@@ -32,17 +32,19 @@ zoom level available.
 
 ___ Alternative Configuration ___
 
-Open the .htconfig.php file and add "openstreetmap" to the list of activated
+Open the config/local.ini.php file and add "openstreetmap" to the list of activated
 addons.
 
-    $a->config['system']['addon'] = "openstreetmap, ..."
+    [system]
+       addon = ...,openstreetmap
 
-You have to add two configuration variables for the addon:
+You can change two configuration variables for the addon:
 
-    $a->config['openstreetmap']['tmsserver'] = 'http://www.openstreetmap.org/';
-    $a->config['openstreetmap']['zoom'] = '18';
+       [openstreetmap]
+       tmsserver = https://www.openstreetmap.org
+    zoom = 18
 
 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 
-level on the map with *zoom*. 1 will show the whole world and 18 is the highest 
+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
 zoom level available.
\ No newline at end of file

diff --git a/openstreetmap/config/openstreetmap.ini.php b/openstreetmap/config/openstreetmap.ini.php
new file mode 100644 (file)
index 0000000..38df95b
--- /dev/null
+++ b/openstreetmap/config/openstreetmap.ini.php
@@ -0,0 +1,23 @@
+<?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/local.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
\ No newline at end of file

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 0fe2a2fdba1dd9fb9792649f67d829612c41cf47..26d51e1a5ebbae398bf1b858ba55df2b6a0d97e2 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -15,13 +15,14 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Util\Network;
 
-const OSM_TMS = 'http://www.openstreetmap.org';
-const OSM_NOM = 'http://nominatim.openstreetmap.org/search.php';
+const OSM_TMS = 'https://www.openstreetmap.org';
+const OSM_NOM = 'https://nominatim.openstreetmap.org/search.php';
 const OSM_ZOOM = 16;
 const OSM_MARKER = 0;
 
 function openstreetmap_install()
 {
+       Addon::registerHook('load_config',     'addon/openstreetmap/openstreetmap.php', 'openstreetmap_load_config');
        Addon::registerHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
        Addon::registerHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
        Addon::registerHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
@@ -33,6 +34,7 @@ function openstreetmap_install()
 
 function openstreetmap_uninstall()
 {
+       Addon::unregisterHook('load_config',     'addon/openstreetmap/openstreetmap.php', 'openstreetmap_load_config');
        Addon::unregisterHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
        Addon::unregisterHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
        Addon::unregisterHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
@@ -42,6 +44,11 @@ function openstreetmap_uninstall()
        logger("removed openstreetmap");
 }
 
+function openstreetmap_load_config(\Friendica\App $a)
+{
+       $a->loadConfigFile(__DIR__. '/config/openstreetmap.ini.php');
+}
+
 function openstreetmap_alterheader($a, &$navHtml)
 {
        $addScriptTag = '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n";