Changeset 7082

Timestamp:

11/26/08 01:26:00 (6 weeks ago)

Author:

daybreaker

Message:

refs #1131: merging 1.7 to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• plugins/GoogleMap/gmap_common.js (modified) (4 diffs)
• plugins/GoogleMap/index.php (modified) (9 diffs)
• plugins/GoogleMap/index.xml (modified) (2 diffs)

trunk/plugins/GoogleMap/gmap_common.js

@@ -3 +3 @@
 
 var geocoder = null;
-var locationMap = null;
+
+function GMap_normalizeAddress(address) {
+    //return address.split('/').slice(0,4).join(' ');
+    return address.split('/').join(' ');
+}
 
 /**
@@ -18 +22 @@
     if (!geocoder)
         geocoder = new GClientGeocoder();
-    var address = location_path.split('/').slice(0,4).join(' ');
-    geocoder.getLocations(address, function(response) {GMap_findLocationCallback(response, gmap, address, title, link, boundary, locations);});
+    var address = GMap_normalizeAddress(location_path);
+    geocoder.getLocations(address, function(response) {GMap_findLocationCallback(response, gmap, {'address': address, 'path': location_path}, title, link, boundary, locations);});
+}
+
+function GMap_addLocationMarkDirect(gmap, location_info, title, link, point, boundary, locations) {
+    var prev = null;
+    var i;
+    // Check duplicated locations
+    for (i = 0; i < locations.length; i++) {
+        if (locations[i].point.equals(point)) {
+            prev = locations[i];
+            break;
+        }
+    }
+    if (prev == null) {
+        // Create a new marker for this location
+        var marker = new GMarker(point, {'title': location_info.address.split(' ').pop()});
+        var locative = {
+            'point': point,
+            'marker': marker,
+            'address': location_info.address,
+            'entries': new Array({'title': title, 'link': link})
+        };
+        locations.push(locative);
+        marker.bindInfoWindowHtml(GMap_buildLocationInfoHTML(locative));
+        gmap.addOverlay(marker);
+        boundary.extend(point);
+    } else {
+        // Add information to the existing marker for here
+        prev.entries.push({'title': title, 'link': link});
+        prev.marker.bindInfoWindowHtml(null);
+        prev.marker.bindInfoWindowHtml(GMap_buildLocationInfoHTML(prev));
+    }
+    if (process_count != undefined)
+        process_count++;
 }
 
@@ -39 +76 @@
  * @brief (내부용 함수) geocoder.getLocations()에 의해 호출되는 비동기 콜백 함수
  */
-function GMap_findLocationCallback(response, gmap, address, title, link, boundary, locations) {
+function GMap_findLocationCallback(response, gmap, location_info, title, link, boundary, locations) {
     if (!response || response.Status.code != 200) {
         // alert('Can\'t retrieve this address "'+address+'"');
@@ -45 +82 @@
         var place = response.Placemark[0];
         var point = new GLatLng(place.Point.coordinates[1], place.Point.coordinates[0]);
-        var prev = null;
-        var i;
-        // Check duplicated locations
-        for (i = 0; i < locations.length; i++) {
-            if (locations[i].point.equals(point)) {
-                prev = locations[i];
-                break;
-            }
-        }
-        if (prev == null) {
-            // Create a new marker for this location
-            var marker = new GMarker(point, {'title': address.split(' ').pop()});
-            var locative = {
-                'point': point,
-                'marker': marker,
-                'address': address,
-                'entries': new Array({'title': title, 'link': link})
-            };
-            locations.push(locative);
-            marker.bindInfoWindowHtml(GMap_buildLocationInfoHTML(locative));
-            gmap.addOverlay(marker);
-            boundary.extend(point);
-        } else {
-            // Add information to the existing marker for here
-            prev.entries.push({'title': title, 'link': link});
-            prev.marker.bindInfoWindowHtml(null);
-            prev.marker.bindInfoWindowHtml(GMap_buildLocationInfoHTML(prev));
-        }
+        GMap_addLocationMarkDirect(gmap, location_info, title, link, point, boundary, locations);
     }
-    if (process_count != undefined)
-        process_count++;
 }
 

trunk/plugins/GoogleMap/index.php

@@ -18 +18 @@
         $api_key = $config['apiKey'];
         $target .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"$pluginURL/common.css\" />\n";
-        $target .= "<script type=\"text/javascript\" src=\"http://maps.google.co.kr/maps?file=api&amp;v=2&amp;key=$api_key\"></script>\n";
+        $target .= "<script type=\"text/javascript\" src=\"http://maps.google.co.kr/maps?file=api&amp;v=2&amp;sensor=false&amp;key=$api_key\"></script>\n";
         $target .= "<script type=\"text/javascript\" src=\"$pluginURL/gmap_common.js?".time()."\"></script>\n";
         $target .= "<script type=\"text/javascript\">
@@ -36 +36 @@
         $api_key = $config['apiKey']; // should exist here
         $target .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"$pluginURL/common.css\" />\n";
-        $target .= "<script type=\"text/javascript\" src=\"http://maps.google.co.kr/maps?file=api&amp;v=2&amp;key=$api_key\"></script>\n";
+        $target .= "<script type=\"text/javascript\" src=\"http://maps.google.co.kr/maps?file=api&amp;v=2&amp;sensor=false&amp;key=$api_key\"></script>\n";
         $target .= "<script type=\"text/javascript\">
         //<![CDATA[
@@ -89 +89 @@
 
 function GoogleMap_LocationLogView($target) {
-    global $blogid, $blog, $blogURL, $pluginURL, $configVal, $service;
+    global $blogid, $blog, $blogURL, $pluginURL, $configVal, $service, $database;
     requireComponent('Textcube.Function.Misc');
     $config = Setting::fetchConfigVal($configVal);
@@ -107 +107 @@
     var process_count = 0;
     var polling_interval = 60; // ms
-    var boundary;
-    function locationFetchPoller(target_count) {
-        if (process_count != target_count) {
-            window.setTimeout('locationFetchPoller('+target_count+');', polling_interval);
-            return;
-        }
+    var boundary = null;
+    var locationMap = null;
+    function adjustToBoundary() {
         var z = locationMap.getBoundsZoomLevel(boundary);
         if (z > 8)
@@ -121 +118 @@
         locationMap.setCenter(boundary.getCenter());
     }
+    function locationFetchPoller(target_count) {
+        if (process_count != target_count) {
+            window.setTimeout('locationFetchPoller('+target_count+');', polling_interval);
+            return;
+        }
+        adjustToBoundary();
+    }
     STD.addLoadEventListener(function() {
         var c = document.getElementById('<?php echo $id;?>');
@@ -128 +132 @@
             locationMap = new GMap2(c);
             locationMap.setMapType(<?php echo $default_type;?>);
-            locationMap.setCenter(new GLatLng(<?php echo $lat;?>, <?php echo $lng;?>), <?php echo $zoom;?>);
             locationMap.addControl(new GHierarchicalMapTypeControl());
             locationMap.addControl(new GLargeMapControl());
             locationMap.addControl(new GScaleControl());
             locationMap.enableContinuousZoom();
-            boundary = new GLatLngBounds(locationMap.getCenter(), locationMap.getCenter());
+            locationMap.setCenter(new GLatLng(<?php echo $lat;?>, <?php echo $lng;?>), <?php echo $zoom;?>);
+            boundary = new GLatLngBounds(locationMap.getCenter()); //, new GLatLng(<?php echo $lat+0.1;?>, <?php echo $lng+0.1;?>));
             var locations = new Array();
 <?php
@@ -139 +143 @@
     foreach ($locatives as $locative) {
         $locative['link'] = "$blogURL/" . ($blog['useSloganOnPost'] ? 'entry/' . URL::encode($locative['slogan'],$service['useEncodedURL']) : $locative['id']);
-        echo "\t\t\tGMap_addLocationMark(locationMap, '{$locative['location']}', '".str_replace("'", "\\'", $locative['title'])."', encodeURI('".str_replace("'", "\\'", $locative['link'])."'), boundary, locations);\n";
+        $row = POD::queryRow("SELECT * FROM {$database['prefix']}GMapLocations WHERE blogid = ".getBlogId()." AND address = '".POD::escapeString($locative['location'])."'");
+        $found = false;
+        if ($row == null || empty($row)) {
+            //echo "\t\t\t/* New location query */\n";
+            // Recursively repeat until location is found. (continuously reducing accuracy)
+            $addr = explode(' ', _GMap_normalizeAddress($locative['location']));
+            while (true) {
+                $url = "http://maps.google.co.kr/maps/geo?q=".urlencode(trim(implode(' ', $addr)))."&output=csv&sensor=false&key={$config['apiKey']}";
+                //echo "\t\t\t/* recurse : $addr */\n";
+                $response = requestHttp('get', $url, false, 'text/plain');
+                if ($response === false) {
+                    $found = false;
+                    break;
+                } else {
+                    $response_lines = explode("\n", $response[1]);
+                    $response_csv = explode(',', $response_lines[1]);
+                    if ($response_csv[0] == '200') {
+                        // Insert for later use.
+                        //echo "\t\t\t/* read from api, {$locative['location']} */\n";
+                        $lat = $response_csv[2];
+                        $lng = $response_csv[3];
+                        POD::execute("INSERT INTO {$database['prefix']}GMapLocations VALUES (".getBlogId().", '".POD::escapeString($locative['location'])."', $lng, $lat, NOW())");
+                        $found = true;
+                        break;
+                    } else {
+                        //echo "\t\t\t/* can't retrieve result for {$locative['location']} */\n";
+                        $lat = null; $lng = null;
+                        $found = false;
+                        if (count($addr) == 1)
+                            break;
+                        if (!$found)
+                            array_pop($addr);
+                        continue;
+                    }
+                }
+            }
+            if (!$found) {
+                // Not found.
+                //echo "\t\t\t/* no result for {$locative['location']} */\n";
+                POD::execute("INSERT INTO {$database['prefix']}GMapLocations VALUES (".getBlogId().", '".POD::escapeString($locative['location'])."', NULL, NULL, NOW())");
+            }
+        } else {
+            //echo "\t\t\t/* read from db : {$locative['location']} */\n";
+            $lat = $row['latitude'];
+            $lng = $row['longitude'];
+            $found = true;
+        }
+        if ($found && !is_null($lat)) {
+            echo "\t\t\tGMap_addLocationMarkDirect(locationMap, {address:GMap_normalizeAddress('{$locative['location']}'), path:'{$locative['location']}'}, '".str_replace("'", "\\'", $locative['title'])."', encodeURI('".str_replace("'", "\\'", $locative['link'])."'), new GLatLng($lat, $lng), boundary, locations);\n";
+        } else
+            echo "\t\t\tif (process_count != undefined) process_count++;\n";
         $count++;
     }
 ?>
-            window.setTimeout('locationFetchPoller(<?php echo $count;?>);', polling_interval);
+            //window.setTimeout('locationFetchPoller(<?php echo $count;?>);', polling_interval);
+            adjustToBoundary();
         } else {
             c.innerHTML = '<p style="text-align:center; color:#c99;">이 웹브라우저는 구글맵과 호환되지 않습니다.</p>';
@@ -226 +281 @@
     <script type="text/javascript" src="<?php echo $pluginURL;?>/mootools-1.2.1-core-yc.js"></script>
     <script type="text/javascript" src="<?php echo $pluginURL;?>/mootools-1.2-more.js"></script>
-    <script type="text/javascript" src="http://maps.google.co.kr/maps?file=api&amp;v=2&amp;key=<?php echo $api_key;?>"></script>
+    <script type="text/javascript" src="http://maps.google.co.kr/maps?file=api&amp;v=2&amp;sensor=false&amp;key=<?php echo $api_key;?>"></script>
     <script type="text/javascript" src="<?php echo $pluginURL;?>/gmap_common.js?<?php echo time();?>"></script>
     <script type="text/javascript" src="<?php echo $pluginURL;?>/gmap_ui.js?<?php echo time();?>"></script>
@@ -255 +310 @@
 <?php
 }
+
+function _GMap_normalizeAddress($address) {
+    //return trim(implode(' ', array_slice(explode('/', $address), 0, 4)));
+    return trim(implode(' ', explode('/', $address)));
+}
 /* vim: set noet ts=4 sts=4 sw=4: */
 ?>

trunk/plugins/GoogleMap/index.xml

@@ -36 +36 @@
       </fieldset>
       <fieldset legend="지역로그 설정">
-        <field title="기본 맵 형식" name="locative_maptype" type="select">
-          <op value="G_NORMAL_MAP">일반 정보 지도</op>
-          <op value="G_SATELLITE_MAP">위성 사진</op>
-          <op value="G_HYBRID_MAP" selected="selected">위성 사진 + 정보 지도</op>
-        </field>
+        <field title="기본 맵 형식" name="locative_maptype" type="select">
+          <op value="G_NORMAL_MAP">일반 정보 지도</op>
+          <op value="G_SATELLITE_MAP">위성 사진</op>
+          <op value="G_HYBRID_MAP" selected="selected">위성 사진 + 정보 지도</op>
+        </field>
       </fieldset>
     </config>
@@ -56 +56 @@
       </fieldset>
       <fieldset legend="Location Log">
-        <field title="Default Map Type" name="locative_maptype" type="select">
-          <op value="G_NORMAL_MAP" checked="checked">Normal</op>
-          <op value="G_SATELLITE_MAP">Satellite</op>
-          <op value="G_HYBRID_MAP">Hybrid (Normal+Satellite)</op>
-        </field>
+        <field title="Default Map Type" name="locative_maptype" type="select">
+          <op value="G_NORMAL_MAP" checked="checked">Normal</op>
+          <op value="G_SATELLITE_MAP">Satellite</op>
+          <op value="G_HYBRID_MAP">Hybrid (Normal+Satellite)</op>
+        </field>
       </fieldset>
     </config>
   </binding>
+  <storage>
+    <table>
+      <name>GMapLocations</name>
+      <fields>
+        <field><name>address</name><attribute>varchar</attribute><length>300</length><isnull>0</isnull><default></default></field>
+        <field><name>longitude</name><attribute>double</attribute><isnull>1</isnull></field>
+        <field><name>latitude</name><attribute>double</attribute><isnull>1</isnull></field>
+        <field><name>updated</name><attribute>timestamp</attribute><isnull>0</isnull><default>0</default></field>
+      </fields>
+      <key>address</key>
+    </table>
+  </storage>
 </plugin>
+<!-- vim: set sts=2 sw=2 et: -->