OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

okapi r869: protection areas

Browse Source
This commit is contained in:
following
2013-07-10 19:15:08 +02:00
parent 25d8005cd6
commit 69fbfab88f
8 changed files with 159 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/okapi/core.php
View File

@ -814,7 +814,7 @@ class Okapi
{
public static $data_store;
public static $server;
public static $revision = 863; # This gets replaced in automatically deployed packages
public static $revision = 869; # This gets replaced in automatically deployed packages
private static $okapi_vars = null;
/** Get a variable stored in okapi_vars. If variable not found, return $default. */

BIN
htdocs/okapi/locale/de_DE/LC_MESSAGES/okapi_messages.mo
View File

Binary file not shown.

43
htdocs/okapi/locale/de_DE/LC_MESSAGES/okapi_messages.po
View File

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OKAPI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-03 00:54+0100\n"
"PO-Revision-Date: 2013-05-03 00:58+0100\n"
"POT-Creation-Date: 2013-07-10 12:30+0100\n"
"PO-Revision-Date: 2013-07-10 12:31+0100\n"
"Last-Translator: following <following@online.de>\n"
"Language-Team: following <following@online.de>\n"
"Language: German\n"
@ -19,11 +19,15 @@ msgstr ""
"X-Poedit-SearchPath-1: D:\\PRIV\\Projekty\\EclipseWorkspace\\opencaching-api"
"\\okapi\n"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:911
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:956
msgid "Stage"
msgstr "Station"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1139
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1108
msgid "National Park / Landscape"
msgstr "Nationalpark / Landschaft"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1260
#, php-format
msgid ""
"This <a href='%s'>geocache</a> description comes from the <a href='%s'>%s</"
@ -31,7 +35,7 @@ msgid ""
msgstr ""
"Diese <a href='%s'>Cache</a>-Beschreibung stammt von <a href='%s'>%s</a>."
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1151
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1272
#, php-format
msgid ""
"&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, <a href='http://"
@ -42,7 +46,7 @@ msgstr ""
"creativecommons.org/licenses/by-nc-nd/3.0/de/'>CC-BY-NC-ND</a>, Stand: %s; "
"alle Logeinträge &copy; jeweiliger Autor"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1162
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/geocaches.php:1283
#, php-format
msgid ""
"&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, <a href='http://"
@ -54,56 +58,61 @@ msgstr ""
"Logeinträge &copy; jeweiliger Autor"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:31
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:48
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:60
msgid "hidden by"
msgstr "versteckt von"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:50
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:62
#, php-format
msgid "%d recommendation"
msgid_plural "%d recommendations"
msgstr[0] "%d Empfehlung"
msgstr[1] "%d Empfehlungen"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:51
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:63
#, php-format
msgid "found %d time"
msgid_plural "found %d times"
msgstr[0] "%d mal gefunden"
msgstr[1] "%d mal gefunden"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:54
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:66
#, php-format
msgid "%d trackable"
msgid_plural "%d trackables"
msgstr[0] "%d Geokret"
msgstr[1] "%d Geokrets"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:58
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:70
msgid "Personal notes"
msgstr "Persönliche Notizen"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:62
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:74
msgid "Attributes"
msgstr "Attribute"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:66
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:78
msgid "Trackables"
msgstr "Geokrets"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:76
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:92
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:88
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:104
msgid "Images"
msgstr "Bilder"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:99
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:111
msgid "Spoilers"
msgstr "Spoiler"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:108
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:120
msgid "Image descriptions"
msgstr "Bildbeschreibungen"
#: c:\source\oc\server-3.0\htdocs\okapi/services/caches/formatters/gpxfile.tpl.php:128
msgid "The cache probably is located in the following protection areas:"
msgstr ""
"Der Geocache befindet sich wahrscheinlich in den folgenden Schutzgebieten:"
#: c:\source\oc\server-3.0\htdocs\okapi/services/logs/submit.php:70
msgid ""
"You are trying to publish a log entry with a date in future. Cache log "

13
htdocs/okapi/services/caches/formatters/gpx.php
View File

@ -111,6 +111,16 @@ class WebService
}
}
$protection_areas = $request->get_parameter('protection_areas');
if (!$protection_areas || $protection_areas == 'desc:auto')
{
if (Settings::get('OC_BRANCH') == 'oc.de') $protection_areas = 'desc:text';
else $protection_areas = 'none';
}
if (!in_array($protection_areas, array('none', 'desc:text')))
throw new InvalidParam('protection_areas',"'$protection_areas'");
$vars['protection_areas'] = $protection_areas;
$tmp = $request->get_parameter('trackables');
if (!$tmp) $tmp = 'none';
if (!in_array($tmp, array('none', 'desc:list', 'desc:count')))
@ -131,7 +141,8 @@ class WebService
# Which fields of the services/caches/geocaches method do we need?
$fields = 'code|name|location|date_created|url|type|status|size|size2|oxsize'.
'|difficulty|terrain|description|hint2|rating|owner|url|internal_id';
'|difficulty|terrain|description|hint2|rating|owner|url|internal_id'.
'|protection_areas';
if ($vars['images'] != 'none')
$fields .= "|images";
if (count($vars['attrs']) > 0)

15
htdocs/okapi/services/caches/formatters/gpx.xml
View File

@ -102,6 +102,21 @@
parameter to <b>none</b>. Using an empty string won't work this way - it will
trigger the default (<b>desc:text</b>) to be selected, for backward-compatibility.</p>
</opt>
<opt name='protection_areas' default='desc:auto'>
<p>This argument controls wether protection area information is included and how
it is included.</p>
<ul>
<li><b>desc:text</b> - if the cache is (probably) located within one or more
protection areas, e.g. a nature reserve, a list of the protection areas will
be included in the cache description.</li>
<li><b>desc:auto</b> - protection area information may be included in the
cache description, depending on the installation.</li>
<li><b>none</b> - no protection area information will be included in the
GPX data.</li>
</ul>
<p>Note that information on protection areas may be incomplete or outdated
or completely missing on some installations.</p>
</opt>
<opt name='trackables' default='none'>
<p>This argument controls wether information on trackables is included and how it is included.
One of the following values:</p>

8
htdocs/okapi/services/caches/formatters/gpxfile.tpl.php
View File

@ -124,6 +124,14 @@ http://www.gsak.net/xmlv1/5 http://www.gsak.net/xmlv1/5/gsak.xsd
<? } ?>
&lt;/ul&gt;
<? } ?>
<? if ($vars['protection_areas'] == 'desc:text' && count($c['protection_areas'])) { ?>
&lt;p&gt;<?= _("The cache probably is located in the following protection areas:") ?>&lt;/p&gt;
&lt;ul&gt;
<? foreach($c['protection_areas'] as $protection_area) { ?>
&lt;li&gt;<?= Okapi::xmlescape($protection_area['type'])." - ".Okapi::xmlescape($protection_area['name']) ?>&lt;/li&gt;
<? } ?>
&lt;/ul;&gt;
<? } ?>
</groundspeak:long_description>
<groundspeak:encoded_hints><?= Okapi::xmlescape($c['hint2']) ?></groundspeak:encoded_hints>
<? if ($vars['latest_logs']) { /* Does user want us to include latest log entries? */ ?>

15
htdocs/okapi/services/caches/geocache.xml
View File

@ -362,6 +362,21 @@
in (but it *may* start to vary on the value of your <b>langpref</b>
parameter in the future).</p>
</li>
<li>
<p><b>protection_areas</b> - list of dictionaries, each representing a
protection area in which the cache probably is located; each dictionary
has the following structure:</p>
<ul>
<li><b>type</b> - the type of the protection area, e.g.
"National Nature Reserve",</li>
<li><b>name</b> - the name of the protection area, e.g.
"East Dartmoor Woods and Heaths".</li>
</ul>
<p>The types and names currently are in a local language of the OC site but
may be translated depending on the <b>langpref</b> parameter in the future.</p>
<p>Note that this information is not authoritative. It may be outdated
or incomplete, and it is completely missing on some OC installations.</p>
</li>
<li>
<p><b>last_found</b> - date and time (ISO 8601) when the
geocache was last found <b>or null</b> when it hasn't been yet found.</p>

83
htdocs/okapi/services/caches/geocaches.php
View File

@ -34,7 +34,8 @@ class WebService
'my_notes', 'trackables_count', 'trackables', 'alt_wpts', 'last_found',
'last_modified', 'date_created', 'date_hidden', 'internal_id', 'is_watched',
'is_ignored', 'willattends', 'country', 'state', 'preview_image',
'trip_time', 'trip_distance', 'attribution_note','gc_code', 'hint2', 'hints2');
'trip_time', 'trip_distance', 'attribution_note','gc_code', 'hint2', 'hints2',
'protection_areas');
public static function call(OkapiRequest $request)
{
@ -338,6 +339,7 @@ class WebService
case 'date_hidden': $entry['date_hidden'] = date('c', strtotime($row['date_hidden'])); break;
case 'internal_id': $entry['internal_id'] = $row['cache_id']; break;
case 'attribution_note': /* handled separately */ break;
case 'protection_areas': /* handled separately */ break;
default: throw new Exception("Missing field case: ".$field);
}
}
@ -1073,6 +1075,85 @@ class WebService
);
}
# Protection areas
if (in_array('protection_areas', $fields))
{
$cache_ids_escaped_and_imploded = "'".implode("','", array_map('mysql_real_escape_string', array_keys($cacheid2wptcode)))."'";
if (Settings::get('OC_BRANCH') == 'oc.de')
{
$rs = Db::query("
select
c.wp_oc as cache_code,
npa_types.name as type,
npa_areas.name as name
from
caches c
inner join cache_npa_areas on cache_npa_areas.cache_id=c.cache_id
inner join npa_areas on cache_npa_areas.npa_id = npa_areas.id
inner join npa_types on npa_areas.type_id = npa_types.id
where
c.cache_id in (".$cache_ids_escaped_and_imploded.")
group by npa_areas.type_id, npa_areas.name
order by npa_types.ordinal
");
}
else if (Settings::get('ORIGIN_URL') == 'http://opencaching.pl/' ||
Settings::get('ORIGIN_URL') == 'http://www.opencaching.nl/')
{
# Current OCPL table definitions use collation 'latin1' for parkipl
# and 'utf8' for np_areas. Union needs identical collations.
# To be sure, we convert both to utf8.
$rs = Db::query("
select
c.wp_oc as cache_code,
'"._('National Park / Landscape')."' as type,
CONVERT(parkipl.name USING utf8) as name
from
caches c
inner join cache_npa_areas on cache_npa_areas.cache_id=c.cache_id
inner join parkipl on cache_npa_areas.parki_id=parkipl.id
where
c.cache_id in (".$cache_ids_escaped_and_imploded.")
and cache_npa_areas.parki_id != 0
union
select
c.wp_oc as cache_code,
'Natura 2000' as type,
CONVERT(npa_areas.sitename USING utf8) as name
from
caches c
inner join cache_npa_areas on cache_npa_areas.cache_id=c.cache_id
inner join npa_areas on cache_npa_areas.npa_id=npa_areas.id
where
c.cache_id in (".$cache_ids_escaped_and_imploded.")
and cache_npa_areas.npa_id != 0
");
}
else
{
# OC.US and .UK do not have a 'parkipl' table.
# OC.US has a 'us_parks' table instead.
# Natura 2000 is Europe-only.
$rs = null;
}
foreach ($results as &$result_ref)
$result_ref['protection_areas'] = array();
if ($rs)
{
while ($row = mysql_fetch_assoc($rs))
{
$results[$row['cache_code']]['protection_areas'][] = array(
'type' => $row['type'],
'name' => $row['name'],
);
}
mysql_free_result($rs);
}
}
# Check which cache codes were not found and mark them with null.
foreach ($cache_codes as $cache_code)
if (!isset($results[$cache_code]))