Merge lp:~andrewsomething/ubuntu-weather-app/predictive into lp:ubuntu-weather-app/obsolete.trunk

[Andrew Starr-Bochicchio]

Add predictive search for locations.

Adds predictive search for locations.
- Uses a Timer that triggers a search after a pause so we don't hit the api for each letter typed.
- Add '&type=like' to the API call so we get more results back.

[Martin Borho (martin-borho)]

Very good! Another task done, thanks a lot!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

[lp:~andrewsomething/ubuntu-weather-app/predictive]

119. By Andrew Starr-Bochicchio on 2013-09-18

Add predictive search for locations. Fixes: https://bugs.launchpad.net/bugs/1218910.

Approved by Ubuntu Phone Apps Jenkins Bot, Martin Borho.

=== modified file 'components/AddLocationSheet.qml'
--- components/AddLocationSheet.qml	2013-09-12 15:53:10 +0000
+++ components/AddLocationSheet.qml	2013-09-18 17:59:34 +0000
@@ -92,7 +92,6 @@
         function doSearch() {
             if(locationString.text !== "") {
                 cityList.visible = true
-                locationString.focus = false
                 citiesModel.clear();
                 searching.running = true;
                 searchWorker.sendMessage({
@@ -121,7 +120,11 @@
                     height:parent.height
                     placeholderText: i18n.tr("Enter a city name")
                     hasClearButton: true
-                    onAccepted: doSearch()
+                    onAccepted: {
+                        doSearch();
+                        search_timer.stop()
+                        locationString.focus = false
+                    }
                     primaryItem: Image {
                         height: parent.height*0.5
                         width: parent.height*0.5
@@ -129,6 +132,20 @@
                         anchors.verticalCenterOffset: -units.gu(0.2)
                         source: Qt.resolvedUrl("../resources/images/search.svg")
                     }
+
+                    Timer {
+                        id: search_timer
+
+                        interval: 1100
+                        repeat: false
+                        onTriggered: {
+                            if (locationString.text != "") {
+                                doSearch();
+                            }
+                        }
+                    }
+
+                    onTextChanged: search_timer.restart()
                 }
                 ActivityIndicator {
                     id: searching

=== modified file 'components/WeatherApi.js'
--- components/WeatherApi.js	2013-09-08 19:38:47 +0000
+++ components/WeatherApi.js	2013-09-18 17:59:34 +0000
@@ -161,7 +161,7 @@
                                 +"&lon="+encodeURIComponent(params.coords.lon)+"&units="+params.units}
             } else {
                 request = { type: "search",
-                            url: _baseUrl+"find?q="+encodeURIComponent(params.name)+"&units="+params.units}
+                            url: _baseUrl+"find?q="+encodeURIComponent(params.name)+"&type=like&units="+params.units}
             }
             apiCaller(request, searchResponseHandler, retryHandler);
         },