Merge pull request #2304 from kojoty/pju-attributes

Refactoring of geocache attributes

config/geocache.default.php

@@ -8,6 +8,7 @@
  */
 
 use src\Models\GeoCache\GeoCacheCommons;
+use src\Models\GeoCache\CacheAttribute;
 
 $geocache = [];
 
@@ -62,3 +63,11 @@
  * If the list is empty only custom (user defined) option will be active.
  */
 $geocache['reactivationRulesPredefinedOpts'] = [];
+
+/**
+ * List of attributes supported by the node. The order is significant - the same order is used on sites.
+ * Use CacheAttribute::* notation for more clear definition.
+ */
+$geocache['supportedAttributes'] = [
+    CacheAttribute::FEE, CacheAttribute::BOAT, CacheAttribute::CHILDREN
+];

config/geocache.nl.php

@@ -6,6 +6,7 @@
  * Those are configuration overrides for OCNL node only.
  */
 
+use src\Models\GeoCache\CacheAttribute;
 use src\Models\GeoCache\GeoCacheCommons;
 
 $geocache['enabledSizes'][] = GeoCacheCommons::SIZE_NANO;
@@ -19,4 +20,22 @@
 /**
  * Minimum number of founds necessary for titled cache
  */
-$geocache['titledCacheMinFounds'] = 2;
+$geocache['titledCacheMinFounds'] = 2;
+
+/**
+ * List of attributes supported by the node. The order is significant - the same order is used on sites.
+ * Use CacheAttribute::* notation for more clear definition.
+ */
+$geocache['supportedAttributes'] = [
+    CacheAttribute::BOAT, CacheAttribute::CHILDREN, CacheAttribute::HIKING,
+    CacheAttribute::AVAILABLE247, CacheAttribute::NIGHT, CacheAttribute::TICKS,
+    CacheAttribute::HUNTING, CacheAttribute::DANGER, CacheAttribute::WHEELCHAIR,
+    CacheAttribute::PARKING, CacheAttribute::BIKE, CacheAttribute::THORNS,
+    CacheAttribute::STEALTH, CacheAttribute::FLASHLIGHT, CacheAttribute::TOOLS,
+    CacheAttribute::BEACON, CacheAttribute::OCONLY, CacheAttribute::LETTERBOX,
+    CacheAttribute::COMPASS, CacheAttribute::QUICK, CacheAttribute::GEOHOTEL,
+    CacheAttribute::PEN, CacheAttribute::MAGNETIC, CacheAttribute::MP3,
+    CacheAttribute::USB, CacheAttribute::BENCHMARK, CacheAttribute::NATURE,
+    CacheAttribute::HISTORIC, CacheAttribute::SHOVEL, CacheAttribute::WALK,
+    CacheAttribute::NOTAVAILABLE247
+];

config/geocache.pl.php

@@ -6,6 +6,7 @@
  * Those are configuration overrides for OCPL node only.
  */
 
+use src\Models\GeoCache\CacheAttribute;
 use src\Models\GeoCache\GeoCacheCommons;
 
 /**
@@ -43,3 +44,20 @@
     'editDesc_reactivRuleOptNoReactivations',
     'editDesc_reactivRuleOptAfterContact',
     'editDesc_reactivRuleOptReactAllowed'];
+
+/**
+ * List of attributes supported by the node. The order is significant - the same order is used on sites.
+ * Use CacheAttribute::* notation for more clear definition.
+ */
+$geocache['supportedAttributes'] = [
+    CacheAttribute::FEE, CacheAttribute::BOAT, CacheAttribute::CHILDREN,
+    CacheAttribute::NIGHT, CacheAttribute::DANGER, CacheAttribute::WHEELCHAIR,
+    CacheAttribute::BIKE, CacheAttribute::FLASHLIGHT, CacheAttribute::TOOLS,
+    CacheAttribute::BEACON, CacheAttribute::LETTERBOX, CacheAttribute::COMPASS,
+    CacheAttribute::QUICK, CacheAttribute::GEOHOTEL, CacheAttribute::PEN,
+    CacheAttribute::MAGNETIC, CacheAttribute::MP3, CacheAttribute::OFFSET,
+    CacheAttribute::USB, CacheAttribute::BENCHMARK, CacheAttribute::WHERIGO,
+    CacheAttribute::NATURE, CacheAttribute::MONUMENT, CacheAttribute::SHOVEL,
+    CacheAttribute::WALK
+];
+

config/geocache.ro.php

@@ -6,6 +6,7 @@
  * Those are configuration overrides for OCRO node only.
  */
 
+use src\Models\GeoCache\CacheAttribute;
 use src\Models\GeoCache\GeoCacheCommons;
 
 $geocache['enabledSizes'][] = GeoCacheCommons::SIZE_NANO;
@@ -21,3 +22,22 @@
  * Hide coordinates for non-logged users
  */
 $geocache['coordsHiddenForNonLogged'] = false;
+
+/**
+ * List of attributes supported by the node. The order is significant - the same order is used on sites.
+ * Use CacheAttribute::* notation for more clear definition.
+ */
+$geocache['supportedAttributes'] = [
+    CacheAttribute::FEE, CacheAttribute::BOAT, CacheAttribute::CHILDREN,
+    CacheAttribute::HIKING, CacheAttribute::AVAILABLE247, CacheAttribute::NIGHT,
+    CacheAttribute::TICKS, CacheAttribute::HUNTING, CacheAttribute::DANGER,
+    CacheAttribute::WHEELCHAIR, CacheAttribute::PARKING, CacheAttribute::WATER,
+    CacheAttribute::BIKE, CacheAttribute::THORNS, CacheAttribute::STEALTH,
+    CacheAttribute::FLASHLIGHT, CacheAttribute::RIDDLE, CacheAttribute::TOOLS,
+    CacheAttribute::BEACON, CacheAttribute::OCONLY, CacheAttribute::LETTERBOX,
+    CacheAttribute::COMPASS, CacheAttribute::QUICK, CacheAttribute::GEOHOTEL,
+    CacheAttribute::PEN, CacheAttribute::MAGNETIC, CacheAttribute::MP3,
+    CacheAttribute::OFFSET, CacheAttribute::USB, CacheAttribute::BENCHMARK,
+    CacheAttribute::WHERIGO, CacheAttribute::NATURE, CacheAttribute::MONUMENT,
+    CacheAttribute::SHOVEL, CacheAttribute::WALK, CacheAttribute::NOTAVAILABLE247,
+];

config/geocache.uk.php

@@ -6,6 +6,7 @@
  * Those are configuration overrides for OCUK node only.
  */
 
+use src\Models\GeoCache\CacheAttribute;
 use src\Models\GeoCache\GeoCacheCommons;
 
 /**
@@ -24,3 +25,28 @@
  * Minimum number of founds necessary for titled cache
  */
 $geocache['titledCacheMinFounds'] = 7;
+
+/**
+ * List of attributes supported by the node. The order is significant - the same order is used on sites.
+ * Use CacheAttribute::* notation for more clear definition.
+ */
+$geocache['supportedAttributes'] = [
+    CacheAttribute::FEE, CacheAttribute::RAPPELING, CacheAttribute::BOAT,
+    CacheAttribute::DIVING, CacheAttribute::CHILDREN, CacheAttribute::HIKING,
+    CacheAttribute::CLIMBING, CacheAttribute::WADING, CacheAttribute::SWIMMING, CacheAttribute::AVAILABLE247,
+    CacheAttribute::WINTER, CacheAttribute::POISON, CacheAttribute::ANIMALS,
+    CacheAttribute::TICKS, CacheAttribute::MINE, CacheAttribute::CLIFF,
+    CacheAttribute::HUNTING, CacheAttribute::DANGER, CacheAttribute::PARKING,
+    CacheAttribute::TRANSPORT, CacheAttribute::WATER, CacheAttribute::RESTROOMS,
+    CacheAttribute::PHONE, CacheAttribute::THORNS, CacheAttribute::FLASHLIGHT,
+    CacheAttribute::RIDDLE, CacheAttribute::TOOLS, CacheAttribute::NIGHTONLY,
+    CacheAttribute::DRIVEIN, CacheAttribute::OCONLY, CacheAttribute::LETTERBOX,
+    CacheAttribute::TRAIN, CacheAttribute::FIRSTAID, CacheAttribute::STEEP,
+    CacheAttribute::HISTORIC, CacheAttribute::MOVING, CacheAttribute::WEBCAM,
+    CacheAttribute::INDOOR, CacheAttribute::UNDERWATER, CacheAttribute::NOGPS,
+    CacheAttribute::OVERNIGHT, CacheAttribute::TIDE, CacheAttribute::PRESERVE,
+    CacheAttribute::COMPASS, CacheAttribute::CAVE, /*CacheAttribute::AIRCRAFT,*/
+    CacheAttribute::WIKI, CacheAttribute::MATH, /*CacheAttribute::OTHER,*/
+    /*CacheAttribute::ASKOWNER,*/ CacheAttribute::HANDICACHING, CacheAttribute::MUNZEE,
+    CacheAttribute::NOTAVAILABLE247, CacheAttribute::DAY, CacheAttribute::ALLSEASONS
+];

config/geocache.us.php

@@ -6,6 +6,26 @@
  * Those are configuration overrides for OCUS node only.
  */
 
+use src\Models\GeoCache\CacheAttribute;
 use src\Models\GeoCache\GeoCacheCommons;
 
 $geocache['enabledSizes'][] = GeoCacheCommons::SIZE_NANO;
+
+/**
+ * List of attributes supported by the node. The order is significant - the same order is used on sites.
+ * Use CacheAttribute::* notation for more clear definition.
+ */
+$geocache['supportedAttributes'] = [
+    CacheAttribute::FEE, CacheAttribute::CHILDREN, CacheAttribute::WINTER,
+    CacheAttribute::POISON, CacheAttribute::ANIMALS, CacheAttribute::TICKS,
+    CacheAttribute::DANGER, CacheAttribute::WHEELCHAIR, CacheAttribute::THORNS,
+    CacheAttribute::STEALTH, CacheAttribute::FLASHLIGHT, CacheAttribute::TRUCK,
+    CacheAttribute::TOOLS, CacheAttribute::NIGHTONLY, CacheAttribute::BEACON,
+    /*CacheAttribute::CHALLENGE ???, */ CacheAttribute::OCONLY, CacheAttribute::LETTERBOX,
+    CacheAttribute::COMPASS, CacheAttribute::QUICK, CacheAttribute::GEOHOTEL,
+    CacheAttribute::PEN, CacheAttribute::MAGNETIC, CacheAttribute::MP3,
+    CacheAttribute::OFFSET, CacheAttribute::USB, CacheAttribute::BENCHMARK,
+    CacheAttribute::NATURE, CacheAttribute::HISTORIC, CacheAttribute::MUNZEE,
+    CacheAttribute::ADS, /*CacheAttribute::BITCACHE ???*/ /*CacheAttribute::GUESTBOOK??*/
+    CacheAttribute::NOTAVAILABLE247
+];

lib/languages/en.php

@@ -3136,6 +3136,86 @@
     'vote_elListThEnd' => 'End of election',
     'vote_optionsToChoose' => 'Options to choose from',
 
-
+    'at_fee' => 'Access or parking fee',
+    'at_rappeling' => 'Climbing gear requried',
+    'at_boat' => 'Boat required',
+    'at_diving' => 'Diving equipment required',
+    'at_children' => 'Suitable for children',
+    'at_hiking' => 'Long walk or hike',
+    'at_climbing' => 'Some climbing (no gear needed)',
+    'at_wading' => 'Swamp or marsh. May require wading',
+    'at_swimming' => 'Swimming required',
+    'at_available247' => 'Available 24/7',
+    'at_night' => 'Recommended at night',
+    'at_winter' => 'Available during winter',
+    'at_poison' => 'Poisonous plants',
+    'at_animals' => 'Dangerous animals',
+    'at_ticks' => 'Ticks',
+    'at_mine' => 'Abandoned mines',
+    'at_cliff' => 'Cliffs / falling rocks hazard',
+    'at_hunting' => 'Hunting grounds',
+    'at_danger' => 'Dangerous area',
+    'at_wheelchair' => 'Wheelchair accessible',
+    'at_parking' => 'Parking area nearby',
+    'at_transport' => 'Public transportation',
+    'at_water' => 'Drinking water nearby',
+    'at_restrooms' => 'Public restrooms nearby',
+    'at_phone' => 'Public phone nerby',
+    'at_bike' => 'Bycicles allowed',
+    'at_thorn' => 'Thorns',
+    'at_stealth' => 'Stealth required',
+    'at_flashlight' => 'Flashlight required',
+    'at_truck' => 'Truck / RV allowed',
+    'at_riddle' => 'Puzzle / Mystery',
+    'at_uv' => 'UV light required',
+    'at_tools' => 'Special tool / equipment required',
+    'at_nightonly' => 'Night cache - can only be found at night',
+    'at_drivein' => 'Park and grab',
+    'at_ruin' => 'Abandoned structure / ruin',
+    'at_beacon' => 'Wireless beacon / Garmin Chirp™',
+    'at_tree' => 'Tree climbing required',
+    'at_oconly' => 'Only loggable at Opencaching',
+    'at_letterbox' => 'Letterbox',
+    'at_train' => 'Active railway nearby',
+    'at_firstaid' => 'First aid available',
+    'at_steep' => 'Hilly area',
+    'at_poi' => 'Point of interest',
+    'at_moving' => 'Moving target',
+    'at_webcam' => 'Webcam',
+    'at_indoor' => 'Wihin enclosed rooms (caves, buildings etc.)',
+    'at_underwater' => 'Under water',
+    'at_nogps' => 'No GPS required',
+    'at_overnight' => 'Overnight stay necessary',
+    'at_tide' => 'Not available during high tide',
+    'at_preserve' => 'Nature preserve / Breeding season',
+    'at_compass' => 'Compass required',
+    'at_cave' => 'Cave equipment required',
+    'at_wiki' => 'Internet research required',
+    'at_math' => 'Mathematical or logical problem',
+    'at_quick' => 'Quick and easy cache',
+    'at_geohotel' => 'GeoHotel for trackables',
+    'at_pen' => 'Bring your own pen',
+    'at_magnetic' => 'Attached using magnet(s)',
+    'at_mp3' => 'Information in MP3 file',
+    'at_offset' => 'Container placed at an offset from given coordinates',
+    'at_usb' => 'Dead Drop USB container',
+    'at_benchmark' => 'Benchmark - geodetic point',
+    'at_wherigo' => 'Wherigo cartridge to play',
+    'at_nature' => 'Hidden in natural surroundings',
+    'at_monument' => 'Monument or historic site',
+    'at_shovel' => 'Shovel required',
+    'at_walk' => 'Access only by walk',
+    'at_handicaching' => 'Rated on Handicaching.com',
+    'at_munzee' => 'Contains a Munzee',
+    'at_ads' => 'Contains advertising',
+    'at_military' => 'Military training area, some access restrictions - check before visit',
+    'at_monitoring' => 'Caution, area under video surveillance',
+    'at_trackables' => 'Suitable to hold trackables',
+    'at_historic' => 'Officially designated historical monument',
+    'at_nodogs' => 'Dogs not allowed',
+    'at_notAvailable247' => 'Only available at specified time',
+    'at_day' => 'NOT recommended at night',
+    'at_notinwinter' => 'NOT available during winter',
+    'at_allseasons' => 'Available all seasons',
 
 );

public/images/cacheAttributes/nl/ReadMe.txt

@@ -0,0 +1,3 @@
+
+The icons of attributes base on free icons from http://icons.mysitemyway.com/
+

public/images/cacheAttributes/pl/ReadMe.txt

@@ -0,0 +1,3 @@
+
+The icons of attributes base on free icons from http://icons.mysitemyway.com/
+

public/images/cacheAttributes/ro/ReadMe.txt

@@ -0,0 +1,3 @@
+
+The icons of attributes base on free icons from http://icons.mysitemyway.com/
+

src/Controllers/TestController.php

@@ -25,14 +25,14 @@
 use src\Utils\Uri\SimpleRouter;
 use src\Models\Coordinates\Coordinates;
 use src\Models\Coordinates\Altitude;
-use src\Controllers\Cron\Jobs\AltitudeUpdateJob;
 use src\Utils\Database\OcDb;
 use src\Utils\DateTime\OcDateTime;
 use src\Models\Voting\ChoiceOption;
 use src\Models\Voting\Election;
 use src\Models\User\User;
+use src\Controllers\Core\ViewBaseController;
 
-class TestController extends BaseController
+class TestController extends ViewBaseController
 {
     public function __construct(){
         parent::__construct();
@@ -79,6 +79,40 @@ public function newLayout()
         $this->view->display();
     }
 
+    public function attributes()
+    {
+        $this->view->setTemplate('test/attributes');
+        $this->view->loadJQuery();
+
+        $attrList = [];
+        $geocache = [];
+        $link = [];
+
+        include ('../config/geocache.pl.php');
+        $attrList['pl'] = $geocache['supportedAttributes'];
+        $link['pl'] = 'https://opencaching.pl/search.php?lang=pl';
+
+        include ('../config/geocache.nl.php');
+        $attrList['nl'] = $geocache['supportedAttributes'];
+        $link['nl'] = '';
+
+        include ('../config/geocache.ro.php');
+        $attrList['ro'] = $geocache['supportedAttributes'];
+        $link['ro'] = '';
+
+        include ('../config/geocache.uk.php');
+        $attrList['uk'] = $geocache['supportedAttributes'];
+        $link['uk'] = '';
+
+        include ('../config/geocache.us.php');
+        $attrList['us'] = $geocache['supportedAttributes'];
+        $link['us'] = '';
+
+        $this->view->setVar('link', $link);
+        $this->view->setVar('attrList', $attrList);
+        $this->view->buildView();
+    }
+
     /**
      * This method allow to init test authorization process based on external service
      */