Revamp of the geocoder system #2320

DawoudIO · 2017-04-17T07:13:48Z

Moving to willdurand/geocoder
Auto update Geo Location on Family Create / Update only
Update Maps
Update Update Geo Location for missing locations
Now we have an option for Google Maps or Bing Maps
Added Bing API Key
Moved Map zoom level to config
Updated Family/Person logic

closes #2314
closes #582
closes #1867
closes #2259
closes #2322

…without geo info

DawoudIO · 2017-04-17T14:52:27Z

src/ChurchCRM/utils/GeoUtils.php

+    // Function takes latitude and longitude
+    // of two places as input and returns the
+    // distance in miles.
+    public static function LatLonDistance($lat1, $lon1, $lat2, $lon2)


these are copy/past form the other geocode.php file i'm not sure how useful the data is

DawoudIO · 2017-04-17T14:55:58Z

src/FamilyView.php

@@ -507,18 +506,18 @@ class="fa fa-cart-plus"></i> <?= gettext("Add All Family Members to Cart") ?></a
                                        <?= $item['text'] ?>
                                    </div>

-                                    <?php if (($_SESSION['bNotes']) && ($item["editLink"] != "" || $item["deleteLink"] != "")) {
+                                    <?php if (($_SESSION['bNotes']) && (isset($item["editLink"]) || isset($item["deleteLink"]))) {


this is to fix errors in the logs

DawoudIO · 2017-04-17T14:56:12Z

src/Include/Footer.php

@@ -298,7 +298,7 @@

 <script src="<?= SystemURLs::getRootPath() ?>/skin/locale/<?= $localeInfo->getLocale() ?>.js"></script>

-<?php if ($sGlobalMessage) {
+<?php if (isset($sGlobalMessage)) {


fixing log errors

DawoudIO · 2017-04-17T14:56:44Z

src/MapUsingGoogle.php

-if (SystemConfig::getValue('nChurchLatitude') == '' || SystemConfig::getValue('nChurchLongitude') == '') {
-    require 'Include/GeoCoder.php';
-    $myAddressLatLon = new AddressLatLon();
+<div class="callout callout-info">


added exra info to link to the update all lat/lon

DawoudIO · 2017-04-17T14:57:13Z

src/MapUsingGoogle.php

@@ -72,6 +63,8 @@
        //Map all the families
        $families = FamilyQuery::create()
            ->filterByDateDeactivated(null)
+            ->filterByLatitude(0, Criteria::NOT_EQUAL)


since we no longer update on the fly, filter out bad lat/lon

DawoudIO · 2017-04-17T14:58:05Z

src/UpdateAllLatLon.php

+            <?php
+
+            foreach ($families as $family) {
+                echo '<li><a href="'.$family->getViewURI().'">' . $family->getName() . '</a> ' . $family->getAddress() . '</li>';


added link to it is faster to fix the bad addresses

DawoudIO · 2017-04-17T14:58:13Z

src/composer.json

@@ -40,7 +40,8 @@
        "setasign/fpdf": "1.8.1",
        "phpmailer/phpmailer": "5.2.*",
        "verot/class.upload.php": "dev-master",
-        "ifsnop/mysqldump-php": "2.*"
+        "ifsnop/mysqldump-php": "2.*",
+        "willdurand/geocoder": "3.3.*"


crossan007 · 2017-04-19T00:59:06Z

src/ChurchCRM/dto/ChurchMetaData.php

+
+use ChurchCRM\Utils\GeoUtils;
+
+class ChurchMetaData


crossan007 · 2017-04-19T00:59:55Z

src/ChurchCRM/dto/SystemConfig.php

-        "bUseGoogleGeocode" => new ConfigItem(56, "bUseGoogleGeocode", "boolean", "1", gettext("Set true to use the Google geocoder.  Set false to use rpc.geocoder.us.")),
+        "sISTusername" => new ConfigItem(54, "sISTusername", "text", "username", gettext("Intelligent Search Technolgy, Ltd. CorrectAddress Username for") . " - https://www.intelligentsearch.com/Hosted/User"),
+        "sISTpassword" => new ConfigItem(55, "sISTpassword", "text", "", gettext("Intelligent Search Technolgy, Ltd. CorrectAddress Password for") . " - https://www.intelligentsearch.com/Hosted/User"),
+        "sGeoCoderProvider" => new ConfigItem(56, "sGeoCoderProvider", "choice", "GoogleMaps", gettext("Select GeoCoder Provider") . " - https://github.com/geocoder-php/Geocoder/blob/3.x/README.md#address-based-providers", '{"Choices":["GoogleMaps", "BingMaps"]}'),


crossan007 · 2017-04-19T01:03:34Z

src/ChurchCRM/model/ChurchCRM/Family.php

-                $this->setLatitude($output->results[0]->geometry->location->lat);
-                $this->setLongitude($output->results[0]->geometry->location->lng);
+    public function updateLanLng() {
+        if (!empty($this->getAddress()) && (!$this->hasLatitudeAndLongitude())) {


What if we want to update the lat/lng of an existing family?

crossan007 · 2017-04-19T01:07:46Z

src/ChurchCRM/model/ChurchCRM/Family.php

-                $this->setLongitude($output->results[0]->geometry->location->lng);
+    public function updateLanLng() {
+        if (!empty($this->getAddress()) && (!$this->hasLatitudeAndLongitude())) {
+            $latLng = GeoUtils::getLatLong($this->getAddress());


this causes a traceback:

vagrant@scotchbox:~$ tail -f /tmp/ChurchCRM.log [2017-04-18 21:06:22] defaultLogger.INFO: INSERT INTO note_nte (nte_ID, nte_per_ID, nte_Text, nte_DateEntered, nte_EnteredBy, nte_Type) VALUES (NULL, 2, 'Created via Family', '2017-04-18 21:06:22.000000', 1, 'create') [] [] [2017-04-18 21:06:22] defaultLogger.INFO: INSERT INTO note_nte (nte_ID, nte_per_ID, nte_Text, nte_DateEntered, nte_EnteredBy, nte_Type) VALUES (NULL, 3, 'Created via Family', '2017-04-18 21:06:22.000000', 1, 'create') [] [] [2017-04-18 21:06:22] defaultLogger.INFO: INSERT INTO note_nte (nte_ID, nte_fam_ID, nte_Text, nte_DateEntered, nte_EnteredBy, nte_Type) VALUES (NULL, 1, 'Created', '2017-04-18 21:06:22.000000', 1, 'create') [] [] [2017-04-18 21:06:22] defaultLogger.INFO: SELECT fam_ID, fam_Name, fam_Address1, fam_Address2, fam_City, fam_State, fam_Zip, fam_Country, fam_HomePhone, fam_WorkPhone, fam_CellPhone, fam_Email, fam_WeddingDate, fam_DateEntered, fam_DateLastEdited, fam_EnteredBy, fam_EditedBy, fam_scanCheck, fam_scanCredit, fam_SendNewsLetter, fam_DateDeactivated, fam_OkToCanvass, fam_Canvasser, fam_Latitude, fam_Longitude, fam_Envelope FROM family_fam WHERE fam_ID = '1' [] [] [18-Apr-2017 21:06:22 America/New_York] PHP Fatal error: Uncaught Error: Class 'ChurchCRM\Utils\CurlHttpAdapter' not found in /var/www/public/ChurchCRM/utils/GeoUtils.php:15 Stack trace: #0 /var/www/public/ChurchCRM/model/ChurchCRM/Family.php(298): ChurchCRM\Utils\GeoUtils::getLatLong('4222 Clinton Wa...') #1 /var/www/public/FamilyEditor.php(442): ChurchCRM\Family->updateLanLng() #2 {main} thrown in /var/www/public/ChurchCRM/utils/GeoUtils.php on line 15

this is also what's causing the travis tests to fail

ya bad last min refactor ... i just fixed it

DawoudIO · 2017-04-21T00:38:19Z

This should good tongo

DawoudIO added 19 commits April 16, 2017 22:11

added willdurand/geocoder

8f0b8ff

fixed log wan for missing sGlobalMessage

70ed420

new static class for quick access to church info

6ef953f

replaced bUseGoogleGeocode with sGeoCoderProvider

2ae3405

new GeoCoder Service to select the provider based on system config

80a0df6

fixed typo

76f96e2

Lat Lng Cleanup

4fbb8b3

updated json_decode to remove log warning

bfbdf99

cleanup of the use ORM and using new ChurchMetaData Service

2201295

Extracted LatLonDistance & LatLonBearing into a GeoUtils

1ef0833

removed used code

3250653

Extracted LatLonDistance & LatLonBearing into a GeoUtils and ORM cleanup

109dd8d

Redone via ORM

d645c19

added note about how to update families and better fileter for items …

b17c766

…without geo info

no longer needed

d078635

moved to GeoCoderService

ca7204d

update lat/lang after new create or update

e890cb4

added sBingMapKey for Bing Maps

db5d16b

added iMapZoom

907665a

DawoudIO added bug development enhancement New Feature Request labels Apr 17, 2017

DawoudIO added this to the 2.7.0 milestone Apr 17, 2017

ghost assigned DawoudIO Apr 17, 2017

ghost added In Review and removed bug labels Apr 17, 2017

This was referenced Apr 17, 2017

Bing Maps as Geocoder #582

Closed

Move default zoom level for maps to systemsettings #1867

Closed

Apply fixes from StyleCI (#2319)

a72aaf0

DawoudIO commented Apr 17, 2017

View reviewed changes

No longer need getMailingAddress as we have getAddress

9740579

DawoudIO requested a review from crossan007 April 18, 2017 13:53

Merge branch 'master' into feature/update-family-latlon

bb1d588

DawoudIO modified the milestones: 2.7.1, 2.7.0 Apr 19, 2017

crossan007 reviewed Apr 19, 2017

View reviewed changes

DawoudIO added 2 commits April 19, 2017 21:02

Merge branch 'master' into feature/update-family-latlon

17176f7

Aadded Missing Imports

f712135

DawoudIO added the do not merge! label Apr 20, 2017

Merge branch 'master' into feature/update-family-latlon

be66b03

DawoudIO removed the do not merge! label Apr 22, 2017

Merge branch 'master' into feature/update-family-latlon

e47b54b

crossan007 modified the milestones: 2.7.1, 2.7.2 Apr 23, 2017

crossan007 approved these changes Apr 23, 2017

View reviewed changes

crossan007 merged commit b14ed3f into master Apr 23, 2017

ghost removed the In Review label Apr 23, 2017

crossan007 deleted the feature/update-family-latlon branch April 23, 2017 01:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revamp of the geocoder system #2320

Revamp of the geocoder system #2320

DawoudIO commented Apr 17, 2017 •

edited

Loading

DawoudIO Apr 17, 2017

DawoudIO Apr 17, 2017

DawoudIO Apr 17, 2017

DawoudIO Apr 17, 2017

DawoudIO Apr 17, 2017

DawoudIO Apr 17, 2017

DawoudIO Apr 17, 2017

crossan007 Apr 19, 2017

crossan007 Apr 19, 2017

crossan007 Apr 19, 2017

crossan007 Apr 19, 2017

crossan007 Apr 19, 2017

DawoudIO Apr 20, 2017

DawoudIO commented Apr 21, 2017

Revamp of the geocoder system #2320

Revamp of the geocoder system #2320

Conversation

DawoudIO commented Apr 17, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DawoudIO commented Apr 21, 2017

DawoudIO commented Apr 17, 2017 •

edited

Loading