friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #553 from annando/osm-cache 

Results are now cached, format limits to other networks are respected
pull/555/head
Tobias Diekershoff 2018-03-20 08:48:02 +01:00 committed by GitHub
parent ecd62d5927 987b53c6e6
commit 3b0decec7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 85 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
openstreetmap/openstreetmap.php
View File

@ -12,13 +12,20 @@ use Friendica\Core\Addon;
use Friendica\Core\Cache; use Friendica\Core\Cache;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Util\Network; use Friendica\Util\Network;
const OSM_TMS = 'http://www.openstreetmap.org';
const OSM_NOM = 'http://nominatim.openstreetmap.org/search.php';
const OSM_ZOOM = 16;
const OSM_MARKER = 0;
function openstreetmap_install() function openstreetmap_install()
{ {
Addon::registerHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location'); Addon::registerHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
Addon::registerHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map'); Addon::registerHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
Addon::registerHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map'); Addon::registerHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
Addon::registerHook('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
Addon::registerHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader'); Addon::registerHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
logger("installed openstreetmap"); logger("installed openstreetmap");
@ -29,6 +36,7 @@ function openstreetmap_uninstall()
Addon::unregisterHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location'); Addon::unregisterHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
Addon::unregisterHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map'); Addon::unregisterHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
Addon::unregisterHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map'); Addon::unregisterHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
Addon::unregisterHook('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
Addon::unregisterHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader'); Addon::unregisterHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
logger("removed openstreetmap"); logger("removed openstreetmap");
@ -49,9 +57,9 @@ function openstreetmap_alterheader($a, &$navHtml)
* @param mixed $a * @param mixed $a
* @param array& $item * @param array& $item
*/ */
function openstreetmap_location($a, &$item) { function openstreetmap_location($a, &$item)
{
if(! (strlen($item['location']) || strlen($item['coord']))) { if (!(strlen($item['location']) || strlen($item['coord']))) {
return; return;
} }
@ -63,34 +71,25 @@ function openstreetmap_location($a, &$item) {
* ?mlat=lat&mlon=lon for markers. * ?mlat=lat&mlon=lon for markers.
*/ */
$tmsserver = Config::get('openstreetmap', 'tmsserver'); $tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
if(! $tmsserver) { $nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
$tmsserver = 'http://www.openstreetmap.org'; $zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
} $marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
$nomserver = Config::get('openstreetmap', 'nomserver'); // This is needed since we stored an empty string in the config in previous versions
if(! $nomserver) { if (empty($nomserver)) {
$nomserver = 'http://nominatim.openstreetmap.org/search.php'; $nomserver = OSM_NOM;
}
$zoom = Config::get('openstreetmap', 'zoom');
if(! $zoom) {
$zoom = 16;
}
$marker = Config::get('openstreetmap', 'marker');
if(! $marker) {
$marker = 0;
} }
if ($item['coord'] != "") { if ($item['coord'] != "") {
$coords = explode(' ', $item['coord']); $coords = explode(' ', $item['coord']);
if(count($coords) > 1) { if (count($coords) > 1) {
$lat = urlencode(round($coords[0], 5)); $lat = urlencode(round($coords[0], 5));
$lon = urlencode(round($coords[1], 5)); $lon = urlencode(round($coords[1], 5));
$target = $tmsserver; $target = $tmsserver;
if($marker > 0) if ($marker > 0) {
$target .= '?mlat='.$lat.'&mlon='.$lon; $target .= '?mlat=' . $lat . '&mlon=' . $lon;
}
$target .= '#map='.intval($zoom).'/'.$lat.'/'.$lon; $target .= '#map='.intval($zoom).'/'.$lat.'/'.$lon;
} }
} }
@ -108,46 +107,53 @@ function openstreetmap_location($a, &$item) {
$item['html'] = '<a target="map" title="'.$title.'" href= "'.$target.'">'.$title.'</a>'; $item['html'] = '<a target="map" title="'.$title.'" href= "'.$target.'">'.$title.'</a>';
} }
function openstreetmap_get_coordinates($a, &$b)
{
$nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
// This is needed since we stored an empty string in the config in previous versions
if (empty($nomserver)) {
$nomserver = OSM_NOM;
}
$args = '?q=' . urlencode($b['location']) . '&format=json';
$cachekey = "openstreetmap:" . $b['location'];
$j = Cache::get($cachekey);
if (is_null($j)) {
$x = Network::curl($nomserver . $args);
if ($x['success']) {
$j = json_decode($x['body'], true);
Cache::set($cachekey, $j, CACHE_MONTH);
}
}
if (!empty($j[0]['lat']) && !empty($j[0]['lon'])) {
$b['lat'] = $j[0]['lat'];
$b['lon'] = $j[0]['lon'];
}
}
function openstreetmap_generate_named_map(&$a, &$b) function openstreetmap_generate_named_map(&$a, &$b)
{ {
$nomserver = Config::get('openstreetmap', 'nomserver'); openstreetmap_get_coordinates($a, $b);
if(! $nomserver)
$nomserver = 'http://nominatim.openstreetmap.org/search.php';
$args = '?q=' . urlencode($b['location']) . '&format=json';
$x = Network::curl($nomserver . $args); if (!empty($b['lat']) && !empty($b['lon'])) {
if($x['success']) { openstreetmap_generate_map($a, $b);
$j = json_decode($x['body'],true);
if($j && is_array($j) && $j[0]['lat'] && $j[0]['lon']) {
$arr = ['lat' => $j[0]['lat'],'lon' => $j[0]['lon'],'location' => $b['location'], 'html' => ''];
openstreetmap_generate_map($a,$arr);
$b['html'] = $arr['html'];
}
} }
} }
function openstreetmap_generate_map(&$a, &$b) function openstreetmap_generate_map(&$a, &$b)
{ {
$tmsserver = Config::get('openstreetmap', 'tmsserver'); $tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
if(! $tmsserver) {
$tmsserver = 'http://www.openstreetmap.org'; if (strpos(z_root(), 'https:') !== false) {
}
if(strpos(z_root(),'https:') !== false) {
$tmsserver = str_replace('http:','https:',$tmsserver); $tmsserver = str_replace('http:','https:',$tmsserver);
} }
$zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
$zoom = Config::get('openstreetmap', 'zoom'); $marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
if (!$zoom) {
$zoom = 16;
}
$marker = Config::get('openstreetmap', 'marker');
if (!$marker) {
$marker = 0;
}
$lat = $b['lat']; // round($b['lat'], 5); $lat = $b['lat']; // round($b['lat'], 5);
$lon = $b['lon']; // round($b['lon'], 5); $lon = $b['lon']; // round($b['lon'], 5);
@ -155,10 +161,21 @@ function openstreetmap_generate_map(&$a, &$b)
logger('lat: ' . $lat, LOGGER_DATA); logger('lat: ' . $lat, LOGGER_DATA);
logger('lon: ' . $lon, LOGGER_DATA); logger('lon: ' . $lon, LOGGER_DATA);
$cardlink = '<a href="' . $tmsserver;
$b['html'] = '<iframe style="width:100%; height:300px; border:1px solid #ccc" src="' . $tmsserver . '/export/embed.html?bbox=' . ($lon - 0.01) . '%2C' . ($lat - 0.01) . '%2C' . ($lon + 0.01) . '%2C' . ($lat + 0.01) ; if ($marker > 0) {
$cardlink .= '?mlat=' . $lat . '&mlon=' . $lon;
}
$b['html'] .= '&amp;layer=mapnik&amp;marker=' . $lat . '%2C' . $lon . '" style="border: 1px solid black"></iframe><br/><small><a href="' . $tmsserver . '/?mlat=' . $lat . '&mlon=' . $lon . '#map=16/' . $lat . '/' . $lon . '">' . (($b['location']) ? escape_tags($b['location']) : L10n::t('View Larger')) . '</a></small>'; $cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ? escape_tags($b['location']) : L10n::t('View Larger')) . '</a>';
if (empty($b['mode'])) {
$b['html'] = '<iframe style="width:100%; height:300px; border:1px solid #ccc" src="' . $tmsserver .
'/export/embed.html?bbox=' . ($lon - 0.01) . '%2C' . ($lat - 0.01) . '%2C' . ($lon + 0.01) . '%2C' . ($lat + 0.01) .
'&amp;layer=mapnik&amp;marker=' . $lat . '%2C' . $lon . '" style="border: 1px solid black"></iframe>' .
'<br/><small>' . $cardlink . '</small>';
} else {
$b['html'] .= '<br/>' . $cardlink;
}
logger('generate_map: ' . $b['html'], LOGGER_DATA); logger('generate_map: ' . $b['html'], LOGGER_DATA);
} }
@ -166,21 +183,14 @@ function openstreetmap_generate_map(&$a, &$b)
function openstreetmap_addon_admin(&$a, &$o) function openstreetmap_addon_admin(&$a, &$o)
{ {
$t = get_markup_template("admin.tpl", "addon/openstreetmap/"); $t = get_markup_template("admin.tpl", "addon/openstreetmap/");
$tmsserver = Config::get('openstreetmap', 'tmsserver'); $tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
if (!$tmsserver) { $nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
$tmsserver = 'http://www.openstreetmap.org'; $zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
} $marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
$nomserver = Config::get('openstreetmap', 'nomserver');
if (!$nomserver) { // This is needed since we stored an empty string in the config in previous versions
$nomserver = 'http://nominatim.openstreetmap.org/search.php'; if (empty($nomserver)) {
} $nomserver = OSM_NOM;
$zoom = Config::get('openstreetmap', 'zoom');
if (!$zoom) {
$zoom = 16;
}
$marker = Config::get('openstreetmap', 'marker');
if (!$marker) {
$marker = 0;
} }
$o = replace_macros($t, [ $o = replace_macros($t, [
@ -194,13 +204,15 @@ function openstreetmap_addon_admin(&$a, &$o)
function openstreetmap_addon_admin_post(&$a) function openstreetmap_addon_admin_post(&$a)
{ {
$urltms = ((x($_POST, 'tmsserver')) ? notags(trim($_POST['tmsserver'])) : ''); $urltms = defaults($_POST, 'tmsserver', OSM_TMS);
$urlnom = ((x($_POST, 'nomserver')) ? notags(trim($_POST['nomserver'])) : ''); $urlnom = defaults($_POST, 'nomserver', OSM_NOM);
$zoom = ((x($_POST, 'zoom')) ? intval(trim($_POST['zoom'])) : '16'); $zoom = defaults($_POST, 'zoom', OSM_ZOOM);
$marker = ((x($_POST, 'marker')) ? intval(trim($_POST['marker'])) : '0'); $marker = defaults($_POST, 'marker', OSM_MARKER);
Config::set('openstreetmap', 'tmsserver', $urltms); Config::set('openstreetmap', 'tmsserver', $urltms);
Config::set('openstreetmap', 'nomserver', $urlnom); Config::set('openstreetmap', 'nomserver', $urlnom);
Config::set('openstreetmap', 'zoom', $zoom); Config::set('openstreetmap', 'zoom', $zoom);
Config::set('openstreetmap', 'marker', $marker); Config::set('openstreetmap', 'marker', $marker);
info(L10n::t('Settings updated.') . EOL); info(L10n::t('Settings updated.') . EOL);
} }

2
openstreetmap/templates/admin.tpl
View File

@ -1,5 +1,5 @@
{{include file="field_input.tpl" field=$tmsserver}} {{include file="field_input.tpl" field=$tmsserver}}
<!-- {{include file="field_input.tpl" field=$nomserver}}--> {{include file="field_input.tpl" field=$nomserver}}
{{include file="field_input.tpl" field=$zoom}} {{include file="field_input.tpl" field=$zoom}}
{{include file="field_checkbox.tpl" field=$marker}} {{include file="field_checkbox.tpl" field=$marker}}
<div class="submit"><input type="submit" name="openstreetmap" value="{{$submit}}"></div> <div class="submit"><input type="submit" name="openstreetmap" value="{{$submit}}"></div>