Merge lp:~joergberroth/unav/improved_set_radars into lp:unav

[JkB]

* improved search algorithm to set radars by adding more intelligent bounding polygons instead of a rectangular bounding box.
* big performance improvement

* improved search algorithm to set radars by adding more intelligent bounding polygons instead of a rectangular bounding box.

[lp:~joergberroth/unav/improved_set_radars]

44. By JkB on 2016-04-11

* remove unnecessary comments

45. By JkB on 2016-04-11

*reduce coord accuracy to reduce data being send.

[Nekhelesh Ramananthan (nik90)]

Hmm I don't have a car to check the radar performance. To be honest, I have never used the radar feature as well.

@Joerg, if you give me clear steps to test your MP, I can do it.

review: Needs Information

[JkB (joergberroth)]

That's easy:
Activate radars.
Choose a route (best a long one accross france, not longer than 999km)
Youll see the improvement while the radars are being analyzed.
m Mittwoch, 13. April 2016 14:45:45 CEST schrieb Nekhelesh Ramananthan
<email address hidden>:
> Review: Needs Information
>
> Hmm I don't have a car to check the radar performance. To be
> honest, I have never used the radar feature as well.
>
> @Joerg, if you give me clear steps to test your MP, I can do it.

--
Versandt, mit Dekko von meinem Ubuntu-Gerät

[Nekhelesh Ramananthan (nik90)]

OMG Are you kidding me? @Joerg what kind of magic did you do? Massive performance improvement! Excellent job!

In my testing, a route from Delft, Netherlands to Bern, Germany (~750 km) took about 3-4 minutes in trunk. With your branch it takes hardly 5-6 seconds!

I am so approving this! [phone]

review: Approve (testing)

[costales (costales)]

So awesome work Joerg |o/ Incredible :D

Could you merge my propose branch lp:~costales/unav/0.59-improved_set_radars in this branch?
I merged with trunk and adjusted a few minor things.

Thanks a lot mate!

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

@Joerg pls merge the latest trunk lp:unav.

review: Needs Fixing

[lp:~joergberroth/unav/improved_set_radars]

46. By JkB on 2016-04-14

*merge with trunk

47. By JkB on 2016-04-14

*add marcos fixes.

48. By JkB on 2016-04-14

* minor fix: found wrong toFixed() values

Unmerged revisions

=== modified file 'nav/class/WebAPI.js'
--- nav/class/WebAPI.js	2016-04-06 17:07:14 +0000
+++ nav/class/WebAPI.js	2016-04-14 20:18:35 +0000
@@ -58,7 +58,7 @@
 				api_key: 'valhalla-4DcFzeQ' // TODO debug
 			},
 			dataType: 'json',
-			timeout: 30000,
+			timeout: 50000,
 			success: this.OK_callback_set_route.bind(this),
 			error: this.KO_callback_set_route.bind()
 		});
@@ -126,7 +126,7 @@
 			api_key: 'valhalla-4DcFzeQ' // TODO debug
 		},
 		dataType: 'json',
-		timeout: 30000,
+		timeout: 50000,
 		success: this.OK_callback_simulate.bind(this),
 		error: this.KO_callback_simulate.bind()
 	});
@@ -139,8 +139,8 @@
 	
 	if (data.trip.status == 0) {
 		this.nav.set_route(	(data.trip.summary.length*1000),
-							data.trip.summary.time,     // totals (meters & seconds)
-							data.trip.legs[0].shape,    // Map line
+							data.trip.summary.time,	 // totals (meters & seconds)
+							data.trip.legs[0].shape,	// Map line
 							data.trip.legs[0].maneuvers // Route stracks
 		);
 		// Avoid wait for GPS
@@ -174,7 +174,7 @@
 
 
 // Radars
-WebAPI.prototype.set_radars = function(lat1, lng1, lat2, lng2) {
+WebAPI.prototype.set_radars = function() {
 	// Refresh current radars
 	this.nav.radars_clear();
 	this.ui.markers_radar_clear();
@@ -182,18 +182,93 @@
 	// Search radars?
 	if (!this.settings.get_alert_radars() || this.settings.get_routing_mode() != 0)
 		return;
-	
-	// Search in extra border 5km
-	var bbox = "[bbox=" +
-			   (Number(Math.min(lng1, lng2)) - 0.049999989569187164 + ",").toString() +
-			   (Number(Math.min(lat1, lat2)) - 0.049999989569187164 + ",").toString() +
-			   (Number(Math.max(lng1, lng2)) + 0.049999989569187164 + ",").toString() +
-			   (Number(Math.max(lat1, lat2)) + 0.049999989569187164).toString() + "]";
-	
+
+	var lng1, lat1, lng2, lat2, lng2_ext, lat2_ext, lng1_ext, lat1_ext;
+	var lng_rt, lat_rt, rt_l, lng_rt_n, lat_rt_n;
+	var n1, n2, n_l, n1_n, n2_n, k;
+
+	var routeBoundaryPolygon_1 = "";
+	var routeBoundaryPolygon_2 = "";
+
+	// MAXPOINTS: maximum fixpoints for the Polygon (2x +4).
+	// The higher the value, the higher the accuracy.
+	// the faster getting all relevant radars
+	// the closer to the route you are. might be limited by overpass.
+	var MAXPOINTS = 75;
+
+	//complete_line:
+	var line = this.nav.route['complete_line'].geometry.coordinates
+	var iter = Math.ceil(line.length/MAXPOINTS);
+	lng1 = line[0][0];
+	lat1 = line[0][1];
+
+	//iterate over fixpoints:
+	for (i = 0; i < line.length; i+=iter) {
+
+		k = (i+iter).toFixed(0);
+		if (k >= line.length) {k = line.length-1;}
+		lng2 = line[k][0];
+		lat2 = line[k][1];
+
+		// route segment vector:
+		lng_rt = lng2 - lng1;
+		lat_rt = lat2 - lat1;
+		// normalized (|1|) vector components
+		rt_l = Math.sqrt(lat_rt*lat_rt + lng_rt*lng_rt);
+		lng_rt_n = lng_rt/rt_l
+		lat_rt_n = lat_rt/rt_l
+
+		//route segment normal vector components to line
+		n1 = lat2 - lat1; //lng
+		n2 = lng1 - lng2; //lat
+		// normalized (|1|) normal vector components
+		n_l = Math.sqrt(n1*n1 + n2*n2);
+		n1_n = n1/n_l;
+		n2_n = n2/n_l;
+
+		// init tolerance of route segment expansion:
+		var d_neg_min = -0.005;
+		var d_pos_max =  0.005;
+		// extent route segment start/end points
+		lng1_ext = lng1 - lng_rt_n*0.0005;
+		lat1_ext = lat1 - lat_rt_n*0.0005;
+		lng2_ext = lng2 + lng_rt_n*0.0005;
+		lat2_ext = lat2 + lat_rt_n*0.0005;
+
+		// iterate over route segment points to get max expansion of the route segment
+		for (j = i+1; j < k; j++) {
+			var lng_pt = line[j][0];
+			var lat_pt = line[j][1];
+			var lng_d_pt = lng1 - lng_pt;
+			var lat_d_pt = lat1 - lat_pt;
+			var distance_to_pt = (lng_rt*lat_d_pt - lng_d_pt*lat_rt) / Math.sqrt( lng_rt*lng_rt + lat_rt*lat_rt )
+			if (distance_to_pt <= 0 && distance_to_pt < d_neg_min) { d_neg_min = distance_to_pt - 0.001; }
+			if (distance_to_pt > 0 && distance_to_pt > d_pos_max) { d_pos_max = distance_to_pt + 0.001 ; }
+		}
+
+		// add fixpoints to polygon point set (routeBoundaryPolygon_x):
+		if (i==0) { routeBoundaryPolygon_1 = Number(lat1_ext + n2_n*d_pos_max - lat_rt_n*0.005).toFixed(5) +
+                    " " + Number(lng1_ext + n1_n*d_pos_max - lng_rt_n*0.005).toFixed(5) + " " ;
+					routeBoundaryPolygon_2 = Number(lat1_ext + n2_n*d_neg_min - lat_rt_n*0.005).toFixed(5) +
+                    " " + Number(lng1_ext + n1_n*d_neg_min- lng_rt_n*0.005).toFixed(5);
+		}
+		routeBoundaryPolygon_1 = //forward
+				routeBoundaryPolygon_1 +
+				Number(lat2_ext + n2_n*d_pos_max).toFixed(5) + " " + Number(lng2_ext + n1_n*d_pos_max).toFixed(5) + " " ;
+		routeBoundaryPolygon_2 = //backward
+				Number(lat2_ext + n2_n*d_neg_min).toFixed(5) + " " + Number(lng2_ext + n1_n*d_neg_min).toFixed(5) + " " +
+				routeBoundaryPolygon_2;
+
+		//set segment end to segment start
+		lat1 = lat2;
+		lng1 = lng2;
+	}
+
 	// Search radars POI http://wiki.openstreetmap.org/wiki/Overpass_API
+	var poly_box = '(poly:\"' + routeBoundaryPolygon_1 + routeBoundaryPolygon_2 + '\");out;'
 	$.ajax({
-		url: 'https://www.overpass-api.de/api/xapi?node[highway=speed_camera]' + bbox,
-		timeout: 30000,
+		url: 'https://overpass-api.de/api/interpreter?data=node[highway=speed_camera]' + poly_box,
+		timeout: 50000,
 		dataType: 'xml',
 		success: this.OK_callback_set_radars.bind(this),
 		error: this.KO_callback_set_radars.bind()
@@ -201,11 +276,6 @@
 }
 
 WebAPI.prototype.OK_callback_set_radars = function(xml) {
-	$('#p_txt_ind').html(t("Analyzing speed cameras… This could take a while"));
-	setTimeout(this.analize_radars, 75, xml); // Need this setTimeout because the message will not apply if not
-}
-
-WebAPI.prototype.analize_radars = function(xml) {
 	// For each radar...
 	var aux_nav = this.nav;
 	$(xml).find('node').each(function() {
 
=== modified file 'nav/index.html'
--- nav/index.html	2016-04-10 16:36:44 +0000
+++ nav/index.html	2016-04-14 20:18:35 +0000
@@ -114,7 +114,6 @@
 		<h1 data-localize="Route so long">Route so long</h1>
 		<p>
 			<span data-localize="More than 1000km could affect the performance">More than 1000km could affect the performance</span><br>
-			<span data-localize="In these long routes the speed camera alerts are disabled">In these long routes the speed camera alerts are disabled</span><br>
 			<span data-localize="We recommend you a waypoint in the middle as destination">We recommend you a waypoint in the middle as destination</span>
 		</p>
 		<menu>
@@ -250,9 +249,9 @@
 	<script src="class/Maths.js"></script>
 	<script>
 		var settings = new Settings();
-		var maths    = new Maths();
-		var nav      = new Navigator(maths, lang);
-		var ui       = new UI(map, nav, settings, maths, lang);
+		var maths	= new Maths();
+		var nav	  = new Navigator(maths, lang);
+		var ui	   = new UI(map, nav, settings, maths, lang);
 		var webapi   = new WebAPI(nav, ui, settings);
 		
 		// Navigation (map in review mode by default, without read GPS for not drain battery)
@@ -310,10 +309,7 @@
 						ui.route(false);
 						nav.set_route_status('yes');
 					}
-					if (route_indication['distance_total'] <= 1000000) {
-						var gps_data = nav.get_pos_data();
-						webapi.set_radars(gps_data['now_lat'], gps_data['now_lng'], gps_data['end_lat'], gps_data['end_lng']);
-					}
+					webapi.set_radars();
 					break;
 				case 'waiting4signal':
 					id_auto_accept = 0; // ask recalculating