diff --git a/editcache.php b/editcache.php index 9de668952f..d3031be79e 100644 --- a/editcache.php +++ b/editcache.php @@ -191,15 +191,18 @@ function build_drop_seq($item_row, $selected_seq, $max_drop, $thisid, $drop_type // mp3 update end() if (!isset($_POST['size'])) { - if ($cache_type == GeoCache::TYPE_VIRTUAL || $cache_type == GeoCache::TYPE_WEBCAM || - $cache_type == GeoCache::TYPE_EVENT) { + if ($cache_type == GeoCache::TYPE_VIRTUAL || $cache_type == GeoCache::TYPE_WEBCAM || $cache_type == GeoCache::TYPE_EVENT || + $cache_type == GeoCache::TYPE_BITCACHE || $cache_type == GeoCache::TYPE_GUESTBOOK || + $cache_type == GeoCache::TYPE_BENCHMARK || $cache_type == GeoCache::TYPE_CHALLENGE) { $sel_size = GeoCache::SIZE_NONE; } else { $sel_size = $cache_record['size']; } } else { $sel_size = isset($_POST['size']) ? $_POST['size'] : $cache_record['size']; - if ($cache_type == GeoCache::TYPE_VIRTUAL || $cache_type == GeoCache::TYPE_WEBCAM || $cache_type == GeoCache::TYPE_EVENT) { + if ($cache_type == GeoCache::TYPE_VIRTUAL || $cache_type == GeoCache::TYPE_WEBCAM || $cache_type == GeoCache::TYPE_EVENT || + $cache_type == GeoCache::TYPE_BITCACHE || $cache_type == GeoCache::TYPE_GUESTBOOK || + $cache_type == GeoCache::TYPE_BENCHMARK || $cache_type == GeoCache::TYPE_CHALLENGE) { $sel_size = GeoCache::SIZE_NONE; } } @@ -406,9 +409,9 @@ function build_drop_seq($item_row, $selected_seq, $max_drop, $thisid, $drop_type //check cache size $size_not_ok = false; if ($sel_size != GeoCache::SIZE_NONE && - ( $cache_type == GeoCache::TYPE_VIRTUAL || - $cache_type == GeoCache::TYPE_WEBCAM || - $cache_type == GeoCache::TYPE_EVENT )) { + ( $cache_type == GeoCache::TYPE_VIRTUAL || $cache_type == GeoCache::TYPE_WEBCAM || $cache_type == GeoCache::TYPE_EVENT || + $cache_type == GeoCache::TYPE_BITCACHE || $cache_type == GeoCache::TYPE_GUESTBOOK || + $cache_type == GeoCache::TYPE_BENCHMARK || $cache_type == GeoCache::TYPE_CHALLENGE )) { $error = true; $size_not_ok = true; } diff --git a/editlog.php b/editlog.php index 6809a423cf..60f7bd34ba 100644 --- a/editlog.php +++ b/editlog.php @@ -160,6 +160,7 @@ $date_not_ok = true; } + // TYPE_EVENT if ($cache_type == 6) { switch ($log_type) { case 1: @@ -449,7 +450,7 @@ continue; } } - if ($cache_type == 6 || $cache_type == 8) { + if ($cache_type == 6 || $cache_type == 9) { // Event cache if ($cache_type == 6) { if ($type['id'] == 1 || $type['id'] == 2 || $type['id'] == 4 || $type['id'] == 5 || $type['id'] == 9 || $type['id'] == 10 || $type['id'] == 11) { @@ -457,7 +458,7 @@ } } // Mobile cache - if ($cache_type == 8) { + if ($cache_type == 9) { if ($type['id'] == 7 || $type['id'] == 8 || $type['id'] == 9) { continue; } diff --git a/lib/cache.php b/lib/cache.php index ef469891dd..bda6d73c0a 100644 --- a/lib/cache.php +++ b/lib/cache.php @@ -3,23 +3,28 @@ final class cache { - const TYPE_OTHERTYPE = 1; - const TYPE_TRADITIONAL = 2; - const TYPE_MULTICACHE = 3; - const TYPE_VIRTUAL = 4; - const TYPE_WEBCAM = 5; - const TYPE_EVENT = 6; - const TYPE_QUIZ = 7; - const TYPE_MOVING = 8; - const TYPE_GEOPATHFINAL = 9; - const TYPE_OWNCACHE = 10; - + const TYPE_OTHERTYPE = 1; + const TYPE_TRADITIONAL = 2; + const TYPE_MULTICACHE = 3; + const TYPE_VIRTUAL = 4; + const TYPE_WEBCAM = 5; + const TYPE_EVENT = 6; + const TYPE_QUIZ = 7; + const TYPE_MOVING = 9; + const TYPE_OWNCACHE = 11; + const TYPE_BITCACHE = 12; + const TYPE_GUESTBOOK = 13; + const TYPE_BENCHMARK = 14; + const TYPE_CHALLENGE = 15; + + const SIZE_OTHER = 1; // Not specified const SIZE_MICRO = 2; const SIZE_SMALL = 3; const SIZE_NORMAL = 4; const SIZE_LARGE = 5; const SIZE_VERYLARGE = 6; - const SIZE_NOCONTAINER = 7; + const SIZE_NONE = 7; // No container + const SIZE_NANO = 8; const STATUS_READY = 1; const STATUS_UNAVAILABLE = 2; @@ -59,27 +64,27 @@ final class cache self::TYPE_OTHERTYPE => array( 'name' => 'other', 'icon' => 'unknown.png', - 'translation' => 'cacheType_5' + 'translation' => 'cacheType_1' ), self::TYPE_TRADITIONAL => array( 'name' => 'traditional', 'icon' => 'traditional.png', - 'translation' => 'cacheType_1' + 'translation' => 'cacheType_2' ), self::TYPE_MULTICACHE => array( 'name' => 'multicache', 'icon' => 'multi.png', - 'translation' => 'cacheType_2', + 'translation' => 'cacheType_3', ), self::TYPE_VIRTUAL => array( 'name' => 'virtual', 'icon' => 'virtual.png', - 'translation' => 'cacheType_8' + 'translation' => 'cacheType_4' ), self::TYPE_WEBCAM => array( 'name' => 'webcam', 'icon' => 'webcam.png', - 'translation' => 'cacheType_7' + 'translation' => 'cacheType_5' ), self::TYPE_EVENT => array( 'name' => 'event', @@ -89,22 +94,37 @@ final class cache self::TYPE_QUIZ => array( 'name' => 'quiz', 'icon' => 'quiz.png', - 'translation' => 'cacheType_3' + 'translation' => 'cacheType_7' ), self::TYPE_MOVING => array( 'name' => 'moving', 'icon' => 'moving.png', - 'translation' => 'cacheType_4' - ), - self::TYPE_GEOPATHFINAL => array( - 'name' => 'podcast', - 'icon' => 'podcache.png', 'translation' => 'cacheType_9' ), self::TYPE_OWNCACHE => array( 'name' => 'own-cache', 'icon' => 'owncache.png', - 'translation' => 'cacheType_10', + 'translation' => 'cacheType_11', + ), + self::TYPE_BITCACHE => array( + 'name' => 'bit-cache', + 'icon' => 'bitcache.png', + 'translation' => 'cacheType_12', + ), + self::TYPE_GUESTBOOK => array( + 'name' => 'guestbook', + 'icon' => 'guestbook.png', + 'translation' => 'cacheType_13', + ), + self::TYPE_BENCHMARK => array( + 'name' => 'benchmark', + 'icon' => 'benchmark.png', + 'translation' => 'cacheType_14', + ), + self::TYPE_CHALLENGE => array( + 'name' => 'challenge', + 'icon' => 'challenge.png', + 'translation' => 'cacheType_15', ), ); private static $iconPath = 'images/cache/'; diff --git a/lib/caches.inc.php b/lib/caches.inc.php index 339fbaf7e9..c9281342c8 100644 --- a/lib/caches.inc.php +++ b/lib/caches.inc.php @@ -28,7 +28,8 @@ function get_cache_types_from_database() function get_wp_types_from_database($cachetype) { $wp_types = array(); - if ($cachetype == '2' || $cachetype == '4' || $cachetype == '5' || $cachetype == '6' || $cachetype == '9') { + if ($cachetype == '2' || $cachetype == '4' || $cachetype == '5' || $cachetype == '6' || + $cachetype == '12' || $cachetype == '13' || $cachetype == '14' || $cachetype == '15') { $param = "id=-1 OR id=4 OR id=5 OR id=6"; } else { $param = "id=-1 OR id=1 OR id=2 OR id=3 OR id=4 OR id=5 OR id=6"; diff --git a/lib/format.gpx.inc.php b/lib/format.gpx.inc.php index 42d88bc44c..2e76b8d002 100644 --- a/lib/format.gpx.inc.php +++ b/lib/format.gpx.inc.php @@ -151,7 +151,7 @@ $gpxContainer[4] = 'Regular'; // OC: SIZE_REGULAR $gpxContainer[5] = 'Large'; // OC: SIZE_LARGE $gpxContainer[6] = 'Very Large'; // OC: SIZE_XLARGE -$gpxContainer[7] = 'No container'; // OC: SIZE_NONE +$gpxContainer[7] = 'Virtual'; // OC: SIZE_NONE $gpxContainer[8] = 'Nano'; // OC: SIZE_NANO // size strings for oc:size (OC GPX extension) @@ -177,9 +177,12 @@ $gpxType[6] = 'Event Cache'; // OC: TYPE_EVENT // OC specific cache types $gpxType[7] = 'Unknown Cache'; // OC: TYPE_QUIZ -$gpxType[8] = 'Unknown Cache'; // OC: TYPE_MOVING -$gpxType[9] = 'Unknown Cache'; // OC: TYPE_GEOPATHFINAL -$gpxType[10] = 'Unknown Cache'; // OC: TYPE_OWNCACHE +$gpxType[9] = 'Traditional'; // OC: TYPE_MOVING +$gpxType[11] = 'Traditional'; // OC: TYPE_OWNCACHE +$gpxType[12] = 'Virtual'; // OC: TYPE_BITCACHE +$gpxType[13] = 'Traditional'; // OC: TYPE_GUESTBOOK +$gpxType[14] = 'Virtual'; // OC: TYPE_BENCHMARK +$gpxType[15] = 'Unknown Cache'; // OC: TYPE_CHALLENGE // type strings for oc:type (OC GPX extension) $gpxOcType[1] = 'Other Cache'; @@ -189,9 +192,12 @@ $gpxOcType[5] = 'Webcam Cache'; $gpxOcType[6] = 'Event Cache'; $gpxOcType[7] = 'Quiz Cache'; -$gpxOcType[8] = 'Moving Cache'; -$gpxOcType[9] = 'Podcast Cache'; -$gpxOcType[10] = 'Own Cache'; +$gpxOcType[9] = 'Moving Cache'; +$gpxOcType[11] = 'Own Cache'; +$gpxOcType[12] = 'BIT Cache'; +$gpxOcType[13] = 'Guestbook Cache'; +$gpxOcType[14] = 'Benchmark Cache'; +$gpxOcType[15] = 'Challenge Cache'; /* Groundspeak IDs: 2 Traditional Cache @@ -220,16 +226,21 @@ // OC type names // Note: these names should be defined with cache types. See well_defined project. +// well known types $gpxGeocacheTypeText[1] = 'Unknown Cache'; $gpxGeocacheTypeText[2] = 'Traditional Cache'; $gpxGeocacheTypeText[3] = 'Multi-Cache'; $gpxGeocacheTypeText[4] = 'Virtual Cache'; $gpxGeocacheTypeText[5] = 'Webcam Cache'; $gpxGeocacheTypeText[6] = 'Event Cache'; -$gpxGeocacheTypeText[7] = 'Puzzle Cache'; -$gpxGeocacheTypeText[8] = 'Moving Cache'; -$gpxGeocacheTypeText[9] = 'Podcast cache'; -$gpxGeocacheTypeText[10] = 'Own cache'; +// OC specific cache types +$gpxGeocacheTypeText[7] = 'Quiz'; +$gpxGeocacheTypeText[9] = 'Moving Cache'; +$gpxGeocacheTypeText[11] = 'Own Cache'; +$gpxGeocacheTypeText[12] = 'BIT Cache'; +$gpxGeocacheTypeText[13] = 'Guestbook Cache'; +$gpxGeocacheTypeText[14] = 'Benchmark Cache'; +$gpxGeocacheTypeText[15] = 'Challenge Cache'; // ************************************************************************ // Logs diff --git a/lib/format.kml.inc.php b/lib/format.kml.inc.php index ba6ba90bd2..090553580a 100644 --- a/lib/format.kml.inc.php +++ b/lib/format.kml.inc.php @@ -8,24 +8,24 @@ - - - @@ -50,6 +50,13 @@ + - - - + + + - - - @@ -122,6 +143,13 @@ + - - + + - - - @@ -194,6 +236,13 @@ + - - + + @@ -314,12 +377,16 @@ $kmlType[6] = 'event'; // OC: TYPE_EVENT // OC specific cache types $kmlType[7] = 'quiz'; // OC: TYPE_QUIZ -$kmlType[8] = 'moving'; // OC: TYPE_MOVING -$kmlType[9] = 'podcache'; // OC: TYPE_GEOPATHFINAL -$kmlType[10] = 'owncache'; // OC: TYPE_OWNCACHE +$kmlType[9] = 'moving'; // OC: TYPE_MOVING +$kmlType[11] = 'owncache'; // OC: TYPE_OWNCACHE + +$kmlType[12] = 'bitcache'; // OC: TYPE_BITCACHE +$kmlType[13] = 'guestbook'; // OC: TYPE_GUESTBOOK +$kmlType[14] = 'benchmark'; // OC: TYPE_BENCHMARK +$kmlType[15] = 'challenge'; // OC: TYPE_CHALLENGE // OC type names -// Note: these names should be defined with cache types. See well_defined project. +// Note: these names should be defined with cache types. $kmlGeocacheTypeText[1] = 'Unknown Cache'; $kmlGeocacheTypeText[2] = 'Traditional Cache'; $kmlGeocacheTypeText[3] = 'Multi-Cache'; @@ -327,9 +394,12 @@ $kmlGeocacheTypeText[5] = 'Webcam Cache'; $kmlGeocacheTypeText[6] = 'Event Cache'; $kmlGeocacheTypeText[7] = 'Puzzle Cache'; -$kmlGeocacheTypeText[8] = 'Moving Cache'; -$kmlGeocacheTypeText[9] = 'Podcast cache'; -$kmlGeocacheTypeText[10] = 'Own cache'; +$kmlGeocacheTypeText[9] = 'Moving Cache'; +$kmlGeocacheTypeText[11] = 'Own cache'; +$kmlGeocacheTypeText[12] = 'BIT cache'; +$kmlGeocacheTypeText[13] = 'Guestbook cache'; +$kmlGeocacheTypeText[14] = 'Benchmark cache'; +$kmlGeocacheTypeText[15] = 'Challenge cache'; // ************************************************************************ // Waypoints diff --git a/lib/languages/aa.php b/lib/languages/aa.php index b774e3f65c..01fac39c16 100644 --- a/lib/languages/aa.php +++ b/lib/languages/aa.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'crwdns12404:0crwdne12404:0', 'sort_by' => 'crwdns5648:0crwdne5648:0', 'map_excludeCachesByType' => 'crwdns12405:0crwdne12405:0', - 'unknown_type' => 'crwdns5652:0crwdne5652:0', - 'traditional' => 'crwdns5653:0crwdne5653:0', - 'multicache' => 'crwdns5654:0crwdne5654:0', - 'virtual' => 'crwdns5655:0crwdne5655:0', - 'webcam' => 'crwdns5656:0crwdne5656:0', - 'event' => 'crwdns5657:0crwdne5657:0', - 'quiz' => 'crwdns5658:0crwdne5658:0', - 'moving' => 'crwdns5659:0crwdne5659:0', - 'podcast' => 'crwdns5660:0crwdne5660:0', - 'owncache' => 'crwdns5661:0crwdne5661:0', 'ignored' => 'crwdns12438:0crwdne12438:0', 'founds' => 'crwdns12440:0crwdne12440:0', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'crwdns12411:0crwdne12411:0', 'map_biggerSizeThan' => 'crwdns12412:0crwdne12412:0', 'map_sizeAny' => 'crwdns12413:0crwdne12413:0', - 'map_otherType' => 'crwdns12414:0crwdne12414:0', - 'map_traditionalType' => 'crwdns12415:0crwdne12415:0', - 'map_multicacheType' => 'crwdns12416:0crwdne12416:0', - 'map_virtualType' => 'crwdns12417:0crwdne12417:0', - 'map_webcamType' => 'crwdns12418:0crwdne12418:0', - 'map_eventType' => 'crwdns12419:0crwdne12419:0', - 'map_quizType' => 'crwdns12420:0crwdne12420:0', - 'map_movingType' => 'crwdns12421:0crwdne12421:0', - 'map_owncacheType' => 'crwdns12422:0crwdne12422:0', + 'map_incorectMapParams' => 'crwdns12442:0crwdne12442:0', 'map_circle150mMode' => 'crwdns12444:0crwdne12444:0', 'map_searchResultsMode' => 'crwdns12446:0crwdne12446:0', @@ -1868,16 +1850,20 @@ 'region_04' => 'crwdns7526:0crwdne7526:0', 'region_mapQuest' => 'crwdns7527:0crwdne7527:0', - 'cacheType_1' => 'crwdns7528:0crwdne7528:0', - 'cacheType_2' => 'crwdns7529:0crwdne7529:0', - 'cacheType_3' => 'crwdns7530:0crwdne7530:0', - 'cacheType_4' => 'crwdns12592:0crwdne12592:0', - 'cacheType_5' => 'crwdns7532:0crwdne7532:0', - 'cacheType_6' => 'crwdns7533:0crwdne7533:0', - 'cacheType_7' => 'crwdns7534:0crwdne7534:0', - 'cacheType_8' => 'crwdns7535:0crwdne7535:0', - 'cacheType_9' => 'crwdns7536:0crwdne7536:0', - 'cacheType_10' => 'crwdns7537:0crwdne7537:0', + 'cacheType_1' => 'Other type', + 'cacheType_2' => 'Traditional', + 'cacheType_3' => 'Multicache', + 'cacheType_4' => 'Virtual', + 'cacheType_5' => 'Webcam', + 'cacheType_6' => 'Event', + 'cacheType_7' => 'Quiz', + 'cacheType_9' => 'Moving', + 'cacheType_11' => 'Own cache', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Guestbook', + 'cacheType_14' => 'Benchmark', + 'cacheType_15' => 'Challenge', + 'cacheSize_nano' => 'crwdns7538:0crwdne7538:0', 'cacheSize_micro' => 'crwdns7539:0crwdne7539:0', 'cacheSize_small' => 'crwdns7540:0crwdne7540:0', diff --git a/lib/languages/cs.php b/lib/languages/cs.php index 3b946afaeb..15424491b9 100644 --- a/lib/languages/cs.php +++ b/lib/languages/cs.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'Vlastní', 'sort_by' => 'Řadit podle', 'map_excludeCachesByType' => 'Hide krabice-Type', - 'unknown_type' => 'neznámý typ', - 'traditional' => 'Tradiční', - 'multicache' => 'Multicache', - 'virtual' => 'Virtuální', - 'webcam' => 'Webcam', - 'event' => 'Event', - 'quiz' => 'Kvíz', - 'moving' => 'Mobile', - 'podcast' => 'Podcast', - 'owncache' => 'Owncache', 'ignored' => 'ignored', 'founds' => 'found', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'Without recommendation', 'map_biggerSizeThan' => 'only bigger than', 'map_sizeAny' => 'any size', - 'map_otherType' => 'Other type', - 'map_traditionalType' => 'Traditional', - 'map_multicacheType' => 'Multicache', - 'map_virtualType' => 'Virtual', - 'map_webcamType' => 'Webcam', - 'map_eventType' => 'Event', - 'map_quizType' => 'Puzzle', - 'map_movingType' => 'Moving', - 'map_owncacheType' => 'Owncache', + 'map_incorectMapParams' => 'Incorrect map params - default map is presented!', 'map_circle150mMode' => 'Circle with radius 150m for given location', 'map_searchResultsMode' => 'Map presents only the results of geocaches search query', @@ -1868,16 +1850,20 @@ 'region_04' => 'Region found by Google Maps', 'region_mapQuest' => 'Region found by MapQuest API', - 'cacheType_1' => 'Tradiční', - 'cacheType_2' => 'Multicache', - 'cacheType_3' => 'Quiz', - 'cacheType_4' => 'Pohyblivá', - 'cacheType_5' => 'Jiný typ', + 'cacheType_1' => 'Other type', + 'cacheType_2' => 'Traditional', + 'cacheType_3' => 'Multicache', + 'cacheType_4' => 'Virtual', + 'cacheType_5' => 'Webcam', 'cacheType_6' => 'Event', - 'cacheType_7' => 'Webcam', - 'cacheType_8' => 'Virtuální', - 'cacheType_9' => 'Podcast cache', - 'cacheType_10' => 'Own cache', + 'cacheType_7' => 'Quiz', + 'cacheType_9' => 'Moving', + 'cacheType_11' => 'Own cache', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Guestbook', + 'cacheType_14' => 'Benchmark', + 'cacheType_15' => 'Challenge', + 'cacheSize_nano' => 'Nano', 'cacheSize_micro' => 'Mikro', 'cacheSize_small' => 'Malá', diff --git a/lib/languages/de.php b/lib/languages/de.php index 1791dd5f5a..357430ffbc 100644 --- a/lib/languages/de.php +++ b/lib/languages/de.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'eigene', 'sort_by' => 'Sortieren nach', 'map_excludeCachesByType' => 'Cachetypen ausblenden', - 'unknown_type' => 'Sonstiger Cache', - 'traditional' => 'Traditioneller Cache', - 'multicache' => 'Multicache', - 'virtual' => 'Virtueller Cache', - 'webcam' => 'Webcam-Cache', - 'event' => 'Event-Cache', - 'quiz' => 'Rätselcache', - 'moving' => 'Beweglicher Cache', - 'podcast' => 'Podcast-Cache', - 'owncache' => 'Persönlicher Cache', 'ignored' => 'ignorierte', 'founds' => 'gefundene', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'ohne Empfehlungen', 'map_biggerSizeThan' => 'Größer als', 'map_sizeAny' => 'alle Größen', - 'map_otherType' => 'Sonstiger Cachetyp', - 'map_traditionalType' => 'Traditioneller Cache', - 'map_multicacheType' => 'Multicache', - 'map_virtualType' => 'Virtueller Cache', - 'map_webcamType' => 'Webcam-Cache', - 'map_eventType' => 'Event-Cache', - 'map_quizType' => 'Rätselcache', - 'map_movingType' => 'Beweglicher Cache', - 'map_owncacheType' => 'Persönlicher Cache', + 'map_incorectMapParams' => 'Ungültige Kartenparameter – Standardkarte wird angezeigt', 'map_circle150mMode' => '150 Meter Umkreis um die Koordinaten', 'map_searchResultsMode' => 'Es werden nur passende Caches angezeigt.', @@ -1868,16 +1850,20 @@ 'region_04' => 'Region per Google Maps', 'region_mapQuest' => 'Region per MapQuest-API', - 'cacheType_1' => 'Traditioneller Cache', - 'cacheType_2' => 'Multicache', - 'cacheType_3' => 'Rätselcache', - 'cacheType_4' => 'Beweglicher Cache', - 'cacheType_5' => 'Sonstiger Cachetyp', + 'cacheType_1' => 'Sonstiger Cachetyp', + 'cacheType_2' => 'Traditioneller Cache', + 'cacheType_3' => 'Multicache', + 'cacheType_4' => 'Virtueller Cache', + 'cacheType_5' => 'Webcam-Cache', 'cacheType_6' => 'Event-Cache', - 'cacheType_7' => 'Webcam-Cache', - 'cacheType_8' => 'Virtueller Cache', - 'cacheType_9' => 'Podcast Cache', - 'cacheType_10' => 'Persönlicher Cache', + 'cacheType_7' => 'Rätselcache', + 'cacheType_9' => 'Beweglicher Cache', + 'cacheType_11' => 'Persönlicher Cache', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Gästebuch', + 'cacheType_14' => 'Vermessungspunkt', + 'cacheType_15' => 'Herausforderung', + 'cacheSize_nano' => 'Nano', 'cacheSize_micro' => 'Mikro', 'cacheSize_small' => 'Klein', diff --git a/lib/languages/en.php b/lib/languages/en.php index 693ab862a7..9f84a4fdb6 100644 --- a/lib/languages/en.php +++ b/lib/languages/en.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'Owned', 'sort_by' => 'Sort by', 'map_excludeCachesByType' => 'Hide caches by type', - 'unknown_type' => 'Other type', - 'traditional' => 'Traditional', - 'multicache' => 'Multicache', - 'virtual' => 'Virtual', - 'webcam' => 'Webcam', - 'event' => 'Event', - 'quiz' => 'Puzzle', - 'moving' => 'Moving', - 'podcast' => 'Podcast', - 'owncache' => 'Owncache', 'ignored' => 'ignored', 'founds' => 'found', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'Without recommendation', 'map_biggerSizeThan' => 'only bigger than', 'map_sizeAny' => 'any size', - 'map_otherType' => 'Other type', - 'map_traditionalType' => 'Traditional', - 'map_multicacheType' => 'Multicache', - 'map_virtualType' => 'Virtual', - 'map_webcamType' => 'Webcam', - 'map_eventType' => 'Event', - 'map_quizType' => 'Puzzle', - 'map_movingType' => 'Moving', - 'map_owncacheType' => 'Owncache', + 'map_incorectMapParams' => 'Incorrect map params - default map is presented!', 'map_circle150mMode' => 'Circle with radius 150m for given location', 'map_searchResultsMode' => 'Map presents only the results of geocaches search query', @@ -1868,16 +1850,20 @@ 'region_04' => 'Region found by Google Maps', 'region_mapQuest' => 'Region found by MapQuest API', - 'cacheType_1' => 'Traditional', - 'cacheType_2' => 'Multicache', - 'cacheType_3' => 'Puzzle', - 'cacheType_4' => 'Moving', - 'cacheType_5' => 'Other type', + 'cacheType_1' => 'Other type', + 'cacheType_2' => 'Traditional', + 'cacheType_3' => 'Multicache', + 'cacheType_4' => 'Virtual', + 'cacheType_5' => 'Webcam', 'cacheType_6' => 'Event', - 'cacheType_7' => 'Webcam', - 'cacheType_8' => 'Virtual', - 'cacheType_9' => 'Podcast cache', - 'cacheType_10' => 'Own cache', + 'cacheType_7' => 'Quiz', + 'cacheType_9' => 'Moving', + 'cacheType_11' => 'Own cache', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Guestbook', + 'cacheType_14' => 'Benchmark', + 'cacheType_15' => 'Challenge', + 'cacheSize_nano' => 'Nano', 'cacheSize_micro' => 'Micro', 'cacheSize_small' => 'Small', diff --git a/lib/languages/es.php b/lib/languages/es.php index 8254d3dab1..99dca33963 100644 --- a/lib/languages/es.php +++ b/lib/languages/es.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'Propios', 'sort_by' => 'Ordenar por', 'map_excludeCachesByType' => 'Ocultar la caja de tipo', - 'unknown_type' => 'Otro tipo de', - 'traditional' => 'Tradicional', - 'multicache' => 'Multicache', - 'virtual' => 'Virtual', - 'webcam' => 'Webcam', - 'event' => 'Evento', - 'quiz' => 'Quiz', - 'moving' => 'Móvil', - 'podcast' => 'Podcast', - 'owncache' => 'Owncache', 'ignored' => 'ignored', 'founds' => 'found', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'Without recommendation', 'map_biggerSizeThan' => 'only bigger than', 'map_sizeAny' => 'any size', - 'map_otherType' => 'Other type', - 'map_traditionalType' => 'Traditional', - 'map_multicacheType' => 'Multicache', - 'map_virtualType' => 'Virtual', - 'map_webcamType' => 'Webcam', - 'map_eventType' => 'Event', - 'map_quizType' => 'Puzzle', - 'map_movingType' => 'Moving', - 'map_owncacheType' => 'Owncache', + 'map_incorectMapParams' => 'Incorrect map params - default map is presented!', 'map_circle150mMode' => 'Circle with radius 150m for given location', 'map_searchResultsMode' => 'Map presents only the results of geocaches search query', @@ -1868,16 +1850,20 @@ 'region_04' => 'Region found by Google Maps', 'region_mapQuest' => 'Region found by MapQuest API', - 'cacheType_1' => 'Traditional', - 'cacheType_2' => 'Multicache', - 'cacheType_3' => 'Puzzle', - 'cacheType_4' => 'Moving', - 'cacheType_5' => 'Other type', + 'cacheType_1' => 'Other type', + 'cacheType_2' => 'Traditional', + 'cacheType_3' => 'Multicache', + 'cacheType_4' => 'Virtual', + 'cacheType_5' => 'Webcam', 'cacheType_6' => 'Event', - 'cacheType_7' => 'Webcam', - 'cacheType_8' => 'Virtual', - 'cacheType_9' => 'Podcast cache', - 'cacheType_10' => 'Own cache', + 'cacheType_7' => 'Quiz', + 'cacheType_9' => 'Moving', + 'cacheType_11' => 'Own cache', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Guestbook', + 'cacheType_14' => 'Benchmark', + 'cacheType_15' => 'Challenge', + 'cacheSize_nano' => 'Nano', 'cacheSize_micro' => 'Micro', 'cacheSize_small' => 'Small', diff --git a/lib/languages/fr.php b/lib/languages/fr.php index 387bc4f776..3c76262c7f 100644 --- a/lib/languages/fr.php +++ b/lib/languages/fr.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'Possédées', 'sort_by' => 'Trier par', 'map_excludeCachesByType' => 'Caches posées par type', - 'unknown_type' => 'Autre type', - 'traditional' => 'Traditionnelle', - 'multicache' => 'Multicache', - 'virtual' => 'Virtuelle', - 'webcam' => 'Webcam', - 'event' => 'Événement', - 'quiz' => 'Énigme', - 'moving' => 'Mobile', - 'podcast' => 'Podcast', - 'owncache' => 'Mes caches', 'ignored' => 'ignorée', 'founds' => 'trouvées', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'Sans recommandation', 'map_biggerSizeThan' => 'seulement les plus grandes que', 'map_sizeAny' => 'quelque soit la taille', - 'map_otherType' => 'Autre type', - 'map_traditionalType' => 'Traditionnelle', - 'map_multicacheType' => 'Multicache', - 'map_virtualType' => 'Virtuelle', - 'map_webcamType' => 'Webcam', - 'map_eventType' => 'Évènement', - 'map_quizType' => 'Énigme', - 'map_movingType' => 'Mobile', - 'map_owncacheType' => 'Mes caches', + 'map_incorectMapParams' => 'Les paramètres de la carte sont invalides - la carte par défaut sera affichée !', 'map_circle150mMode' => 'Cercle avec un rayon de 150m pour les coordonnées fournies', 'map_searchResultsMode' => 'La carte affiche seulement les résultats de la recherche', @@ -1868,16 +1850,20 @@ 'region_04' => 'Région trouvée via Google Maps', 'region_mapQuest' => 'Région trouvée via MapQuest API', - 'cacheType_1' => 'Traditionnel', - 'cacheType_2' => 'Multicache', - 'cacheType_3' => 'Énigme', - 'cacheType_4' => 'Mobile', - 'cacheType_5' => 'Autre type', + 'cacheType_1' => 'Autre type', + 'cacheType_2' => 'Traditionnel', + 'cacheType_3' => 'Multicache', + 'cacheType_4' => 'Virtuelle', + 'cacheType_5' => 'Webcam', 'cacheType_6' => 'Événement', - 'cacheType_7' => 'Webcam', - 'cacheType_8' => 'Virtuelle', - 'cacheType_9' => 'Cache Podcast', - 'cacheType_10' => 'Votre cache', + 'cacheType_7' => 'Énigme', + 'cacheType_9' => 'Mobile', + 'cacheType_11' => 'Votre cache', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Livre d\'or', + 'cacheType_14' => 'Point géodésique', + 'cacheType_15' => 'Défi', + 'cacheSize_nano' => 'Nano', 'cacheSize_micro' => 'Micro', 'cacheSize_small' => 'Petite', diff --git a/lib/languages/hu.php b/lib/languages/hu.php index 14f31c12e8..3d0eb759d6 100644 --- a/lib/languages/hu.php +++ b/lib/languages/hu.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'Tulajdonos', 'sort_by' => 'Rendezés', 'map_excludeCachesByType' => 'Láda elrejtése típus szerint', - 'unknown_type' => 'Más típus', - 'traditional' => 'Hagyományos', - 'multicache' => 'Multicache', - 'virtual' => 'Virtuális', - 'webcam' => 'Webkamera', - 'event' => 'Esemény', - 'quiz' => 'Feladvány', - 'moving' => 'Mozgó', - 'podcast' => 'Podcast', - 'owncache' => 'Saját láda', 'ignored' => 'kihagyva', 'founds' => 'found', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'Without recommendation', 'map_biggerSizeThan' => 'only bigger than', 'map_sizeAny' => 'any size', - 'map_otherType' => 'Other type', - 'map_traditionalType' => 'Traditional', - 'map_multicacheType' => 'Multicache', - 'map_virtualType' => 'Virtual', - 'map_webcamType' => 'Webcam', - 'map_eventType' => 'Event', - 'map_quizType' => 'Puzzle', - 'map_movingType' => 'Moving', - 'map_owncacheType' => 'Owncache', + 'map_incorectMapParams' => 'Incorrect map params - default map is presented!', 'map_circle150mMode' => 'Circle with radius 150m for given location', 'map_searchResultsMode' => 'Map presents only the results of geocaches search query', @@ -1868,16 +1850,20 @@ 'region_04' => 'Region found by Google Maps', 'region_mapQuest' => 'Region found by MapQuest API', - 'cacheType_1' => 'Traditional', - 'cacheType_2' => 'Multicache', - 'cacheType_3' => 'Puzzle', - 'cacheType_4' => 'Moving', - 'cacheType_5' => 'Other type', + 'cacheType_1' => 'Other type', + 'cacheType_2' => 'Traditional', + 'cacheType_3' => 'Multicache', + 'cacheType_4' => 'Virtual', + 'cacheType_5' => 'Webcam', 'cacheType_6' => 'Event', - 'cacheType_7' => 'Webcam', - 'cacheType_8' => 'Virtual', - 'cacheType_9' => 'Podcast cache', - 'cacheType_10' => 'Own cache', + 'cacheType_7' => 'Quiz', + 'cacheType_9' => 'Moving', + 'cacheType_11' => 'Own cache', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Guestbook', + 'cacheType_14' => 'Benchmark', + 'cacheType_15' => 'Challenge', + 'cacheSize_nano' => 'Nano', 'cacheSize_micro' => 'Micro', 'cacheSize_small' => 'Small', diff --git a/lib/languages/it.php b/lib/languages/it.php index df78ca44cf..35bda052f2 100644 --- a/lib/languages/it.php +++ b/lib/languages/it.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'Owned', 'sort_by' => 'Sort by', 'map_excludeCachesByType' => 'Hide caches by type', - 'unknown_type' => 'Other type', - 'traditional' => 'Traditional', - 'multicache' => 'Multicache', - 'virtual' => 'Virtual', - 'webcam' => 'Webcam', - 'event' => 'Event', - 'quiz' => 'Puzzle', - 'moving' => 'Moving', - 'podcast' => 'Podcast', - 'owncache' => 'Owncache', 'ignored' => 'ignored', 'founds' => 'found', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'Without recommendation', 'map_biggerSizeThan' => 'only bigger than', 'map_sizeAny' => 'any size', - 'map_otherType' => 'Other type', - 'map_traditionalType' => 'Traditional', - 'map_multicacheType' => 'Multicache', - 'map_virtualType' => 'Virtual', - 'map_webcamType' => 'Webcam', - 'map_eventType' => 'Event', - 'map_quizType' => 'Puzzle', - 'map_movingType' => 'Moving', - 'map_owncacheType' => 'Owncache', + 'map_incorectMapParams' => 'Incorrect map params - default map is presented!', 'map_circle150mMode' => 'Circle with radius 150m for given location', 'map_searchResultsMode' => 'Map presents only the results of geocaches search query', @@ -1868,16 +1850,20 @@ 'region_04' => 'Region found by Google Maps', 'region_mapQuest' => 'Region found by MapQuest API', - 'cacheType_1' => 'Traditional', - 'cacheType_2' => 'Multicache', - 'cacheType_3' => 'Puzzle', - 'cacheType_4' => 'Moving', - 'cacheType_5' => 'Other type', + 'cacheType_1' => 'Other type', + 'cacheType_2' => 'Traditional', + 'cacheType_3' => 'Multicache', + 'cacheType_4' => 'Virtual', + 'cacheType_5' => 'Webcam', 'cacheType_6' => 'Event', - 'cacheType_7' => 'Webcam', - 'cacheType_8' => 'Virtual', - 'cacheType_9' => 'Podcast cache', - 'cacheType_10' => 'Own cache', + 'cacheType_7' => 'Quiz', + 'cacheType_9' => 'Moving', + 'cacheType_11' => 'Own cache', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Guestbook', + 'cacheType_14' => 'Benchmark', + 'cacheType_15' => 'Challenge', + 'cacheSize_nano' => 'Nano', 'cacheSize_micro' => 'Micro', 'cacheSize_small' => 'Small', diff --git a/lib/languages/nl.php b/lib/languages/nl.php index 45fb224b71..a1ac698bc9 100644 --- a/lib/languages/nl.php +++ b/lib/languages/nl.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'Eigen caches', 'sort_by' => 'Sorteer zoekresultaat op', 'map_excludeCachesByType' => 'Verberg caches op soort', - 'unknown_type' => 'Ander soort', - 'traditional' => 'Traditioneel', - 'multicache' => 'Multi', - 'virtual' => 'Virtueel', - 'webcam' => 'Webcam', - 'event' => 'Evenement', - 'quiz' => 'Puzzel', - 'moving' => 'Reizend', - 'podcast' => 'Podcast', - 'owncache' => 'Eigen cache', 'ignored' => 'genegeerde', 'founds' => 'gevonden', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'Zonder aanbevelingen', 'map_biggerSizeThan' => 'alleen groter dan', 'map_sizeAny' => 'elke grootte', - 'map_otherType' => 'Ander soort', - 'map_traditionalType' => 'Traditioneel', - 'map_multicacheType' => 'Multi', - 'map_virtualType' => 'Virtueel', - 'map_webcamType' => 'Webcam', - 'map_eventType' => 'Evenement', - 'map_quizType' => 'Puzzel', - 'map_movingType' => 'Reizend', - 'map_owncacheType' => 'Eigen cache', + 'map_incorectMapParams' => 'Onjuiste kaart gegevens - standaard kaart wordt getoond!', 'map_circle150mMode' => 'Cirkel met straal 150m voor opgegeven locatie', 'map_searchResultsMode' => 'Kaart toont alleen de caches van het zoekresultaat', @@ -1868,16 +1850,20 @@ 'region_04' => 'Provincie gevonden via Google Map', 'region_mapQuest' => 'Provincie gevonden via MapQuest API', - 'cacheType_1' => 'Traditionele Cache', - 'cacheType_2' => 'Multi Cache', - 'cacheType_3' => 'Puzzel Cache', - 'cacheType_4' => 'Reizend', - 'cacheType_5' => 'Onbekende Cache', + 'cacheType_1' => 'Onbekende Cache', + 'cacheType_2' => 'Traditionele Cache', + 'cacheType_3' => 'Multi cache', + 'cacheType_4' => 'Virtuele Cache', + 'cacheType_5' => 'Webcam Cache', 'cacheType_6' => 'Evenement', - 'cacheType_7' => 'Webcam Cache', - 'cacheType_8' => 'Virtuele Cache', - 'cacheType_9' => 'Podcast Cache', - 'cacheType_10' => 'Eigen Cache', + 'cacheType_7' => 'Puzzel Cache', + 'cacheType_9' => 'Reizend', + 'cacheType_11' => 'Eigen Cache', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Gastenboek', + 'cacheType_14' => 'Meetpunt', + 'cacheType_15' => 'Uitdaging', + 'cacheSize_nano' => 'Nano', 'cacheSize_micro' => 'Micro', 'cacheSize_small' => 'Klein', diff --git a/lib/languages/pl.php b/lib/languages/pl.php index d57e531cfd..70e8085614 100644 --- a/lib/languages/pl.php +++ b/lib/languages/pl.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'własne', 'sort_by' => 'Sortuj według', 'map_excludeCachesByType' => 'Ukryj skrzynki typu', - 'unknown_type' => 'Nietypowa', - 'traditional' => 'Tradycyjna', - 'multicache' => 'Multicache', - 'virtual' => 'Wirtualna', - 'webcam' => 'Webcam', - 'event' => 'Wydarzenie', - 'quiz' => 'Quiz', - 'moving' => 'Mobilna', - 'podcast' => 'Podcast', - 'owncache' => 'Owncache', 'ignored' => 'ignorowane', 'founds' => 'znalezione', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'bez rekomendacji', 'map_biggerSizeThan' => 'tylko większe niż', 'map_sizeAny' => 'dowolny rozmiar', - 'map_otherType' => 'Nietypowa', - 'map_traditionalType' => 'Tradycyjna', - 'map_multicacheType' => 'Multicache', - 'map_virtualType' => 'Wirtualna', - 'map_webcamType' => 'Webcam', - 'map_eventType' => 'Wydarzenie', - 'map_quizType' => 'Quiz', - 'map_movingType' => 'Mobilna', - 'map_owncacheType' => 'Owncache', + 'map_incorectMapParams' => 'Niepoprawne dane wejsciowe!', 'map_circle150mMode' => 'Okrąg o promieniu 150m dla danej lokalizacji', 'map_searchResultsMode' => 'Mapa przedstawia wyniki wyszukiwania', @@ -1868,16 +1850,20 @@ 'region_04' => 'Region na podstawie Google Geocoding API', 'region_mapQuest' => 'Region na podstawie MapQuest API', - 'cacheType_1' => 'Tradycyjna', - 'cacheType_2' => 'Multicache', - 'cacheType_3' => 'Quiz', - 'cacheType_4' => 'Mobilna', - 'cacheType_5' => 'Nietypowa', + 'cacheType_1' => 'Nietypowa', + 'cacheType_2' => 'Tradycyjna', + 'cacheType_3' => 'Multicache', + 'cacheType_4' => 'Wirtualna', + 'cacheType_5' => 'Webcam', 'cacheType_6' => 'Wydarzenie', - 'cacheType_7' => 'Webcam', - 'cacheType_8' => 'Wirtualna', - 'cacheType_9' => 'Finał serii', - 'cacheType_10' => 'Own cache', + 'cacheType_7' => 'Quiz', + 'cacheType_9' => 'Mobilna', + 'cacheType_11' => 'Own cache', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Księga gości', + 'cacheType_14' => 'Punkt geodezyjny', + 'cacheType_15' => 'Wyzwanie', + 'cacheSize_nano' => 'Nano', 'cacheSize_micro' => 'Mikro', 'cacheSize_small' => 'Mała', diff --git a/lib/languages/ro.php b/lib/languages/ro.php index 674f0cd1e2..2c42c325ba 100644 --- a/lib/languages/ro.php +++ b/lib/languages/ro.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'deţinute', 'sort_by' => 'Sortează după', 'map_excludeCachesByType' => 'Ascunde în funcţie de tipul cutiei', - 'unknown_type' => 'Alt tip', - 'traditional' => 'Tradiţională', - 'multicache' => 'Multi-cutie', - 'virtual' => 'Virtuală', - 'webcam' => 'Cameră web', - 'event' => 'Eveniment', - 'quiz' => 'Mister', - 'moving' => 'Mobilă', - 'podcast' => 'Podcast', - 'owncache' => 'Geocutie personală', 'ignored' => 'ignorate', 'founds' => 'găsiri', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'Without recommendation', 'map_biggerSizeThan' => 'only bigger than', 'map_sizeAny' => 'any size', - 'map_otherType' => 'Alt tip', - 'map_traditionalType' => 'Tradiţională', - 'map_multicacheType' => 'Multi-cutie', - 'map_virtualType' => 'Virtuală', - 'map_webcamType' => 'Cameră web', - 'map_eventType' => 'Eveniment', - 'map_quizType' => 'Mister', - 'map_movingType' => 'Mobilă', - 'map_owncacheType' => 'Geocutie personală', + 'map_incorectMapParams' => 'Incorrect map params - default map is presented!', 'map_circle150mMode' => 'Circle with radius 150m for given location', 'map_searchResultsMode' => 'Map presents only the results of geocaches search query', @@ -1868,16 +1850,20 @@ 'region_04' => 'Zonă găsită de Google Maps', 'region_mapQuest' => 'Zonă găsită de MapQuest API', - 'cacheType_1' => 'Tradiţională', - 'cacheType_2' => 'Multiplă', - 'cacheType_3' => 'Puzzle', - 'cacheType_4' => 'În mişcare', - 'cacheType_5' => 'Necunoscută', + 'cacheType_1' => 'Necunoscută', + 'cacheType_2' => 'Tradiţională', + 'cacheType_3' => 'Multiplă', + 'cacheType_4' => 'Virtuală', + 'cacheType_5' => 'Cameră web', 'cacheType_6' => 'Eveniment', - 'cacheType_7' => 'Cameră web', - 'cacheType_8' => 'Virtuală', - 'cacheType_9' => 'Podcast', - 'cacheType_10' => 'Personală', + 'cacheType_7' => 'Puzzle', + 'cacheType_9' => 'Mobilă', + 'cacheType_11' => 'Personală', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Carte de oaspeţi', + 'cacheType_14' => 'Marcaj topografic', + 'cacheType_15' => 'Provocare', + 'cacheSize_nano' => 'Nano', 'cacheSize_micro' => 'Micro', 'cacheSize_small' => 'Mică', diff --git a/lib/languages/sv.php b/lib/languages/sv.php index 85b4f870c7..b828c79803 100644 --- a/lib/languages/sv.php +++ b/lib/languages/sv.php @@ -42,16 +42,6 @@ 'map_excludeOwned' => 'egna', 'sort_by' => 'Sortera sökresultatet efter', 'map_excludeCachesByType' => 'Dölj cacher av typ', - 'unknown_type' => 'Okänd', - 'traditional' => 'Traditionell', - 'multicache' => 'Multi', - 'virtual' => 'Virtuell', - 'webcam' => 'Webcam', - 'event' => 'Event', - 'quiz' => 'Gåta', - 'moving' => 'Rörlig', - 'podcast' => 'Podcast', - 'owncache' => 'Owncache', 'ignored' => 'ignored', 'founds' => 'found', @@ -64,15 +54,7 @@ 'map_exWithoutRecomendation' => 'Without recommendation', 'map_biggerSizeThan' => 'only bigger than', 'map_sizeAny' => 'any size', - 'map_otherType' => 'Other type', - 'map_traditionalType' => 'Traditional', - 'map_multicacheType' => 'Multicache', - 'map_virtualType' => 'Virtual', - 'map_webcamType' => 'Webcam', - 'map_eventType' => 'Event', - 'map_quizType' => 'Puzzle', - 'map_movingType' => 'Moving', - 'map_owncacheType' => 'Owncache', + 'map_incorectMapParams' => 'Incorrect map params - default map is presented!', 'map_circle150mMode' => 'Circle with radius 150m for given location', 'map_searchResultsMode' => 'Map presents only the results of geocaches search query', @@ -1868,16 +1850,20 @@ 'region_04' => 'Region found by Google Maps', 'region_mapQuest' => 'Region found by MapQuest API', - 'cacheType_1' => 'Traditional', - 'cacheType_2' => 'Multicache', - 'cacheType_3' => 'Puzzle', - 'cacheType_4' => 'Moving', - 'cacheType_5' => 'Other type', + 'cacheType_1' => 'Other type', + 'cacheType_2' => 'Traditional', + 'cacheType_3' => 'Multicache', + 'cacheType_4' => 'Virtual', + 'cacheType_5' => 'Webcam', 'cacheType_6' => 'Event', - 'cacheType_7' => 'Webcam', - 'cacheType_8' => 'Virtual', - 'cacheType_9' => 'Podcast cache', - 'cacheType_10' => 'Own cache', + 'cacheType_7' => 'Quiz', + 'cacheType_9' => 'Moving', + 'cacheType_11' => 'Own cache', + 'cacheType_12' => 'BIT cache', + 'cacheType_13' => 'Guestbook', + 'cacheType_14' => 'Benchmark', + 'cacheType_15' => 'Challenge', + 'cacheSize_nano' => 'Nano', 'cacheSize_micro' => 'Micro', 'cacheSize_small' => 'Small', diff --git a/lib/search.gpx.inc.php b/lib/search.gpx.inc.php index c69e535a02..55df515a6c 100644 --- a/lib/search.gpx.inc.php +++ b/lib/search.gpx.inc.php @@ -122,7 +122,7 @@ function getPictures($cacheid, $picturescount) $gpxStatus[2] = 'Unavailable'; $gpxStatus[3] = 'Archived'; -$gpxContainer[0] = 'Other'; +$gpxContainer[1] = 'Other'; $gpxContainer[2] = 'Micro'; $gpxContainer[3] = 'Small'; $gpxContainer[4] = 'Regular'; @@ -131,40 +131,56 @@ function getPictures($cacheid, $picturescount) $gpxContainer[7] = 'Virtual'; $gpxContainer[8] = 'Micro'; -// known by gpx +// GS compatibile GPX mapping +// well known types $gpxType[1] = 'Other'; $gpxType[2] = 'Traditional'; $gpxType[3] = 'Multi'; $gpxType[4] = 'Virtual'; $gpxType[5] = 'Webcam'; $gpxType[6] = 'Event'; -// unknown ... converted -$gpxType[7] = 'Multi'; -$gpxType[8] = 'Multi'; -$gpxType[9] = 'Traditional'; -$gpxType[10] = 'Traditional'; - -// nazwy skrzynek zgodne z Geocaching / Garmin +// OC specific cache types +$gpxType[7] = 'Other'; // Quiz +$gpxType[9] = 'Traditional'; // Moving cache +$gpxType[11] = 'Traditional'; // Own cache +$gpxType[12] = 'Virtual'; // BIT cache +$gpxType[13] = 'Traditional'; // Guestbook cache +$gpxType[14] = 'Virtual'; // Benchmark cache +$gpxType[15] = 'Other'; // Challenge cache + +// Groundspeak compatibility +// well known types $gpxGeocacheType[1] = 'Unknown Cache'; $gpxGeocacheType[2] = 'Traditional Cache'; $gpxGeocacheType[3] = 'Multi-Cache'; $gpxGeocacheType[4] = 'Virtual Cache'; $gpxGeocacheType[5] = 'Webcam Cache'; $gpxGeocacheType[6] = 'Event Cache'; -$gpxGeocacheType[7] = 'Multi-cache'; -$gpxGeocacheType[8] = 'Multi-cache'; -$gpxGeocacheType[9] = 'Unknown Cache'; - -// nazwy skrzynek do description +// OC specific cache types +$gpxGeocacheType[7] = 'Other'; +$gpxGeocacheType[9] = 'Traditional'; +$gpxGeocacheType[11] = 'Traditional'; +$gpxGeocacheType[12] = 'Virtual'; +$gpxGeocacheType[13] = 'Traditional'; +$gpxGeocacheType[14] = 'Virtual'; +$gpxGeocacheType[15] = 'Other'; + +// Cache type - actual OC names +// well known types $gpxGeocacheTypeText[1] = 'Unknown Cache'; $gpxGeocacheTypeText[2] = 'Traditional Cache'; $gpxGeocacheTypeText[3] = 'Multi-Cache'; $gpxGeocacheTypeText[4] = 'Virtual Cache'; $gpxGeocacheTypeText[5] = 'Webcam Cache'; $gpxGeocacheTypeText[6] = 'Event Cache'; +// OC specific cache types $gpxGeocacheTypeText[7] = 'Quiz'; -$gpxGeocacheTypeText[8] = 'Moving Cache'; -$gpxGeocacheTypeText[9] = 'Podcast cache'; +$gpxGeocacheTypeText[9] = 'Moving Cache'; +$gpxGeocacheTypeText[11] = 'Own Cache'; +$gpxGeocacheTypeText[12] = 'BIT Cache'; +$gpxGeocacheTypeText[13] = 'Guestbook Cache'; +$gpxGeocacheTypeText[14] = 'Benchmark Cache'; +$gpxGeocacheTypeText[15] = 'Challenge Cache'; $gpxLogType[0] = 'Write note'; // OC: Other $gpxLogType[1] = 'Found it'; // OC: Found @@ -558,7 +574,7 @@ function getPictures($cacheid, $picturescount) if (isset($gpxContainer[$r['size']])) $thisline = str_replace('{container}', $gpxContainer[$r['size']], $thisline); else - $thisline = str_replace('{container}', $gpxContainer[0], $thisline); + $thisline = str_replace('{container}', $gpxContainer[1], $thisline); if (isset($gpxStatus[$r['status']])) $thisline = str_replace('{status}', $gpxStatus[$r['status']], $thisline); diff --git a/lib/search.loc.inc.php b/lib/search.loc.inc.php index 689d1f2536..bcb04d3598 100644 --- a/lib/search.loc.inc.php +++ b/lib/search.loc.inc.php @@ -28,16 +28,19 @@ $locFoot = ''; -$cacheTypeText[1] = "" . tr('cacheType_5') . ""; -$cacheTypeText[2] = "" . tr('cacheType_1') . ""; -$cacheTypeText[3] = "" . tr('cacheType_2') . ""; -$cacheTypeText[4] = "" . tr('cacheType_8') . ""; -$cacheTypeText[5] = "" . tr('cacheType_7') . ""; +$cacheTypeText[1] = "" . tr('cacheType_1') . ""; +$cacheTypeText[2] = "" . tr('cacheType_2') . ""; +$cacheTypeText[3] = "" . tr('cacheType_3') . ""; +$cacheTypeText[4] = "" . tr('cacheType_4') . ""; +$cacheTypeText[5] = "" . tr('cacheType_5') . ""; $cacheTypeText[6] = "" . tr('cacheType_6') . ""; -$cacheTypeText[7] = "" . tr('cacheType_3') . ""; -$cacheTypeText[8] = "" . tr('cacheType_4') . ""; +$cacheTypeText[7] = "" . tr('cacheType_7') . ""; $cacheTypeText[9] = "" . tr('cacheType_9') . ""; -$cacheTypeText[10] = "" . tr('cacheType_10') . ""; +$cacheTypeText[11] = "" . tr('cacheType_11') . ""; +$cacheTypeText[12] = "" . tr('cacheType_12') . ""; +$cacheTypeText[13] = "" . tr('cacheType_13') . ""; +$cacheTypeText[14] = "" . tr('cacheType_14') . ""; +$cacheTypeText[15] = "" . tr('cacheType_15') . ""; if ($usr || ! $hide_coords) { // prepare the output diff --git a/lib/search.ov2.inc.php b/lib/search.ov2.inc.php index fc6f763d90..d6f0e9c4be 100644 --- a/lib/search.ov2.inc.php +++ b/lib/search.ov2.inc.php @@ -14,16 +14,21 @@ require_once (__DIR__.'/../lib/calculation.inc.php'); +// well known types $cacheTypeText[1] = 'Unknown Cache'; $cacheTypeText[2] = 'Traditional Cache'; $cacheTypeText[3] = 'Multi-Cache'; $cacheTypeText[4] = 'Virtual Cache'; $cacheTypeText[5] = 'Webcam Cache'; $cacheTypeText[6] = 'Event Cache'; +// OC specific cache types $cacheTypeText[7] = 'Puzzle'; -$cacheTypeText[8] = 'Moving Cache'; -$cacheTypeText[9] = 'Podcast'; -$cacheTypeText[10] = 'Own Cache'; +$cacheTypeText[9] = 'Moving Cache'; +$cacheTypeText[11] = 'Own Cache'; +$cacheTypeText[12] = 'BIT Cache'; +$cacheTypeText[13] = 'Guestbook Cache'; +$cacheTypeText[14] = 'Benchmark Cache'; +$cacheTypeText[15] = 'Challenge Cache'; if ($usr || ! $hide_coords) { // prepare the output diff --git a/lib/search.uam-cs.inc.php b/lib/search.uam-cs.inc.php index aaf4a67573..6e7bdc1ebd 100644 --- a/lib/search.uam-cs.inc.php +++ b/lib/search.uam-cs.inc.php @@ -38,19 +38,22 @@ $uamSize[7] = '-'; // 'No container' $uamSize[8] = 'n'; // 'Nano' -// known by gpx +// well known types $uamType[1] = 'O'; // 'Other' $uamType[2] = 'T'; // 'Traditional' $uamType[3] = 'M'; // 'Multi' $uamType[4] = 'V'; // 'Virtual' $uamType[5] = 'W'; // 'Webcam' $uamType[6] = 'E'; // 'Event' +// OC specific cache types +$uamType[7] = 'Q'; // 'Quiz' +$uamType[9] = 'M'; // 'Moving' +$uamType[11] = 'U'; // 'Own/user's cache' +$uamType[12] = 'B'; // 'BIT cache' +$uamType[13] = 'G'; // 'Guestbook cache' +$uamType[14] = 'K'; // 'Benchmark cache' +$uamType[15] = 'C'; // 'Challenge cache' -// by OC -$uamType[7] = 'Q'; // 'Puzzle / formerly Quiz' -$uamType[8] = 'M'; // 'Moving' -$uamType[9] = 'P'; // 'Podcast' -$uamType[10] = 'U'; // 'Own/user's cache' if ($usr || ! $hide_coords) { // prepare the output diff --git a/lib/search.uam.inc.php b/lib/search.uam.inc.php index 00da8e5986..9e9adcd7eb 100644 --- a/lib/search.uam.inc.php +++ b/lib/search.uam.inc.php @@ -23,19 +23,21 @@ $uamSize[7] = '-'; // 'No container' $uamSize[8] = 'n'; // 'Nano' -// known by gpx +// well known types $uamType[1] = 'O'; // 'Other' $uamType[2] = 'T'; // 'Traditional' $uamType[3] = 'M'; // 'Multi' $uamType[4] = 'V'; // 'Virtual' $uamType[5] = 'W'; // 'Webcam' $uamType[6] = 'E'; // 'Event' - -// by OC -$uamType[7] = 'Q'; // 'Puzzle / formerly Quiz' -$uamType[8] = 'M'; // 'Moving' -$uamType[9] = 'P'; // 'Podcast' -$uamType[10] = 'U'; // 'Own/user's cache' +// OC specific cache types +$uamType[7] = 'Q'; // 'Quiz' +$uamType[9] = 'M'; // 'Moving' +$uamType[11] = 'U'; // 'Own/user's cache' +$uamType[12] = 'B'; // 'BIT cache' +$uamType[13] = 'G'; // 'Guestbook cache' +$uamType[14] = 'K'; // 'Benchmark cache' +$uamType[15] = 'C'; // 'Challenge cache' if ($usr || ! $hide_coords) { // prepare the output diff --git a/lib/search.wpt.inc.php b/lib/search.wpt.inc.php index 0e1ac01c3d..0a7eda9938 100644 --- a/lib/search.wpt.inc.php +++ b/lib/search.wpt.inc.php @@ -24,16 +24,21 @@ $wptSize[7] = 'No container'; $wptSize[8] = 'Nano'; +// well known types $wptType[1] = 'Unknown Cache'; $wptType[2] = 'Traditional Cache'; $wptType[3] = 'Multi-Cache'; $wptType[4] = 'Virtual Cache'; $wptType[5] = 'Webcam Cache'; $wptType[6] = 'Event Cache'; +// OC specific cache types $wptType[7] = 'Puzzle'; -$wptType[8] = 'Moving Cache'; -$wptType[9] = 'Podcast'; -$wptType[10] = 'Own Cache'; +$wptType[9] = 'Moving Cache'; +$wptType[11] = 'Own Cache'; +$wptType[12] = 'BIT Cache'; +$wptType[13] = 'Guestbook Cache'; +$wptType[14] = 'Benchmark Cache'; +$wptType[15] = 'Challenge Cache'; if( $usr || !$hide_coords ) { //prepare the output diff --git a/lib/settingsDefault.inc.php b/lib/settingsDefault.inc.php index 211a49f2aa..1c109d0d3f 100644 --- a/lib/settingsDefault.inc.php +++ b/lib/settingsDefault.inc.php @@ -79,7 +79,10 @@ 'forbidenCacheTypes' => array( cache::TYPE_VIRTUAL, cache::TYPE_WEBCAM, - cache::TYPE_GEOPATHFINAL + cache::TYPE_BITCACHE, + cache::TYPE_GUESTBOOK, + cache::TYPE_BENCHMARK, + cache::TYPE_CHALLENGE ), /** * cache limits for user. If user is allowed to place limited nomber of specified cache type, diff --git a/myroutes_search.php b/myroutes_search.php index 0634598b59..d8841aa7c0 100644 --- a/myroutes_search.php +++ b/myroutes_search.php @@ -111,9 +111,12 @@ $options['cachetype5'] = isset($_POST['cachetype5']) ? $_POST['cachetype5'] : ''; $options['cachetype6'] = isset($_POST['cachetype6']) ? $_POST['cachetype6'] : ''; $options['cachetype7'] = isset($_POST['cachetype7']) ? $_POST['cachetype7'] : ''; - $options['cachetype8'] = isset($_POST['cachetype8']) ? $_POST['cachetype8'] : ''; $options['cachetype9'] = isset($_POST['cachetype9']) ? $_POST['cachetype9'] : ''; - $options['cachetype10'] = isset($_POST['cachetype10']) ? $_POST['cachetype10'] : ''; + $options['cachetype11'] = isset($_POST['cachetype11']) ? $_POST['cachetype11'] : ''; + $options['cachetype12'] = isset($_POST['cachetype12']) ? $_POST['cachetype12'] : ''; + $options['cachetype13'] = isset($_POST['cachetype13']) ? $_POST['cachetype13'] : ''; + $options['cachetype14'] = isset($_POST['cachetype14']) ? $_POST['cachetype14'] : ''; + $options['cachetype15'] = isset($_POST['cachetype15']) ? $_POST['cachetype15'] : ''; $options['cachesize_1'] = isset($_POST['cachesize_1']) ? $_POST['cachesize_1'] : ''; $options['cachesize_2'] = isset($_POST['cachesize_2']) ? $_POST['cachesize_2'] : ''; @@ -157,9 +160,12 @@ $options['cachetype5'] = isset($_POST['cachetype5']) ? $_POST['cachetype5'] : '1'; $options['cachetype6'] = isset($_POST['cachetype6']) ? $_POST['cachetype6'] : '1'; $options['cachetype7'] = isset($_POST['cachetype7']) ? $_POST['cachetype7'] : '1'; - $options['cachetype8'] = isset($_POST['cachetype8']) ? $_POST['cachetype8'] : '1'; $options['cachetype9'] = isset($_POST['cachetype9']) ? $_POST['cachetype9'] : '1'; - $options['cachetype10'] = isset($_POST['cachetype10']) ? $_POST['cachetype10'] : '1'; + $options['cachetype11'] = isset($_POST['cachetype11']) ? $_POST['cachetype11'] : '1'; + $options['cachetype12'] = isset($_POST['cachetype12']) ? $_POST['cachetype12'] : '1'; + $options['cachetype13'] = isset($_POST['cachetype13']) ? $_POST['cachetype13'] : '1'; + $options['cachetype14'] = isset($_POST['cachetype14']) ? $_POST['cachetype14'] : '1'; + $options['cachetype15'] = isset($_POST['cachetype15']) ? $_POST['cachetype15'] : '1'; $options['cachesize_1'] = isset($_POST['cachesize_1']) ? $_POST['cachesize_1'] : '1'; $options['cachesize_2'] = isset($_POST['cachesize_2']) ? $_POST['cachesize_2'] : '1'; @@ -326,14 +332,23 @@ if (isset($options['cachetype7'])) { tpl_set_var('cachetype7', ($options['cachetype7'] == 1) ? ' checked="checked"' : ''); } -if (isset($options['cachetype8'])) { - tpl_set_var('cachetype8', ($options['cachetype8'] == 1) ? ' checked="checked"' : ''); -} if (isset($options['cachetype9'])) { tpl_set_var('cachetype9', ($options['cachetype9'] == 1) ? ' checked="checked"' : ''); } -if (isset($options['cachetype10'])) { - tpl_set_var('cachetype10', ($options['cachetype10'] == 1) ? ' checked="checked"' : ''); +if (isset($options['cachetype11'])) { + tpl_set_var('cachetype11', ($options['cachetype11'] == 1) ? ' checked="checked"' : ''); +} +if (isset($options['cachetype12'])) { + tpl_set_var('cachetype12', ($options['cachetype12'] == 1) ? ' checked="checked"' : ''); +} +if (isset($options['cachetype13'])) { + tpl_set_var('cachetype13', ($options['cachetype13'] == 1) ? ' checked="checked"' : ''); +} +if (isset($options['cachetype14'])) { + tpl_set_var('cachetype14', ($options['cachetype14'] == 1) ? ' checked="checked"' : ''); +} +if (isset($options['cachetype15'])) { + tpl_set_var('cachetype15', ($options['cachetype15'] == 1) ? ' checked="checked"' : ''); } for ($size = 1; $size <= 8; ++$size) { @@ -423,14 +438,23 @@ if (isset($options['cachetype7']) && ($options['cachetype7'] == '1')) { $cachetype[] = '7'; } -if (isset($options['cachetype8']) && ($options['cachetype8'] == '1')) { - $cachetype[] = '8'; -} if (isset($options['cachetype9']) && ($options['cachetype9'] == '1')) { $cachetype[] = '9'; } -if (isset($options['cachetype10']) && ($options['cachetype10'] == '1')) { - $cachetype[] = '10'; +if (isset($options['cachetype11']) && ($options['cachetype11'] == '1')) { + $cachetype[] = '11'; +} +if (isset($options['cachetype12']) && ($options['cachetype12'] == '1')) { + $cachetype[] = '12'; +} +if (isset($options['cachetype13']) && ($options['cachetype13'] == '1')) { + $cachetype[] = '13'; +} +if (isset($options['cachetype14']) && ($options['cachetype14'] == '1')) { + $cachetype[] = '14'; +} +if (isset($options['cachetype15']) && ($options['cachetype15'] == '1')) { + $cachetype[] = '15; } if ((sizeof($cachetype) > 0) && (sizeof($cachetype) < 10)) { diff --git a/newcache.php b/newcache.php index d67541ac91..acb2f32a37 100644 --- a/newcache.php +++ b/newcache.php @@ -110,14 +110,18 @@ } $sel_type = isset($_POST['type']) ? $_POST['type'] : - 1; if (! isset($_POST['size'])) { - if ($sel_type == GeoCache::TYPE_VIRTUAL || $sel_type == GeoCache::TYPE_WEBCAM || $sel_type == GeoCache::TYPE_EVENT) { + if ($sel_type == GeoCache::TYPE_VIRTUAL || $sel_type == GeoCache::TYPE_WEBCAM || $sel_type == GeoCache::TYPE_EVENT || + $sel_type == GeoCache::TYPE_BITCACHE || $sel_type == GeoCache::TYPE_GUESTBOOK || + $sel_type == GeoCache::TYPE_BENCHMARK || $sel_type == GeoCache::TYPE_CHALLENGE) { $sel_size = GeoCache::SIZE_NONE; } else { $sel_size = - 1; } } else { $sel_size = isset($_POST['size']) ? $_POST['size'] : - 1; - if ($sel_type == GeoCache::TYPE_VIRTUAL || $sel_type == GeoCache::TYPE_WEBCAM || $sel_type == GeoCache::TYPE_EVENT) { + if ($sel_type == GeoCache::TYPE_VIRTUAL || $sel_type == GeoCache::TYPE_WEBCAM || $sel_type == GeoCache::TYPE_EVENT || + $sel_type == GeoCache::TYPE_BITCACHE || $sel_type == GeoCache::TYPE_GUESTBOOK || + $sel_type == GeoCache::TYPE_BENCHMARK || $sel_type == GeoCache::TYPE_CHALLENGE) { $sel_size = GeoCache::SIZE_NONE; } } @@ -612,7 +616,10 @@ $error = true; $type_not_ok = true; } - if ($sel_size != 7 && ($sel_type == 4 || $sel_type == 5 || $sel_type == 6)) { + if ($sel_size != GeoCache::SIZE_NONE && + ( $sel_type == GeoCache::TYPE_VIRTUAL || $sel_type == GeoCache::TYPE_WEBCAM || $sel_type == GeoCache::TYPE_EVENT || + $sel_type == GeoCache::TYPE_BITCACHE || $sel_type == GeoCache::TYPE_GUESTBOOK || + $sel_type == GeoCache::TYPE_BENCHMARK || $sel_type == GeoCache::TYPE_CHALLENGE )) { if (! $size_not_ok) { tpl_set_var('size_message', $sizemismatch_message); } diff --git a/powerTrail/ajaxGetPowerTrailCaches.php b/powerTrail/ajaxGetPowerTrailCaches.php index 00f12eea22..036fc9cb64 100644 --- a/powerTrail/ajaxGetPowerTrailCaches.php +++ b/powerTrail/ajaxGetPowerTrailCaches.php @@ -66,7 +66,6 @@ function displayAllCachesOfPowerTrail(PowerTrail $powerTrail, $choseFinalCaches) $totalFounds = 0; $totalTopRatings = 0; $bgcolor = '#ffffff'; - $cachetypes = array_fill_keys(GeoCache::CacheTypesArray(), 0); // array of all types $cacheSize = array_fill_keys(GeoCache::CacheSizesArray(), 0); // array of all types diff --git a/powerTrail/powerTrailBase.php b/powerTrail/powerTrailBase.php index 014bc52ab3..a72db5b12f 100644 --- a/powerTrail/powerTrailBase.php +++ b/powerTrail/powerTrailBase.php @@ -145,16 +145,19 @@ public static function cacheSizePoints() { public static function cacheTypePoints() { return array ( - 1 => 2, #Other - 2 => 2, #Trad. - 3 => 3, #Multi - 4 => 1, #Virt. - 5 => 0.2, #ICam. - 6 => 0, #Event - 7 => 4, #Quiz - 8 => 2, #Moving - 9 => 1, #podcast - 10 => 1, #own + 1 => 2, // Other + 2 => 2, // Traditional + 3 => 3, // Multicache + 4 => 1, // Virtual + 5 => 0.2, // Webcam + 6 => 0, // Event + 7 => 4, // Quiz + 9 => 2, // Moving cache + 11 => 1, // Own cache + 12 => 1, // BIT cache + 13 => 1, // Guestbook + 14 => 2, // Benchmark + 15 => 0, // Challenge ); } diff --git a/public/images/cache/16x16-benchmark-found.png b/public/images/cache/16x16-benchmark-found.png new file mode 100644 index 0000000000..ca581b0b60 Binary files /dev/null and b/public/images/cache/16x16-benchmark-found.png differ diff --git a/public/images/cache/16x16-benchmark-s-owner.png b/public/images/cache/16x16-benchmark-s-owner.png new file mode 100644 index 0000000000..646c9824fd Binary files /dev/null and b/public/images/cache/16x16-benchmark-s-owner.png differ diff --git a/public/images/cache/16x16-benchmark.png b/public/images/cache/16x16-benchmark.png new file mode 100644 index 0000000000..94eebf5123 Binary files /dev/null and b/public/images/cache/16x16-benchmark.png differ diff --git a/public/images/cache/16x16-bitcache-found.png b/public/images/cache/16x16-bitcache-found.png new file mode 100644 index 0000000000..fc10b5d393 Binary files /dev/null and b/public/images/cache/16x16-bitcache-found.png differ diff --git a/public/images/cache/16x16-bitcache-s-owner.png b/public/images/cache/16x16-bitcache-s-owner.png new file mode 100644 index 0000000000..e2acf85c83 Binary files /dev/null and b/public/images/cache/16x16-bitcache-s-owner.png differ diff --git a/public/images/cache/16x16-bitcache.png b/public/images/cache/16x16-bitcache.png new file mode 100644 index 0000000000..15988c1f1b Binary files /dev/null and b/public/images/cache/16x16-bitcache.png differ diff --git a/public/images/cache/16x16-challenge-found.png b/public/images/cache/16x16-challenge-found.png new file mode 100644 index 0000000000..5d44d5ae7d Binary files /dev/null and b/public/images/cache/16x16-challenge-found.png differ diff --git a/public/images/cache/16x16-challenge-s-owner.png b/public/images/cache/16x16-challenge-s-owner.png new file mode 100644 index 0000000000..4462356fe0 Binary files /dev/null and b/public/images/cache/16x16-challenge-s-owner.png differ diff --git a/public/images/cache/16x16-challenge.png b/public/images/cache/16x16-challenge.png index ed56852cd7..d1a2193e69 100644 Binary files a/public/images/cache/16x16-challenge.png and b/public/images/cache/16x16-challenge.png differ diff --git a/public/images/cache/16x16-guestbook-found.png b/public/images/cache/16x16-guestbook-found.png new file mode 100644 index 0000000000..51e1031b73 Binary files /dev/null and b/public/images/cache/16x16-guestbook-found.png differ diff --git a/public/images/cache/16x16-guestbook-s-owner.png b/public/images/cache/16x16-guestbook-s-owner.png new file mode 100644 index 0000000000..35d4b9ddb0 Binary files /dev/null and b/public/images/cache/16x16-guestbook-s-owner.png differ diff --git a/public/images/cache/16x16-guestbook.png b/public/images/cache/16x16-guestbook.png index e18e6d8939..5b9e389fb3 100644 Binary files a/public/images/cache/16x16-guestbook.png and b/public/images/cache/16x16-guestbook.png differ diff --git a/public/images/cache/16x16-podcache-found.png b/public/images/cache/16x16-podcache-found.png deleted file mode 100644 index fdadfa4b74..0000000000 Binary files a/public/images/cache/16x16-podcache-found.png and /dev/null differ diff --git a/public/images/cache/16x16-podcache.png b/public/images/cache/16x16-podcache.png deleted file mode 100644 index b46d2a9d34..0000000000 Binary files a/public/images/cache/16x16-podcache.png and /dev/null differ diff --git a/public/images/cache/22x22-challenge.png b/public/images/cache/22x22-challenge.png deleted file mode 100644 index e5b080142d..0000000000 Binary files a/public/images/cache/22x22-challenge.png and /dev/null differ diff --git a/public/images/cache/22x22-event.png b/public/images/cache/22x22-event.png deleted file mode 100644 index d75a18120a..0000000000 Binary files a/public/images/cache/22x22-event.png and /dev/null differ diff --git a/public/images/cache/22x22-guestbook.png b/public/images/cache/22x22-guestbook.png deleted file mode 100644 index 267f8ecef3..0000000000 Binary files a/public/images/cache/22x22-guestbook.png and /dev/null differ diff --git a/public/images/cache/22x22-moving.png b/public/images/cache/22x22-moving.png deleted file mode 100644 index 538c63509f..0000000000 Binary files a/public/images/cache/22x22-moving.png and /dev/null differ diff --git a/public/images/cache/22x22-multi.png b/public/images/cache/22x22-multi.png deleted file mode 100644 index 150f2ddd27..0000000000 Binary files a/public/images/cache/22x22-multi.png and /dev/null differ diff --git a/public/images/cache/22x22-owncache.png b/public/images/cache/22x22-owncache.png deleted file mode 100644 index fbf8c9f456..0000000000 Binary files a/public/images/cache/22x22-owncache.png and /dev/null differ diff --git a/public/images/cache/22x22-podcache.png b/public/images/cache/22x22-podcache.png deleted file mode 100644 index 47108bc9ac..0000000000 Binary files a/public/images/cache/22x22-podcache.png and /dev/null differ diff --git a/public/images/cache/22x22-quiz.png b/public/images/cache/22x22-quiz.png deleted file mode 100644 index c7a3479f52..0000000000 Binary files a/public/images/cache/22x22-quiz.png and /dev/null differ diff --git a/public/images/cache/22x22-traditional.png b/public/images/cache/22x22-traditional.png deleted file mode 100644 index 9effec7a17..0000000000 Binary files a/public/images/cache/22x22-traditional.png and /dev/null differ diff --git a/public/images/cache/22x22-unknown.png b/public/images/cache/22x22-unknown.png deleted file mode 100644 index b3ae46fd31..0000000000 Binary files a/public/images/cache/22x22-unknown.png and /dev/null differ diff --git a/public/images/cache/22x22-virtual.png b/public/images/cache/22x22-virtual.png deleted file mode 100644 index 9ee9efead8..0000000000 Binary files a/public/images/cache/22x22-virtual.png and /dev/null differ diff --git a/public/images/cache/22x22-webcam.png b/public/images/cache/22x22-webcam.png deleted file mode 100644 index ae74cb2676..0000000000 Binary files a/public/images/cache/22x22-webcam.png and /dev/null differ diff --git a/public/images/cache/24x24-challenge.png b/public/images/cache/24x24-challenge.png deleted file mode 100644 index ceca8015cb..0000000000 Binary files a/public/images/cache/24x24-challenge.png and /dev/null differ diff --git a/public/images/cache/24x24-event.png b/public/images/cache/24x24-event.png deleted file mode 100644 index 6daaf1af91..0000000000 Binary files a/public/images/cache/24x24-event.png and /dev/null differ diff --git a/public/images/cache/24x24-guestbook.png b/public/images/cache/24x24-guestbook.png deleted file mode 100644 index 3754c9610f..0000000000 Binary files a/public/images/cache/24x24-guestbook.png and /dev/null differ diff --git a/public/images/cache/24x24-moving.png b/public/images/cache/24x24-moving.png deleted file mode 100644 index da6e2a62cb..0000000000 Binary files a/public/images/cache/24x24-moving.png and /dev/null differ diff --git a/public/images/cache/24x24-multi.png b/public/images/cache/24x24-multi.png deleted file mode 100644 index 094a570a6e..0000000000 Binary files a/public/images/cache/24x24-multi.png and /dev/null differ diff --git a/public/images/cache/24x24-owncache.png b/public/images/cache/24x24-owncache.png deleted file mode 100644 index 1a2abfbbe2..0000000000 Binary files a/public/images/cache/24x24-owncache.png and /dev/null differ diff --git a/public/images/cache/24x24-podcache.png b/public/images/cache/24x24-podcache.png deleted file mode 100644 index abd11a291d..0000000000 Binary files a/public/images/cache/24x24-podcache.png and /dev/null differ diff --git a/public/images/cache/24x24-quiz.png b/public/images/cache/24x24-quiz.png deleted file mode 100644 index d94cce81c1..0000000000 Binary files a/public/images/cache/24x24-quiz.png and /dev/null differ diff --git a/public/images/cache/24x24-traditional.png b/public/images/cache/24x24-traditional.png deleted file mode 100644 index f10b605c6a..0000000000 Binary files a/public/images/cache/24x24-traditional.png and /dev/null differ diff --git a/public/images/cache/24x24-unknown.png b/public/images/cache/24x24-unknown.png deleted file mode 100644 index 9643349dc7..0000000000 Binary files a/public/images/cache/24x24-unknown.png and /dev/null differ diff --git a/public/images/cache/24x24-virtual.png b/public/images/cache/24x24-virtual.png deleted file mode 100644 index 3b3580175d..0000000000 Binary files a/public/images/cache/24x24-virtual.png and /dev/null differ diff --git a/public/images/cache/24x24-webcam.png b/public/images/cache/24x24-webcam.png deleted file mode 100644 index 0528623e7b..0000000000 Binary files a/public/images/cache/24x24-webcam.png and /dev/null differ diff --git a/public/images/cache/benchmark-a-dnf.png b/public/images/cache/benchmark-a-dnf.png new file mode 100644 index 0000000000..955c0ef9c0 Binary files /dev/null and b/public/images/cache/benchmark-a-dnf.png differ diff --git a/public/images/cache/benchmark-a-found.png b/public/images/cache/benchmark-a-found.png new file mode 100644 index 0000000000..dd767cbc74 Binary files /dev/null and b/public/images/cache/benchmark-a-found.png differ diff --git a/public/images/cache/benchmark-a-owner.png b/public/images/cache/benchmark-a-owner.png new file mode 100644 index 0000000000..4d8c08fc89 Binary files /dev/null and b/public/images/cache/benchmark-a-owner.png differ diff --git a/public/images/cache/benchmark-a.png b/public/images/cache/benchmark-a.png new file mode 100644 index 0000000000..e9ed433092 Binary files /dev/null and b/public/images/cache/benchmark-a.png differ diff --git a/public/images/cache/benchmark-d-dnf.png b/public/images/cache/benchmark-d-dnf.png new file mode 100644 index 0000000000..564427cce6 Binary files /dev/null and b/public/images/cache/benchmark-d-dnf.png differ diff --git a/public/images/cache/benchmark-d-found.png b/public/images/cache/benchmark-d-found.png new file mode 100644 index 0000000000..f4aa4b5382 Binary files /dev/null and b/public/images/cache/benchmark-d-found.png differ diff --git a/public/images/cache/benchmark-d-owner.png b/public/images/cache/benchmark-d-owner.png new file mode 100644 index 0000000000..cc3d001f19 Binary files /dev/null and b/public/images/cache/benchmark-d-owner.png differ diff --git a/public/images/cache/benchmark-d.png b/public/images/cache/benchmark-d.png new file mode 100644 index 0000000000..fb909c9f5e Binary files /dev/null and b/public/images/cache/benchmark-d.png differ diff --git a/public/images/cache/benchmark-i-bw.png b/public/images/cache/benchmark-i-bw.png new file mode 100644 index 0000000000..d2e7dbdefa Binary files /dev/null and b/public/images/cache/benchmark-i-bw.png differ diff --git a/public/images/cache/benchmark-i.png b/public/images/cache/benchmark-i.png new file mode 100644 index 0000000000..cfd0ab4c59 Binary files /dev/null and b/public/images/cache/benchmark-i.png differ diff --git a/public/images/cache/benchmark-n-dnf.png b/public/images/cache/benchmark-n-dnf.png new file mode 100644 index 0000000000..38aceebb7c Binary files /dev/null and b/public/images/cache/benchmark-n-dnf.png differ diff --git a/public/images/cache/benchmark-n-found.png b/public/images/cache/benchmark-n-found.png new file mode 100644 index 0000000000..d408d405b4 Binary files /dev/null and b/public/images/cache/benchmark-n-found.png differ diff --git a/public/images/cache/benchmark-n-owner.png b/public/images/cache/benchmark-n-owner.png new file mode 100644 index 0000000000..2ec8bd93c6 Binary files /dev/null and b/public/images/cache/benchmark-n-owner.png differ diff --git a/public/images/cache/benchmark-n.png b/public/images/cache/benchmark-n.png new file mode 100644 index 0000000000..1d70fafe4b Binary files /dev/null and b/public/images/cache/benchmark-n.png differ diff --git a/public/images/cache/benchmark-s-dnf.png b/public/images/cache/benchmark-s-dnf.png new file mode 100644 index 0000000000..d302aa67b1 Binary files /dev/null and b/public/images/cache/benchmark-s-dnf.png differ diff --git a/public/images/cache/benchmark-s-found.png b/public/images/cache/benchmark-s-found.png new file mode 100644 index 0000000000..a5a67ae1f4 Binary files /dev/null and b/public/images/cache/benchmark-s-found.png differ diff --git a/public/images/cache/benchmark-s-owner.png b/public/images/cache/benchmark-s-owner.png new file mode 100644 index 0000000000..ad2b79ef3c Binary files /dev/null and b/public/images/cache/benchmark-s-owner.png differ diff --git a/public/images/cache/benchmark-s.png b/public/images/cache/benchmark-s.png new file mode 100644 index 0000000000..06b6b6453b Binary files /dev/null and b/public/images/cache/benchmark-s.png differ diff --git a/public/images/cache/benchmark.png b/public/images/cache/benchmark.png new file mode 100644 index 0000000000..2a8b0a9d14 Binary files /dev/null and b/public/images/cache/benchmark.png differ diff --git a/public/images/cache/bitcache-a-dnf.png b/public/images/cache/bitcache-a-dnf.png new file mode 100644 index 0000000000..dffc81a1ec Binary files /dev/null and b/public/images/cache/bitcache-a-dnf.png differ diff --git a/public/images/cache/bitcache-a-found.png b/public/images/cache/bitcache-a-found.png new file mode 100644 index 0000000000..ccf11fa417 Binary files /dev/null and b/public/images/cache/bitcache-a-found.png differ diff --git a/public/images/cache/bitcache-a-owner.png b/public/images/cache/bitcache-a-owner.png new file mode 100644 index 0000000000..dd0d31101e Binary files /dev/null and b/public/images/cache/bitcache-a-owner.png differ diff --git a/public/images/cache/bitcache-a.png b/public/images/cache/bitcache-a.png new file mode 100644 index 0000000000..8253d78be0 Binary files /dev/null and b/public/images/cache/bitcache-a.png differ diff --git a/public/images/cache/bitcache-d-dnf.png b/public/images/cache/bitcache-d-dnf.png new file mode 100644 index 0000000000..9d0827bd67 Binary files /dev/null and b/public/images/cache/bitcache-d-dnf.png differ diff --git a/public/images/cache/bitcache-d-found.png b/public/images/cache/bitcache-d-found.png new file mode 100644 index 0000000000..926d2c408f Binary files /dev/null and b/public/images/cache/bitcache-d-found.png differ diff --git a/public/images/cache/bitcache-d-owner.png b/public/images/cache/bitcache-d-owner.png new file mode 100644 index 0000000000..5085de09dc Binary files /dev/null and b/public/images/cache/bitcache-d-owner.png differ diff --git a/public/images/cache/bitcache-d.png b/public/images/cache/bitcache-d.png new file mode 100644 index 0000000000..f64cca2465 Binary files /dev/null and b/public/images/cache/bitcache-d.png differ diff --git a/public/images/cache/bitcache-i-bw.png b/public/images/cache/bitcache-i-bw.png new file mode 100644 index 0000000000..91b9d12fe6 Binary files /dev/null and b/public/images/cache/bitcache-i-bw.png differ diff --git a/public/images/cache/bitcache-i.png b/public/images/cache/bitcache-i.png new file mode 100644 index 0000000000..10cc2de038 Binary files /dev/null and b/public/images/cache/bitcache-i.png differ diff --git a/public/images/cache/bitcache-n-dnf.png b/public/images/cache/bitcache-n-dnf.png new file mode 100644 index 0000000000..1f4c5e3e50 Binary files /dev/null and b/public/images/cache/bitcache-n-dnf.png differ diff --git a/public/images/cache/bitcache-n-found.png b/public/images/cache/bitcache-n-found.png new file mode 100644 index 0000000000..0d85d81458 Binary files /dev/null and b/public/images/cache/bitcache-n-found.png differ diff --git a/public/images/cache/bitcache-n-owner.png b/public/images/cache/bitcache-n-owner.png new file mode 100644 index 0000000000..d01fa7d694 Binary files /dev/null and b/public/images/cache/bitcache-n-owner.png differ diff --git a/public/images/cache/bitcache-n.png b/public/images/cache/bitcache-n.png new file mode 100644 index 0000000000..ecc24106ca Binary files /dev/null and b/public/images/cache/bitcache-n.png differ diff --git a/public/images/cache/bitcache-s-dnf.png b/public/images/cache/bitcache-s-dnf.png new file mode 100644 index 0000000000..9b0843feb8 Binary files /dev/null and b/public/images/cache/bitcache-s-dnf.png differ diff --git a/public/images/cache/bitcache-s-found.png b/public/images/cache/bitcache-s-found.png new file mode 100644 index 0000000000..694167dea4 Binary files /dev/null and b/public/images/cache/bitcache-s-found.png differ diff --git a/public/images/cache/bitcache-s-owner.png b/public/images/cache/bitcache-s-owner.png new file mode 100644 index 0000000000..0e63b770e3 Binary files /dev/null and b/public/images/cache/bitcache-s-owner.png differ diff --git a/public/images/cache/bitcache-s.png b/public/images/cache/bitcache-s.png new file mode 100644 index 0000000000..dce843bc39 Binary files /dev/null and b/public/images/cache/bitcache-s.png differ diff --git a/public/images/cache/bitcache.png b/public/images/cache/bitcache.png new file mode 100644 index 0000000000..ba36e30ec0 Binary files /dev/null and b/public/images/cache/bitcache.png differ diff --git a/public/images/cache/challenge-a-dnf.png b/public/images/cache/challenge-a-dnf.png index cd5c398fb1..c3afb0ff5e 100644 Binary files a/public/images/cache/challenge-a-dnf.png and b/public/images/cache/challenge-a-dnf.png differ diff --git a/public/images/cache/challenge-a-found.png b/public/images/cache/challenge-a-found.png index 3fe56c059c..ed5f3189a9 100644 Binary files a/public/images/cache/challenge-a-found.png and b/public/images/cache/challenge-a-found.png differ diff --git a/public/images/cache/challenge-a-owner.png b/public/images/cache/challenge-a-owner.png index 0e8f6a20d2..460991dc2b 100644 Binary files a/public/images/cache/challenge-a-owner.png and b/public/images/cache/challenge-a-owner.png differ diff --git a/public/images/cache/challenge-a.png b/public/images/cache/challenge-a.png index 2a9575bc09..010fa2d442 100644 Binary files a/public/images/cache/challenge-a.png and b/public/images/cache/challenge-a.png differ diff --git a/public/images/cache/challenge-d-dnf.png b/public/images/cache/challenge-d-dnf.png index 311af4208c..3302e8722d 100644 Binary files a/public/images/cache/challenge-d-dnf.png and b/public/images/cache/challenge-d-dnf.png differ diff --git a/public/images/cache/challenge-d-found.png b/public/images/cache/challenge-d-found.png index c37ac25e21..a7bc60bb44 100644 Binary files a/public/images/cache/challenge-d-found.png and b/public/images/cache/challenge-d-found.png differ diff --git a/public/images/cache/challenge-d-owner.png b/public/images/cache/challenge-d-owner.png index 6b9b90400b..1e6dc63920 100644 Binary files a/public/images/cache/challenge-d-owner.png and b/public/images/cache/challenge-d-owner.png differ diff --git a/public/images/cache/challenge-d.png b/public/images/cache/challenge-d.png index eddff5ae5f..efd7780c28 100644 Binary files a/public/images/cache/challenge-d.png and b/public/images/cache/challenge-d.png differ diff --git a/public/images/cache/challenge-i-bw.png b/public/images/cache/challenge-i-bw.png index 3bba3dec82..35ebb2ad2b 100644 Binary files a/public/images/cache/challenge-i-bw.png and b/public/images/cache/challenge-i-bw.png differ diff --git a/public/images/cache/challenge-i.png b/public/images/cache/challenge-i.png index 5f39ea58b2..c283967732 100644 Binary files a/public/images/cache/challenge-i.png and b/public/images/cache/challenge-i.png differ diff --git a/public/images/cache/challenge-n-dnf.png b/public/images/cache/challenge-n-dnf.png index e1652540c1..0bef3918a9 100644 Binary files a/public/images/cache/challenge-n-dnf.png and b/public/images/cache/challenge-n-dnf.png differ diff --git a/public/images/cache/challenge-n-found.png b/public/images/cache/challenge-n-found.png index 97cc558530..305692d411 100644 Binary files a/public/images/cache/challenge-n-found.png and b/public/images/cache/challenge-n-found.png differ diff --git a/public/images/cache/challenge-n-owner.png b/public/images/cache/challenge-n-owner.png index c90d1a3128..d8e7cdb4b0 100644 Binary files a/public/images/cache/challenge-n-owner.png and b/public/images/cache/challenge-n-owner.png differ diff --git a/public/images/cache/challenge-n.png b/public/images/cache/challenge-n.png index 0a2d836e10..ec0fb92e82 100644 Binary files a/public/images/cache/challenge-n.png and b/public/images/cache/challenge-n.png differ diff --git a/public/images/cache/challenge-s-dnf.png b/public/images/cache/challenge-s-dnf.png index 47fb88ebb9..5a53835332 100644 Binary files a/public/images/cache/challenge-s-dnf.png and b/public/images/cache/challenge-s-dnf.png differ diff --git a/public/images/cache/challenge-s-found.png b/public/images/cache/challenge-s-found.png index 00e2a2abf9..a9f75932c9 100644 Binary files a/public/images/cache/challenge-s-found.png and b/public/images/cache/challenge-s-found.png differ diff --git a/public/images/cache/challenge-s-owner.png b/public/images/cache/challenge-s-owner.png index 43d30fabd5..a0bba87bc0 100644 Binary files a/public/images/cache/challenge-s-owner.png and b/public/images/cache/challenge-s-owner.png differ diff --git a/public/images/cache/challenge-s.png b/public/images/cache/challenge-s.png index 632298df18..ec3d0151cc 100644 Binary files a/public/images/cache/challenge-s.png and b/public/images/cache/challenge-s.png differ diff --git a/public/images/cache/challenge.png b/public/images/cache/challenge.png index 632298df18..172439467f 100644 Binary files a/public/images/cache/challenge.png and b/public/images/cache/challenge.png differ diff --git a/public/images/cache/guestbook-a-dnf.png b/public/images/cache/guestbook-a-dnf.png index f4eebcbf61..6433ddeefb 100644 Binary files a/public/images/cache/guestbook-a-dnf.png and b/public/images/cache/guestbook-a-dnf.png differ diff --git a/public/images/cache/guestbook-a-found.png b/public/images/cache/guestbook-a-found.png index 4a5e89b2a4..bad7520f0d 100644 Binary files a/public/images/cache/guestbook-a-found.png and b/public/images/cache/guestbook-a-found.png differ diff --git a/public/images/cache/guestbook-a-owner.png b/public/images/cache/guestbook-a-owner.png index 00beef06ba..fd316db930 100644 Binary files a/public/images/cache/guestbook-a-owner.png and b/public/images/cache/guestbook-a-owner.png differ diff --git a/public/images/cache/guestbook-a.png b/public/images/cache/guestbook-a.png index e3ff65d600..acb16425c1 100644 Binary files a/public/images/cache/guestbook-a.png and b/public/images/cache/guestbook-a.png differ diff --git a/public/images/cache/guestbook-d-dnf.png b/public/images/cache/guestbook-d-dnf.png index 24ab73db31..b5ed2977f4 100644 Binary files a/public/images/cache/guestbook-d-dnf.png and b/public/images/cache/guestbook-d-dnf.png differ diff --git a/public/images/cache/guestbook-d-found.png b/public/images/cache/guestbook-d-found.png index 7381db2c08..5558f4c2d2 100644 Binary files a/public/images/cache/guestbook-d-found.png and b/public/images/cache/guestbook-d-found.png differ diff --git a/public/images/cache/guestbook-d-owner.png b/public/images/cache/guestbook-d-owner.png index 208c41e99a..74a462ba1f 100644 Binary files a/public/images/cache/guestbook-d-owner.png and b/public/images/cache/guestbook-d-owner.png differ diff --git a/public/images/cache/guestbook-d.png b/public/images/cache/guestbook-d.png index d21b9d0b92..286a451f81 100644 Binary files a/public/images/cache/guestbook-d.png and b/public/images/cache/guestbook-d.png differ diff --git a/public/images/cache/guestbook-i-bw.png b/public/images/cache/guestbook-i-bw.png index 91dfe42357..520f80d2e5 100644 Binary files a/public/images/cache/guestbook-i-bw.png and b/public/images/cache/guestbook-i-bw.png differ diff --git a/public/images/cache/guestbook-i.png b/public/images/cache/guestbook-i.png index bdabb6a53e..2957ab314a 100644 Binary files a/public/images/cache/guestbook-i.png and b/public/images/cache/guestbook-i.png differ diff --git a/public/images/cache/guestbook-n-dnf.png b/public/images/cache/guestbook-n-dnf.png index 6640cba044..7ec1fcb001 100644 Binary files a/public/images/cache/guestbook-n-dnf.png and b/public/images/cache/guestbook-n-dnf.png differ diff --git a/public/images/cache/guestbook-n-found.png b/public/images/cache/guestbook-n-found.png index 692785b5c1..2eed1a2433 100644 Binary files a/public/images/cache/guestbook-n-found.png and b/public/images/cache/guestbook-n-found.png differ diff --git a/public/images/cache/guestbook-n-owner.png b/public/images/cache/guestbook-n-owner.png index fc1e7b8c53..99b47261e8 100644 Binary files a/public/images/cache/guestbook-n-owner.png and b/public/images/cache/guestbook-n-owner.png differ diff --git a/public/images/cache/guestbook-n.png b/public/images/cache/guestbook-n.png index 8e66bca98e..66bb2bdcba 100644 Binary files a/public/images/cache/guestbook-n.png and b/public/images/cache/guestbook-n.png differ diff --git a/public/images/cache/guestbook-s-dnf.png b/public/images/cache/guestbook-s-dnf.png index a4ffa1ab4f..5141936e33 100644 Binary files a/public/images/cache/guestbook-s-dnf.png and b/public/images/cache/guestbook-s-dnf.png differ diff --git a/public/images/cache/guestbook-s-found.png b/public/images/cache/guestbook-s-found.png index dd4aac475b..cfefe507d7 100644 Binary files a/public/images/cache/guestbook-s-found.png and b/public/images/cache/guestbook-s-found.png differ diff --git a/public/images/cache/guestbook-s-owner.png b/public/images/cache/guestbook-s-owner.png index b7a8a77ce6..f638b10fad 100644 Binary files a/public/images/cache/guestbook-s-owner.png and b/public/images/cache/guestbook-s-owner.png differ diff --git a/public/images/cache/guestbook-s.png b/public/images/cache/guestbook-s.png index eac183eba4..f6c3b671bd 100644 Binary files a/public/images/cache/guestbook-s.png and b/public/images/cache/guestbook-s.png differ diff --git a/public/images/cache/guestbook.png b/public/images/cache/guestbook.png index eac183eba4..bec7e508b7 100644 Binary files a/public/images/cache/guestbook.png and b/public/images/cache/guestbook.png differ diff --git a/public/images/cache/kml/benchmark_kml-archived.png b/public/images/cache/kml/benchmark_kml-archived.png new file mode 100644 index 0000000000..f04b9f014a Binary files /dev/null and b/public/images/cache/kml/benchmark_kml-archived.png differ diff --git a/public/images/cache/kml/benchmark_kml-disabled.png b/public/images/cache/kml/benchmark_kml-disabled.png new file mode 100644 index 0000000000..5a9aec203c Binary files /dev/null and b/public/images/cache/kml/benchmark_kml-disabled.png differ diff --git a/public/images/cache/kml/benchmark_kml.png b/public/images/cache/kml/benchmark_kml.png new file mode 100644 index 0000000000..4b8d5de5ac Binary files /dev/null and b/public/images/cache/kml/benchmark_kml.png differ diff --git a/public/images/cache/kml/bitcache_kml-archived.png b/public/images/cache/kml/bitcache_kml-archived.png new file mode 100644 index 0000000000..16572bf15f Binary files /dev/null and b/public/images/cache/kml/bitcache_kml-archived.png differ diff --git a/public/images/cache/kml/bitcache_kml-disabled.png b/public/images/cache/kml/bitcache_kml-disabled.png new file mode 100644 index 0000000000..99a14743b9 Binary files /dev/null and b/public/images/cache/kml/bitcache_kml-disabled.png differ diff --git a/public/images/cache/kml/bitcache_kml.png b/public/images/cache/kml/bitcache_kml.png new file mode 100644 index 0000000000..5330874da4 Binary files /dev/null and b/public/images/cache/kml/bitcache_kml.png differ diff --git a/public/images/cache/kml/challenge_kml-archived.png b/public/images/cache/kml/challenge_kml-archived.png new file mode 100644 index 0000000000..81a7f707e7 Binary files /dev/null and b/public/images/cache/kml/challenge_kml-archived.png differ diff --git a/public/images/cache/kml/challenge_kml-disabled.png b/public/images/cache/kml/challenge_kml-disabled.png new file mode 100644 index 0000000000..160653c0bf Binary files /dev/null and b/public/images/cache/kml/challenge_kml-disabled.png differ diff --git a/public/images/cache/kml/challenge_kml.png b/public/images/cache/kml/challenge_kml.png new file mode 100644 index 0000000000..2524d0dcf1 Binary files /dev/null and b/public/images/cache/kml/challenge_kml.png differ diff --git a/public/images/cache/kml/convert-cache-icons-4-kml.sh b/public/images/cache/kml/convert-cache-icons-4-kml.sh deleted file mode 100644 index 51bc756b11..0000000000 --- a/public/images/cache/kml/convert-cache-icons-4-kml.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# Convert standard cache icons (in parent directory) for better display -# in Google Earth via KML export - -SRC="../" -CACHE_TYPES="event moving multi owncache podcache quiz traditional unknown virtual webcam" - -MARKER="__marker_oc.png" -MARKER_DISABLED="__marker_disabled_oc.png" -MARKER_ARCHIVED="__marker_archived_oc.png" - -function convertKML() { - CACHE="$1.png" - KML="$1_kml.png" - KML_DISABLED="$1_kml-disabled.png" - KML_ARCHIVED="$1_kml-archived.png" - if [ ! -f "${SRC}${CACHE}" ]; then - echo "Error: file not found ${CACHE}!" - exit 1 - fi - rm -f "${KML}" - rm -f "${KML_DISABLED}" - rm -f "${KML_ARCHIVED}" - composite -compose src-over -geometry +6+6 "${SRC}${CACHE}" "${MARKER}" "${KML}" - composite -compose src-over -geometry +6+6 "${SRC}${CACHE}" "${MARKER_DISABLED}" "${KML_DISABLED}" - composite -compose src-over -geometry +6+6 "${SRC}${CACHE}" "${MARKER_ARCHIVED}" "${KML_ARCHIVED}" -} - -for x in ${CACHE_TYPES}; do - echo -n "Creating KML icon for ${x}..." - convertKML $x - echo "done." -done diff --git a/public/images/cache/kml/event_kml-archived.png b/public/images/cache/kml/event_kml-archived.png index faf5a95679..d94c2d718b 100644 Binary files a/public/images/cache/kml/event_kml-archived.png and b/public/images/cache/kml/event_kml-archived.png differ diff --git a/public/images/cache/kml/event_kml-disabled.png b/public/images/cache/kml/event_kml-disabled.png index aa28436c06..c59092f689 100644 Binary files a/public/images/cache/kml/event_kml-disabled.png and b/public/images/cache/kml/event_kml-disabled.png differ diff --git a/public/images/cache/kml/event_kml.png b/public/images/cache/kml/event_kml.png index 85e552e526..ecd1332c60 100644 Binary files a/public/images/cache/kml/event_kml.png and b/public/images/cache/kml/event_kml.png differ diff --git a/public/images/cache/kml/guestbook_kml-archived.png b/public/images/cache/kml/guestbook_kml-archived.png new file mode 100644 index 0000000000..a981d996fb Binary files /dev/null and b/public/images/cache/kml/guestbook_kml-archived.png differ diff --git a/public/images/cache/kml/guestbook_kml-disabled.png b/public/images/cache/kml/guestbook_kml-disabled.png new file mode 100644 index 0000000000..9d825ad33b Binary files /dev/null and b/public/images/cache/kml/guestbook_kml-disabled.png differ diff --git a/public/images/cache/kml/guestbook_kml.png b/public/images/cache/kml/guestbook_kml.png new file mode 100644 index 0000000000..b7d8bbec6a Binary files /dev/null and b/public/images/cache/kml/guestbook_kml.png differ diff --git a/public/images/cache/kml/moving_kml-archived.png b/public/images/cache/kml/moving_kml-archived.png index 8aaa8165dc..a0196619c4 100644 Binary files a/public/images/cache/kml/moving_kml-archived.png and b/public/images/cache/kml/moving_kml-archived.png differ diff --git a/public/images/cache/kml/moving_kml-disabled.png b/public/images/cache/kml/moving_kml-disabled.png index 791cc9159a..547bf5a4f8 100644 Binary files a/public/images/cache/kml/moving_kml-disabled.png and b/public/images/cache/kml/moving_kml-disabled.png differ diff --git a/public/images/cache/kml/moving_kml.png b/public/images/cache/kml/moving_kml.png index 4f5cbef9e6..471cac51e9 100644 Binary files a/public/images/cache/kml/moving_kml.png and b/public/images/cache/kml/moving_kml.png differ diff --git a/public/images/cache/kml/multi_kml-archived.png b/public/images/cache/kml/multi_kml-archived.png index 9d9c8ce2e9..86b0e0ea51 100644 Binary files a/public/images/cache/kml/multi_kml-archived.png and b/public/images/cache/kml/multi_kml-archived.png differ diff --git a/public/images/cache/kml/multi_kml-disabled.png b/public/images/cache/kml/multi_kml-disabled.png index 59a196530e..8ba7bdce80 100644 Binary files a/public/images/cache/kml/multi_kml-disabled.png and b/public/images/cache/kml/multi_kml-disabled.png differ diff --git a/public/images/cache/kml/multi_kml.png b/public/images/cache/kml/multi_kml.png index e8714795f1..e0bd78c683 100644 Binary files a/public/images/cache/kml/multi_kml.png and b/public/images/cache/kml/multi_kml.png differ diff --git a/public/images/cache/kml/owncache_kml-archived.png b/public/images/cache/kml/owncache_kml-archived.png index b6e93a9f59..af7e61fb12 100644 Binary files a/public/images/cache/kml/owncache_kml-archived.png and b/public/images/cache/kml/owncache_kml-archived.png differ diff --git a/public/images/cache/kml/owncache_kml-disabled.png b/public/images/cache/kml/owncache_kml-disabled.png index c1cdf3a18c..d87b5b9434 100644 Binary files a/public/images/cache/kml/owncache_kml-disabled.png and b/public/images/cache/kml/owncache_kml-disabled.png differ diff --git a/public/images/cache/kml/owncache_kml.png b/public/images/cache/kml/owncache_kml.png index 059c887960..f0794ebb5b 100644 Binary files a/public/images/cache/kml/owncache_kml.png and b/public/images/cache/kml/owncache_kml.png differ diff --git a/public/images/cache/kml/podcache_kml-archived.png b/public/images/cache/kml/podcache_kml-archived.png deleted file mode 100644 index bca8eb34f2..0000000000 Binary files a/public/images/cache/kml/podcache_kml-archived.png and /dev/null differ diff --git a/public/images/cache/kml/podcache_kml-disabled.png b/public/images/cache/kml/podcache_kml-disabled.png deleted file mode 100644 index e645d35958..0000000000 Binary files a/public/images/cache/kml/podcache_kml-disabled.png and /dev/null differ diff --git a/public/images/cache/kml/podcache_kml.png b/public/images/cache/kml/podcache_kml.png deleted file mode 100644 index d6c0249c90..0000000000 Binary files a/public/images/cache/kml/podcache_kml.png and /dev/null differ diff --git a/public/images/cache/kml/quiz_kml-archived.png b/public/images/cache/kml/quiz_kml-archived.png index f0c7017653..fdde710ece 100644 Binary files a/public/images/cache/kml/quiz_kml-archived.png and b/public/images/cache/kml/quiz_kml-archived.png differ diff --git a/public/images/cache/kml/quiz_kml-disabled.png b/public/images/cache/kml/quiz_kml-disabled.png index 32025c56f5..4ab9c372f6 100644 Binary files a/public/images/cache/kml/quiz_kml-disabled.png and b/public/images/cache/kml/quiz_kml-disabled.png differ diff --git a/public/images/cache/kml/quiz_kml.png b/public/images/cache/kml/quiz_kml.png index 68d11394ff..319d8f016d 100644 Binary files a/public/images/cache/kml/quiz_kml.png and b/public/images/cache/kml/quiz_kml.png differ diff --git a/public/images/cache/kml/traditional_kml-archived.png b/public/images/cache/kml/traditional_kml-archived.png index e2b866f34d..1b6087fa9f 100644 Binary files a/public/images/cache/kml/traditional_kml-archived.png and b/public/images/cache/kml/traditional_kml-archived.png differ diff --git a/public/images/cache/kml/traditional_kml-disabled.png b/public/images/cache/kml/traditional_kml-disabled.png index fce4c25f59..bccdbf1be3 100644 Binary files a/public/images/cache/kml/traditional_kml-disabled.png and b/public/images/cache/kml/traditional_kml-disabled.png differ diff --git a/public/images/cache/kml/traditional_kml.png b/public/images/cache/kml/traditional_kml.png index 2081f7e64f..356b17eaa3 100644 Binary files a/public/images/cache/kml/traditional_kml.png and b/public/images/cache/kml/traditional_kml.png differ diff --git a/public/images/cache/kml/virtual_kml-archived.png b/public/images/cache/kml/virtual_kml-archived.png index e877609718..ba5f7e1b7b 100644 Binary files a/public/images/cache/kml/virtual_kml-archived.png and b/public/images/cache/kml/virtual_kml-archived.png differ diff --git a/public/images/cache/kml/virtual_kml-disabled.png b/public/images/cache/kml/virtual_kml-disabled.png index 51d3cd0458..f4cbb4b5d1 100644 Binary files a/public/images/cache/kml/virtual_kml-disabled.png and b/public/images/cache/kml/virtual_kml-disabled.png differ diff --git a/public/images/cache/kml/virtual_kml.png b/public/images/cache/kml/virtual_kml.png index d58f9a2dbf..ba6bcdabf1 100644 Binary files a/public/images/cache/kml/virtual_kml.png and b/public/images/cache/kml/virtual_kml.png differ diff --git a/public/images/cache/kml/webcam_kml-archived.png b/public/images/cache/kml/webcam_kml-archived.png index defa11ebbf..f344d70ba5 100644 Binary files a/public/images/cache/kml/webcam_kml-archived.png and b/public/images/cache/kml/webcam_kml-archived.png differ diff --git a/public/images/cache/kml/webcam_kml-disabled.png b/public/images/cache/kml/webcam_kml-disabled.png index 0ed317091c..c3e4345fa6 100644 Binary files a/public/images/cache/kml/webcam_kml-disabled.png and b/public/images/cache/kml/webcam_kml-disabled.png differ diff --git a/public/images/cache/kml/webcam_kml.png b/public/images/cache/kml/webcam_kml.png index ccc07be105..88d30c207e 100644 Binary files a/public/images/cache/kml/webcam_kml.png and b/public/images/cache/kml/webcam_kml.png differ diff --git a/public/images/cache/mystery-i-bw.png b/public/images/cache/mystery-i-bw.png deleted file mode 100644 index 97f2de8a34..0000000000 Binary files a/public/images/cache/mystery-i-bw.png and /dev/null differ diff --git a/public/images/cache/mystery-i.png b/public/images/cache/mystery-i.png deleted file mode 100644 index ba7736b92d..0000000000 Binary files a/public/images/cache/mystery-i.png and /dev/null differ diff --git a/public/images/cache/podcache-a-dnf.png b/public/images/cache/podcache-a-dnf.png deleted file mode 100644 index a08d0ea107..0000000000 Binary files a/public/images/cache/podcache-a-dnf.png and /dev/null differ diff --git a/public/images/cache/podcache-a-found.png b/public/images/cache/podcache-a-found.png deleted file mode 100644 index a7ac262333..0000000000 Binary files a/public/images/cache/podcache-a-found.png and /dev/null differ diff --git a/public/images/cache/podcache-a-owner.png b/public/images/cache/podcache-a-owner.png deleted file mode 100644 index 7b7ee4bc94..0000000000 Binary files a/public/images/cache/podcache-a-owner.png and /dev/null differ diff --git a/public/images/cache/podcache-a.png b/public/images/cache/podcache-a.png deleted file mode 100644 index 400dcc0afc..0000000000 Binary files a/public/images/cache/podcache-a.png and /dev/null differ diff --git a/public/images/cache/podcache-d-dnf.png b/public/images/cache/podcache-d-dnf.png deleted file mode 100644 index 7a9771387f..0000000000 Binary files a/public/images/cache/podcache-d-dnf.png and /dev/null differ diff --git a/public/images/cache/podcache-d-found.png b/public/images/cache/podcache-d-found.png deleted file mode 100644 index 0dea672ddc..0000000000 Binary files a/public/images/cache/podcache-d-found.png and /dev/null differ diff --git a/public/images/cache/podcache-d-owner.png b/public/images/cache/podcache-d-owner.png deleted file mode 100644 index c599914286..0000000000 Binary files a/public/images/cache/podcache-d-owner.png and /dev/null differ diff --git a/public/images/cache/podcache-d.png b/public/images/cache/podcache-d.png deleted file mode 100644 index 9ba880f1b7..0000000000 Binary files a/public/images/cache/podcache-d.png and /dev/null differ diff --git a/public/images/cache/podcache-i-bw.png b/public/images/cache/podcache-i-bw.png deleted file mode 100644 index 75ec14d5f9..0000000000 Binary files a/public/images/cache/podcache-i-bw.png and /dev/null differ diff --git a/public/images/cache/podcache-i.png b/public/images/cache/podcache-i.png deleted file mode 100644 index cdd10abab9..0000000000 Binary files a/public/images/cache/podcache-i.png and /dev/null differ diff --git a/public/images/cache/podcache-n-dnf.png b/public/images/cache/podcache-n-dnf.png deleted file mode 100644 index 737e9183e4..0000000000 Binary files a/public/images/cache/podcache-n-dnf.png and /dev/null differ diff --git a/public/images/cache/podcache-n-found.png b/public/images/cache/podcache-n-found.png deleted file mode 100644 index 785f30ef95..0000000000 Binary files a/public/images/cache/podcache-n-found.png and /dev/null differ diff --git a/public/images/cache/podcache-n-owner.png b/public/images/cache/podcache-n-owner.png deleted file mode 100644 index 2ffad967d0..0000000000 Binary files a/public/images/cache/podcache-n-owner.png and /dev/null differ diff --git a/public/images/cache/podcache-n.png b/public/images/cache/podcache-n.png deleted file mode 100644 index d573f83278..0000000000 Binary files a/public/images/cache/podcache-n.png and /dev/null differ diff --git a/public/images/cache/podcache-s-dnf.png b/public/images/cache/podcache-s-dnf.png deleted file mode 100644 index f3eb3c8cc1..0000000000 Binary files a/public/images/cache/podcache-s-dnf.png and /dev/null differ diff --git a/public/images/cache/podcache-s-found.png b/public/images/cache/podcache-s-found.png deleted file mode 100644 index d33bd551ce..0000000000 Binary files a/public/images/cache/podcache-s-found.png and /dev/null differ diff --git a/public/images/cache/podcache-s-owner.png b/public/images/cache/podcache-s-owner.png deleted file mode 100644 index fa14a83399..0000000000 Binary files a/public/images/cache/podcache-s-owner.png and /dev/null differ diff --git a/public/images/cache/podcache-s.png b/public/images/cache/podcache-s.png deleted file mode 100644 index fd4e39b53b..0000000000 Binary files a/public/images/cache/podcache-s.png and /dev/null differ diff --git a/public/images/cache/podcache.png b/public/images/cache/podcache.png deleted file mode 100644 index fd4e39b53b..0000000000 Binary files a/public/images/cache/podcache.png and /dev/null differ diff --git a/public/images/cache/preview.png b/public/images/cache/preview.png index 710db1a933..d1b9d44812 100644 Binary files a/public/images/cache/preview.png and b/public/images/cache/preview.png differ diff --git a/public/images/cache/res/__cache_types.txt b/public/images/cache/res/__cache_types.txt new file mode 100644 index 0000000000..65ce8cc9c2 --- /dev/null +++ b/public/images/cache/res/__cache_types.txt @@ -0,0 +1,22 @@ +# cache types +# +# Format: cache_type_definition (according to GeoCacheCommons) {space} icon name +# Lines starting with # are comments +# Empty lines are ignored + +# All files 32x32 PNG or SVG images + +TYPE_OTHERTYPE unknown +TYPE_TRADITIONAL traditional +TYPE_MULTICACHE multi +TYPE_VIRTUAL virtual +TYPE_WEBCAM webcam +TYPE_EVENT event +TYPE_QUIZ quiz +TYPE_MOVING moving +TYPE_OWNCACHE owncache + +TYPE_GUESTBOOK guestbook +TYPE_BITCACHE bitcache +TYPE_BENCHMARK benchmark +TYPE_CHALLENGE challenge diff --git a/public/images/cache/kml/__marker_archived_oc.png b/public/images/cache/res/__kml_archived_oc.png similarity index 100% rename from public/images/cache/kml/__marker_archived_oc.png rename to public/images/cache/res/__kml_archived_oc.png diff --git a/public/images/cache/kml/__marker_disabled_oc.png b/public/images/cache/res/__kml_disabled_oc.png similarity index 100% rename from public/images/cache/kml/__marker_disabled_oc.png rename to public/images/cache/res/__kml_disabled_oc.png diff --git a/public/images/cache/kml/__marker_oc.png b/public/images/cache/res/__kml_oc.png similarity index 100% rename from public/images/cache/kml/__marker_oc.png rename to public/images/cache/res/__kml_oc.png diff --git a/public/images/cache/res/_cache_type__benchmark.png b/public/images/cache/res/_cache_type__benchmark.png new file mode 100644 index 0000000000..6816d9ccbc Binary files /dev/null and b/public/images/cache/res/_cache_type__benchmark.png differ diff --git a/public/images/cache/res/_cache_type__bitcache.png b/public/images/cache/res/_cache_type__bitcache.png new file mode 100644 index 0000000000..0a5b2ea866 Binary files /dev/null and b/public/images/cache/res/_cache_type__bitcache.png differ diff --git a/public/images/cache/res/_cache_type__challenge.png b/public/images/cache/res/_cache_type__challenge.png new file mode 100644 index 0000000000..632298df18 Binary files /dev/null and b/public/images/cache/res/_cache_type__challenge.png differ diff --git a/public/images/cache/res/_cache_type__event.png b/public/images/cache/res/_cache_type__event.png new file mode 100644 index 0000000000..f8811e35c7 Binary files /dev/null and b/public/images/cache/res/_cache_type__event.png differ diff --git a/public/images/cache/res/_cache_type__guestbook.png b/public/images/cache/res/_cache_type__guestbook.png new file mode 100644 index 0000000000..96b82776f9 Binary files /dev/null and b/public/images/cache/res/_cache_type__guestbook.png differ diff --git a/public/images/cache/res/_cache_type__moving.png b/public/images/cache/res/_cache_type__moving.png new file mode 100644 index 0000000000..5b8472e2c6 Binary files /dev/null and b/public/images/cache/res/_cache_type__moving.png differ diff --git a/public/images/cache/res/_cache_type__multi.png b/public/images/cache/res/_cache_type__multi.png new file mode 100644 index 0000000000..c3a5d324bd Binary files /dev/null and b/public/images/cache/res/_cache_type__multi.png differ diff --git a/public/images/cache/res/_cache_type__owncache.png b/public/images/cache/res/_cache_type__owncache.png new file mode 100644 index 0000000000..a83a201dc9 Binary files /dev/null and b/public/images/cache/res/_cache_type__owncache.png differ diff --git a/public/images/cache/res/_cache_type__quiz.png b/public/images/cache/res/_cache_type__quiz.png new file mode 100644 index 0000000000..0d3197d111 Binary files /dev/null and b/public/images/cache/res/_cache_type__quiz.png differ diff --git a/public/images/cache/res/_cache_type__traditional.png b/public/images/cache/res/_cache_type__traditional.png new file mode 100644 index 0000000000..c63f71f06d Binary files /dev/null and b/public/images/cache/res/_cache_type__traditional.png differ diff --git a/public/images/cache/res/_cache_type__unknown.png b/public/images/cache/res/_cache_type__unknown.png new file mode 100644 index 0000000000..f4018e683e Binary files /dev/null and b/public/images/cache/res/_cache_type__unknown.png differ diff --git a/public/images/cache/res/_cache_type__virtual.png b/public/images/cache/res/_cache_type__virtual.png new file mode 100644 index 0000000000..9404f0c8ca Binary files /dev/null and b/public/images/cache/res/_cache_type__virtual.png differ diff --git a/public/images/cache/res/_cache_type__webcam.png b/public/images/cache/res/_cache_type__webcam.png new file mode 100644 index 0000000000..be65fc0c47 Binary files /dev/null and b/public/images/cache/res/_cache_type__webcam.png differ diff --git a/public/images/cache/res/_overlay__-a.png b/public/images/cache/res/_overlay__-a.png new file mode 100644 index 0000000000..3db1367f9c Binary files /dev/null and b/public/images/cache/res/_overlay__-a.png differ diff --git a/public/images/cache/res/_overlay__-d.png b/public/images/cache/res/_overlay__-d.png new file mode 100644 index 0000000000..8b8034ab11 Binary files /dev/null and b/public/images/cache/res/_overlay__-d.png differ diff --git a/public/images/cache/res/_overlay__-dnf.png b/public/images/cache/res/_overlay__-dnf.png new file mode 100644 index 0000000000..cf5213035c Binary files /dev/null and b/public/images/cache/res/_overlay__-dnf.png differ diff --git a/public/images/cache/res/_overlay__-found.png b/public/images/cache/res/_overlay__-found.png new file mode 100644 index 0000000000..2a2c3b361b Binary files /dev/null and b/public/images/cache/res/_overlay__-found.png differ diff --git a/public/images/cache/res/_overlay__-i.png b/public/images/cache/res/_overlay__-i.png new file mode 100644 index 0000000000..bc90ec2d83 Binary files /dev/null and b/public/images/cache/res/_overlay__-i.png differ diff --git a/public/images/cache/res/_overlay__-n.png b/public/images/cache/res/_overlay__-n.png new file mode 100644 index 0000000000..b69c38e95e Binary files /dev/null and b/public/images/cache/res/_overlay__-n.png differ diff --git a/public/images/cache/res/_overlay__-owner.png b/public/images/cache/res/_overlay__-owner.png new file mode 100644 index 0000000000..17dc5bc7da Binary files /dev/null and b/public/images/cache/res/_overlay__-owner.png differ diff --git a/public/images/cache/res/make-cache-icons.sh b/public/images/cache/res/make-cache-icons.sh new file mode 100755 index 0000000000..35b4640b27 --- /dev/null +++ b/public/images/cache/res/make-cache-icons.sh @@ -0,0 +1,127 @@ +#!/bin/bash + +# Compose standard cache icons (in res directory) +# to required opencaching-pl iconset + + +SRC="." +DST=".." +PWD_CHECK="res" +SKIP_EXISTING=1 + +CACHE_TYPES=$(cat __cache_types.txt | grep -vE "^#|^\s*$" | cut -f2 -d' ') + +_FILENAME() { + INPUT="$1" + OUTPUT=$(echo ${INPUT}.* | grep -iE "png|svg" | sort -r | head -n 1) + echo "${OUTPUT}" +} + +_OVERLAY_A="-a" +_OVERLAY_D="-d" +_OVERLAY_DNF="-dnf" +_OVERLAY_FOUND="-found" +_OVERLAY_I="-i" +_OVERLAY_N="-n" +_OVERLAY_S="-s" +_OVERLAY_OWNER="-owner" + +OVERLAY_A=$(_FILENAME "_overlay__${_OVERLAY_A}") +OVERLAY_D=$(_FILENAME "_overlay__${_OVERLAY_D}") +OVERLAY_DNF=$(_FILENAME "_overlay__${_OVERLAY_DNF}") +OVERLAY_FOUND=$(_FILENAME "_overlay__${_OVERLAY_FOUND}") +OVERLAY_I=$(_FILENAME "_overlay__${_OVERLAY_I}") +OVERLAY_N=$(_FILENAME "_overlay__${_OVERLAY_N}") +OVERLAY_OWNER=$(_FILENAME "_overlay__${_OVERLAY_OWNER}") + +usage() { + cat << EOM + usage: make-cache-iconset.sh [options] + + OPTIONS: + -o overwrite existing icons (default skip) + -h show this message + +EOM +} + +if [ "$(basename $(pwd))" != "${PWD_CHECK}" ]; then + echo "Error: must be called inside '${PWD_CHECK}' directory. Stop." + echo + exit 1 +fi + +while getopts "oh" OPTS; do + case $OPTS in + o) + SKIP_EXISTING= + ;; + h) + usage + exit 1 + ;; + \?) + echo "use $0 -h for help" + exit + ;; + esac +done + +# Compose icons +function composeICONS() { + NAME="$1" + CACHE=$(_FILENAME "_cache_type__$1") + + if [ ! -f "${SRC}/${CACHE}" ]; then + echo "Error: file not found ${CACHE}!" + exit 1 + fi + rm -f "${DST}/${NAME}*" + + convert "${SRC}/${CACHE}" png32:"${DST}/${NAME}.png" + + convert "${SRC}/${CACHE}" -resize 16x16 png32:"${DST}/16x16-${NAME}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_FOUND}" -compose src-over -composite -resize 16x16 png32:"${DST}/16x16-${NAME}${_OVERLAY_FOUND}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_OWNER}" -compose src-over -composite -resize 16x16 png32:"${DST}/16x16-${NAME}${_OVERLAY_S}${_OVERLAY_OWNER}.png" + + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_A}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_A}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_A}" -compose src-over -composite "${OVERLAY_DNF}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_A}${_OVERLAY_DNF}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_A}" -compose src-over -composite "${OVERLAY_FOUND}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_A}${_OVERLAY_FOUND}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_A}" -compose src-over -composite "${OVERLAY_OWNER}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_A}${_OVERLAY_OWNER}.png" + + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_D}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_D}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_D}" -compose src-over -composite "${OVERLAY_DNF}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_D}${_OVERLAY_DNF}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_D}" -compose src-over -composite "${OVERLAY_FOUND}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_D}${_OVERLAY_FOUND}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_D}" -compose src-over -composite "${OVERLAY_OWNER}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_D}${_OVERLAY_OWNER}.png" + + convert -size 34x34 xc:none -alpha set -background none "${SRC}/${CACHE}" -geometry +1+1 -compose dst-over -composite "${OVERLAY_I}" -compose dst-over -composite png32:"${DST}/${NAME}${_OVERLAY_I}.png" + convert -size 34x34 xc:none -alpha set -background none "${SRC}/${CACHE}" -geometry +1+1 -compose dst-over -composite "${OVERLAY_I}" -compose dst-over -composite -fx '(r+g+b)/3' png32:"${DST}/${NAME}${_OVERLAY_I}-bw.png" + + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_N}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_N}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_N}" -compose src-over -composite "${OVERLAY_DNF}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_N}${_OVERLAY_DNF}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_N}" -compose src-over -composite "${OVERLAY_FOUND}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_N}${_OVERLAY_FOUND}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_N}" -compose src-over -composite "${OVERLAY_OWNER}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_N}${_OVERLAY_OWNER}.png" + + convert -alpha set -background none "${SRC}/${CACHE}" png32:"${DST}/${NAME}${_OVERLAY_S}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_DNF}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_S}${_OVERLAY_DNF}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_FOUND}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_S}${_OVERLAY_FOUND}.png" + convert -alpha set -background none "${SRC}/${CACHE}" -channel a -evaluate multiply 0.6 +channel "${OVERLAY_OWNER}" -compose src-over -composite png32:"${DST}/${NAME}${_OVERLAY_S}${_OVERLAY_OWNER}.png" +} + +# Process all cache types +for x in ${CACHE_TYPES}; do + if [ -f "${DST}/${x}.png" -a "${SKIP_EXISTING}" == "1" ]; then + echo "Skipping ${x} (already exists)" + continue + fi + echo -n "Creating iconset for ${x}..." + composeICONS "${x}" + echo "done." +done + + +if [ -f "${DST}/preview.png" ]; then + rm -f "${DST}/preview.png" +fi +echo "Creating preview ..." +montage "${DST}/*.png" -geometry 32x32+2+2 -tile 16x png24:${DST}/preview.png diff --git a/public/images/cache/res/make-kml-icons.sh b/public/images/cache/res/make-kml-icons.sh new file mode 100755 index 0000000000..a8cdb755fd --- /dev/null +++ b/public/images/cache/res/make-kml-icons.sh @@ -0,0 +1,52 @@ +#!/bin/bash + +# Convert standard cache icons (in parent directory) for better display +# in Google Earth via KML export + +SRC="." +DST="../kml" +PWD_CHECK="res" +CACHE_TYPES=$(cat "__cache_types.txt" | grep -vE "^#|^\s*$" | cut -f2 -d' ') + +MARKER="__kml_oc.png" +MARKER_DISABLED="__kml_disabled_oc.png" +MARKER_ARCHIVED="__kml_archived_oc.png" + +if [ "$(basename $(pwd))" != "${PWD_CHECK}" ]; then + echo "Error: must be called inside '${PWD_CHECK}' directory. Stop." + echo + exit 1 +fi + +function _FILENAME() { + INPUT="$1" + OUTPUT=$(echo ${INPUT}.* | grep -iE "png|svg" | sort -r | head -n 1) + echo "${OUTPUT}" +} + +function convertKML() { + NAME="$1" + CACHE=$(_FILENAME "_cache_type__$1") + KML="$1_kml.png" + KML_DISABLED="$1_kml-disabled.png" + KML_ARCHIVED="$1_kml-archived.png" + + if [ ! -f "${CACHE}" ]; then + echo "Error: file not found ${CACHE}!" + exit 1 + fi + + rm -f "${DST}/${KML}" + rm -f "${DST}/${KML_DISABLED}" + rm -f "${DST}/${KML_ARCHIVED}" + + composite -compose src-over -geometry +6+6 "${CACHE}" "${MARKER}" png32:"${DST}/${KML}" + composite -compose src-over -geometry +6+6 "${CACHE}" "${MARKER_DISABLED}" png32:"${DST}/${KML_DISABLED}" + composite -compose src-over -geometry +6+6 "${CACHE}" "${MARKER_ARCHIVED}" png32:"${DST}/${KML_ARCHIVED}" +} + +for x in ${CACHE_TYPES}; do + echo -n "Creating KML icon for ${x}..." + convertKML $x + echo "done." +done diff --git a/public/images/cache/usb-a-dnf.png b/public/images/cache/usb-a-dnf.png deleted file mode 100644 index d1cd4888a3..0000000000 Binary files a/public/images/cache/usb-a-dnf.png and /dev/null differ diff --git a/public/images/cache/usb-a-found.png b/public/images/cache/usb-a-found.png deleted file mode 100644 index 94775dc7dd..0000000000 Binary files a/public/images/cache/usb-a-found.png and /dev/null differ diff --git a/public/images/cache/usb-a-owner.png b/public/images/cache/usb-a-owner.png deleted file mode 100644 index 19eebec9f1..0000000000 Binary files a/public/images/cache/usb-a-owner.png and /dev/null differ diff --git a/public/images/cache/usb-i-bw.png b/public/images/cache/usb-i-bw.png deleted file mode 100644 index 98da108b37..0000000000 Binary files a/public/images/cache/usb-i-bw.png and /dev/null differ diff --git a/public/images/cache/usb-n-dnf.png b/public/images/cache/usb-n-dnf.png deleted file mode 100644 index 4bfb5ceec1..0000000000 Binary files a/public/images/cache/usb-n-dnf.png and /dev/null differ diff --git a/public/images/cache/usb-n-found.png b/public/images/cache/usb-n-found.png deleted file mode 100644 index eb0f60cf82..0000000000 Binary files a/public/images/cache/usb-n-found.png and /dev/null differ diff --git a/public/images/cache/usb-n-owner.png b/public/images/cache/usb-n-owner.png deleted file mode 100644 index ec6a2c87c4..0000000000 Binary files a/public/images/cache/usb-n-owner.png and /dev/null differ diff --git a/public/images/cache/usb-s-dnf.png b/public/images/cache/usb-s-dnf.png deleted file mode 100644 index d7ce125e55..0000000000 Binary files a/public/images/cache/usb-s-dnf.png and /dev/null differ diff --git a/public/images/cache/usb-s-found.png b/public/images/cache/usb-s-found.png deleted file mode 100644 index ecc60f0136..0000000000 Binary files a/public/images/cache/usb-s-found.png and /dev/null differ diff --git a/public/images/cache/usb-s-owner.png b/public/images/cache/usb-s-owner.png deleted file mode 100644 index 1549ee063f..0000000000 Binary files a/public/images/cache/usb-s-owner.png and /dev/null differ diff --git a/public/images/cache/usb-s.png b/public/images/cache/usb-s.png deleted file mode 100644 index ecb133045d..0000000000 Binary files a/public/images/cache/usb-s.png and /dev/null differ diff --git a/public/images/cache/usb.png b/public/images/cache/usb.png deleted file mode 100644 index ecb133045d..0000000000 Binary files a/public/images/cache/usb.png and /dev/null differ diff --git a/search.php b/search.php index 71fad8d841..3800c58e89 100644 --- a/search.php +++ b/search.php @@ -378,7 +378,7 @@ function sanitize(&$array) $options['sort'] = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'bydistance'; $options['country'] = isset($_REQUEST['country']) ? $_REQUEST['country'] : ''; $options['region'] = isset($_REQUEST['region']) ? $_REQUEST['region'] : ''; - $options['cachetype'] = isset($_REQUEST['cachetype']) ? $_REQUEST['cachetype'] : '111111111'; + $options['cachetype'] = isset($_REQUEST['cachetype']) ? $_REQUEST['cachetype'] : '1111111111111'; $options['cachesize_1'] = isset($_REQUEST['cachesize_1']) ? $_REQUEST['cachesize_1'] : 1; $options['cachesize_2'] = isset($_REQUEST['cachesize_2']) ? $_REQUEST['cachesize_2'] : 1; @@ -1014,7 +1014,7 @@ function sanitize(&$array) $sql_where[] = '`caches`.`cache_id` IN (SELECT `cache_location`.`cache_id` FROM `cache_location` WHERE `cache_location`.`code3`=\'' . XDb::xEscape($options['region']) . '\')'; } - if(!isset($options['cachetype'])) $options['cachetype']='111111111'; + if(!isset($options['cachetype'])) $options['cachetype']='1111111111111'; $pos = strpos($options['cachetype'], '0'); //echo $options['cachetype']; diff --git a/sqlAlters/2019-07-04_cache_type_id.sql b/sqlAlters/2019-07-04_cache_type_id.sql new file mode 100644 index 0000000000..7e3e595d2f --- /dev/null +++ b/sqlAlters/2019-07-04_cache_type_id.sql @@ -0,0 +1,68 @@ +-- andrixnet +-- New cache types according to https://github.com/opencaching/opencaching-pl/issues/860 +-- cache_type ID changes according to https://github.com/opencaching/opencaching-pl/issues/2024 + +-- ######################################################################## +-- Recreate table `cache_type` (simpler then multiple editing in this case) +-- Table structure for table `cache_type` +-- + +DROP TABLE IF EXISTS `cache_type`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `cache_type` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `sort` int(11) NOT NULL DEFAULT '100' COMMENT 'This also is the translation ID number; see I18n::getIdColumnName()', + `short` varchar(10) NOT NULL, + `pl` varchar(60) NOT NULL, + `en` varchar(60) NOT NULL, + `nl` varchar(60) NOT NULL, + `ro` varchar(60) NOT NULL, + `de` varchar(60) NOT NULL, + `fr` varchar(60) NOT NULL, + `icon_large` varchar(60) NOT NULL, + `icon_small` varchar(60) NOT NULL, + `color` varchar(7) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- Repopulate table `cache_type` +LOCK TABLES `cache_type` WRITE; +/*!40000 ALTER TABLE `cache_type` DISABLE KEYS */; +-- id,sort,short,pl,en,nl,ro,de,fr,icon_large,icon_small,color +INSERT INTO `cache_type` VALUES (1,5,'Other','Nietypowa','Other type','Onbekende Cache','Necunoscută','Sonstiger Cachetyp','Autre type','cache/unknown.png','cache/16x16-unknown.png','#FFFF00'); +INSERT INTO `cache_type` VALUES (2,1,'Traditional','Tradycyjna','Traditional','Traditionele Cache','Tradiţională','Traditioneller Cache','Traditionnel','cache/traditional.png','cache/16x16-traditional.png','#0000FF'); +INSERT INTO `cache_type` VALUES (3,2,'Multicache','Multicache','Multicache','Multi Cache','Multiplă','Multicache','Multicache','cache/multi.png','cache/16x16-multi.png','#00D400'); +INSERT INTO `cache_type` VALUES (4,8,'Virtual','Wirtualna','Virtual','Virtuele Cache','Virtuală','Virtueller Cache','Virtuelle','cache/virtual.png','cache/16x16-virtual.png','#00D5FF'); +INSERT INTO `cache_type` VALUES (5,7,'Webcam.','Webcam','Webcam','Webcam Cache','Cameră web','Webcam-Cache','Webcam','cache/webcam.png','cache/16x16-webcam.png','#00FFFF'); +INSERT INTO `cache_type` VALUES (6,6,'Event','Wydarzenie','Event','Evenement','Eveniment','Event-Cache','Événement','cache/event.png','cache/16x16-event.png','#FF80FF'); +INSERT INTO `cache_type` VALUES (7,3,'Quiz','Quiz','Puzzle','Puzzel Cache','Puzzle','Rätselcache','Énigme','cache/quiz.png','cache/16x16-quiz.png','#FF8000'); +INSERT INTO `cache_type` VALUES (9,4,'Moving','Mobilna','Moving','Reizend','Mobilă','Beweglicher Cache','Mobile','cache/moving.png','cache/16x16-moving.png','#FF99FF'); +INSERT INTO `cache_type` VALUES (11,99,'Owncache','Own cache','Own cache','Eigen Cache','Personală','Persönlicher Cache','Votre cache','cache/owncache.png','cache/16x16-owncache.png','#009900'); +INSERT INTO `cache_type` VALUES (12,12,'BIT cache','BIT cache','BIT cache','BIT cache','BIT cache','BIT cache','BIT cache','cache/bitcache.png','cache/16x16-bitcache.png','#000000'); +INSERT INTO `cache_type` VALUES (13,13,'Guestbook','Księga gości','Guestbook','Gastenboek','Carte de oaspeţi','Gästebuch',"Livre d'or",'cache/guestbook.png','cache/16x16-guestbook.png','#CC9900'); +INSERT INTO `cache_type` VALUES (14,14,'Benchmark','Punkt geodezyjny','Benchmark','Meetpunt','Marcaj topografic','Vermessungspunkt','Point géodésique','cache/benchmark.png','cache/16x16-benchmark.png','#666666'); +INSERT INTO `cache_type` VALUES (15,15,'Challenge','Wyzwanie','Challenge','Uitdaging','Provocare','Herausforderung','Défi','cache/challenge.png','cache/16x16-challenge.png','#FF0000'); +/*!40000 ALTER TABLE `cache_type` ENABLE KEYS */; +UNLOCK TABLES; + +-- ######################################################################## +-- Implement cache_type_id changes in caches table + +-- Podcast ID=9 => 1 (other) +-- * safeguard to handle old data from when "podcache" was still in use, if any +-- * add MP3 attribute (new ID according to https://wiki.opencaching.eu/index.php?title=Cache_attributes ) +INSERT INTO `caches_attributes` SELECT `cache_id`,205 FROM `caches` where `type`=9; +-- * change type to "other" +UPDATE `caches` + SET `type`=1 WHERE `type`=9; + +-- Moving cache ID=8 => 9 +UPDATE `caches` + SET `type`=9 WHERE `type`=8; + +-- Owncache ID=10 => 11 +UPDATE `caches` + SET `type`=11 WHERE `type`=10; + diff --git a/src/Models/CacheSet/CacheSetCommon.php b/src/Models/CacheSet/CacheSetCommon.php index 504a89de7d..949c83f044 100644 --- a/src/Models/CacheSet/CacheSetCommon.php +++ b/src/Models/CacheSet/CacheSetCommon.php @@ -96,6 +96,7 @@ public static function isCacheTypeAllowedForGeoPath(GeoCache $cache) GeoCache::TYPE_EVENT, GeoCache::TYPE_OWNCACHE, GeoCache::TYPE_WEBCAM, + GeoCache::TYPE_CHALLENGE, ]; return !in_array($cache->getCacheType(), $forbiddenTypes); @@ -123,16 +124,19 @@ public function getCachePoints(GeoCache $cache) { // cache type to points $typePointsArray = [ - 1 => 2, #Other - 2 => 2, #Trad. - 3 => 3, #Multi - 4 => 1, #Virt. - 5 => 0.2, #ICam. - 6 => 0, #Event - 7 => 4, #Quiz - 8 => 2, #Moving - 9 => 1, #podcast - 10 => 1, #own + 1 => 2, // Other + 2 => 2, // Traditional + 3 => 3, // Multicache + 4 => 1, // Virtual + 5 => 0.2, // Webcam + 6 => 0, // Event + 7 => 4, // Quiz + 9 => 2, // Moving cache + 11 => 1, // Own cache + 12 => 1, // BIT cache + 13 => 1, // Guestbook + 14 => 2, // Benchmark + 15 => 0, // Challenge ]; $typePoints = $typePointsArray[$cache->getCacheType()]; diff --git a/src/Models/GeoCache/GeoCacheCommons.php b/src/Models/GeoCache/GeoCacheCommons.php index 462c811d17..39a12b281d 100644 --- a/src/Models/GeoCache/GeoCacheCommons.php +++ b/src/Models/GeoCache/GeoCacheCommons.php @@ -11,16 +11,19 @@ class GeoCacheCommons extends BaseObject { - const TYPE_OTHERTYPE = 1; - const TYPE_TRADITIONAL = 2; - const TYPE_MULTICACHE = 3; - const TYPE_VIRTUAL = 4; - const TYPE_WEBCAM = 5; - const TYPE_EVENT = 6; - const TYPE_QUIZ = 7; - const TYPE_MOVING = 8; - const TYPE_GEOPATHFINAL = 9; //TODO: old -podcast- type? - const TYPE_OWNCACHE = 10; + const TYPE_OTHERTYPE = 1; + const TYPE_TRADITIONAL = 2; + const TYPE_MULTICACHE = 3; + const TYPE_VIRTUAL = 4; + const TYPE_WEBCAM = 5; + const TYPE_EVENT = 6; + const TYPE_QUIZ = 7; + const TYPE_MOVING = 9; + const TYPE_OWNCACHE = 11; + const TYPE_BITCACHE = 12; + const TYPE_GUESTBOOK = 13; + const TYPE_BENCHMARK = 14; + const TYPE_CHALLENGE = 15; const STATUS_READY = 1; const STATUS_UNAVAILABLE = 2; @@ -29,14 +32,14 @@ class GeoCacheCommons extends BaseObject { const STATUS_NOTYETAVAILABLE = 5; const STATUS_BLOCKED = 6; - const SIZE_NONE = 7; + const SIZE_NONE = 7; // No container const SIZE_NANO = 8; const SIZE_MICRO = 2; const SIZE_SMALL = 3; const SIZE_REGULAR = 4; const SIZE_LARGE = 5; const SIZE_XLARGE = 6; - const SIZE_OTHER = 1; + const SIZE_OTHER = 1; // Not specified const RECOMENDATION_RATIO = 10; //percentage of founds which can be recomeded by user @@ -47,16 +50,19 @@ class GeoCacheCommons extends BaseObject { const ICON_PATH = '/images/cache/'; //path to the dir with cache icons - const TYPE_TRADITIONAL_TR_KEY = 'cacheType_1'; - const TYPE_OTHERTYPE_TR_KEY = 'cacheType_5'; - const TYPE_MULTICACHE_TR_KEY = 'cacheType_2'; - const TYPE_VIRTUAL_TR_KEY = 'cacheType_8'; - const TYPE_WEBCAM_TR_KEY = 'cacheType_7'; + const TYPE_OTHERTYPE_TR_KEY = 'cacheType_1'; + const TYPE_TRADITIONAL_TR_KEY = 'cacheType_2'; + const TYPE_MULTICACHE_TR_KEY = 'cacheType_3'; + const TYPE_VIRTUAL_TR_KEY = 'cacheType_4'; + const TYPE_WEBCAM_TR_KEY = 'cacheType_5'; const TYPE_EVENT_TR_KEY = 'cacheType_6'; - const TYPE_QUIZ_TR_KEY = 'cacheType_3'; - const TYPE_MOVING_TR_KEY = 'cacheType_4'; - const TYPE_GEOPATHFINAL_TR_KEY = 'cacheType_9'; - const TYPE_OWNCACHE_TR_KEY = 'cacheType_10'; + const TYPE_QUIZ_TR_KEY = 'cacheType_7'; + const TYPE_MOVING_TR_KEY = 'cacheType_9'; + const TYPE_OWNCACHE_TR_KEY = 'cacheType_11'; + const TYPE_BITCACHE_TR_KEY = 'cacheType_12'; + const TYPE_GUESTBOOK_TR_KEY = 'cacheType_13'; + const TYPE_BENCHMARK_TR_KEY = 'cacheType_14'; + const TYPE_CHALLENGE_TR_KEY = 'cacheType_15'; const STATUS_READY_TR_KEY = 'cacheStatus_1'; const STATUS_UNAVAILABLE_TR_KEY = 'cacheStatus_2'; @@ -83,16 +89,19 @@ public static function CacheTypeTranslationKey($type) { switch ($type) { - case self::TYPE_TRADITIONAL: return self::TYPE_TRADITIONAL_TR_KEY; case self::TYPE_OTHERTYPE: return self::TYPE_OTHERTYPE_TR_KEY; + case self::TYPE_TRADITIONAL: return self::TYPE_TRADITIONAL_TR_KEY; case self::TYPE_MULTICACHE: return self::TYPE_MULTICACHE_TR_KEY; case self::TYPE_VIRTUAL: return self::TYPE_VIRTUAL_TR_KEY; case self::TYPE_WEBCAM: return self::TYPE_WEBCAM_TR_KEY; case self::TYPE_EVENT: return self::TYPE_EVENT_TR_KEY; case self::TYPE_QUIZ: return self::TYPE_QUIZ_TR_KEY; case self::TYPE_MOVING: return self::TYPE_MOVING_TR_KEY; - case self::TYPE_GEOPATHFINAL: return self::TYPE_GEOPATHFINAL_TR_KEY; case self::TYPE_OWNCACHE: return self::TYPE_OWNCACHE_TR_KEY; + case self::TYPE_BITCACHE: return self::TYPE_BITCACHE_TR_KEY; + case self::TYPE_GUESTBOOK: return self::TYPE_GUESTBOOK_TR_KEY; + case self::TYPE_BENCHMARK: return self::TYPE_BENCHMARK_TR_KEY; + case self::TYPE_CHALLENGE: return self::TYPE_CHALLENGE_TR_KEY; } } @@ -193,6 +202,8 @@ public static function CacheStatusArray() public static function CacheTypeIdFromOkapi($okapiType) { switch ($okapiType) { + case 'Other': + return self::TYPE_OTHERTYPE; case 'Traditional': return self::TYPE_TRADITIONAL; case 'Multi': @@ -209,8 +220,14 @@ public static function CacheTypeIdFromOkapi($okapiType) return self::TYPE_MOVING; case 'Own': return self::TYPE_OWNCACHE; - case 'Other': - return self::TYPE_OTHERTYPE; + case 'BIT Cache': + return self::TYPE_BITCACHE; + case 'Guestbook': + return self::TYPE_GUESTBOOK; + case 'Benchmark': + return self::TYPE_BENCHMARK; + case 'Challenge': + return self::TYPE_CHALLENGE; default: Debug::errorLog('Unknown cache type from OKAPI: ' . $okapiType); return self::TYPE_TRADITIONAL; @@ -356,6 +373,23 @@ public static function CacheIconByType( case self::TYPE_OWNCACHE: $typePart = 'owncache'; break; + + case self::TYPE_BITCACHE: + $typePart = 'bitcache'; + break; + + case self::TYPE_GUESTBOOK: + $typePart = 'guestbook'; + break; + + case self::TYPE_BENCHMARK: + $typePart = 'benchmark'; + break; + + case self::TYPE_CHALLENGE: + $typePart = 'challenge'; + break; + } if ($fileNameOnly) { diff --git a/src/Views/mainMap/mainMapFilters.tpl.php b/src/Views/mainMap/mainMapFilters.tpl.php index 46c80afc6d..8bb92085a2 100644 --- a/src/Views/mainMap/mainMapFilters.tpl.php +++ b/src/Views/mainMap/mainMapFilters.tpl.php @@ -9,25 +9,41 @@
+
+
+ + +
+
+ +
@@ -35,51 +51,67 @@
+
+
+ + +
+
+ +
+ +
-
-
-
-
- -
+
+
+ +
diff --git a/src/Views/myroutes_search.tpl.php b/src/Views/myroutes_search.tpl.php index b338802c89..3cc9989edd 100644 --- a/src/Views/myroutes_search.tpl.php +++ b/src/Views/myroutes_search.tpl.php @@ -55,9 +55,12 @@ function sync_options(element) document.forms['optionsform'].cachetype5.value = document.optionsform.cachetype5.checked ? 1 : 0; document.forms['optionsform'].cachetype6.value = document.optionsform.cachetype6.checked ? 1 : 0; document.forms['optionsform'].cachetype7.value = document.optionsform.cachetype7.checked ? 1 : 0; - document.forms['optionsform'].cachetype8.value = document.optionsform.cachetype8.checked ? 1 : 0; document.forms['optionsform'].cachetype9.value = document.optionsform.cachetype9.checked ? 1 : 0; - document.forms['optionsform'].cachetype10.value = document.optionsform.cachetype10.checked ? 1 : 0; + document.forms['optionsform'].cachetype11.value = document.optionsform.cachetype11.checked ? 1 : 0; + document.forms['optionsform'].cachetype12.value = document.optionsform.cachetype12.checked ? 1 : 0; + document.forms['optionsform'].cachetype13.value = document.optionsform.cachetype13.checked ? 1 : 0; + document.forms['optionsform'].cachetype14.value = document.optionsform.cachetype14.checked ? 1 : 0; + document.forms['optionsform'].cachetype15.value = document.optionsform.cachetype15.checked ? 1 : 0; document.forms['optionsform'].cachesize_1.value = document.optionsform.cachesize_1.checked ? 1 : 0; document.forms['optionsform'].cachesize_2.value = document.optionsform.cachesize_2.checked ? 1 : 0; @@ -161,22 +164,25 @@ function switchCat2() - - - - - + + + + - - - - - + + + + + + + + + + - - + diff --git a/src/Views/newcache.tpl.php b/src/Views/newcache.tpl.php index 6997d0a1d9..cd0c19c7a7 100644 --- a/src/Views/newcache.tpl.php +++ b/src/Views/newcache.tpl.php @@ -220,7 +220,8 @@ function _chkVirtual () { $('#log_pw').removeAttr('disabled'); } - if ($('#cacheType').val() == "4" || $('#cacheType').val() == "5" || $('#cacheType').val() == "6") { + if ($('#cacheType').val() == "4" || $('#cacheType').val() == "5" || $('#cacheType').val() == "6" || + $('#cacheType').val() == "12" || $('#cacheType').val() == "13" || $('#cacheType').val() == "14" || $('#cacheType').val() == "15") { // if( document.newcacheform.size.options[ $('#size option').length - 1].value != "7" && document.newcacheform.size.options[document.newcacheform.size.options.length - 2].value != "7") if (!($("#size option[value='7']").length > 0)) { var o = new Option("{{cacheSize_none}}", "7"); @@ -286,8 +287,12 @@ function chkiconcache() { iconarray['5'] = 'webcam.png'; iconarray['6'] = 'event.png'; iconarray['7'] = 'quiz.png'; - iconarray['8'] = 'moving.png'; - iconarray['10'] = 'owncache.png'; + iconarray['9'] = 'moving.png'; + iconarray['11'] = 'owncache.png'; + iconarray['12'] = 'bitcache.png'; + iconarray['13'] = 'guestbook.png'; + iconarray['14'] = 'benchmark.png'; + iconarray['15'] = 'challenge.png'; var image_cache = "/images/cache/" + iconarray[mode]; $('#actionicons').attr('src', image_cache); } diff --git a/src/Views/newcache_beginner.tpl.php b/src/Views/newcache_beginner.tpl.php index a55c9382e1..0632d296d5 100644 --- a/src/Views/newcache_beginner.tpl.php +++ b/src/Views/newcache_beginner.tpl.php @@ -10,11 +10,11 @@

{{nc_begin_01}} need_find_limit ?> {{nc_begin_02}}

-

<?=tr('traditional')?>

-

<?=tr('multicache')?>

-

<?=tr('quiz')?>

-

<?=tr('moving')?>

-

<?=tr('unknown_type')?>

+

<?=tr('cacheType_2')?>

+

<?=tr('cacheType_3')?>

+

<?=tr('cacheType_7')?>

+

<?=tr('cacheType_9')?>

+

<?=tr('cacheType_1')?>

{{nc_begin_03}} diff --git a/src/Views/search.simple.tpl.php b/src/Views/search.simple.tpl.php index b649ad41f4..c2b29ab2f7 100644 --- a/src/Views/search.simple.tpl.php +++ b/src/Views/search.simple.tpl.php @@ -257,9 +257,12 @@ function getCachetypeFilter() { cachetype_filter = cachetype_filter.concat(document.getElementById('cachetype_5').style.visibility == 'hidden' ? 0 : 1); cachetype_filter = cachetype_filter.concat(document.getElementById('cachetype_6').style.visibility == 'hidden' ? 0 : 1); cachetype_filter = cachetype_filter.concat(document.getElementById('cachetype_7').style.visibility == 'hidden' ? 0 : 1); - cachetype_filter = cachetype_filter.concat(document.getElementById('cachetype_8').style.visibility == 'hidden' ? 0 : 1); cachetype_filter = cachetype_filter.concat(document.getElementById('cachetype_9').style.visibility == 'hidden' ? 0 : 1); - cachetype_filter = cachetype_filter.concat(document.getElementById('cachetype_10').style.visibility == 'hidden' ? 0 : 1); + cachetype_filter = cachetype_filter.concat(document.getElementById('cachetype_11').style.visibility == 'hidden' ? 0 : 1); + cachetype_filter = cachetype_filter.concat(document.getElementById('cachetype_12').style.visibility == 'hidden' ? 0 : 1); + cachetype_filter = cachetype_filter.concat(document.getElementById('cachetype_13').style.visibility == 'hidden' ? 0 : 1); + cachetype_filter = cachetype_filter.concat(document.getElementById('cachetype_14').style.visibility == 'hidden' ? 0 : 1); + cachetype_filter = cachetype_filter.concat(document.getElementById('cachetype_15').style.visibility == 'hidden' ? 0 : 1); return cachetype_filter; }