Changeset 1140

Timestamp:

11/24/06 11:07:33 (7 years ago)

Author:

benoitg

Message:

• Make the google-map locator for nodes use the network center coordinates. This change makes it usable when you didn't use the geocoder first.

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/admin/hotspot_location_map.php (modified) (2 diffs)
• wifidog/classes/Node.php (modified) (3 diffs)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 2006-11-23 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Fix bug un node creation
+        * Fix bug in node creation
+        * Add error message for geooder wwhen you didn't set the country
+        * Clarify error messages and description for the geocoder.
+        * Make the google-map locator for nodes use the network center coordinates.
+          This change makes it usable when you didn't use the geocoder first. 
         
 2006-11-22 Benoit Grégoire  <bock@step.polymtl.ca>

trunk/wifidog-auth/wifidog/admin/hotspot_location_map.php

@@ -73 +73 @@
     $ui->addContent('main_area_middle', $html);
 
-    if($node->getGisLocation() !== null)
-    {
-        $lat = $node->getGisLocation()->getLatitude();
-        $long = $node->getGisLocation()->getLongitude();
+    if(($gisLocation = $node->getGisLocation()) !== null && $gisLocation->getLatitude() != null) {
+    }
+    elseif(($gisLocation = $node->getNetwork()->getGisLocation()) !== null && $gisLocation->getLatitude() != null) {
+    }
+    else {
+         $html .= "<div class='error'>"._("Error:  You need to set the GIS coordinates of the center of your network")."</div\n";
+        $gisLocation = null;
+    }
+    if($gisLocation !== null)
+    {//pretty_print_r($gisLocation);
+        $lat = $gisLocation->getLatitude();
+        $long = $gisLocation->getLongitude();
     }
     else
@@ -94 +102 @@
     $script .= "var current_marker = new GMarker(current_marker_point);\n";
     $script .= "map.addOverlay(current_marker);\n";
-    $gis_lat_name = "node_" . md5($node->getId()) ."_gis_latitude";
-    $gis_long_name = "node_" . md5($node->getId()) . "_gis_longitude";
+    $gis_lat_name = "node_" . $node->getId() ."_gis_latitude";
+    $gis_long_name = "node_" . $node->getId() . "_gis_longitude";
     $script .= "function setLocationInOriginalWindow() {\n";
     $script .= "  window.opener.document.getElementById(\"$gis_lat_name\").value = current_marker_point.y;\n";

trunk/wifidog-auth/wifidog/classes/Node.php

@@ -988 +988 @@
                 // Call the geocoding service, if Google Maps is enabled then use Google Maps to let the user choose a more precise location
                 if (defined('GMAPS_HOTSPOTS_MAP_ENABLED') && GMAPS_HOTSPOTS_MAP_ENABLED === true) {
-                    $_data  = InterfaceElements::generateInputSubmit("geocode_only", _("Geocode only"), "geocode_only_submit");
+                    $_data  = InterfaceElements::generateInputSubmit("geocode_only", _("Geocode the address or postal code above"), "geocode_only_submit");
                     $_data .= InterfaceElements::generateInputButton("google_maps_geocode", _("Check using Google Maps"), "google_maps_geocode_button", "submit", array("onclick" => "window.open('hotspot_location_map.php?node_id={$this->getId()}', 'hotspot_location', 'toolbar = 0, scrollbars = 1, resizable = 1, location = 0, statusbar = 0, menubar = 0, width = 600, height = 600');"));
                     $_data .= InterfaceElements::generateDiv("(" . _("Use a geocoding service, then use Google Maps to pinpoint the exact location.") . ")", "admin_section_hint", "node_gis_geocode_hint");
                 } else {
-                    $_data  = InterfaceElements::generateInputSubmit("geocode_only", _("Geocode location"), "geocode_only_submit");
+                    $_data  = InterfaceElements::generateInputSubmit("geocode_only", _("Geocode the address or postal code above"), "geocode_only_submit");
                     $_data .= InterfaceElements::generateDiv("(" . _("Use a geocoding service") . ")", "admin_section_hint", "node_gis_geocode_hint");
                 }
@@ -1088 +1088 @@
         {
                 $user = User::getCurrentUser();
-
+//pretty_print_r($_REQUEST);
                 if (!$this->isOwner($user) && !$user->isSuperAdmin()) {
                         throw new Exception(_('Access denied!'));
@@ -1194 +1194 @@
                                         $this->_warningMessage = _("You must enter a valid address.");
                         }
+            else
+            {
+                $this->_warningMessage = _("Unable to create geocoder.  Are you sure you set the country?");
+            }
                 }
                 else