Skip to content

Commit

Permalink
Merge pull request #104 from davec555/master
Browse files Browse the repository at this point in the history
Call to Maps updated
  • Loading branch information
zhephree committed Jun 24, 2013
2 parents dba7a5e + bd036fb commit f242134
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Foursquare/app/assistants/preferences-assistant.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ PreferencesAssistant.prototype.setup = function() {
{label: "Spaz", value: "spaz",secondaryIconPath: "images/spaz_32.png"},
{label: "Spaz Special Edition", value: "spaz-sped",secondaryIconPath: "images/spaz_32.png"},
{label: "TweetMe", value: "tweetme",secondaryIconPath: "images/tweetme_32.png"},
{label: "Project Macaw", value: "projectmacaw",secondaryIconPath: "images/project_macaw_32.png"}
{label: "Project Macaw", value: "projectmacaw",secondaryIconPath: "images/project_macaw.png"}
]},

this.twittermodel = {
Expand Down
19 changes: 12 additions & 7 deletions Foursquare/app/assistants/venuedetail-assistant.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ function VenuedetailAssistant(venue,u,p,i,fui,ps,fm,fl) {
this.password=_globals.password;
this.uid=_globals.uid;
this.fromuserinfo=fui;
this.vgeolat=this.venue.geolat;
this.vgeolong=this.venue.geolong;
//this.vgeolat=this.venue.geolat;
//this.vgeolong=this.venue.geolong;
this.vgeolat=this.venue.location.lat;
this.vgeolong=this.venue.location.lng;
this.prevScene=ps;
this.fromMap=fm;
this.fromLaunch=fl;
Expand Down Expand Up @@ -433,11 +435,14 @@ VenuedetailAssistant.prototype.swapTabs = function(what) {
}

VenuedetailAssistant.prototype.showGoogleMaps = function() {
this.controller.serviceRequest('palm://com.palm.applicationManager', {
method:'open',
parameters:{target: "maploc:("+this.vgeolat+","+this.vgeolong+")" }
}
);
//Mojo.Log.error('calling maps: ' + this.vgeolat + ',' + this.vgeolong);
this.controller.serviceRequest('palm://com.palm.applicationManager', {
method:'open',
//parameters:{target: "maploc:("+this.vgeolat+","+this.vgeolong+")" } // googlemaps supports brackets, but not enyo bing maps
//Unfortunately setting the Default App for addresses only sets the mapto: target and not maploc:, so in the future we'll have to create an option to select mapping app to use
parameters:{target: "maploc:"+this.vgeolat+","+this.vgeolong }
}
);
}

VenuedetailAssistant.prototype.getVenueInfo = function() {
Expand Down
Binary file added Foursquare/images/1.5/main-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Foursquare/images/1.5/project_macaw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
1 change: 1 addition & 0 deletions Foursquare/stylesheets/4squarecheckin.css
Original file line number Diff line number Diff line change
Expand Up @@ -2371,6 +2371,7 @@ img.right-arrow {

#mojo-scene-main-scene-scroller {
background: url(../images/main-bg.png) no-repeat fixed left top;
//background-position: 0px 1px;
}
#loginSpinner {
margin: -45px auto 2px auto;
Expand Down
Binary file added com.foursquare.foursquare_2.8.5_all.ipk
Binary file not shown.

0 comments on commit f242134

Please sign in to comment.