Merge pull request #24 from RootStudio/v2.1.0-dev

v2.1.0

Author: James Wigger

.gitignore

@@ -12,6 +12,12 @@
 !/perch/addons/apps/jw_locator
 !/perch/addons/apps/root_locator
 
+!/perch/addons/fieldtypes
+!/perch/addons/fieldtypes/*
+
+!/perch/addons/fieldtypes/locator
+!/perch/addons/fieldtypes/locator/*
+
 !/locations/*
 
 !.gitignore

README.md

@@ -1,4 +1,4 @@
-# Perch Locator v2
+# Perch Locator v2.1
 
 Perch Locator is an app to manage locatable resources within Perch CMS. Addresses are Geocoded and can be searched using coordinates or by a valid address to allow users to find places of interest near to them.
 
@@ -56,6 +56,8 @@ CSV Data must include the following columns:
 
 Rows that are missing any of the required fields will not be imported. Those missing recommended fields will be imported but may fail in the geocoding queue.
 
+**v2.1**: You can now include custom fields in the CSV import. Any additional columns that are not listed above will be included in the dynamic fields array to be used in your templates.
+
 ---
 
 ## Displaying on a map

perch/addons/apps/root_locator/admin.php

@@ -1,7 +1,7 @@
 <?php
 
 if ($CurrentUser->logged_in() && $CurrentUser->has_priv('root_locator')) {
-    $this->register_app('root_locator', 'Locator', 1, 'Provide location based listings for your site', '2.0.0');
+    $this->register_app('root_locator', 'Locator', 1, 'Provide location based listings for your site', '2.1.0');
     $this->require_version('root_locator', '2.8.31');
     $this->add_create_page('root_locator', 'edit');
 

perch/addons/apps/root_locator/composer.lock

@@ -73,6 +73,13 @@ class RootLocator_Addresses extends PerchAPI_Factory
 
     protected $addressDistances = [];
 
+    /**
+     * Return queued addresses by array of IDs
+     *
+     * @param array $ids
+     *
+     * @return array|bool|SplFixedArray
+     */
     public function getQueued(array $ids)
     {
         $sql = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pk . ' IN(' . implode(',', $ids) . ');';
@@ -81,6 +88,19 @@ public function getQueued(array $ids)
         return $this->return_instances($rows);
     }
 
+    /**
+     * Return list of addresses that have been geocoded
+     *
+     * @return array|bool|SplFixedArray
+     */
+    public function getCompleted()
+    {
+        $sql = 'SELECT * FROM `' . $this->table . '` WHERE `addressLatitude` IS NOT NULL AND `addressLongitude` IS NOT NULL';
+        $rows = $this->db->get_rows($sql);
+
+        return $this->return_instances($rows);
+    }
+
     /**
      * Return results filtered by first character of title column
      *

perch/addons/apps/root_locator/lib/RootLocator_Addresses.class.php

@@ -99,14 +99,17 @@ public function import()
                 $this->addWarning($row, $Lang->get('‘%s’ columns are recommended to prevent geocoding errors.', $warnings));
             }
 
+            $dynamicFields = $this->getDynamicFields($Addresses->static_fields, $row);
+
             $imported = $Addresses->create([
-                'addressTitle'    => $row['addressTitle'],
-                'addressBuilding' => $row['addressBuilding'],
-                'addressStreet'   => $row['addressStreet'],
-                'addressTown'     => $row['addressTown'],
-                'addressRegion'   => $row['addressRegion'],
-                'addressPostcode' => $row['addressPostcode'],
-                'addressCountry'  => $row['addressCountry']
+                'addressTitle'         => $row['addressTitle'],
+                'addressBuilding'      => $row['addressBuilding'],
+                'addressStreet'        => $row['addressStreet'],
+                'addressTown'          => $row['addressTown'],
+                'addressRegion'        => $row['addressRegion'],
+                'addressPostcode'      => $row['addressPostcode'],
+                'addressCountry'       => $row['addressCountry'],
+                'addressDynamicFields' => PerchUtil::json_safe_encode($dynamicFields)
             ]);
 
             $imported->index($Template);
@@ -218,6 +221,27 @@ private function getRowWarnings($row)
         return false;
     }
 
+    /**
+     * Collect dynamic fields from CSV, compared with static fields
+     *
+     * @param array $static
+     * @param array $row
+     *
+     * @return array
+     */
+    private function getDynamicFields($static, $row)
+    {
+        $dynamicColumns = [];
+
+        foreach($row as $key => $value) {
+            if(!in_array($key, $static)) {
+                $dynamicColumns[$key] = $value;
+            }
+        }
+
+        return $dynamicColumns;
+    }
+
     /**
      * Add successful status to results
      *

perch/addons/apps/root_locator/lib/RootLocator_Importer.class.php

@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitdab9da119c295811d6eee5ec2134719a::getLoader();

perch/addons/apps/root_locator/lib/vendor/autoload.php

@@ -13,9 +13,7 @@
 namespace Composer\Autoload;
 
 /**
- * ClassLoader implements a PSR-0 class loader
- *
- * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
  *
  *     $loader = new \Composer\Autoload\ClassLoader();
  *
@@ -39,6 +37,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
@@ -53,8 +53,9 @@ class ClassLoader
 
     private $useIncludePath = false;
     private $classMap = array();
-
     private $classMapAuthoritative = false;
+    private $missingClasses = array();
+    private $apcuPrefix;
 
     public function getPrefixes()
     {
@@ -147,7 +148,7 @@ public function add($prefix, $paths, $prepend = false)
      * appending or prepending to the ones previously set for this namespace.
      *
      * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-0 base directories
+     * @param array|string $paths   The PSR-4 base directories
      * @param bool         $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
@@ -271,6 +272,26 @@ public function isClassMapAuthoritative()
         return $this->classMapAuthoritative;
     }
 
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
     /**
      * Registers this instance as an autoloader.
      *
@@ -313,29 +334,34 @@ public function loadClass($class)
      */
     public function findFile($class)
     {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
         // class map lookup
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
         }
-        if ($this->classMapAuthoritative) {
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
             return false;
         }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
 
         $file = $this->findFileWithExtension($class, '.php');
 
         // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
+        if (false === $file && defined('HHVM_VERSION')) {
             $file = $this->findFileWithExtension($class, '.hh');
         }
 
-        if ($file === null) {
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
             // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
+            $this->missingClasses[$class] = true;
         }
 
         return $file;
@@ -399,6 +425,8 @@ private function findFileWithExtension($class, $ext)
         if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
             return $file;
         }
+
+        return false;
     }
 }
 

perch/addons/apps/root_locator/lib/vendor/composer/ClassLoader.php

@@ -1,5 +1,5 @@
 
-Copyright (c) 2015 Nils Adermann, Jordi Boggiano
+Copyright (c) 2016 Nils Adermann, Jordi Boggiano
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

perch/addons/apps/root_locator/lib/vendor/composer/LICENSE

@@ -6,5 +6,5 @@
 $baseDir = dirname(dirname($vendorDir));
 
 return array(
-    $vendorDir . '/igorw/get-in/src/get_in.php',
+    'a16312f9300fed4a097923eacb0ba814' => $vendorDir . '/igorw/get-in/src/get_in.php',
 );