svn commit: r721940 - in /portals/applications: demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java

[taylor]

Author: taylor
Date: Sun Nov 30 17:25:47 2008
New Revision: 721940

URL: http://svn.apache.org/viewvc?rev=721940&view=rev
Log:
fixing google maps portlet, they changed the url at yahoo, and, it the impl was 
dependent on a default app id that no longer exists

Modified:
    portals/applications/demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm
    
portals/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java

Modified: 
portals/applications/demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm
URL: 
http://svn.apache.org/viewvc/portals/applications/demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm?rev=721940&r1=721939&r2=721940&view=diff
==============================================================================
--- portals/applications/demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm 
(original)
+++ portals/applications/demo/src/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm 
Sun Nov 30 17:25:47 2008
@@ -17,8 +17,9 @@
 <script language="JavaScript" type="text/javascript">
     function portletGoogleMapsLoadMap()
     {
-        var loc = 
escape("$renderRequest.getPreferences().getValue('Location','')");
-        var getLatitudeLongitudeUrl = 
"$renderRequest.getScheme():\/\/$renderRequest.getServerName():$renderRequest.getServerPort()$renderRequest.getContextPath()\/yahoogeocode?location="
 + loc ;
+        var loc = 
escape("$renderRequest.getPreferences().getValue('Location','')");
+        var appid = 
escape("$renderRequest.getPreferences().getValue('APIKey','')");
+        var getLatitudeLongitudeUrl = 
"$renderRequest.getScheme():\/\/$renderRequest.getServerName():$renderRequest.getServerPort()$renderRequest.getContextPath()\/yahoogeocode?location="
 + loc + "&appid=" + appid;
         dojo.io.bind({
                    url: getLatitudeLongitudeUrl,
                    mimetype: "text/xml",

Modified: 
portals/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java
URL: 
http://svn.apache.org/viewvc/portals/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java?rev=721940&r1=721939&r2=721940&view=diff
==============================================================================
--- 
portals/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java
 (original)
+++ 
portals/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java
 Sun Nov 30 17:25:47 2008
@@ -55,9 +55,9 @@
                throws ServletException, java.io.IOException {
                String location = req.getParameter("location");
                location = URLEncoder.encode(location,"UTF-8");
-               String url = YAHOO_REQUEST + location;
-               String content = "<error/>";
-               
+        appid = URLEncoder.encode(location,"UTF-8");
+        String url = YAHOO_REQUEST + appid + "&location=" +location;           
+               String content = "<error/>";            
                // get content from yahoo, code from 
http://jakarta.apache.org/commons/httpclient/tutorial.html
                HttpClient client = new HttpClient();
                GetMethod method = new GetMethod(url);