Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cache type changes at OCPL #595

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions okapi/core/Okapi.php
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ public static function get_allowed_base_urls()
case 'OCRO':
$urls = array(
"http://www.opencaching.ro/okapi/",
"https://www.opencaching.ro/okapi/",
);
break;
case 'OCUK':
Expand All @@ -346,7 +347,7 @@ public static function get_allowed_base_urls()
case 'OCUS':
$urls = array(
"http://www.opencaching.us/okapi/",
"http://opencaching.us/okapi/",
"https://www.opencaching.us/okapi/",
);
break;
default:
Expand Down Expand Up @@ -928,20 +929,24 @@ public static function xmlmap2_dumps(&$obj)
#

# common types of all OC sites
'Other' => ['oc.de' => 1, 'oc.pl' => 1],
'Traditional' => ['oc.de' => 2, 'oc.pl' => 2],
'Multi' => ['oc.de' => 3, 'oc.pl' => 3],
'Quiz' => ['oc.de' => 7, 'oc.pl' => 7],
'Virtual' => ['oc.de' => 4, 'oc.pl' => 4],
'Event' => ['oc.de' => 6, 'oc.pl' => 6],
'Webcam' => ['oc.de' => 5, 'oc.pl' => 5],
'Moving' => ['oc.de' => 9, 'oc.pl' => 8],
'Other' => ['oc.de' => 1, 'oc.pl' => 1],
'Event' => ['oc.de' => 6, 'oc.pl' => 6],
'Quiz' => ['oc.de' => 7, 'oc.pl' => 7],
'Moving' => ['oc.de' => 9, 'oc.pl' => 9],

# local types
'Podcast' => ['oc.pl' => 9],
'Own' => ['oc.pl' => 10],
'Math/Physics' => ['oc.de' => 8, 'mapto' => ['name' => 'Quiz', 'acodes' => ['A16']]],
'Podcast' => [],
'Drive-In' => ['oc.de' => 10, 'mapto' => ['name' => 'Traditional', 'acodes' => ['A19']]],
'Own' => ['oc.pl' => 11],
'BIT Cache' => ['oc.pl' => 12],
'Guestbook' => ['oc.pl' => 13],
'Benchmark' => ['oc.pl' => 14],
'Challenge' => ['oc.pl' => 15],
);

/** Return all types of this OC site which are exposed by OKAPI. **/
Expand Down
15 changes: 11 additions & 4 deletions okapi/services/caches/geocache/docs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,20 @@
<p>More types are in use at some installations:</p>
<ul>
<li><b>Own</b>, a moving geocache which is carried by the owner,</li>
<li><b>Podcast</b>, a geocache with attached MP3 file(s). The MP3
data is not accessible via OKAPI. This type is only in use
at Opencaching.US.</li>
<li><b>BIT cache</b>, a laminated label with log password,</li>
<li><b>Guestbook</b>, a real world guestbook also used as a logbook,</li>
<li><b>Benchmark</b>, a geodetic benchmark,</li>
<li><b>Challenge</b>, logging requires the geocacher to meet some sort
of goal or task,</li>
<li><b><s>Podcast</s></b>, a geocache with attached MP3 file(s).
<i>This cache type no longer exists and it's reference is kept
for compatibility reasons.</i></li>
<li>(Types may be added or removed. Your application MUST be
prepared for any new types and may handle them as "Other".)</li>
</ul>
<p>There are even more types, but OKAPI maps them to common types
<p>Opencaching cache types are documented
<a href="https://wiki.opencaching.eu/index.php?title=Cache_types" target="_blank">here</a></p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everthing OKAPI developers need to know should be documented here, so it is not necessary to reference any external documentation. To avoid redundancy and all its inherent problems, I suggest to remove this reference from OKAPI docs.

<p>There are may be more types, but OKAPI maps them to common types
(and eventually some attributes), so you won't see them in OKAPI data.</p>
</li>
<li>
Expand Down
Binary file added okapi/static/tilemap/large_inner_benchmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/large_inner_bitcache.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/large_inner_challenge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/large_inner_guestbook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/legend_benchmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/legend_bitcache.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/legend_challenge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/legend_guestbook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/medium_benchmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/medium_bitcache.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/medium_challenge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/medium_guestbook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/tiny_benchmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/tiny_bitcache.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/tiny_challenge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/tiny_guestbook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/tiny_own.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added okapi/static/tilemap/tiny_webcam.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.