You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by wo...@apache.org on 2009/04/15 15:45:43 UTC
svn commit: r765198 - in
/portals/applications/demo/trunk/src/main/webapp/WEB-INF:
other/googlemaps/GoogleMaps.vm portlet.xml
Author: woonsan
Date: Wed Apr 15 13:45:43 2009
New Revision: 765198
URL: http://svn.apache.org/viewvc?rev=765198&view=rev
Log:
APA-6: the default API key for http://localhost:8080 is changed to use v2.x API key and the view template was changed to adapt it to 2.x API
Modified:
portals/applications/demo/trunk/src/main/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm
portals/applications/demo/trunk/src/main/webapp/WEB-INF/portlet.xml
Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm?rev=765198&r1=765197&r2=765198&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/other/googlemaps/GoogleMaps.vm Wed Apr 15 13:45:43 2009
@@ -14,36 +14,33 @@
See the License for the specific language governing permissions and
limitations under the License.
*#
-<script language="JavaScript" type="text/javascript">
- function portletGoogleMapsLoadMap()
- {
- 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",
- error: function(type, error){
- dojo.raise( "request failed for yahoo latitude-longitude type=" + type + " error=" + error );
- },
- load: function( type, data, evt )
- {
- lat = data.getElementsByTagName("Latitude").item(0).firstChild.nodeValue;
- lng = data.getElementsByTagName("Longitude").item(0).firstChild.nodeValue;
- //alert ("ll: " + lat + "," + lng);
- mapit(lat,lng);
- }
- });
- }
- dojo.addOnLoad( portletGoogleMapsLoadMap ) ;
-</script>
-<script language="JavaScript" type="text/javascript">
- function mapit(la, ln) {
- var map = new GMap2(document.getElementById("map"));
-map.addControl(new GSmallMapControl());
- map.addControl(new GMapTypeControl());
- map.setCenter(new GLatLng(la, ln), 13);
- }
-</script>
-<div id="map" style="width: 100%; height: $renderRequest.getPreferences().getValue('MapHeight','400px')"></div>
-
+<script language="JavaScript" type="text/javascript">
+function ${renderResponse.namespace}mapsLoaded() {
+ 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",
+ error: function(type, error)
+ {
+ dojo.raise( "request failed for yahoo latitude-longitude type=" + type + " error=" + error );
+ },
+ load: function( type, data, evt )
+ {
+ lat = data.getElementsByTagName("Latitude").item(0).firstChild.nodeValue;
+ lng = data.getElementsByTagName("Longitude").item(0).firstChild.nodeValue;
+ //alert ("ll: " + lat + "," + lng);
+ var map = new google.maps.Map2(document.getElementById("${renderResponse.namespace}map"));
+ map.addControl(new GSmallMapControl());
+ map.addControl(new GMapTypeControl());
+ map.setCenter(new google.maps.LatLng(lat, lng), 13);
+ }
+ });
+}
+function ${renderResponse.namespace}mapit() {
+ google.load("maps", "2", {"callback" : ${renderResponse.namespace}mapsLoaded});
+}
+</script>
+
+<div id="${renderResponse.namespace}map" style="width: 100%; height: $renderRequest.getPreferences().getValue('MapHeight','400px')"></div>
Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=765198&r1=765197&r2=765198&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/portlet.xml (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/portlet.xml Wed Apr 15 13:45:43 2009
@@ -41,10 +41,10 @@
<portlet-mode>VIEW</portlet-mode>
<portlet-mode>HELP</portlet-mode>
</supports>
- <supports>
- <mime-type>text/vnd.wap.wml</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
+ <supports>
+ <mime-type>text/vnd.wap.wml</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
<supported-locale>en</supported-locale>
<supported-locale>ja</supported-locale>
<resource-bundle>org.apache.jetspeed.portlet.helloworld.resources.HelloWorldResources</resource-bundle>
@@ -862,19 +862,19 @@
<preference>
<name>conditions</name>
<value><![CDATA[where CLIENT_ID > 5]]></value>
- </preference>
+ </preference>
<preference>
<name>columnTitles</name>
<value>CLIENT,NAME,CLIENT-MODEL</value>
- </preference>
+ </preference>
<preference>
<name>columnNames</name>
<value>CLIENT_ID,NAME,MODEL</value>
- </preference>
+ </preference>
<preference>
<name>orderByColumns</name>
<value></value>
- </preference>
+ </preference>
</portlet-preferences>
</portlet>
@@ -956,7 +956,7 @@
</preference>
<preference>
<name>APIKey</name>
- <value>ABQIAAAAisHr-hr7f_yfo_m3teTC5RQXGaCFRGWXJQavRKQcb1Ew_fwkKRQ26QnpXVIkxSMwwTECWDV23ZDaLQ</value>
+ <value>ABQIAAAAMDRA8-wV3kKZLHtfyDUJGhTwM0brOpm-All5BF6PoaKBxRWWERQ4jdA2WxzK62g0E2Xk-DF9JJccFg</value>
</preference>
</portlet-preferences>
</portlet>