From: Richard Fairhurst <richard@systemeD.net>
Date: Fri, 7 Mar 2014 15:58:04 +0000 (+0000)
Subject: Merge pull request #11 from danstowell/jsrouting-pulldownchange
X-Git-Tag: live~4217^2~38
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/565f661f20ad0caca2b91cba4d036ff65ee6e9ec?hp=deea77ab93b4932b4bc48f91562ee31e6e7b54fc

Merge pull request #11 from danstowell/jsrouting-pulldownchange

refresh search if showing and user changes provider
---

diff --git a/app/assets/javascripts/routing.js.erb b/app/assets/javascripts/routing.js.erb
index 4ea30fa00..fbec3e7e3 100644
--- a/app/assets/javascripts/routing.js.erb
+++ b/app/assets/javascripts/routing.js.erb
@@ -211,6 +211,8 @@ OSM.Routing=function(map,name,jqSearch) {
 			$('#turnbyturn').append(row);
 			cumulative+=step[3];
 		}
+		$('#sidebar_content').append('<p id="routing_credit">' + r.chosenEngine.creditline + '</p>');
+
 	};
 	r.clickTurn=function(num,latlng) {
 		r.popup=L.popup().setLatLng(latlng).setContent("<p>"+(num+1)+"</p>").openOn(r.map);
diff --git a/app/assets/javascripts/routing_engines/cloudmade_foot.js b/app/assets/javascripts/routing_engines/cloudmade_foot.js
index 5c1ba0e97..bee9e448a 100644
--- a/app/assets/javascripts/routing_engines/cloudmade_foot.js
+++ b/app/assets/javascripts/routing_engines/cloudmade_foot.js
@@ -5,6 +5,7 @@
 
 OSM.RoutingEngines.list.push({
 	name: "javascripts.directions.engines.cloudmade_foot",
+	creditline: 'Directions courtesy of <a href="http://cloudmade.com/products/routing" target="_blank">Cloudmade</a>',
 	draggable: false,
 	CM_SPRITE_MAP: {
 		"C": 1,
diff --git a/app/assets/javascripts/routing_engines/graphhopper_bicycle.js b/app/assets/javascripts/routing_engines/graphhopper_bicycle.js
index 6245124b1..bec855f88 100644
--- a/app/assets/javascripts/routing_engines/graphhopper_bicycle.js
+++ b/app/assets/javascripts/routing_engines/graphhopper_bicycle.js
@@ -2,6 +2,7 @@
 
 OSM.RoutingEngines.list.push({    
     name: "javascripts.directions.engines.graphhopper_bike",
+    creditline: 'Directions courtesy of <a href="http://graphhopper.com/routing/" target="_blank">Graphhopper</a>',
     draggable: true,
     _hints: {},
     getRoute: function(isFinal, points) {
diff --git a/app/assets/javascripts/routing_engines/mapquest_bicycle.js b/app/assets/javascripts/routing_engines/mapquest_bicycle.js
index b08096955..c7995246a 100644
--- a/app/assets/javascripts/routing_engines/mapquest_bicycle.js
+++ b/app/assets/javascripts/routing_engines/mapquest_bicycle.js
@@ -3,10 +3,9 @@
 // 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: "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: {
diff --git a/app/assets/javascripts/routing_engines/osrm_car.js b/app/assets/javascripts/routing_engines/osrm_car.js
index 0011b0205..da94adf05 100644
--- a/app/assets/javascripts/routing_engines/osrm_car.js
+++ b/app/assets/javascripts/routing_engines/osrm_car.js
@@ -4,6 +4,7 @@
 
 OSM.RoutingEngines.list.push({
 	name: "javascripts.directions.engines.osrm_car",
+	creditline: 'Directions courtesy of <a href="http://project-osrm.org/" target="_blank">OSRM</a>',
 	draggable: true,
 	_hints: {},
 	getRoute: function(isFinal,points) {
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 0f306b6d3..a8fba1943 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1217,6 +1217,15 @@ tr.turn:hover {
   }
 }
 
+/* Rules for the routing sidebar */
+
+#sidebar_content {
+  #routing_credit {
+    text-align: center;
+    padding: 0.5em;
+  }
+}
+
 /* Rules for edit pages */
 
 .site-edit {