Merge pull request #10 from danstowell/jsrouting-credits

[rails.git] / app / assets / javascripts / routing_engines / mapquest_bicycle.js

diff --git a/app/assets/javascripts/routing_engines/mapquest_bicycle.js b/app/assets/javascripts/routing_engines/mapquest_bicycle.js
index bf33870782c034f3d2717a3772b4079eb012b5ae..c7995246ab22466a84aeed019eac1d86c1f26498 100644 (file)
--- a/app/assets/javascripts/routing_engines/mapquest_bicycle.js
+++ b/app/assets/javascripts/routing_engines/mapquest_bicycle.js
@@ -3,11 +3,10 @@
 // http://open.mapquestapi.com/directions/
 // https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153
 
-// *** needs to give credit
-
 OSM.RoutingEngines.list.push({
-       name: 'Bicycle (MapQuest Open)',
-       draggable: true,
+       name: "javascripts.directions.engines.mapquest_bike",
+       creditline: 'Directions courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',
+       draggable: false,
        _hints: {},
        MQ_SPRITE_MAP: {
                0: 1, // straight
@@ -30,12 +29,13 @@ OSM.RoutingEngines.list.push({
                17: 8, // left fork
                18: 1  // straight fork
        },
-       getRoute: function(final,points) {
+       getRoute: function(isFinal,points) {
                var url="http://open.mapquestapi.com/directions/v2/route?key=Fmjtd%7Cluur290anu%2Crl%3Do5-908a0y";
                var from=points[0]; var to=points[points.length-1];
                url+="&from="+from.join(',');
                url+="&to="+to.join(',');
                url+="&routeType=bicycle";
+        //url+="&locale=" + I18n.currentLocale(); //Doesn't actually work. MapQuest requires full locale e.g. "de_DE", but I18n only provides language, e.g. "de"
                url+="&manMaps=false";
                url+="&shapeFormat=raw&generalize=0";
                this.requestJSONP(url+"&callback=");