language support for mapping/routing/searching engines is added

7 files changed, 310 insertions, 250 deletions

diff --git a/plugins/geoservices/nokia/marclanguagecodes.cpp b/plugins/geoservices/nokia/marclanguagecodes.cpp
new file mode 100644
index 0000000000..5dc5573cb0
--- /dev/null
+++ b/plugins/geoservices/nokia/marclanguagecodes.cpp
@@ -0,0 +1,291 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+** This file is part of the Ovi services plugin for the Maps and
+** Navigation API.  The use of these services, whether by use of the
+** plugin or by other means, is governed by the terms and conditions
+** described by the file OVI_SERVICES_TERMS_AND_CONDITIONS.txt in
+** this package, located in the directory containing the Ovi services
+** plugin source code.
+**
+****************************************************************************/
+
+#include "marclanguagecodes.h"
+
+// MARC language codes for GeoCoding service language/locale support
+// http://www.loc.gov/marc/languages/language_code.html
+// Order matches QLocale::Language
+
+namespace {
+const unsigned char marc_language_code_list[] =
+    "\0\0\0" // Unused
+    "\0\0\0" // C
+    "abk" // Abkhazian
+    "\0\0\0" // Afan
+    "aar" // Afar
+    "afr" // Afrikaans
+    "alb" // Albanian
+    "amh" // Amharic
+    "ara" // Arabic
+    "arm" // Armenian
+    "asm" // Assamese
+    "aym" // Aymara
+    "aze" // Azerbaijani
+    "bak" // Bashkir
+    "baq" // Basque
+    "ben" // Bengali
+    "\0\0\0" // Bhutani
+    "bih" // Bihari
+    "bis" // Bislama
+    "bre" // Breton
+    "bul" // Bulgarian
+    "bur" // Burmese
+    "bel" // Byelorussian
+    "khm" // Cambodian
+    "cat" // Catalan
+    "chi" // Chinese
+    "cos" // Corsican
+    "hrv" // Croatian
+    "cze" // Czech
+    "dan" // Danish
+    "dut" // Dutch
+    "eng" // English
+    "epo" // Esperanto
+    "est" // Estonian
+    "fao" // Faroese
+    "fij" // FijiLanguage
+    "fin" // Finnish
+    "fre" // French
+    "fry" // Frisian
+    "gla" // Gaelic
+    "glg" // Galician
+    "geo" // Georgian
+    "ger" // German
+    "gre" // Greek
+    "\0\0\0" // Greenlandic
+    "grn" // Guarani
+    "guj" // Gujarati
+    "hau" // Hausa
+    "heb" // Hebrew
+    "hin" // Hindi
+    "hun" // Hungarian
+    "ice" // Icelandic
+    "ind" // Indonesian
+    "ina" // Interlingua
+    "ile" // Interlingue
+    "iku" // Inuktitut
+    "ipk" // Inupiak
+    "gle" // Irish
+    "ita" // Italian
+    "jpn" // Japanese
+    "jav" // Javanese
+    "kan" // Kannada
+    "kas" // Kashmiri
+    "kaz" // Kazakh
+    "kin" // Kinyarwanda
+    "kir" // Kirghiz
+    "kor" // Korean
+    "kur" // Kurdish
+    "\0\0\0" // Kurundi
+    "lao" // Laothian
+    "lat" // Latin
+    "lav" // Latvian
+    "lin" // Lingala
+    "lit" // Lithuanian
+    "mac" // Macedonian
+    "mlg" // Malagasy
+    "may" // Malay
+    "mal" // Malayalam
+    "mlt" // Maltese
+    "mao" // Maori
+    "mar" // Marathi
+    "mol" // Moldavian
+    "mon" // Mongolian
+    "nau" // NauruLanguage
+    "nep" // Nepali
+    "nor" // Norwegian
+    "oci" // Occitan
+    "ori" // Oriya
+    "\0\0\0" // Pashto
+    "per" // Persian
+    "pol" // Polish
+    "por" // Portuguese
+    "pan" // Punjabi
+    "que" // Quechua
+    "roh" // RhaetoRomance
+    "rum" // Romanian
+    "rus" // Russian
+    "smo" // Samoan
+    "sag" // Sangho
+    "san" // Sanskrit
+    "srp" // Serbian
+    "\0\0\0" // SerboCroatian
+    "\0\0\0" // Sesotho
+    "\0\0\0" // Setswana
+    "sna" // Shona
+    "snd" // Sindhi
+    "\0\0\0" // Singhalese
+    "\0\0\0" // Siswati
+    "slo" // Slovak
+    "slv" // Slovenian
+    "som" // Somali
+    "spa" // Spanish
+    "sun" // Sundanese
+    "swa" // Swahili
+    "swe" // Swedish
+    "tgl" // Tagalog
+    "tgk" // Tajik
+    "tam" // Tamil
+    "tat" // Tatar
+    "tel" // Telugu
+    "tha" // Thai
+    "tib" // Tibetan
+    "tir" // Tigrinya
+    "tog" // TongaLanguage
+    "tso" // Tsonga
+    "tur" // Turkish
+    "tuk" // Turkmen
+    "twi" // Twi
+    "uig" // Uigur
+    "ukr" // Ukrainian
+    "urd" // Urdu
+    "uzb" // Uzbek
+    "vie" // Vietnamese
+    "vol" // Volapuk
+    "wel" // Welsh
+    "wol" // Wolof
+    "xho" // Xhosa
+    "yid" // Yiddish
+    "yor" // Yoruba
+    "zha" // Zhuang
+    "zul" // Zulu
+    "nno" // NorwegianNynorsk
+    "bos" // Bosnian
+    "div" // Divehi
+    "glv" // Manx
+    "cor" // Cornish
+    "aka" // Akan
+    "kok" // Konkani
+    "gaa" // Ga
+    "ibo" // Igbo
+    "kam" // Kamba
+    "syc" // Syriac
+    "\0\0\0" // Blin
+    "\0\0\0" // Geez
+    "\0\0\0" // Koro
+    "sid" // Sidamo
+    "\0\0\0" // Atsam
+    "tig" // Tigre
+    "\0\0\0" // Jju
+    "fur" // Friulian
+    "ven" // Venda
+    "ewe" // Ewe
+    "\0\0\0" // Walamo
+    "haw" // Hawaiian
+    "\0\0\0" // Tyap
+    "\0\0\0" // Chewa
+    "fil" // Filipino
+    "gsw" // SwissGerman
+    "iii" // SichuanYi
+    "kpe" // Kpelle
+    "nds" // LowGerman
+    "nbl" // SouthNdebele
+    "nso" // NorthernSotho
+    "sme" // NorthernSami
+    "\0\0\0" // Taroko
+    "\0\0\0" // Gusii
+    "\0\0\0" // Taita
+    "ful" // Fulah
+    "kik" // Kikuyu
+    "\0\0\0" // Samburu
+    "\0\0\0" // Sena
+    "nde" // NorthNdebele
+    "\0\0\0" // Rombo
+    "\0\0\0" // Tachelhit
+    "kab" // Kabyle
+    "nyn" // Nyankole
+    "\0\0\0" // Bena
+    "\0\0\0" // Vunjo
+    "bam" // Bambara
+    "\0\0\0" // Embu
+    "chr" // Cherokee
+    "\0\0\0" // Morisyen
+    "\0\0\0" // Makonde
+    "\0\0\0" // Langi
+    "lug" // Ganda
+    "bem" // Bemba
+    "\0\0\0" // Kabuverdianu
+    "\0\0\0" // Meru
+    "\0\0\0" // Kalenjin
+    "\0\0\0" // Nama
+    "\0\0\0" // Machame
+    "\0\0\0" // Colognian
+    "mas" // Masai
+    "\0\0\0" // Soga
+    "\0\0\0" // Luyia
+    "\0\0\0" // Asu
+    "\0\0\0" // Teso
+    "\0\0\0" // Saho
+    "\0\0\0" // KoyraChiini
+    "\0\0\0" // Rwa
+    "luo" // Luo
+    "\0\0\0" // Chiga
+    "\0\0\0" // CentralMoroccoTamazight
+    "\0\0\0" // KoyraboroSenni
+    "\0\0\0" // Shambala
+    ;
+}
+
+QString languageToMarc(QLocale::Language language)
+{
+    uint offset = 3 * (uint(language));
+    if (language == QLocale::C || offset + 3 > sizeof(marc_language_code_list))
+        return QLatin1String("eng");
+
+    const unsigned char *c = marc_language_code_list + offset;
+    if (c[0] == 0)
+        return QLatin1String("eng");
+
+    QString code(3, Qt::Uninitialized);
+    code[0] = ushort(c[0]);
+    code[1] = ushort(c[1]);
+    code[2] = ushort(c[2]);
+
+    return code;
+}
diff --git a/plugins/geoservices/nokia/marclanguagecodes.h b/plugins/geoservices/nokia/marclanguagecodes.h
index 766a0e1954..325f9e6a41 100644
--- a/plugins/geoservices/nokia/marclanguagecodes.h
+++ b/plugins/geoservices/nokia/marclanguagecodes.h
@@ -49,227 +49,9 @@
 #ifndef MARCLANGUAGECODES_H_
 #define MARCLANGUAGECODES_H_
 
-// MARC language codes for GeoCoding service language/locale support
-// http://www.loc.gov/marc/languages/language_code.html
-// Order matches QLocale::Language
-
-static const unsigned char marc_language_code_list[] =
-    "\0\0\0" // Unused
-    "\0\0\0" // C
-    "abk" // Abkhazian
-    "\0\0\0" // Afan
-    "aar" // Afar
-    "afr" // Afrikaans
-    "alb" // Albanian
-    "amh" // Amharic
-    "ara" // Arabic
-    "arm" // Armenian
-    "asm" // Assamese
-    "aym" // Aymara
-    "aze" // Azerbaijani
-    "bak" // Bashkir
-    "baq" // Basque
-    "ben" // Bengali
-    "\0\0\0" // Bhutani
-    "bih" // Bihari
-    "bis" // Bislama
-    "bre" // Breton
-    "bul" // Bulgarian
-    "bur" // Burmese
-    "bel" // Byelorussian
-    "khm" // Cambodian
-    "cat" // Catalan
-    "chi" // Chinese
-    "cos" // Corsican
-    "hrv" // Croatian
-    "cze" // Czech
-    "dan" // Danish
-    "dut" // Dutch
-    "eng" // English
-    "epo" // Esperanto
-    "est" // Estonian
-    "fao" // Faroese
-    "fij" // FijiLanguage
-    "fin" // Finnish
-    "fre" // French
-    "fry" // Frisian
-    "gla" // Gaelic
-    "glg" // Galician
-    "geo" // Georgian
-    "ger" // German
-    "gre" // Greek
-    "\0\0\0" // Greenlandic
-    "grn" // Guarani
-    "guj" // Gujarati
-    "hau" // Hausa
-    "heb" // Hebrew
-    "hin" // Hindi
-    "hun" // Hungarian
-    "ice" // Icelandic
-    "ind" // Indonesian
-    "ina" // Interlingua
-    "ile" // Interlingue
-    "iku" // Inuktitut
-    "ipk" // Inupiak
-    "gle" // Irish
-    "ita" // Italian
-    "jpn" // Japanese
-    "jav" // Javanese
-    "kan" // Kannada
-    "kas" // Kashmiri
-    "kaz" // Kazakh
-    "kin" // Kinyarwanda
-    "kir" // Kirghiz
-    "kor" // Korean
-    "kur" // Kurdish
-    "\0\0\0" // Kurundi
-    "lao" // Laothian
-    "lat" // Latin
-    "lav" // Latvian
-    "lin" // Lingala
-    "lit" // Lithuanian
-    "mac" // Macedonian
-    "mlg" // Malagasy
-    "may" // Malay
-    "mal" // Malayalam
-    "mlt" // Maltese
-    "mao" // Maori
-    "mar" // Marathi
-    "mol" // Moldavian
-    "mon" // Mongolian
-    "nau" // NauruLanguage
-    "nep" // Nepali
-    "nor" // Norwegian
-    "oci" // Occitan
-    "ori" // Oriya
-    "\0\0\0" // Pashto
-    "per" // Persian
-    "pol" // Polish
-    "por" // Portuguese
-    "pan" // Punjabi
-    "que" // Quechua
-    "roh" // RhaetoRomance
-    "rum" // Romanian
-    "rus" // Russian
-    "smo" // Samoan
-    "sag" // Sangho
-    "san" // Sanskrit
-    "srp" // Serbian
-    "\0\0\0" // SerboCroatian
-    "\0\0\0" // Sesotho
-    "\0\0\0" // Setswana
-    "sna" // Shona
-    "snd" // Sindhi
-    "\0\0\0" // Singhalese
-    "\0\0\0" // Siswati
-    "slo" // Slovak
-    "slv" // Slovenian
-    "som" // Somali
-    "spa" // Spanish
-    "sun" // Sundanese
-    "swa" // Swahili
-    "swe" // Swedish
-    "tgl" // Tagalog
-    "tgk" // Tajik
-    "tam" // Tamil
-    "tat" // Tatar
-    "tel" // Telugu
-    "tha" // Thai
-    "tib" // Tibetan
-    "tir" // Tigrinya
-    "tog" // TongaLanguage
-    "tso" // Tsonga
-    "tur" // Turkish
-    "tuk" // Turkmen
-    "twi" // Twi
-    "uig" // Uigur
-    "ukr" // Ukrainian
-    "urd" // Urdu
-    "uzb" // Uzbek
-    "vie" // Vietnamese
-    "vol" // Volapuk
-    "wel" // Welsh
-    "wol" // Wolof
-    "xho" // Xhosa
-    "yid" // Yiddish
-    "yor" // Yoruba
-    "zha" // Zhuang
-    "zul" // Zulu
-    "nno" // NorwegianNynorsk
-    "bos" // Bosnian
-    "div" // Divehi
-    "glv" // Manx
-    "cor" // Cornish
-    "aka" // Akan
-    "kok" // Konkani
-    "gaa" // Ga
-    "ibo" // Igbo
-    "kam" // Kamba
-    "syc" // Syriac
-    "\0\0\0" // Blin
-    "\0\0\0" // Geez
-    "\0\0\0" // Koro
-    "sid" // Sidamo
-    "\0\0\0" // Atsam
-    "tig" // Tigre
-    "\0\0\0" // Jju
-    "fur" // Friulian
-    "ven" // Venda
-    "ewe" // Ewe
-    "\0\0\0" // Walamo
-    "haw" // Hawaiian
-    "\0\0\0" // Tyap
-    "\0\0\0" // Chewa
-    "fil" // Filipino
-    "gsw" // SwissGerman
-    "iii" // SichuanYi
-    "kpe" // Kpelle
-    "nds" // LowGerman
-    "nbl" // SouthNdebele
-    "nso" // NorthernSotho
-    "sme" // NorthernSami
-    "\0\0\0" // Taroko
-    "\0\0\0" // Gusii
-    "\0\0\0" // Taita
-    "ful" // Fulah
-    "kik" // Kikuyu
-    "\0\0\0" // Samburu
-    "\0\0\0" // Sena
-    "nde" // NorthNdebele
-    "\0\0\0" // Rombo
-    "\0\0\0" // Tachelhit
-    "kab" // Kabyle
-    "nyn" // Nyankole
-    "\0\0\0" // Bena
-    "\0\0\0" // Vunjo
-    "bam" // Bambara
-    "\0\0\0" // Embu
-    "chr" // Cherokee
-    "\0\0\0" // Morisyen
-    "\0\0\0" // Makonde
-    "\0\0\0" // Langi
-    "lug" // Ganda
-    "bem" // Bemba
-    "\0\0\0" // Kabuverdianu
-    "\0\0\0" // Meru
-    "\0\0\0" // Kalenjin
-    "\0\0\0" // Nama
-    "\0\0\0" // Machame
-    "\0\0\0" // Colognian
-    "mas" // Masai
-    "\0\0\0" // Soga
-    "\0\0\0" // Luyia
-    "\0\0\0" // Asu
-    "\0\0\0" // Teso
-    "\0\0\0" // Saho
-    "\0\0\0" // KoyraChiini
-    "\0\0\0" // Rwa
-    "luo" // Luo
-    "\0\0\0" // Chiga
-    "\0\0\0" // CentralMoroccoTamazight
-    "\0\0\0" // KoyraboroSenni
-    "\0\0\0" // Shambala
-    ;
+#include <QString>
+#include <QLocale>
 
+QString languageToMarc(QLocale::Language language);
 
 #endif /* MARCLANGUAGECODES_H_ */
diff --git a/plugins/geoservices/nokia/nokia.pro b/plugins/geoservices/nokia/nokia.pro
index 160150b256..27bfc96db9 100644
--- a/plugins/geoservices/nokia/nokia.pro
+++ b/plugins/geoservices/nokia/nokia.pro
@@ -34,7 +34,9 @@ SOURCES += \
             qgeosearchmanagerengine_nokia.cpp \
             qgeosearchreply_nokia.cpp \
             qgeoserviceproviderplugin_nokia.cpp \
-            qgeotiledmapdata_nokia.cpp
+            qgeotiledmapdata_nokia.cpp\
+            marclanguagecodes.cpp
+
 
 INCLUDEPATH += $$SOURCE_DIR/src/location \
                 $$SOURCE_DIR/src/location/maps \
diff --git a/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
index ba2d15ed0b..3e8297dff5 100755
--- a/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
@@ -49,6 +49,7 @@
 #include "qgeomappingmanagerengine_nokia.h"
 #include "qgeomapreply_nokia.h"
 #include "qgeotiledmapdata_nokia.h"
+#include "marclanguagecodes.h"
 
 #include <qgeotiledmaprequest.h>
 
@@ -319,16 +320,17 @@ QString QGeoMappingManagerEngineNokia::getRequestString(const QGeoTiledMapReques
 //#endif
     requestString += slashpng;
 
+    requestString += "?lg=";
+    requestString += languageToMarc(locale().language());
+
     if (!m_token.isEmpty()) {
-        requestString += "?token=";
+        requestString += "&token=";
         requestString += m_token;
+    }
 
-        if (!m_referer.isEmpty()) {
-            requestString += "&referer=";
-            requestString += m_referer;
-        }
-    } else if (!m_referer.isEmpty()) {
-        requestString += "?referer=";
+    if (!m_referer.isEmpty()) {
+
+        requestString += "&referer=";
         requestString += m_referer;
     }
 
diff --git a/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index 9b1e07f6aa..90e4d2a578 100644
--- a/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -48,6 +48,7 @@
 
 #include "qgeoroutingmanagerengine_nokia.h"
 #include "qgeoroutereply_nokia.h"
+#include "marclanguagecodes.h"
 
 #include <QStringList>
 #include <QNetworkProxy>
@@ -365,6 +366,7 @@ QString QGeoRoutingManagerEngineNokia::modesRequestString(const QGeoRouteRequest
         if (featureStrings.count())
             requestString += ";" + featureStrings.join(",");
     }
+
     return requestString;
 }
 
@@ -428,8 +430,8 @@ QString QGeoRoutingManagerEngineNokia::routeRequestString(const QGeoRouteRequest
 
     requestString += "&instructionformat=text";
 
-    requestString += "&language=";
-    requestString += locale().name();
+    requestString += "&lg=";
+    requestString += languageToMarc(locale().language());
 
     return requestString;
 }
diff --git a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
index 3653db4d36..04db58be18 100644
--- a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
@@ -297,21 +297,3 @@ void QGeoSearchManagerEngineNokia::placesError(QGeoSearchReply::Error error, con
 
     emit this->error(reply, error, errorString);
 }
-
-QString QGeoSearchManagerEngineNokia::languageToMarc(QLocale::Language language)
-{
-    uint offset = 3 * (uint(language));
-    if (language == QLocale::C || offset + 3 > sizeof(marc_language_code_list))
-        return QLatin1String("eng");
-
-    const unsigned char *c = marc_language_code_list + offset;
-    if (c[0] == 0)
-        return QLatin1String("eng");
-
-    QString code(3, Qt::Uninitialized);
-    code[0] = ushort(c[0]);
-    code[1] = ushort(c[1]);
-    code[2] = ushort(c[2]);
-
-    return code;
-}
diff --git a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
index 8bad3e0f5e..5fad069c91 100644
--- a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
+++ b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
@@ -87,7 +87,6 @@ private slots:
 private:
     static QString trimDouble(double degree, int decimalDigits = 10);
     QGeoSearchReply* search(QString requestString, QGeoBoundingArea *bounds, int limit = -1, int offset = 0);
-    QString languageToMarc(QLocale::Language language);
 
     QNetworkAccessManager *m_networkManager;
     QString m_host;