Merge into trunk : ip-query-location : Code : Stellarium

Status:	Merged
Merged at revision:	6951
Proposed branch:	lp:~stellarium/stellarium/ip-query-location
Merge into:	lp:stellarium
Diff against target:	1030 lines (+531/-168) 14 files modified data/default_config.ini.cmake (+1/-1) src/core/StelCore.cpp (+11/-2) src/core/StelLocation.cpp (+7/-0) src/core/StelLocation.hpp (+3/-0) src/core/StelLocationMgr.cpp (+115/-1) src/core/StelLocationMgr.hpp (+25/-0) src/core/StelUtils.cpp (+34/-0) src/core/StelUtils.hpp (+12/-0) src/gui/LocationDialog.cpp (+122/-31) src/gui/LocationDialog.hpp (+11/-1) src/gui/StelGuiItems.cpp (+8/-4) src/gui/locationDialogGui.ui (+140/-128) src/tests/testConversions.cpp (+41/-0) src/tests/testConversions.hpp (+1/-0)
To merge this branch:	bzr merge lp:~stellarium/stellarium/ip-query-location
Related bugs:	Link a bug report
Related blueprints:	Location dialog redesign (Medium) Enhanced Location Window (Low) Auto-set Stellarium's location on launch (Low)

Reviewer	Date Requested	Status
Alexander Wolf		Abstain on 2014-08-13
Marcos Cardinot	2014-08-06	Approve on 2014-08-12
gzotti	2014-08-06	Approve on 2014-08-08
Fabien Chéreau	2014-08-06	Pending
Review via email: mp+229834@code.launchpad.net

Revision history for this message

Alexander Wolf (alexwolf) wrote on 2014-07-19: Posted in a previous version of this proposal

#

I checked this feature and it good work! But one moment: I think that label "IP Query" on button is not very informative and we should add tooltip and describe it.

review: Approve

Revision history for this message

Alexander Wolf (alexwolf) wrote on 2014-07-19: Posted in a previous version of this proposal

#

The second feature is OK for me. Are you want merge it yourself?

Revision history for this message

Alexander Wolf (alexwolf) wrote on 2014-07-19: Posted in a previous version of this proposal

#

Wait! What about non-Earth location?

review: Needs Fixing

Revision history for this message

Fabien Chéreau (xalioth) wrote on 2014-07-19: Posted in a previous version of this proposal

#

Download full text (11.0 KiB)

Hi Please cleanup The code. Also use the regular event loop to make a non
blocking call to the service.
Le 19 juil. 2014 15:58, "Alexander Wolf" <email address hidden> a écrit :

> Alexander Wolf has proposed merging
> lp:~georg-zotti/stellarium/ip-query-location into lp:stellarium.
>
> Requested reviews:
> Alexander Wolf (alexwolf)
>
> For more details, see:
>
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
>
> This branch introduces new feature - automatic finding approximate
> location of Stellarium from IP address.
> --
>
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
> You are subscribed to branch lp:stellarium.
>
> === modified file 'src/core/StelCore.cpp'
> --- src/core/StelCore.cpp 2014-04-14 17:55:46 +0000
> +++ src/core/StelCore.cpp 2014-07-19 07:57:49 +0000
> @@ -114,7 +114,14 @@
> defaultLocationID =
> conf->value("init_location/location","error").toString();
> bool ok;
> StelLocationMgr* locationMgr =
> &StelApp::getInstance().getLocationMgr();
> - StelLocation location =
> locationMgr->locationForString(defaultLocationID);
> + StelLocation location;
> + if (conf->value("init_location/use_ip_geolocation_if_available",
> "false").toBool()
> + && locationMgr->ipConnectionExists())
> + {
> + location=locationMgr->locationFromIP();
> + }
> +
> + else location = locationMgr->locationForString(defaultLocationID);
> if (!location.isValid())
> {
> qWarning() << "Warning: location" << defaultLocationID <<
> "is unknown.";
>
> === modified file 'src/core/StelLocationMgr.cpp'
> --- src/core/StelLocationMgr.cpp 2014-06-12 15:47:22 +0000
> +++ src/core/StelLocationMgr.cpp 2014-07-19 07:57:49 +0000
> @@ -25,6 +25,13 @@
> #include <QDebug>
> #include <QFile>
> #include <QDir>
> +#include <QtNetwork/QNetworkInterface>
> +#include <QtNetwork/QNetworkAccessManager>
> +#include <QEventLoop>
> +#include <QNetworkRequest>
> +#include <QNetworkReply>
> +#include <QUrl>
> +#include <QUrlQuery>
>
> StelLocationMgr::StelLocationMgr()
> {
> @@ -307,3 +314,99 @@
> sourcefile.close();
> return true;
> }
> +
> +
> +//! check if there is an IP connection.
> +// Along the lines of
> +//
> http://karanbalkar.com/2014/02/detect-internet-connection-using-qt-5-framework/
> +//#define DEBUG 1
> +bool StelLocationMgr::ipConnectionExists() const
> +{
> + QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
> + bool connectionExists = false;
> +
> + for (int i = 0; i < ifaces.count(); i++) {
> +
> + QNetworkInterface iface = ifaces.at(i);
> + if ( iface.flags().testFlag(QNetworkInterface::IsUp)
> + && !iface.flags().testFlag(QNetworkInterface::IsLoopBack)) {
> +
> +#ifdef DEBUG
> + // details of connection
> + qDebug() << "name:" << iface.name() << endl
> + << "mac:" << iface.hardwareAddress() << endl
> + << "ip addresses:" << endl;
> +#endif
> + for (int j=0; j<iface.addressEntries().count...

Hi Please cleanup The code. Also use the regular event loop to make a non
blocking call to the service.
 Le 19 juil. 2014 15:58, "Alexander Wolf" <alex.v.wolf@gmail.com> a écrit :

> Alexander Wolf has proposed merging
> lp:~georg-zotti/stellarium/ip-query-location into lp:stellarium.
>
> Requested reviews:
>   Alexander Wolf (alexwolf)
>
> For more details, see:
>
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
>
> This branch introduces new feature - automatic finding approximate
> location of Stellarium from IP address.
> --
>
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
> You are subscribed to branch lp:stellarium.
>
> === modified file 'src/core/StelCore.cpp'
> --- src/core/StelCore.cpp       2014-04-14 17:55:46 +0000
> +++ src/core/StelCore.cpp       2014-07-19 07:57:49 +0000
> @@ -114,7 +114,14 @@
>         defaultLocationID =
> conf->value("init_location/location","error").toString();
>         bool ok;
>         StelLocationMgr* locationMgr =
> &StelApp::getInstance().getLocationMgr();
> -       StelLocation location =
> locationMgr->locationForString(defaultLocationID);
> +       StelLocation location;
> +       if (conf->value("init_location/use_ip_geolocation_if_available",
> "false").toBool()
> +                       && locationMgr->ipConnectionExists())
> +       {
> +               location=locationMgr->locationFromIP();
> +       }
> +
> +       else location = locationMgr->locationForString(defaultLocationID);
>         if (!location.isValid())
>         {
>                 qWarning() << "Warning: location" << defaultLocationID <<
> "is unknown.";
>
> === modified file 'src/core/StelLocationMgr.cpp'
> --- src/core/StelLocationMgr.cpp        2014-06-12 15:47:22 +0000
> +++ src/core/StelLocationMgr.cpp        2014-07-19 07:57:49 +0000
> @@ -25,6 +25,13 @@
>  #include <QDebug>
>  #include <QFile>
>  #include <QDir>
> +#include <QtNetwork/QNetworkInterface>
> +#include <QtNetwork/QNetworkAccessManager>
> +#include <QEventLoop>
> +#include <QNetworkRequest>
> +#include <QNetworkReply>
> +#include <QUrl>
> +#include <QUrlQuery>
>
>  StelLocationMgr::StelLocationMgr()
>  {
> @@ -307,3 +314,99 @@
>         sourcefile.close();
>         return true;
>  }
> +
> +
> +//! check if there is an IP connection.
> +//  Along the lines of
> +//
> http://karanbalkar.com/2014/02/detect-internet-connection-using-qt-5-framework/
> +//#define DEBUG 1
> +bool StelLocationMgr::ipConnectionExists() const
> +{
> +    QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
> +    bool connectionExists = false;
> +
> +    for (int i = 0; i < ifaces.count(); i++) {
> +
> +        QNetworkInterface iface = ifaces.at(i);
> +        if ( iface.flags().testFlag(QNetworkInterface::IsUp)
> +             && !iface.flags().testFlag(QNetworkInterface::IsLoopBack)) {
> +
> +#ifdef DEBUG
> +            // details of connection
> +            qDebug() << "name:" << iface.name() << endl
> +                     << "mac:" << iface.hardwareAddress() << endl
> +                     << "ip addresses:" << endl;
> +#endif
> +                for (int j=0; j<iface.addressEntries().count(); j++) {
> +#ifdef DEBUG
> +                qDebug() << iface.addressEntries().at(j).ip().toString()
> +                         << " / " <<
> iface.addressEntries().at(j).netmask().toString() << endl;
> +#endif
> +                // got an interface which is up, and has an ip address
> +                if (connectionExists == false)
> +                    connectionExists = true;
> +            }
> +        }
> +    }
> +    return connectionExists;
> +}
> +
> +//! lookup location from IP address.
> +//  Along the lines of:
> +//
> http://karanbalkar.com/2014/02/sending-a-http-request-using-qt-5-framework/
> +const StelLocation StelLocationMgr::locationFromIP()
> +{
> +// create custom temporary event loop on stack
> +    QEventLoop eventLoop;
> +
> +    // "quit()" the event-loop, when the network request "finished()"
> +    QNetworkAccessManager mgr;
> +    QObject::connect(&mgr, SIGNAL(finished(QNetworkReply*)), &eventLoop,
> SLOT(quit()));
> +
> +    // the HTTP request
> +    QNetworkRequest req( QUrl( QString("http://freegeoip.net/csv/") ) );
> +    QNetworkReply *reply = mgr.get(req);
> +    eventLoop.exec(); // blocks stack until "finished()" has been called
> +
> +    StelLocation location;
> +    if (reply->error() == QNetworkReply::NoError) {
> +        //success
> +        QByteArray answer=reply->readAll();
> +        qDebug() << "Success: read CSV for approximate IP-based location:
> \n\t" << answer;
> +        // TODO: parse answer (CSV string), fill location
> +
> +        const QStringList& splitline = QString(answer).split(",");
> +        float latitude=splitline.at(7).mid(1, splitline.at
> (7).length()-2).toFloat();
> +        float longitude=splitline.at(8).mid(1, splitline.at
> (8).length()-2).toFloat();
> +        // answer/splitline example:
> "222.222.222.222","AT","Austria","","","","","47.3333","13.3333","",""
> +        // The parts from freegeoip are:
> ip,country_code,country_name,region_code,region_name,city,zipcode,latitude,longitude,metro_code,area_code
> +        QString locLine= // we re-pack into a new line that will be
> parsed back by StelLocation...
> +                QString("%1\t%2\t%3\t%4\t%5\t%6\t%7\t0")
> +                    .arg(splitline.at(5).length()>2 ? splitline.at(5).mid(1,
> splitline.at(5).length()-2)  : QString("IP%1").arg(splitline.at(0).mid(1,
> splitline.at(0).length()-2)))
> +                    .arg(splitline.at(4).length()>2 ? splitline.at(4).mid(1,
> splitline.at(4).length()-2)  : "IPregion")
> +                    .arg(splitline.at(2).length()>2 ? splitline.at(2).mid(1,
> splitline.at(2).length()-2) : "IPcountry") // country
> +                    .arg("X") // role: X=user-defined
> +                    .arg(0)   // population: unknown
> +                    .arg(latitude<0 ? QString("%1S").arg(-latitude, 0,
> 'f', 6) : QString("%1N").arg(latitude, 0, 'f', 6))
> +                    .arg(longitude<0 ? QString("%1W").arg(-longitude, 0,
> 'f', 6) : QString("%1E").arg(longitude, 0, 'f', 6));
> +                    //.arg(0); // altitude: unknown
> +                    //.arg(bortleScaleIndex)
> +                    //.arg("")         // Reserve for time zone
> +                    //.arg(planetName) // will be set to Earth by default
> anyway.
> +                    //.arg(landscapeKey); // we don't have that here...
> +
> +        qDebug() << "locLine: " << locLine;
> +
> +        location=StelLocation::createFromLine(locLine);
> +
> +    }
> +    else {
> +        //failure
> +        qDebug() << "Failure getting IP-based location: \n\t"
> <<reply->errorString();
> +    }
> +
> +
> +
> +    delete reply;
> +    return location;
> +}
>
> === modified file 'src/core/StelLocationMgr.hpp'
> --- src/core/StelLocationMgr.hpp        2013-10-14 07:43:06 +0000
> +++ src/core/StelLocationMgr.hpp        2014-07-19 07:57:49 +0000
> @@ -70,6 +70,12 @@
>         //! @param id the location ID
>         bool deleteUserLocation(const QString& id);
>
> +       // GZ 201407 blueprint: find location via IP lookup
> +       //! check if there is an IP connection
> +       bool ipConnectionExists() const;
> +       //! find location via online lookup of IP address
> +       const StelLocation locationFromIP();
> +
>  private:
>         void generateBinaryLocationFile(const QString& txtFile, bool
> isUserLocation, const QString& binFile) const;
>
> @@ -84,6 +90,7 @@
>         QMap<QString, StelLocation> locations;
>
>         StelLocation lastResortLocation;
> +
>  };
>
>  #endif // _STELLOCATIONMGR_HPP_
>
> === modified file 'src/gui/LocationDialog.cpp'
> --- src/gui/LocationDialog.cpp  2014-03-21 18:03:55 +0000
> +++ src/gui/LocationDialog.cpp  2014-07-19 07:57:49 +0000
> @@ -41,6 +41,7 @@
>  #include <QTimer>
>  #include <QStringListModel>
>
> +#include <QMessageBox>
>  LocationDialog::LocationDialog(QObject* parent) : StelDialog(parent),
> isEditingNew(false)
>  {
>         ui = new Ui_locationDialogForm;
> @@ -100,6 +101,7 @@
>
>         connect(ui->addLocationToListPushButton, SIGNAL(clicked()), this,
> SLOT(addCurrentLocationToList()));
>         connect(ui->deleteLocationFromListPushButton, SIGNAL(clicked()),
> this, SLOT(deleteCurrentLocationFromList()));
> +       connect(ui->ipQueryPushButton, SIGNAL(clicked()), this,
> SLOT(ipQueryLocation()));
>
>         StelCore* core = StelApp::getInstance().getCore();
>         const StelLocation& currentLocation = core->getCurrentLocation();
> @@ -235,7 +237,7 @@
>  // Update the map for the given location.
>  void LocationDialog::setMapForLocation(const StelLocation& loc)
>  {
> -       // Avoids usless processing
> +       // Avoids useless processing
>         if (lastPlanet==loc.planetName)
>                 return;
>
> @@ -487,3 +489,19 @@
>         ui->useAsDefaultLocationCheckBox->setEnabled(!currentIsDefault);
>         ui->pushButtonReturnToDefault->setEnabled(!currentIsDefault);
>  }
> +
> +// called when the user clicks on the IP Query button
> +void LocationDialog::ipQueryLocation()
> +{
> +       StelLocationMgr &locMgr=StelApp::getInstance().getLocationMgr();
> +       if (locMgr.ipConnectionExists())
> +       {
> +               StelLocation loc = locMgr.locationFromIP();
> +               StelApp::getInstance().getCore()->moveObserverTo(loc, 0.0,
> 0.0);
> +               //Update the position of the map pointer and GUI fields.
> +               setFieldsFromLocation(loc);
> +               ui->mapLabel->setCursorPos(loc.longitude, loc.latitude);
> +       }
> +       else
> +               QMessageBox::warning(0, "Stellarium", q_("IP query for
> location failed. Are you offline?"));
> +}
>
> === modified file 'src/gui/LocationDialog.hpp'
> --- src/gui/LocationDialog.hpp  2013-10-14 09:27:54 +0000
> +++ src/gui/LocationDialog.hpp  2014-07-19 07:57:49 +0000
> @@ -97,6 +97,9 @@
>
>         //! Called when the user clicks on the delete button
>         void deleteCurrentLocationFromList();
> +
> +       //! called when the user clicks on the IP Query button
> +       void ipQueryLocation();
>
>         //! Called when the user wants to use the current location as
> default
>         void setDefaultLocation();
>
> === modified file 'src/gui/locationDialogGui.ui'
> --- src/gui/locationDialogGui.ui        2014-06-16 13:43:31 +0000
> +++ src/gui/locationDialogGui.ui        2014-07-19 07:57:49 +0000
> @@ -449,6 +449,19 @@
>               </spacer>
>              </item>
>              <item>
> +             <widget class="QPushButton" name="ipQueryPushButton">
> +              <property name="minimumSize">
> +               <size>
> +                <width>30</width>
> +                <height>0</height>
> +               </size>
> +              </property>
> +              <property name="text">
> +               <string>IP Query</string>
> +              </property>
> +             </widget>
> +            </item>
> +            <item>
>               <widget class="QPushButton"
> name="deleteLocationFromListPushButton">
>                <property name="enabled">
>                 <bool>false</bool>
>
>
>

Revision history for this message

gzotti (georg-zotti) wrote on 2014-07-19: Posted in a previous version of this proposal

#

Hm, I was surprised that the site list mixes all sites anyhow. I will try
to reduce selection to the currently set planet...

G.

On Sa, 19.07.2014, 14:26, Alexander Wolf wrote:
> Review: Needs Fixing
>
> Wait! What about non-Earth location?
> --
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
> You are the owner of lp:~georg-zotti/stellarium/ip-query-location.
>

Revision history for this message

Alexander Wolf (alexwolf) wrote on 2014-07-19: Posted in a previous version of this proposal

#

This list is "correct". I meant new features. If I change the planet and picked some point on the map (as example on Mars) then I get locations from Earth!

Revision history for this message

gzotti (georg-zotti) wrote on 2014-07-19: Posted in a previous version of this proposal

#

Sure. This context info did not exist previously...

I filter also by current planet name now. And I want to add a filter for
country as next step towards better usability.

G.

On Sa, 19.07.2014, 18:42, Alexander Wolf wrote:
> This list is "correct". I meant new features. If I change the planet and
> picked some point on the map (as example on Mars) then I get locations
> from Earth!
> --
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
> You are the owner of lp:~georg-zotti/stellarium/ip-query-location.
>

Revision history for this message

Alexander Wolf (alexwolf) wrote on 2014-07-19: Posted in a previous version of this proposal

#

2014-07-20 1:33 GMT+07:00 gzotti <email address hidden>:

> Sure. This context info did not exist previously...
>
> I filter also by current planet name now. And I want to add a filter for
> country as next step towards better usability.
>

It's introduces important problem: search tool will search location in full
list or in filtered list?

--
With best regards, Alexander

Revision history for this message

gzotti (georg-zotti) wrote on 2014-07-19: Posted in a previous version of this proposal

#

The list box gets filled with a preselected short list of nearby locations
on the current planet. If the user selects Earth, the complete list will
be shown at the moment (50 non-Earth entries in 15000 locations, should
not matter...)

The search tool is directly connected to the list, so it only searches in
the pre-filtered list.

There is a reset list button to recreate all entries.

I am not yet sure if I shouldn't clear out the country combobox if
planet!=Earth. This was always quite strange...

G.

On Sa, 19.07.2014, 20:45, Alexander Wolf wrote:
> 2014-07-20 1:33 GMT+07:00 gzotti <email address hidden>:
>
>> Sure. This context info did not exist previously...
>>
>> I filter also by current planet name now. And I want to add a filter for
>> country as next step towards better usability.
>>
>
> It's introduces important problem: search tool will search location in
> full
> list or in filtered list?
>
> --
> With best regards, Alexander
>
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
> You are the owner of lp:~georg-zotti/stellarium/ip-query-location.
>

Revision history for this message

gzotti (georg-zotti) wrote on 2014-07-20: Posted in a previous version of this proposal

#

I have added the requested improvements. I think it works all now.

review: Needs Resubmitting

Revision history for this message

Alexander Wolf (alexwolf) wrote on 2014-07-20: Posted in a previous version of this proposal

#

OK. It work correct now and I think it ready to merge. Fabien?

review: Approve

Revision history for this message

Fabien Chéreau (xalioth) wrote on 2014-07-21: Posted in a previous version of this proposal

#

Please see comments

review: Needs Fixing

Revision history for this message

Marcos Cardinot (cardinot) wrote on 2014-07-21: Posted in a previous version of this proposal

#

Hello Georg,
congrats for the excellent work!
I have just a couple of things to suggest (nitpicks)... see comments + I noticed that you are using spaces instead of tabs...

review: Needs Fixing

Revision history for this message

Marcos Cardinot (cardinot) on 2014-07-22: Posted in a previous version of this proposal

#

review: Approve

Revision history for this message

gzotti (georg-zotti) wrote on 2014-07-26: Posted in a previous version of this proposal

#

Download full text (19.3 KiB)

Dear Fabien,

I fixed these items on Monday. Do you approve a merge now?

Kind regards,
Georg

On Mo, 21.07.2014, 19:07, Fabien Chéreau wrote:
> Review: Needs Fixing
>
> Please see comments
>
> Diff comments:
>
>> === modified file 'src/core/StelCore.cpp'
>> --- src/core/StelCore.cpp 2014-04-14 17:55:46 +0000
>> +++ src/core/StelCore.cpp 2014-07-20 13:42:31 +0000
>> @@ -114,7 +114,13 @@
>> defaultLocationID =
>> conf->value("init_location/location","error").toString();
>> bool ok;
>> StelLocationMgr* locationMgr =
>> &StelApp::getInstance().getLocationMgr();
>> - StelLocation location =
>> locationMgr->locationForString(defaultLocationID);
>> + StelLocation location;
>> + if (conf->value("init_location/use_ip_geolocation_if_available",
>> "false").toBool())
>> + {
>> + locationMgr->locationFromIP();
>> + }
>> +
>> + else location = locationMgr->locationForString(defaultLocationID);
>> if (!location.isValid())
>> {
>> qWarning() << "Warning: location" << defaultLocationID << "is
>> unknown.";
>>
>> === modified file 'src/core/StelLocation.cpp'
>> --- src/core/StelLocation.cpp 2014-02-15 15:37:23 +0000
>> +++ src/core/StelLocation.cpp 2014-07-20 13:42:31 +0000
>> @@ -125,3 +125,10 @@
>> return loc;
>> }
>>
>> +// Compute great-circle distance between two locations
>> +float StelLocation::distanceDegrees(const float long1, const float
>> lat1, const float long2, const float lat2)
>> +{
>> + const float DEGREES=M_PI/180.0f;
>> + return std::acos( std::sin(lat1*DEGREES)*std::sin(lat2*DEGREES) +
>> +
>> std::cos(lat1*DEGREES)*std::cos(lat2*DEGREES)*std::cos((long1-long2)*DEGREES)
>> ) / DEGREES;
>> +}
>>
>> === modified file 'src/core/StelLocation.hpp'
>> --- src/core/StelLocation.hpp 2014-04-15 17:10:07 +0000
>> +++ src/core/StelLocation.hpp 2014-07-20 13:42:31 +0000
>> @@ -74,6 +74,9 @@
>> //! Parse a location from a line serialization
>> static StelLocation createFromLine(const QString& line);
>>
>> + //! Compute great-circle distance between two locations
>> + static float distanceDegrees(const float long1, const float lat1,
>> const float long2, const float lat2);
>> +
>> //! Used privately by the StelLocationMgr
>> bool isUserLocation;
>>
>>
>> === modified file 'src/core/StelLocationMgr.cpp'
>> --- src/core/StelLocationMgr.cpp 2014-06-12 15:47:22 +0000
>> +++ src/core/StelLocationMgr.cpp 2014-07-20 13:42:31 +0000
>> @@ -17,6 +17,7 @@
>> */
>>
>> #include "StelApp.hpp"
>> +#include "StelCore.hpp"
>> #include "StelFileMgr.hpp"
>> #include "StelLocationMgr.hpp"
>> #include "StelUtils.hpp"
>> @@ -25,6 +26,12 @@
>> #include <QDebug>
>> #include <QFile>
>> #include <QDir>
>> +#include <QtNetwork/QNetworkInterface>
>> +#include <QtNetwork/QNetworkAccessManager>
>> +#include <QNetworkRequest>
>> +#include <QNetworkReply>
>> +#include <QUrl>
>> +#include <QUrlQuery>
>>
>> StelLocationMgr::StelLocationMgr()
>> {
>> @@ -36,9 +43,12 @@
>>
>> modelAllLocation = new QStringListModel(this);
>> modelAllLocation->setStringList(locations.keys());
>> + modelPickedLocation = new QStringListModel(this); // keep empty for
>> now.
>>
>> // Init to Paris France because it's the center of the world.
>> lastResortLocation =...

Dear Fabien,

I fixed these items on Monday. Do you approve a merge now?

Kind regards,
Georg

On Mo, 21.07.2014, 19:07, Fabien Chéreau wrote:
> Review: Needs Fixing
>
> Please see comments
>
> Diff comments:
>
>> === modified file 'src/core/StelCore.cpp'
>> --- src/core/StelCore.cpp	2014-04-14 17:55:46 +0000
>> +++ src/core/StelCore.cpp	2014-07-20 13:42:31 +0000
>> @@ -114,7 +114,13 @@
>>  	defaultLocationID =
>> conf->value("init_location/location","error").toString();
>>  	bool ok;
>>  	StelLocationMgr* locationMgr =
>> &StelApp::getInstance().getLocationMgr();
>> -	StelLocation location =
>> locationMgr->locationForString(defaultLocationID);
>> +	StelLocation location;
>> +	if (conf->value("init_location/use_ip_geolocation_if_available",
>> "false").toBool())
>> +	{
>> +		locationMgr->locationFromIP();
>> +	}
>> +
>> +	else location = locationMgr->locationForString(defaultLocationID);
>>  	if (!location.isValid())
>>  	{
>>  		qWarning() << "Warning: location" << defaultLocationID << "is
>> unknown.";
>>
>> === modified file 'src/core/StelLocation.cpp'
>> --- src/core/StelLocation.cpp	2014-02-15 15:37:23 +0000
>> +++ src/core/StelLocation.cpp	2014-07-20 13:42:31 +0000
>> @@ -125,3 +125,10 @@
>>  	return loc;
>>  }
>>
>> +// Compute great-circle distance between two locations
>> +float StelLocation::distanceDegrees(const float long1, const float
>> lat1, const float long2, const float lat2)
>> +{
>> +	const float DEGREES=M_PI/180.0f;
>> +	return std::acos( std::sin(lat1*DEGREES)*std::sin(lat2*DEGREES) +
>> +
>> std::cos(lat1*DEGREES)*std::cos(lat2*DEGREES)*std::cos((long1-long2)*DEGREES)
>> ) / DEGREES;
>> +}
>>
>> === modified file 'src/core/StelLocation.hpp'
>> --- src/core/StelLocation.hpp	2014-04-15 17:10:07 +0000
>> +++ src/core/StelLocation.hpp	2014-07-20 13:42:31 +0000
>> @@ -74,6 +74,9 @@
>>  	//! Parse a location from a line serialization
>>  	static StelLocation createFromLine(const QString& line);
>>
>> +	//! Compute great-circle distance between two locations
>> +	static float distanceDegrees(const float long1, const float lat1,
>> const float long2, const float lat2);
>> +
>>  	//! Used privately by the StelLocationMgr
>>  	bool isUserLocation;
>>
>>
>> === modified file 'src/core/StelLocationMgr.cpp'
>> --- src/core/StelLocationMgr.cpp	2014-06-12 15:47:22 +0000
>> +++ src/core/StelLocationMgr.cpp	2014-07-20 13:42:31 +0000
>> @@ -17,6 +17,7 @@
>>   */
>>
>>  #include "StelApp.hpp"
>> +#include "StelCore.hpp"
>>  #include "StelFileMgr.hpp"
>>  #include "StelLocationMgr.hpp"
>>  #include "StelUtils.hpp"
>> @@ -25,6 +26,12 @@
>>  #include <QDebug>
>>  #include <QFile>
>>  #include <QDir>
>> +#include <QtNetwork/QNetworkInterface>
>> +#include <QtNetwork/QNetworkAccessManager>
>> +#include <QNetworkRequest>
>> +#include <QNetworkReply>
>> +#include <QUrl>
>> +#include <QUrlQuery>
>>
>>  StelLocationMgr::StelLocationMgr()
>>  {
>> @@ -36,9 +43,12 @@
>>
>>  	modelAllLocation = new QStringListModel(this);
>>  	modelAllLocation->setStringList(locations.keys());
>> +	modelPickedLocation = new QStringListModel(this); // keep empty for
>> now.
>>
>>  	// Init to Paris France because it's the center of the world.
>>  	lastResortLocation = locationForString("Paris, France");
>> +	networkAccessMgr = new QNetworkAccessManager(this);
>
> use the common instance of QNetworkAccessManager instead
> (StelApp::getInstance().getNetworkAccessManager()), and connect only the
> signals from the reply object itself
>
>> +	connect(networkAccessMgr, SIGNAL(finished(QNetworkReply*)), this,
>> SLOT(changeLocationFromNetworkLookup(QNetworkReply*)));
>>  }
>>
>>  void StelLocationMgr::generateBinaryLocationFile(const QString&
>> fileName, bool isUserLocation, const QString& binFilePath) const
>> @@ -144,6 +154,9 @@
>>
>>  StelLocationMgr::~StelLocationMgr()
>>  {
>> +	delete modelPickedLocation;
>> +	delete modelAllLocation;
>> +	delete networkAccessMgr;
>
> Please set to NULL after delete, also this last line becomes useless after
> applying previous comment
>
>>  }
>>
>>  static float parseAngle(const QString& s, bool* ok)
>> @@ -307,3 +320,71 @@
>>  	sourcefile.close();
>>  	return true;
>>  }
>> +
>> +// lookup location from IP address.
>> +void StelLocationMgr::locationFromIP()
>> +{
>> +    QNetworkRequest req( QUrl( QString("http://freegeoip.net/csv/") )
>> );
>> +    networkAccessMgr->get(req);
>> +}
>> +
>> +// slot that receives IP-based location data from the network.
>> +void StelLocationMgr::changeLocationFromNetworkLookup(QNetworkReply
>> *reply)
>> +{
>> +    StelLocation location;
>> +    if (reply->error() == QNetworkReply::NoError) {
>> +        //success
>
> you probably need to add more error checking code here. You have to be
> very careful as you are using replies from a service which may change,
> fail etc so it needs to be very robust, at least check that the format is
> what you expect.. Also please do test without network, etc..
>
>> +        QByteArray answer=reply->readAll();
>> +        const QStringList& splitline = QString(answer).split(",");
>> +        float latitude=splitline.at(7).mid(1,
>> splitline.at(7).length()-2).toFloat();
>> +        float longitude=splitline.at(8).mid(1,
>> splitline.at(8).length()-2).toFloat();
>> +        // answer/splitline example:
>> "222.222.222.222","AT","Austria","","","","","47.3333","13.3333","",""
>> +        // The parts from freegeoip are:
>> ip,country_code,country_name,region_code,region_name,city,zipcode,latitude,longitude,metro_code,area_code
>> +        QString locLine= // we re-pack into a new line that will be
>> parsed back by StelLocation...
>
> this is a bit dirty.. but well..
>
>> +                QString("%1\t%2\t%3\t%4\t%5\t%6\t%7\t0")
>> +                    .arg(splitline.at(5).length()>2 ?
>> splitline.at(5).mid(1, splitline.at(5).length()-2)  :
>> QString("IP%1").arg(splitline.at(0).mid(1, splitline.at(0).length()-2)))
>> +                    .arg(splitline.at(4).length()>2 ?
>> splitline.at(4).mid(1, splitline.at(4).length()-2)  : "IPregion")
>> +                    .arg(splitline.at(2).length()>2 ?
>> splitline.at(2).mid(1, splitline.at(2).length()-2) : "IPcountry") //
>> country
>> +                    .arg("X") // role: X=user-defined
>> +                    .arg(0)   // population: unknown
>> +                    .arg(latitude<0 ? QString("%1S").arg(-latitude, 0,
>> 'f', 6) : QString("%1N").arg(latitude, 0, 'f', 6))
>> +                    .arg(longitude<0 ? QString("%1W").arg(-longitude,
>> 0, 'f', 6) : QString("%1E").arg(longitude, 0, 'f', 6));
>> +        location=StelLocation::createFromLine(locLine);
>> +        StelCore *core=StelApp::getInstance().getCore();
>> +        core->moveObserverTo(location, 0.0f, 0.0f);
>> +    }
>> +    else {
>> +        qDebug() << "Failure getting IP-based location: \n\t"
>> <<reply->errorString();
>> +    }
>> +    reply->deleteLater();
>> +}
>> +
>> +void StelLocationMgr::pickLocationsNearby(const QString planetName,
>> const float longitude, const float latitude, const float radiusDegrees)
>
> unnecessary const in function parameters
>
>> +{
>> +    pickedLocations.clear();
>> +    QMapIterator<QString, StelLocation> iter(locations);
>> +    while (iter.hasNext())
>> +    {
>> +        iter.next();
>> +        StelLocation loc=iter.value();
>> +        if ( (loc.planetName == planetName) &&
>> +             (StelLocation::distanceDegrees(longitude, latitude,
>> loc.longitude, loc.latitude) <= radiusDegrees) )
>> +        {
>> +            pickedLocations.insert(iter.key(), iter.value());
>> +        }
>> +    }
>> +    modelPickedLocation->setStringList(pickedLocations.keys());
>> +}
>> +
>> +void StelLocationMgr::pickLocationsInCountry(const QString country)
>> +{
>> +    pickedLocations.clear();
>> +    QMapIterator<QString, StelLocation> iter(locations);
>> +    while (iter.hasNext())
>> +    {
>> +        iter.next();
>> +        StelLocation loc=iter.value();
>
> use const & to avoid copy
>
>> +        if (loc.country == country) pickedLocations.insert(iter.key(),
>> iter.value());
>> +    }
>> +    modelPickedLocation->setStringList(pickedLocations.keys());
>> +}
>>
>> === modified file 'src/core/StelLocationMgr.hpp'
>> --- src/core/StelLocationMgr.hpp	2013-10-14 07:43:06 +0000
>> +++ src/core/StelLocationMgr.hpp	2014-07-20 13:42:31 +0000
>> @@ -26,6 +26,8 @@
>>  #include <QMap>
>>
>>  class QStringListModel;
>> +class QNetworkReply;
>> +class QNetworkAccessManager;
>>
>>  //! @class StelLocationMgr
>>  //! Manage the list of available location.
>> @@ -41,6 +43,8 @@
>>
>>  	//! Return the model containing all the city
>>  	QStringListModel* getModelAll() {return modelAllLocation;}
>> +	//! Return the model containing picked (nearby) cities or cities from
>> a single country, or other preselection.
>> +	QStringListModel* getModelPicked() {return modelPickedLocation;}
>>
>>  	//! Return the list of all loaded locations
>>  	QList<StelLocation> getAll() const {return locations.values();}
>> @@ -70,6 +74,20 @@
>>  	//! @param id the location ID
>>  	bool deleteUserLocation(const QString& id);
>>
>> +	//! Find location via online lookup of IP address
>> +	void locationFromIP();
>> +
>> +	//! Preselect list of locations within @param radiusDegrees of
>> selected (usually screen-clicked) coordinates.
>> +	//! The list can be retrieved by calling @name getModelPicked().
>> +	void pickLocationsNearby(const QString planetName, const float
>> longitude, const float latitude, const float radiusDegrees);
>
> somehow these are 2 independent features, it would be cleaner to merge
> this in 2 times
>
>> +	//! Preselect list of locations in a particular country only.
>> +	//! The list can be retrieved by calling @name getModelPicked().
>> +	void pickLocationsInCountry(const QString country);
>> +
>> +public slots:
>> +	//! Process answer from online lookup of IP address
>> +	void changeLocationFromNetworkLookup(QNetworkReply *reply);
>> +
>>  private:
>>  	void generateBinaryLocationFile(const QString& txtFile, bool
>> isUserLocation, const QString& binFile) const;
>>
>> @@ -79,11 +97,19 @@
>>
>>  	//! Model containing all the city information
>>  	QStringListModel* modelAllLocation;
>> +	//! Model containing selected city information
>> +	QStringListModel* modelPickedLocation;
>>
>>  	//! The list of all loaded locations
>>  	QMap<QString, StelLocation> locations;
>> +	//! A list of locations generated on-the-fly by filtering from @name
>> locations
>> +	QMap<QString, StelLocation> pickedLocations;
>>
>>  	StelLocation lastResortLocation;
>> +
>> +	//!	for IP-based location lookup
>> +	QNetworkAccessManager *networkAccessMgr;
>> +
>>  };
>>
>>  #endif // _STELLOCATIONMGR_HPP_
>>
>> === modified file 'src/gui/LocationDialog.cpp'
>> --- src/gui/LocationDialog.cpp	2014-03-21 18:03:55 +0000
>> +++ src/gui/LocationDialog.cpp	2014-07-20 13:42:31 +0000
>> @@ -41,6 +41,7 @@
>>  #include <QTimer>
>>  #include <QStringListModel>
>>
>> +#include <QMessageBox>
>>  LocationDialog::LocationDialog(QObject* parent) : StelDialog(parent),
>> isEditingNew(false)
>>  {
>>  	ui = new Ui_locationDialogForm;
>> @@ -100,6 +101,9 @@
>>
>>  	connect(ui->addLocationToListPushButton, SIGNAL(clicked()), this,
>> SLOT(addCurrentLocationToList()));
>>  	connect(ui->deleteLocationFromListPushButton, SIGNAL(clicked()), this,
>> SLOT(deleteCurrentLocationFromList()));
>> +	connect(ui->ipQueryPushButton, SIGNAL(clicked()), this,
>> SLOT(ipQueryLocation()));
>> +	connect(ui->resetListPushButton, SIGNAL(clicked()), this,
>> SLOT(resetCompleteList()));
>> +	connect(ui->countryNameComboBox, SIGNAL(activated(const QString &)),
>> this, SLOT(filterSitesByCountry()));
>>
>>  	StelCore* core = StelApp::getInstance().getCore();
>>  	const StelLocation& currentLocation = core->getCurrentLocation();
>> @@ -235,7 +239,7 @@
>>  // Update the map for the given location.
>>  void LocationDialog::setMapForLocation(const StelLocation& loc)
>>  {
>> -	// Avoids usless processing
>> +	// Avoids useless processing
>>  	if (lastPlanet==loc.planetName)
>>  		return;
>>
>> @@ -358,6 +362,15 @@
>>  	loc.longitude = longitude;
>>  	setFieldsFromLocation(loc);
>>  	StelApp::getInstance().getCore()->moveObserverTo(loc, 0.);
>> +	// GZ: Filter location list for nearby sites. I assume Earth locations
>> are better known. With only few locations on other planets in the list,
>> 30 degrees seem OK.
>> +	StelApp::getInstance().getLocationMgr().pickLocationsNearby(loc.planetName,
>> longitude, latitude, loc.planetName=="Earth" ? 3.0f: 30.0f);
>> +	QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
>> +	proxyModel->setSourceModel((QAbstractItemModel*)StelApp::getInstance().getLocationMgr().getModelPicked());
>> +	proxyModel->sort(0, Qt::AscendingOrder);
>> +	proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
>> +	ui->citiesListView->setModel(proxyModel);
>> +	ui->citySearchLineEdit->clear();
>> +	connect(ui->citySearchLineEdit, SIGNAL(textChanged(const QString&)),
>> proxyModel, SLOT(setFilterWildcard(const QString&)));
>>  }
>>
>>  // Called when the planet name is changed by hand
>> @@ -380,6 +393,24 @@
>>  				ls->setCurrentLandscapeID(ls->getDefaultLandscapeID());
>>  		}
>>
>> +		// GZ populate site list with sites only from that planet, or full
>> list for Earth (faster than removing the ~50 non-Earth positions...).
>> +		StelLocationMgr &locMgr=StelApp::getInstance().getLocationMgr();
>> +		QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
>> +		if (loc.planetName == "Earth")
>> +		{
>> +			proxyModel->setSourceModel((QAbstractItemModel*)locMgr.getModelAll());
>> +		}
>> +		else
>> +		{
>> +			locMgr.pickLocationsNearby(loc.planetName, 0.0f, 0.0f, 180.0f);
>> +			proxyModel->setSourceModel((QAbstractItemModel*)locMgr.getModelPicked());
>> +		}
>> +		proxyModel->sort(0, Qt::AscendingOrder);
>> +		proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
>> +		ui->citiesListView->setModel(proxyModel);
>> +		ui->citySearchLineEdit->clear();
>> +		connect(ui->citySearchLineEdit, SIGNAL(textChanged(const QString&)),
>> proxyModel, SLOT(setFilterWildcard(const QString&)));
>> +		ui->citySearchLineEdit->setFocus();
>>  	}
>>  	// Planet transition time also set to null to prevent uglyness when
>>  	// "use landscape location" is enabled for that planet's landscape.
>> --BM
>> @@ -429,7 +460,7 @@
>>  	ui->deleteLocationFromListPushButton->setEnabled(locationMgr.canDeleteUserLocation(loc.getID()));
>>  }
>>
>> -// Called when the user clic on the save button
>> +// Called when the user clicks on the save button
>>  void LocationDialog::addCurrentLocationToList()
>>  {
>>  	const StelLocation& loc = locationFromFields();
>> @@ -487,3 +518,42 @@
>>  	ui->useAsDefaultLocationCheckBox->setEnabled(!currentIsDefault);
>>  	ui->pushButtonReturnToDefault->setEnabled(!currentIsDefault);
>>  }
>> +
>> +// called when the user clicks on the IP Query button
>> +void LocationDialog::ipQueryLocation()
>> +{
>> +	StelLocationMgr &locMgr=StelApp::getInstance().getLocationMgr();
>> +	locMgr.locationFromIP(); // This just triggers asynchronous lookup.
>> +	ui->citySearchLineEdit->setFocus();
>> +}
>> +
>> +// called when user clicks "reset list"
>> +void LocationDialog::resetCompleteList()
>> +{
>> +	QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
>> +	proxyModel->setSourceModel((QAbstractItemModel*)StelApp::getInstance().getLocationMgr().getModelAll());
>> +	proxyModel->sort(0, Qt::AscendingOrder);
>> +	proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
>> +	ui->citiesListView->setModel(proxyModel);
>> +	ui->citySearchLineEdit->clear();
>> +	connect(ui->citySearchLineEdit, SIGNAL(textChanged(const QString&)),
>> proxyModel, SLOT(setFilterWildcard(const QString&)));
>> +	ui->citySearchLineEdit->setFocus();
>> +}
>> +
>> +// called when user clicks in the country combobox and selects a
>> country. The locations in the list are updated to select only sites in
>> that country.
>> +void LocationDialog::filterSitesByCountry()
>> +{
>> +	QString country=ui->countryNameComboBox->currentData().toString();
>> +	QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
>> +	StelLocationMgr &locMgr=StelApp::getInstance().getLocationMgr();
>> +
>> +	locMgr.pickLocationsInCountry(country);
>> +	proxyModel->setSourceModel((QAbstractItemModel*)locMgr.getModelPicked());
>> +
>> +	proxyModel->sort(0, Qt::AscendingOrder);
>> +	proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
>> +	ui->citiesListView->setModel(proxyModel);
>> +	ui->citySearchLineEdit->clear();
>> +	connect(ui->citySearchLineEdit, SIGNAL(textChanged(const QString&)),
>> proxyModel, SLOT(setFilterWildcard(const QString&)));
>> +	ui->citySearchLineEdit->setFocus();
>> +}
>>
>> === modified file 'src/gui/LocationDialog.hpp'
>> --- src/gui/LocationDialog.hpp	2013-10-14 09:27:54 +0000
>> +++ src/gui/LocationDialog.hpp	2014-07-20 13:42:31 +0000
>> @@ -82,6 +82,7 @@
>>  	void updateFromProgram(const StelLocation& location);
>>
>>  	//! Called when the map is clicked.
>> +	//! GZ_New: create new list for places nearby and feed into location
>> list box.
>>  	void setPositionFromMap(double longitude, double latitude);
>>
>>  	//! Called when the user activates an item from the locations list.
>> @@ -97,6 +98,15 @@
>>
>>  	//! Called when the user clicks on the delete button
>>  	void deleteCurrentLocationFromList();
>> +
>> +	//! filter city list to show entries from single country only
>> +	void filterSitesByCountry();
>> +
>> +	//! reset city list to complete list (may have been reduced to picked
>> list)
>> +	void resetCompleteList();
>> +
>> +	//! called when the user clicks on the IP Query button
>> +	void ipQueryLocation();
>>
>>  	//! Called when the user wants to use the current location as default
>>  	void setDefaultLocation();
>>
>> === modified file 'src/gui/locationDialogGui.ui'
>> --- src/gui/locationDialogGui.ui	2014-06-16 13:43:31 +0000
>> +++ src/gui/locationDialogGui.ui	2014-07-20 13:42:31 +0000
>> @@ -359,6 +359,16 @@
>>                </property>
>>               </widget>
>>              </item>
>> +            <item>
>> +             <widget class="QPushButton" name="resetListPushButton">
>> +              <property name="toolTip">
>> +               <string>Reset location list to show all known
>> locations</string>
>> +              </property>
>> +              <property name="text">
>> +               <string>Reset Location List</string>
>> +              </property>
>> +             </widget>
>> +            </item>
>>             </layout>
>>            </widget>
>>           </item>
>> @@ -449,6 +459,22 @@
>>               </spacer>
>>              </item>
>>              <item>
>> +             <widget class="QPushButton" name="ipQueryPushButton">
>> +              <property name="minimumSize">
>> +               <size>
>> +                <width>30</width>
>> +                <height>0</height>
>> +               </size>
>> +              </property>
>> +              <property name="toolTip">
>> +               <string>Use online service to find approximate location
>> based on your IP address</string>
>> +              </property>
>> +              <property name="text">
>> +               <string>IP Query</string>
>> +              </property>
>> +             </widget>
>> +            </item>
>> +            <item>
>>               <widget class="QPushButton"
>> name="deleteLocationFromListPushButton">
>>                <property name="enabled">
>>                 <bool>false</bool>
>>
>
>
> --
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
> You are the owner of lp:~georg-zotti/stellarium/ip-query-location.
>

Revision history for this message

Fabien Chéreau (xalioth) wrote on 2014-07-26: Posted in a previous version of this proposal

#

Download full text (22.3 KiB)

Hi Georg,

now that I'm back from holidays, I could acutally try the code, and I have
some more general comments about your (very very good!) work:

- we should rename "IP Query" to something less technical, like "Get
location from Network"

- I think the IP location is such an improvement that it should be the
default for all new install, and also probably used by default for installs
where the location was never set (set to Paris). This would imply that we
transform at startup all older config.ini from location = Paris, France to
location = auto. And use this "auto" value to trigger IP Lookup instead of
adding a new "init_location/use_ip_geolocation_if_available" key.

- Also when the lookup is successful, we could save the last know location
into an "init_location/last_resort_location" for the next time we start
without network.

Sorry to give these feedbacks so late, I hope they make sense, what do you
think? In any case, I think the lack of auto location feature was the most
annoying problem of Stellarium for an average user living in US, so thanks
a lot again!

Fabien

On Sat, Jul 26, 2014 at 12:24 PM, gzotti <email address hidden> wrote:

> Dear Fabien,
>
> I fixed these items on Monday. Do you approve a merge now?
>
> Kind regards,
> Georg
>
> On Mo, 21.07.2014, 19:07, Fabien Chéreau wrote:
> > Review: Needs Fixing
> >
> > Please see comments
> >
> > Diff comments:
> >
> >> === modified file 'src/core/StelCore.cpp'
> >> --- src/core/StelCore.cpp 2014-04-14 17:55:46 +0000
> >> +++ src/core/StelCore.cpp 2014-07-20 13:42:31 +0000
> >> @@ -114,7 +114,13 @@
> >> defaultLocationID =
> >> conf->value("init_location/location","error").toString();
> >> bool ok;
> >> StelLocationMgr* locationMgr =
> >> &StelApp::getInstance().getLocationMgr();
> >> - StelLocation location =
> >> locationMgr->locationForString(defaultLocationID);
> >> + StelLocation location;
> >> + if (conf->value("init_location/use_ip_geolocation_if_available",
> >> "false").toBool())
> >> + {
> >> + locationMgr->locationFromIP();
> >> + }
> >> +
> >> + else location = locationMgr->locationForString(defaultLocationID);
> >> if (!location.isValid())
> >> {
> >> qWarning() << "Warning: location" << defaultLocationID <<
> "is
> >> unknown.";
> >>
> >> === modified file 'src/core/StelLocation.cpp'
> >> --- src/core/StelLocation.cpp 2014-02-15 15:37:23 +0000
> >> +++ src/core/StelLocation.cpp 2014-07-20 13:42:31 +0000
> >> @@ -125,3 +125,10 @@
> >> return loc;
> >> }
> >>
> >> +// Compute great-circle distance between two locations
> >> +float StelLocation::distanceDegrees(const float long1, const float
> >> lat1, const float long2, const float lat2)
> >> +{
> >> + const float DEGREES=M_PI/180.0f;
> >> + return std::acos( std::sin(lat1*DEGREES)*std::sin(lat2*DEGREES) +
> >> +
> >>
> std::cos(lat1*DEGREES)*std::cos(lat2*DEGREES)*std::cos((long1-long2)*DEGREES)
> >> ) / DEGREES;
> >> +}
> >>
> >> === modified file 'src/core/StelLocation.hpp'
> >> --- src/core/StelLocation.hpp 2014-04-15 17:10:07 +0000
> >> +++ src/core/StelLocation.hpp 2014-07-20 13:42:31 +0000
> >> ...

Hi Georg,

now that I'm back from holidays, I could acutally try the code, and I have
some more general comments about your (very very good!) work:

- we should rename "IP Query" to something less technical, like "Get
location from Network"

- I think the IP location is such an improvement that it should be the
default for all new install, and also probably used by default for installs
where the location was never set (set to Paris). This would imply that we
transform at startup all older config.ini from location = Paris, France to
location = auto. And use this "auto" value to trigger IP Lookup instead of
adding a new "init_location/use_ip_geolocation_if_available" key.

- Also when the lookup is successful, we could save the last know location
into an "init_location/last_resort_location" for the next time we start
without network.

Sorry to give these feedbacks so late, I hope they make sense, what do you
think? In any case, I think the lack of auto location feature was the most
annoying problem of Stellarium for an average user living in US, so thanks
a lot again!

Fabien

On Sat, Jul 26, 2014 at 12:24 PM, gzotti <Georg.Zotti@univie.ac.at> wrote:

> Dear Fabien,
>
> I fixed these items on Monday. Do you approve a merge now?
>
> Kind regards,
> Georg
>
> On Mo, 21.07.2014, 19:07, Fabien Chéreau wrote:
> > Review: Needs Fixing
> >
> > Please see comments
> >
> > Diff comments:
> >
> >> === modified file 'src/core/StelCore.cpp'
> >> --- src/core/StelCore.cpp    2014-04-14 17:55:46 +0000
> >> +++ src/core/StelCore.cpp    2014-07-20 13:42:31 +0000
> >> @@ -114,7 +114,13 @@
> >>      defaultLocationID =
> >> conf->value("init_location/location","error").toString();
> >>      bool ok;
> >>      StelLocationMgr* locationMgr =
> >> &StelApp::getInstance().getLocationMgr();
> >> -    StelLocation location =
> >> locationMgr->locationForString(defaultLocationID);
> >> +    StelLocation location;
> >> +    if (conf->value("init_location/use_ip_geolocation_if_available",
> >> "false").toBool())
> >> +    {
> >> +            locationMgr->locationFromIP();
> >> +    }
> >> +
> >> +    else location = locationMgr->locationForString(defaultLocationID);
> >>      if (!location.isValid())
> >>      {
> >>              qWarning() << "Warning: location" << defaultLocationID <<
> "is
> >> unknown.";
> >>
> >> === modified file 'src/core/StelLocation.cpp'
> >> --- src/core/StelLocation.cpp        2014-02-15 15:37:23 +0000
> >> +++ src/core/StelLocation.cpp        2014-07-20 13:42:31 +0000
> >> @@ -125,3 +125,10 @@
> >>      return loc;
> >>  }
> >>
> >> +// Compute great-circle distance between two locations
> >> +float StelLocation::distanceDegrees(const float long1, const float
> >> lat1, const float long2, const float lat2)
> >> +{
> >> +    const float DEGREES=M_PI/180.0f;
> >> +    return std::acos( std::sin(lat1*DEGREES)*std::sin(lat2*DEGREES) +
> >> +
> >>
> std::cos(lat1*DEGREES)*std::cos(lat2*DEGREES)*std::cos((long1-long2)*DEGREES)
> >> ) / DEGREES;
> >> +}
> >>
> >> === modified file 'src/core/StelLocation.hpp'
> >> --- src/core/StelLocation.hpp        2014-04-15 17:10:07 +0000
> >> +++ src/core/StelLocation.hpp        2014-07-20 13:42:31 +0000
> >> @@ -74,6 +74,9 @@
> >>      //! Parse a location from a line serialization
> >>      static StelLocation createFromLine(const QString& line);
> >>
> >> +    //! Compute great-circle distance between two locations
> >> +    static float distanceDegrees(const float long1, const float lat1,
> >> const float long2, const float lat2);
> >> +
> >>      //! Used privately by the StelLocationMgr
> >>      bool isUserLocation;
> >>
> >>
> >> === modified file 'src/core/StelLocationMgr.cpp'
> >> --- src/core/StelLocationMgr.cpp     2014-06-12 15:47:22 +0000
> >> +++ src/core/StelLocationMgr.cpp     2014-07-20 13:42:31 +0000
> >> @@ -17,6 +17,7 @@
> >>   */
> >>
> >>  #include "StelApp.hpp"
> >> +#include "StelCore.hpp"
> >>  #include "StelFileMgr.hpp"
> >>  #include "StelLocationMgr.hpp"
> >>  #include "StelUtils.hpp"
> >> @@ -25,6 +26,12 @@
> >>  #include <QDebug>
> >>  #include <QFile>
> >>  #include <QDir>
> >> +#include <QtNetwork/QNetworkInterface>
> >> +#include <QtNetwork/QNetworkAccessManager>
> >> +#include <QNetworkRequest>
> >> +#include <QNetworkReply>
> >> +#include <QUrl>
> >> +#include <QUrlQuery>
> >>
> >>  StelLocationMgr::StelLocationMgr()
> >>  {
> >> @@ -36,9 +43,12 @@
> >>
> >>      modelAllLocation = new QStringListModel(this);
> >>      modelAllLocation->setStringList(locations.keys());
> >> +    modelPickedLocation = new QStringListModel(this); // keep empty for
> >> now.
> >>
> >>      // Init to Paris France because it's the center of the world.
> >>      lastResortLocation = locationForString("Paris, France");
> >> +    networkAccessMgr = new QNetworkAccessManager(this);
> >
> > use the common instance of QNetworkAccessManager instead
> > (StelApp::getInstance().getNetworkAccessManager()), and connect only the
> > signals from the reply object itself
> >
> >> +    connect(networkAccessMgr, SIGNAL(finished(QNetworkReply*)), this,
> >> SLOT(changeLocationFromNetworkLookup(QNetworkReply*)));
> >>  }
> >>
> >>  void StelLocationMgr::generateBinaryLocationFile(const QString&
> >> fileName, bool isUserLocation, const QString& binFilePath) const
> >> @@ -144,6 +154,9 @@
> >>
> >>  StelLocationMgr::~StelLocationMgr()
> >>  {
> >> +    delete modelPickedLocation;
> >> +    delete modelAllLocation;
> >> +    delete networkAccessMgr;
> >
> > Please set to NULL after delete, also this last line becomes useless
> after
> > applying previous comment
> >
> >>  }
> >>
> >>  static float parseAngle(const QString& s, bool* ok)
> >> @@ -307,3 +320,71 @@
> >>      sourcefile.close();
> >>      return true;
> >>  }
> >> +
> >> +// lookup location from IP address.
> >> +void StelLocationMgr::locationFromIP()
> >> +{
> >> +    QNetworkRequest req( QUrl( QString("http://freegeoip.net/csv/") )
> >> );
> >> +    networkAccessMgr->get(req);
> >> +}
> >> +
> >> +// slot that receives IP-based location data from the network.
> >> +void StelLocationMgr::changeLocationFromNetworkLookup(QNetworkReply
> >> *reply)
> >> +{
> >> +    StelLocation location;
> >> +    if (reply->error() == QNetworkReply::NoError) {
> >> +        //success
> >
> > you probably need to add more error checking code here. You have to be
> > very careful as you are using replies from a service which may change,
> > fail etc so it needs to be very robust, at least check that the format is
> > what you expect.. Also please do test without network, etc..
> >
> >> +        QByteArray answer=reply->readAll();
> >> +        const QStringList& splitline = QString(answer).split(",");
> >> +        float latitude=splitline.at(7).mid(1,
> >> splitline.at(7).length()-2).toFloat();
> >> +        float longitude=splitline.at(8).mid(1,
> >> splitline.at(8).length()-2).toFloat();
> >> +        // answer/splitline example:
> >> "222.222.222.222","AT","Austria","","","","","47.3333","13.3333","",""
> >> +        // The parts from freegeoip are:
> >>
> ip,country_code,country_name,region_code,region_name,city,zipcode,latitude,longitude,metro_code,area_code
> >> +        QString locLine= // we re-pack into a new line that will be
> >> parsed back by StelLocation...
> >
> > this is a bit dirty.. but well..
> >
> >> +                QString("%1\t%2\t%3\t%4\t%5\t%6\t%7\t0")
> >> +                    .arg(splitline.at(5).length()>2 ?
> >> splitline.at(5).mid(1, splitline.at(5).length()-2)  :
> >> QString("IP%1").arg(splitline.at(0).mid(1, splitline.at
> (0).length()-2)))
> >> +                    .arg(splitline.at(4).length()>2 ?
> >> splitline.at(4).mid(1, splitline.at(4).length()-2)  : "IPregion")
> >> +                    .arg(splitline.at(2).length()>2 ?
> >> splitline.at(2).mid(1, splitline.at(2).length()-2) : "IPcountry") //
> >> country
> >> +                    .arg("X") // role: X=user-defined
> >> +                    .arg(0)   // population: unknown
> >> +                    .arg(latitude<0 ? QString("%1S").arg(-latitude, 0,
> >> 'f', 6) : QString("%1N").arg(latitude, 0, 'f', 6))
> >> +                    .arg(longitude<0 ? QString("%1W").arg(-longitude,
> >> 0, 'f', 6) : QString("%1E").arg(longitude, 0, 'f', 6));
> >> +        location=StelLocation::createFromLine(locLine);
> >> +        StelCore *core=StelApp::getInstance().getCore();
> >> +        core->moveObserverTo(location, 0.0f, 0.0f);
> >> +    }
> >> +    else {
> >> +        qDebug() << "Failure getting IP-based location: \n\t"
> >> <<reply->errorString();
> >> +    }
> >> +    reply->deleteLater();
> >> +}
> >> +
> >> +void StelLocationMgr::pickLocationsNearby(const QString planetName,
> >> const float longitude, const float latitude, const float radiusDegrees)
> >
> > unnecessary const in function parameters
> >
> >> +{
> >> +    pickedLocations.clear();
> >> +    QMapIterator<QString, StelLocation> iter(locations);
> >> +    while (iter.hasNext())
> >> +    {
> >> +        iter.next();
> >> +        StelLocation loc=iter.value();
> >> +        if ( (loc.planetName == planetName) &&
> >> +             (StelLocation::distanceDegrees(longitude, latitude,
> >> loc.longitude, loc.latitude) <= radiusDegrees) )
> >> +        {
> >> +            pickedLocations.insert(iter.key(), iter.value());
> >> +        }
> >> +    }
> >> +    modelPickedLocation->setStringList(pickedLocations.keys());
> >> +}
> >> +
> >> +void StelLocationMgr::pickLocationsInCountry(const QString country)
> >> +{
> >> +    pickedLocations.clear();
> >> +    QMapIterator<QString, StelLocation> iter(locations);
> >> +    while (iter.hasNext())
> >> +    {
> >> +        iter.next();
> >> +        StelLocation loc=iter.value();
> >
> > use const & to avoid copy
> >
> >> +        if (loc.country == country) pickedLocations.insert(iter.key(),
> >> iter.value());
> >> +    }
> >> +    modelPickedLocation->setStringList(pickedLocations.keys());
> >> +}
> >>
> >> === modified file 'src/core/StelLocationMgr.hpp'
> >> --- src/core/StelLocationMgr.hpp     2013-10-14 07:43:06 +0000
> >> +++ src/core/StelLocationMgr.hpp     2014-07-20 13:42:31 +0000
> >> @@ -26,6 +26,8 @@
> >>  #include <QMap>
> >>
> >>  class QStringListModel;
> >> +class QNetworkReply;
> >> +class QNetworkAccessManager;
> >>
> >>  //! @class StelLocationMgr
> >>  //! Manage the list of available location.
> >> @@ -41,6 +43,8 @@
> >>
> >>      //! Return the model containing all the city
> >>      QStringListModel* getModelAll() {return modelAllLocation;}
> >> +    //! Return the model containing picked (nearby) cities or cities
> from
> >> a single country, or other preselection.
> >> +    QStringListModel* getModelPicked() {return modelPickedLocation;}
> >>
> >>      //! Return the list of all loaded locations
> >>      QList<StelLocation> getAll() const {return locations.values();}
> >> @@ -70,6 +74,20 @@
> >>      //! @param id the location ID
> >>      bool deleteUserLocation(const QString& id);
> >>
> >> +    //! Find location via online lookup of IP address
> >> +    void locationFromIP();
> >> +
> >> +    //! Preselect list of locations within @param radiusDegrees of
> >> selected (usually screen-clicked) coordinates.
> >> +    //! The list can be retrieved by calling @name getModelPicked().
> >> +    void pickLocationsNearby(const QString planetName, const float
> >> longitude, const float latitude, const float radiusDegrees);
> >
> > somehow these are 2 independent features, it would be cleaner to merge
> > this in 2 times
> >
> >> +    //! Preselect list of locations in a particular country only.
> >> +    //! The list can be retrieved by calling @name getModelPicked().
> >> +    void pickLocationsInCountry(const QString country);
> >> +
> >> +public slots:
> >> +    //! Process answer from online lookup of IP address
> >> +    void changeLocationFromNetworkLookup(QNetworkReply *reply);
> >> +
> >>  private:
> >>      void generateBinaryLocationFile(const QString& txtFile, bool
> >> isUserLocation, const QString& binFile) const;
> >>
> >> @@ -79,11 +97,19 @@
> >>
> >>      //! Model containing all the city information
> >>      QStringListModel* modelAllLocation;
> >> +    //! Model containing selected city information
> >> +    QStringListModel* modelPickedLocation;
> >>
> >>      //! The list of all loaded locations
> >>      QMap<QString, StelLocation> locations;
> >> +    //! A list of locations generated on-the-fly by filtering from
> @name
> >> locations
> >> +    QMap<QString, StelLocation> pickedLocations;
> >>
> >>      StelLocation lastResortLocation;
> >> +
> >> +    //!     for IP-based location lookup
> >> +    QNetworkAccessManager *networkAccessMgr;
> >> +
> >>  };
> >>
> >>  #endif // _STELLOCATIONMGR_HPP_
> >>
> >> === modified file 'src/gui/LocationDialog.cpp'
> >> --- src/gui/LocationDialog.cpp       2014-03-21 18:03:55 +0000
> >> +++ src/gui/LocationDialog.cpp       2014-07-20 13:42:31 +0000
> >> @@ -41,6 +41,7 @@
> >>  #include <QTimer>
> >>  #include <QStringListModel>
> >>
> >> +#include <QMessageBox>
> >>  LocationDialog::LocationDialog(QObject* parent) : StelDialog(parent),
> >> isEditingNew(false)
> >>  {
> >>      ui = new Ui_locationDialogForm;
> >> @@ -100,6 +101,9 @@
> >>
> >>      connect(ui->addLocationToListPushButton, SIGNAL(clicked()), this,
> >> SLOT(addCurrentLocationToList()));
> >>      connect(ui->deleteLocationFromListPushButton, SIGNAL(clicked()),
> this,
> >> SLOT(deleteCurrentLocationFromList()));
> >> +    connect(ui->ipQueryPushButton, SIGNAL(clicked()), this,
> >> SLOT(ipQueryLocation()));
> >> +    connect(ui->resetListPushButton, SIGNAL(clicked()), this,
> >> SLOT(resetCompleteList()));
> >> +    connect(ui->countryNameComboBox, SIGNAL(activated(const QString
> &)),
> >> this, SLOT(filterSitesByCountry()));
> >>
> >>      StelCore* core = StelApp::getInstance().getCore();
> >>      const StelLocation& currentLocation = core->getCurrentLocation();
> >> @@ -235,7 +239,7 @@
> >>  // Update the map for the given location.
> >>  void LocationDialog::setMapForLocation(const StelLocation& loc)
> >>  {
> >> -    // Avoids usless processing
> >> +    // Avoids useless processing
> >>      if (lastPlanet==loc.planetName)
> >>              return;
> >>
> >> @@ -358,6 +362,15 @@
> >>      loc.longitude = longitude;
> >>      setFieldsFromLocation(loc);
> >>      StelApp::getInstance().getCore()->moveObserverTo(loc, 0.);
> >> +    // GZ: Filter location list for nearby sites. I assume Earth
> locations
> >> are better known. With only few locations on other planets in the list,
> >> 30 degrees seem OK.
> >> +
>  StelApp::getInstance().getLocationMgr().pickLocationsNearby(loc.planetName,
> >> longitude, latitude, loc.planetName=="Earth" ? 3.0f: 30.0f);
> >> +    QSortFilterProxyModel *proxyModel = new
> QSortFilterProxyModel(this);
> >> +
>  proxyModel->setSourceModel((QAbstractItemModel*)StelApp::getInstance().getLocationMgr().getModelPicked());
> >> +    proxyModel->sort(0, Qt::AscendingOrder);
> >> +    proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
> >> +    ui->citiesListView->setModel(proxyModel);
> >> +    ui->citySearchLineEdit->clear();
> >> +    connect(ui->citySearchLineEdit, SIGNAL(textChanged(const
> QString&)),
> >> proxyModel, SLOT(setFilterWildcard(const QString&)));
> >>  }
> >>
> >>  // Called when the planet name is changed by hand
> >> @@ -380,6 +393,24 @@
> >>
>  ls->setCurrentLandscapeID(ls->getDefaultLandscapeID());
> >>              }
> >>
> >> +            // GZ populate site list with sites only from that planet,
> or full
> >> list for Earth (faster than removing the ~50 non-Earth positions...).
> >> +            StelLocationMgr
> &locMgr=StelApp::getInstance().getLocationMgr();
> >> +            QSortFilterProxyModel *proxyModel = new
> QSortFilterProxyModel(this);
> >> +            if (loc.planetName == "Earth")
> >> +            {
> >> +
>  proxyModel->setSourceModel((QAbstractItemModel*)locMgr.getModelAll());
> >> +            }
> >> +            else
> >> +            {
> >> +                    locMgr.pickLocationsNearby(loc.planetName, 0.0f,
> 0.0f, 180.0f);
> >> +
>  proxyModel->setSourceModel((QAbstractItemModel*)locMgr.getModelPicked());
> >> +            }
> >> +            proxyModel->sort(0, Qt::AscendingOrder);
> >> +            proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
> >> +            ui->citiesListView->setModel(proxyModel);
> >> +            ui->citySearchLineEdit->clear();
> >> +            connect(ui->citySearchLineEdit, SIGNAL(textChanged(const
> QString&)),
> >> proxyModel, SLOT(setFilterWildcard(const QString&)));
> >> +            ui->citySearchLineEdit->setFocus();
> >>      }
> >>      // Planet transition time also set to null to prevent uglyness when
> >>      // "use landscape location" is enabled for that planet's landscape.
> >> --BM
> >> @@ -429,7 +460,7 @@
> >>
>  ui->deleteLocationFromListPushButton->setEnabled(locationMgr.canDeleteUserLocation(loc.getID()));
> >>  }
> >>
> >> -// Called when the user clic on the save button
> >> +// Called when the user clicks on the save button
> >>  void LocationDialog::addCurrentLocationToList()
> >>  {
> >>      const StelLocation& loc = locationFromFields();
> >> @@ -487,3 +518,42 @@
> >>      ui->useAsDefaultLocationCheckBox->setEnabled(!currentIsDefault);
> >>      ui->pushButtonReturnToDefault->setEnabled(!currentIsDefault);
> >>  }
> >> +
> >> +// called when the user clicks on the IP Query button
> >> +void LocationDialog::ipQueryLocation()
> >> +{
> >> +    StelLocationMgr &locMgr=StelApp::getInstance().getLocationMgr();
> >> +    locMgr.locationFromIP(); // This just triggers asynchronous lookup.
> >> +    ui->citySearchLineEdit->setFocus();
> >> +}
> >> +
> >> +// called when user clicks "reset list"
> >> +void LocationDialog::resetCompleteList()
> >> +{
> >> +    QSortFilterProxyModel *proxyModel = new
> QSortFilterProxyModel(this);
> >> +
>  proxyModel->setSourceModel((QAbstractItemModel*)StelApp::getInstance().getLocationMgr().getModelAll());
> >> +    proxyModel->sort(0, Qt::AscendingOrder);
> >> +    proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
> >> +    ui->citiesListView->setModel(proxyModel);
> >> +    ui->citySearchLineEdit->clear();
> >> +    connect(ui->citySearchLineEdit, SIGNAL(textChanged(const
> QString&)),
> >> proxyModel, SLOT(setFilterWildcard(const QString&)));
> >> +    ui->citySearchLineEdit->setFocus();
> >> +}
> >> +
> >> +// called when user clicks in the country combobox and selects a
> >> country. The locations in the list are updated to select only sites in
> >> that country.
> >> +void LocationDialog::filterSitesByCountry()
> >> +{
> >> +    QString country=ui->countryNameComboBox->currentData().toString();
> >> +    QSortFilterProxyModel *proxyModel = new
> QSortFilterProxyModel(this);
> >> +    StelLocationMgr &locMgr=StelApp::getInstance().getLocationMgr();
> >> +
> >> +    locMgr.pickLocationsInCountry(country);
> >> +
>  proxyModel->setSourceModel((QAbstractItemModel*)locMgr.getModelPicked());
> >> +
> >> +    proxyModel->sort(0, Qt::AscendingOrder);
> >> +    proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
> >> +    ui->citiesListView->setModel(proxyModel);
> >> +    ui->citySearchLineEdit->clear();
> >> +    connect(ui->citySearchLineEdit, SIGNAL(textChanged(const
> QString&)),
> >> proxyModel, SLOT(setFilterWildcard(const QString&)));
> >> +    ui->citySearchLineEdit->setFocus();
> >> +}
> >>
> >> === modified file 'src/gui/LocationDialog.hpp'
> >> --- src/gui/LocationDialog.hpp       2013-10-14 09:27:54 +0000
> >> +++ src/gui/LocationDialog.hpp       2014-07-20 13:42:31 +0000
> >> @@ -82,6 +82,7 @@
> >>      void updateFromProgram(const StelLocation& location);
> >>
> >>      //! Called when the map is clicked.
> >> +    //! GZ_New: create new list for places nearby and feed into
> location
> >> list box.
> >>      void setPositionFromMap(double longitude, double latitude);
> >>
> >>      //! Called when the user activates an item from the locations list.
> >> @@ -97,6 +98,15 @@
> >>
> >>      //! Called when the user clicks on the delete button
> >>      void deleteCurrentLocationFromList();
> >> +
> >> +    //! filter city list to show entries from single country only
> >> +    void filterSitesByCountry();
> >> +
> >> +    //! reset city list to complete list (may have been reduced to
> picked
> >> list)
> >> +    void resetCompleteList();
> >> +
> >> +    //! called when the user clicks on the IP Query button
> >> +    void ipQueryLocation();
> >>
> >>      //! Called when the user wants to use the current location as
> default
> >>      void setDefaultLocation();
> >>
> >> === modified file 'src/gui/locationDialogGui.ui'
> >> --- src/gui/locationDialogGui.ui     2014-06-16 13:43:31 +0000
> >> +++ src/gui/locationDialogGui.ui     2014-07-20 13:42:31 +0000
> >> @@ -359,6 +359,16 @@
> >>                </property>
> >>               </widget>
> >>              </item>
> >> +            <item>
> >> +             <widget class="QPushButton" name="resetListPushButton">
> >> +              <property name="toolTip">
> >> +               <string>Reset location list to show all known
> >> locations</string>
> >> +              </property>
> >> +              <property name="text">
> >> +               <string>Reset Location List</string>
> >> +              </property>
> >> +             </widget>
> >> +            </item>
> >>             </layout>
> >>            </widget>
> >>           </item>
> >> @@ -449,6 +459,22 @@
> >>               </spacer>
> >>              </item>
> >>              <item>
> >> +             <widget class="QPushButton" name="ipQueryPushButton">
> >> +              <property name="minimumSize">
> >> +               <size>
> >> +                <width>30</width>
> >> +                <height>0</height>
> >> +               </size>
> >> +              </property>
> >> +              <property name="toolTip">
> >> +               <string>Use online service to find approximate location
> >> based on your IP address</string>
> >> +              </property>
> >> +              <property name="text">
> >> +               <string>IP Query</string>
> >> +              </property>
> >> +             </widget>
> >> +            </item>
> >> +            <item>
> >>               <widget class="QPushButton"
> >> name="deleteLocationFromListPushButton">
> >>                <property name="enabled">
> >>                 <bool>false</bool>
> >>
> >
> >
> > --
> >
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
> > You are the owner of lp:~georg-zotti/stellarium/ip-query-location.
> >
>
>
>
> --
>
> https://code.launchpad.net/~georg-zotti/stellarium/ip-query-location/+merge/227418
> You are reviewing the proposed merge of
> lp:~georg-zotti/stellarium/ip-query-location into lp:stellarium.
>

Revision history for this message

gzotti (georg-zotti) wrote on 2014-07-26: Posted in a previous version of this proposal

#

Download full text (3.3 KiB)

Dear Fabien,

thanks for your friendly words.

I know "IP query" is very technical. But what to write on a 6-letter
button? Else, the button must stretch over the whole window, I did not
want to make it too intrusive. If there is space, it should be
"approximate location", my own query is about 50km off... But it's still
quite a good start.

A default IP lookup for new installs seems fine, as long as there remains
a fallback location in case someone travels to his offline PC with an USB
stick with the latest version. (When I traveled to Namibia for some
astrophotos with a Stellarium-guided telescope, my Atom netbook was also
definitely offline...)

Having the always-auto-lookup-at-start feature is OK. But It must be
possible to set and keep a home position as well, even if we are online at
startup. (And if somebody in Paris is happy with startup location, he will
be surprised to find his place renamed to IPxxxx :-)

The other changes are with finding a location near map-click point and
with the country/planet comboboxes. I think they are much more functional
now. What may still be done is to deactivate and empty the country box if
we are not on Earth.

My short slot of time is unfortunately over for this weekend. So, if you
like it, please merge and feel free to tweak these small details.

I just tried your brother's no-bit-field branch. It compiles on my Atom
450 netbook (MSVC2012/Angle; takes ages...), but the shader programs are
too long. I cannot find any info on how to programmatically check shader
support from the GPU: is Angle limited to pixelshader2, vertexshader2 and
fails on every system, or would it compile ps_3, vs_3 if the graphics card
supports this? Going for Angle was the hope to support simpler/older
hardware, so if there would be a way to support ps_2+vs_2 hardware like
Atom or older Radeon or Intel GMA by utilizing simpler shader programs
(e.g. no ring shadows, normal maps, etc.?) after some tests, there would
be less users having to use super-slow MESA. (But I'm happy at least MESA
is a stable fallback...)

What I still don't know is why my both NVidias on WinXP fail. Both should
support OpenGL3.3.

Kind regards,
Georg

On Sa, 26.07.2014, 18:24, Fabien Chéreau wrote:
> Hi Georg,
>
> now that I'm back from holidays, I could acutally try the code, and I have
> some more general comments about your (very very good!) work:
>
> - we should rename "IP Query" to something less technical, like "Get
> location from Network"
>
> - I think the IP location is such an improvement that it should be the
> default for all new install, and also probably used by default for
> installs
> where the location was never set (set to Paris). This would imply that we
> transform at startup all older config.ini from location = Paris, France to
> location = auto. And use this "auto" value to trigger IP Lookup instead of
> adding a new "init_location/use_ip_geolocation_if_available" key.
>
> - Also when the lookup is successful, we could save the last know location
> into an "init_location/last_resort_location" for the next time we start
> without network.
>
> Sorry to give these feedbacks so late, I hope they make sense, what do you
> think? In ...

Stellarium

Merge lp:~stellarium/stellarium/ip-query-location into lp:stellarium

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'data/default_config.ini.cmake'
 --- data/default_config.ini.cmake	2014-07-31 19:02:38 +0000
 +++ data/default_config.ini.cmake	2014-08-08 12:24:49 +0000
@@ -242,7 +242,7 @@
  nebula_magnitude_limit              = 8.5
  [init_location]
--location                            = Paris, France
++location                            = auto
  landscape_name                      = guereins
  [files]
 === modified file 'src/core/StelCore.cpp'
 --- src/core/StelCore.cpp	2014-04-14 17:55:46 +0000
 +++ src/core/StelCore.cpp	2014-08-08 12:24:49 +0000
@@ -111,10 +111,19 @@
+ {
  	QSettings* conf = StelApp::getInstance().getSettings();
--	defaultLocationID = conf->value("init_location/location","error").toString();
++	defaultLocationID = conf->value("init_location/location", "auto").toString();
  	bool ok;
  	StelLocationMgr* locationMgr = &StelApp::getInstance().getLocationMgr();
--	StelLocation location = locationMgr->locationForString(defaultLocationID);
++	StelLocation location;
++	if (defaultLocationID == "auto")
++	{
++		locationMgr->locationFromIP();
++	}
++	else
++	{
++		location = locationMgr->locationForString(defaultLocationID);
++	}
++
  	if (!location.isValid())
+ 	{
  		qWarning() << "Warning: location" << defaultLocationID << "is unknown.";
 === modified file 'src/core/StelLocation.cpp'
 --- src/core/StelLocation.cpp	2014-02-15 15:37:23 +0000
 +++ src/core/StelLocation.cpp	2014-08-08 12:24:49 +0000
@@ -125,3 +125,10 @@
  	return loc;
+ }
++// Compute great-circle distance between two locations
++float StelLocation::distanceDegrees(const float long1, const float lat1, const float long2, const float lat2)
++{
++	const float DEGREES=M_PI/180.0f;
++	return std::acos( std::sin(lat1*DEGREES)*std::sin(lat2*DEGREES) +
++					  std::cos(lat1*DEGREES)*std::cos(lat2*DEGREES)*std::cos((long1-long2)*DEGREES) ) / DEGREES;
++}
 === modified file 'src/core/StelLocation.hpp'
 --- src/core/StelLocation.hpp	2014-04-15 17:10:07 +0000
 +++ src/core/StelLocation.hpp	2014-08-08 12:24:49 +0000
@@ -74,6 +74,9 @@
  	//! Parse a location from a line serialization
  	static StelLocation createFromLine(const QString& line);
++	//! Compute great-circle distance between two locations
++	static float distanceDegrees(const float long1, const float lat1, const float long2, const float lat2);
++
  	//! Used privately by the StelLocationMgr
  	bool isUserLocation;
 === modified file 'src/core/StelLocationMgr.cpp'
 --- src/core/StelLocationMgr.cpp	2014-06-12 15:47:22 +0000
 +++ src/core/StelLocationMgr.cpp	2014-08-08 12:24:49 +0000
@@ -17,6 +17,7 @@
   */
  #include "StelApp.hpp"
++#include "StelCore.hpp"
  #include "StelFileMgr.hpp"
  #include "StelLocationMgr.hpp"
  #include "StelUtils.hpp"
@@ -25,9 +26,18 @@
  #include <QDebug>
  #include <QFile>
  #include <QDir>
++#include <QtNetwork/QNetworkInterface>
++#include <QtNetwork/QNetworkAccessManager>
++#include <QNetworkRequest>
++#include <QNetworkReply>
++#include <QUrl>
++#include <QUrlQuery>
++#include <QSettings>
  StelLocationMgr::StelLocationMgr()
+ {
++	QSettings* conf = StelApp::getInstance().getSettings();
++
  	// The line below allows to re-generate the location file, you still need to gunzip it manually afterward.
  	// generateBinaryLocationFile("data/base_locations.txt", false, "data/base_locations.bin");
@@ -36,9 +46,10 @@
  	modelAllLocation = new QStringListModel(this);
  	modelAllLocation->setStringList(locations.keys());
++	modelPickedLocation = new QStringListModel(this); // keep empty for now.
  	// Init to Paris France because it's the center of the world.
--	lastResortLocation = locationForString("Paris, France");
++	lastResortLocation = locationForString(conf->value("init_location/last_location", "Paris, France").toString());
+ }
  void StelLocationMgr::generateBinaryLocationFile(const QString& fileName, bool isUserLocation, const QString& binFilePath) const
@@ -144,6 +155,10 @@
  StelLocationMgr::~StelLocationMgr()
+ {
++	delete modelPickedLocation;
++	modelPickedLocation=NULL;
++	delete modelAllLocation;
++	modelAllLocation=NULL;
+ }
  static float parseAngle(const QString& s, bool* ok)
@@ -307,3 +322,102 @@
  	sourcefile.close();
  	return true;
+ }
++
++// lookup location from IP address.
++void StelLocationMgr::locationFromIP()
++{
++	QNetworkRequest req( QUrl( QString("http://freegeoip.net/csv/") ) );
++	networkReply=StelApp::getInstance().getNetworkAccessManager()->get(req);
++	connect(networkReply, SIGNAL(finished()), this, SLOT(changeLocationFromNetworkLookup()));
++}
++
++// slot that receives IP-based location data from the network.
++void StelLocationMgr::changeLocationFromNetworkLookup()
++{
++	StelLocation location;
++	StelCore *core=StelApp::getInstance().getCore();
++	if (networkReply->error() == QNetworkReply::NoError) {
++		//success
++		// Tested with and without working network connection.
++		QByteArray answer=networkReply->readAll();
++		// answer/splitline example: "222.222.222.222","AT","Austria","","","","","47.3333","13.3333","",""
++		// The parts from freegeoip are: ip,country_code,country_name,region_code,region_name,city,zipcode,latitude,longitude,metro_code,area_code
++		// longitude and latitude should always be filled.
++		// A few tests:
++		if ((answer.count('"') != 22 ) || (answer.count(',') != 10 ))
++		{
++			qDebug() << "StelLocationMgr: Malformatted answer in IP-based location lookup: \n\t" << answer;
++			qDebug() << "StelLocationMgr: Will not change location.";
++			networkReply->deleteLater();
++			return;
++		}
++		const QStringList& splitline = QString(answer).split(",");
++		if (splitline.count() != 11 )
++		{
++			qDebug() << "StelLocationMgr: Unexpected answer in IP-based location lookup: \n\t" << answer;
++			qDebug() << "StelLocationMgr: Will not change location.";
++			networkReply->deleteLater();
++			return;
++		}
++		if ((splitline.at(7)=="\"\"") || (splitline.at(8)=="\"\"")) // empty coordinates?
++		{
++			qDebug() << "StelLocationMgr: Invalid coordinates from IP-based lookup. Ignoring: \n\t" << answer;
++			networkReply->deleteLater();
++			return;
++		}
++		float latitude=splitline.at(7).mid(1, splitline.at(7).length()-2).toFloat();
++		float longitude=splitline.at(8).mid(1, splitline.at(8).length()-2).toFloat();
++		QString locLine= // we re-pack into a new line that will be parsed back by StelLocation...
++				QString("%1\t%2\t%3\t%4\t%5\t%6\t%7\t0")
++				.arg(splitline.at(5).length()>2 ? splitline.at(5).mid(1, splitline.at(5).length()-2)  : QString("IP%1").arg(splitline.at(0).mid(1, splitline.at(0).length()-2)))
++				.arg(splitline.at(4).length()>2 ? splitline.at(4).mid(1, splitline.at(4).length()-2)  : "IPregion")
++				.arg(splitline.at(2).length()>2 ? splitline.at(2).mid(1, splitline.at(2).length()-2) : "IPcountry") // country
++				.arg("X") // role: X=user-defined
++				.arg(0)   // population: unknown
++				.arg(latitude<0 ? QString("%1S").arg(-latitude, 0, 'f', 6) : QString("%1N").arg(latitude, 0, 'f', 6))
++				.arg(longitude<0 ? QString("%1W").arg(-longitude, 0, 'f', 6) : QString("%1E").arg(longitude, 0, 'f', 6));
++		location=StelLocation::createFromLine(locLine); // in lack of a regular constructor ;-)
++		core->moveObserverTo(location, 0.0f, 0.0f);
++		QSettings* conf = StelApp::getInstance().getSettings();
++		conf->setValue("init_location/last_location", QString("%1, %2").arg(latitude).arg(longitude));
++	}
++	else
++	{
++		qDebug() << "Failure getting IP-based location: \n\t" <<networkReply->errorString();
++		core->moveObserverTo(lastResortLocation, 0.0f, 0.0f);
++	}
++	networkReply->deleteLater();
++}
++
++void StelLocationMgr::pickLocationsNearby(const QString planetName, const float longitude, const float latitude, const float radiusDegrees)
++{
++	pickedLocations.clear();
++	QMapIterator<QString, StelLocation> iter(locations);
++	while (iter.hasNext())
++	{
++		iter.next();
++		const StelLocation *loc=&iter.value();
++		if ( (loc->planetName == planetName) &&
++				(StelLocation::distanceDegrees(longitude, latitude, loc->longitude, loc->latitude) <= radiusDegrees) )
++		{
++			pickedLocations.insert(iter.key(), iter.value());
++		}
++	}
++	modelPickedLocation->setStringList(pickedLocations.keys());
++}
++
++void StelLocationMgr::pickLocationsInCountry(const QString country)
++{
++	pickedLocations.clear();
++	QMapIterator<QString, StelLocation> iter(locations);
++	while (iter.hasNext())
++	{
++		iter.next();
++		const StelLocation *loc=&iter.value();
++		if (loc->country == country)
++		{
++			pickedLocations.insert(iter.key(), iter.value());
++		}
++	}
++	modelPickedLocation->setStringList(pickedLocations.keys());
++}
 === modified file 'src/core/StelLocationMgr.hpp'
 --- src/core/StelLocationMgr.hpp	2013-10-14 07:43:06 +0000
 +++ src/core/StelLocationMgr.hpp	2014-08-08 12:24:49 +0000
@@ -26,6 +26,7 @@
  #include <QMap>
  class QStringListModel;
++class QNetworkReply;
  //! @class StelLocationMgr
  //! Manage the list of available location.
@@ -41,6 +42,8 @@
  	//! Return the model containing all the city
  	QStringListModel* getModelAll() {return modelAllLocation;}
++	//! Return the model containing picked (nearby) cities or cities from a single country, or other preselection.
++	QStringListModel* getModelPicked() {return modelPickedLocation;}
  	//! Return the list of all loaded locations
  	QList<StelLocation> getAll() const {return locations.values();}
@@ -70,6 +73,20 @@
  	//! @param id the location ID
  	bool deleteUserLocation(const QString& id);
++	//! Find location via online lookup of IP address
++	void locationFromIP();
++
++	//! Preselect list of locations within @param radiusDegrees of selected (usually screen-clicked) coordinates.
++	//! The list can be retrieved by calling @name getModelPicked().
++	void pickLocationsNearby(const QString planetName, const float longitude, const float latitude, const float radiusDegrees);
++	//! Preselect list of locations in a particular country only.
++	//! The list can be retrieved by calling @name getModelPicked().
++	void pickLocationsInCountry(const QString country);
++
++public slots:
++	//! Process answer from online lookup of IP address
++	void changeLocationFromNetworkLookup();
++
  private:
  	void generateBinaryLocationFile(const QString& txtFile, bool isUserLocation, const QString& binFile) const;
@@ -79,11 +96,19 @@
  	//! Model containing all the city information
  	QStringListModel* modelAllLocation;
++	//! Model containing selected city information
++	QStringListModel* modelPickedLocation;
  	//! The list of all loaded locations
  	QMap<QString, StelLocation> locations;
++	//! A list of locations generated on-the-fly by filtering from @name locations
++	QMap<QString, StelLocation> pickedLocations;
  	StelLocation lastResortLocation;
++
++	//! For IP-based location lookup
++	QNetworkReply *networkReply;
++
  };
  #endif // _STELLOCATIONMGR_HPP_
 === modified file 'src/core/StelUtils.cpp'
 --- src/core/StelUtils.cpp	2014-07-05 15:16:58 +0000
 +++ src/core/StelUtils.cpp	2014-08-08 12:24:49 +0000
@@ -370,6 +370,40 @@
  	return str;
+ }
++void decDegToDms(double angle, bool &sign, unsigned int &d, unsigned int &m, double &s)
++{
++	sign = true;
++	if (angle<0.)
++	{
++		sign = false;
++		angle *= -1;
++	}
++
++	d = (unsigned int)angle;
++	m = (unsigned int)((angle-d)*60);
++	s = (angle-d)*3600.-60.*m;
++
++	if (s==60.)
++	{
++		s = 0.;
++		m += 1;
++	}
++	if (m==60)
++	{
++		m = 0;
++		d += 1;
++	}
++}
++
++// Convert an angle in decimal degrees to a dms formatted string
++QString decDegToDmsStr(const double angle)
++{
++	bool sign;
++	double s;
++	unsigned int d, m;
++	decDegToDms(angle, sign, d, m, s);
++	return QString("%1%2%3%4\'%5\"").arg(sign?'+':'-').arg(d).arg(QChar(0x00B0)).arg(m,2,10,QLatin1Char('0')).arg((unsigned int)s,2,10,QLatin1Char('0'));
++}
  // Convert a dms formatted string to an angle in radian
  double dmsStrToRad(const QString& s)
 === modified file 'src/core/StelUtils.hpp'
 --- src/core/StelUtils.hpp	2014-06-22 14:08:40 +0000
 +++ src/core/StelUtils.hpp	2014-08-08 12:24:49 +0000
@@ -99,6 +99,18 @@
  	//! @param decimal output decimal second value
  	QString radToDmsStr(const double angle, const bool decimal=false, const bool useD=false);
++	//! Convert an angle in decimal degree to +-dms format.
++	//! @param angle input angle in decimal degree
++	//! @param sign true if positive, false otherwise
++	//! @param d degree component
++	//! @param m minute component
++	//! @param s second component
++	void decDegToDms(double angle, bool& sign, unsigned int& d, unsigned int& m, double& s);
++
++	//! Convert an angle in decimal degrees to a dms formatted string.
++	//! @param angle input angle in decimal degrees
++	QString decDegToDmsStr(const double angle);
++
  	//! Convert a dms formatted string to an angle in radian
  	//! @param s The input string
  	double dmsStrToRad(const QString& s);
 === modified file 'src/gui/LocationDialog.cpp'
 --- src/gui/LocationDialog.cpp	2014-03-21 18:03:55 +0000
 +++ src/gui/LocationDialog.cpp	2014-08-08 12:24:49 +0000
@@ -99,22 +99,30 @@
  	connect(ui->mapLabel, SIGNAL(positionChanged(double, double)), this, SLOT(setPositionFromMap(double, double)));
  	connect(ui->addLocationToListPushButton, SIGNAL(clicked()), this, SLOT(addCurrentLocationToList()));
--	connect(ui->deleteLocationFromListPushButton, SIGNAL(clicked()), this, SLOT(deleteCurrentLocationFromList()));
++	connect(ui->deleteLocationFromListPushButton, SIGNAL(clicked()), this, SLOT(deleteCurrentLocationFromList()));
++	connect(ui->resetListPushButton, SIGNAL(clicked()), this, SLOT(resetCompleteList()));
++	connect(ui->countryNameComboBox, SIGNAL(activated(const QString &)), this, SLOT(filterSitesByCountry()));
  	StelCore* core = StelApp::getInstance().getCore();
  	const StelLocation& currentLocation = core->getCurrentLocation();
++	bool b = (currentLocation.getID() == core->getDefaultLocationID());
++	QSettings* conf = StelApp::getInstance().getSettings();
++	if (conf->value("init_location/location", "auto").toString() == "auto")
++	{
++		ui->useIpQueryCheckBox->setChecked(true);
++		b = false;
++	}
++
  	setFieldsFromLocation(currentLocation);
--
--	const bool b = (currentLocation.getID() == core->getDefaultLocationID());
  	updateDefaultLocationControls(b);
--	connect(ui->useAsDefaultLocationCheckBox, SIGNAL(clicked()), this, SLOT(setDefaultLocation()));
--	connect(ui->pushButtonReturnToDefault, SIGNAL(clicked()),
--	        core, SLOT(returnToDefaultLocation()));
++
++	connect(ui->useIpQueryCheckBox, SIGNAL(clicked(bool)), this, SLOT(ipQueryLocation(bool)));
++	connect(ui->useAsDefaultLocationCheckBox, SIGNAL(clicked(bool)), this, SLOT(setDefaultLocation(bool)));
++	connect(ui->pushButtonReturnToDefault, SIGNAL(clicked()), core, SLOT(returnToDefaultLocation()));
  	connectEditSignals();
--	connect(core, SIGNAL(locationChanged(StelLocation)),
--	        this, SLOT(updateFromProgram(StelLocation)));
++	connect(core, SIGNAL(locationChanged(StelLocation)), this, SLOT(updateFromProgram(StelLocation)));
  	ui->citySearchLineEdit->setFocus();
+ }
@@ -138,7 +146,12 @@
  	// Check that the use as default check box needs to be updated
  	// Move to setFieldsFromLocation()? --BM?
  	const bool b = currentLocation.getID() == stelCore->getDefaultLocationID();
--	updateDefaultLocationControls(b);
++	QSettings* conf = StelApp::getInstance().getSettings();
++	if (conf->value("init_location/location", "auto").toString() != ("auto"))
++	{
++		updateDefaultLocationControls(b);
++		ui->pushButtonReturnToDefault->setEnabled(!b);
++	}
  	const QString& key1 = currentLocation.getID();
  	const QString& key2 = locationFromFields().getID();
@@ -169,8 +182,7 @@
  	disconnect(ui->countryNameComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(reportEdit()));
  	// Why an edit should be reported even if the country is not changed? --BM
  	//disconnect(ui->countryNameComboBox, SIGNAL(activated(const QString&)), this, SLOT(comboBoxChanged(const QString&)));
--	disconnect(ui->cityNameLineEdit, SIGNAL(textEdited(const QString&)),
--	           this, SLOT(reportEdit()));
++	disconnect(ui->cityNameLineEdit, SIGNAL(textEdited(const QString&)), this, SLOT(reportEdit()));
+ }
  void LocationDialog::connectEditSignals()
@@ -182,8 +194,7 @@
  	connect(ui->countryNameComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(reportEdit()));
  	// Why an edit should be reported even if the country is not changed? --BM
  	//connect(ui->countryNameComboBox, SIGNAL(activated(const QString&)), this, SLOT(comboBoxChanged(const QString&)));
--	connect(ui->cityNameLineEdit, SIGNAL(textEdited(const QString&)),
--	        this, SLOT(reportEdit()));
++	connect(ui->cityNameLineEdit, SIGNAL(textEdited(const QString&)), this, SLOT(reportEdit()));
+ }
  void LocationDialog::setFieldsFromLocation(const StelLocation& loc)
@@ -235,7 +246,7 @@
  // Update the map for the given location.
  void LocationDialog::setMapForLocation(const StelLocation& loc)
+ {
--	// Avoids usless processing
++	// Avoids useless processing
  	if (lastPlanet==loc.planetName)
  		return;
@@ -358,6 +369,15 @@
  	loc.longitude = longitude;
  	setFieldsFromLocation(loc);
  	StelApp::getInstance().getCore()->moveObserverTo(loc, 0.);
++	// GZ: Filter location list for nearby sites. I assume Earth locations are better known. With only few locations on other planets in the list, 30 degrees seem OK.
++	StelApp::getInstance().getLocationMgr().pickLocationsNearby(loc.planetName, longitude, latitude, loc.planetName=="Earth" ? 3.0f: 30.0f);
++	QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
++	proxyModel->setSourceModel((QAbstractItemModel*)StelApp::getInstance().getLocationMgr().getModelPicked());
++	proxyModel->sort(0, Qt::AscendingOrder);
++	proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
++	ui->citiesListView->setModel(proxyModel);
++	ui->citySearchLineEdit->clear();
++	connect(ui->citySearchLineEdit, SIGNAL(textChanged(const QString&)), proxyModel, SLOT(setFilterWildcard(const QString&)));
+ }
  // Called when the planet name is changed by hand
@@ -380,6 +400,24 @@
  				ls->setCurrentLandscapeID(ls->getDefaultLandscapeID());
+ 		}
++		// GZ populate site list with sites only from that planet, or full list for Earth (faster than removing the ~50 non-Earth positions...).
++		StelLocationMgr &locMgr=StelApp::getInstance().getLocationMgr();
++		QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
++		if (loc.planetName == "Earth")
++		{
++			proxyModel->setSourceModel((QAbstractItemModel*)locMgr.getModelAll());
++		}
++		else
++		{
++			locMgr.pickLocationsNearby(loc.planetName, 0.0f, 0.0f, 180.0f);
++			proxyModel->setSourceModel((QAbstractItemModel*)locMgr.getModelPicked());
++		}
++		proxyModel->sort(0, Qt::AscendingOrder);
++		proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
++		ui->citiesListView->setModel(proxyModel);
++		ui->citySearchLineEdit->clear();
++		connect(ui->citySearchLineEdit, SIGNAL(textChanged(const QString&)), proxyModel, SLOT(setFilterWildcard(const QString&)));
++		ui->citySearchLineEdit->setFocus();
+ 	}
  	// Planet transition time also set to null to prevent uglyness when
  	// "use landscape location" is enabled for that planet's landscape. --BM
@@ -429,7 +467,7 @@
  	ui->deleteLocationFromListPushButton->setEnabled(locationMgr.canDeleteUserLocation(loc.getID()));
+ }
--// Called when the user clic on the save button
++// Called when the user clicks on the save button
  void LocationDialog::addCurrentLocationToList()
+ {
  	const StelLocation& loc = locationFromFields();
@@ -456,22 +494,27 @@
+ }
  // Called when the user wants to use the current location as default
--void LocationDialog::setDefaultLocation()
++void LocationDialog::setDefaultLocation(bool state)
+ {
--	StelCore* core = StelApp::getInstance().getCore();
--	QString currentLocationId = core->getCurrentLocation().getID();
--	core->setDefaultLocationID(currentLocationId);
++	if (state)
++	{
++		StelCore* core = StelApp::getInstance().getCore();
++		QString currentLocationId = core->getCurrentLocation().getID();
++		core->setDefaultLocationID(currentLocationId);
--	// Why this code even exists? After the previous code, this should always
--	// be true, except if setting the default location somehow fails. --BM
--	bool isDefault = (currentLocationId == core->getDefaultLocationID());
--	disconnectEditSignals();
--	updateDefaultLocationControls(isDefault);
--	//The focus need to be switched to another control, otherwise
--	//ui->latitudeSpinBox receives it and emits a valueChanged() signal when
--	//the window is closed.
--	ui->citySearchLineEdit->setFocus();
--	connectEditSignals();
++		// Why this code even exists? After the previous code, this should always
++		// be true, except if setting the default location somehow fails. --BM
++		bool isDefault = (currentLocationId == core->getDefaultLocationID());
++		disconnectEditSignals();
++		updateDefaultLocationControls(isDefault);
++		ui->pushButtonReturnToDefault->setEnabled(!isDefault);
++		ui->useIpQueryCheckBox->setChecked(!state);
++		//The focus need to be switched to another control, otherwise
++		//ui->latitudeSpinBox receives it and emits a valueChanged() signal when
++		//the window is closed.
++		ui->citySearchLineEdit->setFocus();
++		connectEditSignals();
++	}
+ }
  // Called when the user clicks on the delete button
@@ -484,6 +527,54 @@
  void LocationDialog::updateDefaultLocationControls(bool currentIsDefault)
+ {
  	ui->useAsDefaultLocationCheckBox->setChecked(currentIsDefault);
--	ui->useAsDefaultLocationCheckBox->setEnabled(!currentIsDefault);
--	ui->pushButtonReturnToDefault->setEnabled(!currentIsDefault);
++	ui->useAsDefaultLocationCheckBox->setEnabled(!currentIsDefault);
++}
++
++// called when the user clicks on the IP Query button
++void LocationDialog::ipQueryLocation(bool state)
++{
++	if (state)
++	{
++		QSettings* conf = StelApp::getInstance().getSettings();
++		conf->setValue("init_location/location", "auto");
++		disconnectEditSignals();
++		resetCompleteList(); // in case we are on Moon/Mars, we must get list back to show all (earth) locations...
++		StelLocationMgr &locMgr=StelApp::getInstance().getLocationMgr();
++		locMgr.locationFromIP(); // This just triggers asynchronous lookup.
++		ui->useAsDefaultLocationCheckBox->setChecked(!state);
++		ui->pushButtonReturnToDefault->setEnabled(!state);
++		connectEditSignals();
++		ui->citySearchLineEdit->setFocus();
++	}
++}
++
++// called when user clicks "reset list"
++void LocationDialog::resetCompleteList()
++{
++	QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
++	proxyModel->setSourceModel((QAbstractItemModel*)StelApp::getInstance().getLocationMgr().getModelAll());
++	proxyModel->sort(0, Qt::AscendingOrder);
++	proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
++	ui->citiesListView->setModel(proxyModel);
++	ui->citySearchLineEdit->clear();
++	connect(ui->citySearchLineEdit, SIGNAL(textChanged(const QString&)), proxyModel, SLOT(setFilterWildcard(const QString&)));
++	ui->citySearchLineEdit->setFocus();
++}
++
++// called when user clicks in the country combobox and selects a country. The locations in the list are updated to select only sites in that country.
++void LocationDialog::filterSitesByCountry()
++{
++	QString country=ui->countryNameComboBox->currentData().toString();
++	QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
++	StelLocationMgr &locMgr=StelApp::getInstance().getLocationMgr();
++
++	locMgr.pickLocationsInCountry(country);
++	proxyModel->setSourceModel((QAbstractItemModel*)locMgr.getModelPicked());
++
++	proxyModel->sort(0, Qt::AscendingOrder);
++	proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
++	ui->citiesListView->setModel(proxyModel);
++	ui->citySearchLineEdit->clear();
++	connect(ui->citySearchLineEdit, SIGNAL(textChanged(const QString&)), proxyModel, SLOT(setFilterWildcard(const QString&)));
++	ui->citySearchLineEdit->setFocus();
+ }
 === modified file 'src/gui/LocationDialog.hpp'
 --- src/gui/LocationDialog.hpp	2013-10-14 09:27:54 +0000
 +++ src/gui/LocationDialog.hpp	2014-08-08 12:24:49 +0000
@@ -82,6 +82,7 @@
  	void updateFromProgram(const StelLocation& location);
  	//! Called when the map is clicked.
++	//! GZ_New: create new list for places nearby and feed into location list box.
  	void setPositionFromMap(double longitude, double latitude);
  	//! Called when the user activates an item from the locations list.
@@ -97,9 +98,18 @@
  	//! Called when the user clicks on the delete button
  	void deleteCurrentLocationFromList();
++
++	//! filter city list to show entries from single country only
++	void filterSitesByCountry();
++
++	//! reset city list to complete list (may have been reduced to picked list)
++	void resetCompleteList();
++
++	//! called when the user wants get location from network
++	void ipQueryLocation(bool state);
  	//! Called when the user wants to use the current location as default
--	void setDefaultLocation();
++	void setDefaultLocation(bool state);
  private:
  	QString lastPlanet;
 === modified file 'src/gui/StelGuiItems.cpp'
 --- src/gui/StelGuiItems.cpp	2014-06-09 01:02:28 +0000
 +++ src/gui/StelGuiItems.cpp	2014-08-08 12:24:49 +0000
@@ -579,9 +579,7 @@
+ 	}
  	if (flagShowLocation && loc->name.isEmpty())
+ 	{
--		newLocation = q_(loc->planetName)+", "
--		        +StelUtils::radToDmsStr(loc->latitude)+", "
--		        +StelUtils::radToDmsStr(loc->longitude);
++		newLocation = q_(loc->planetName)+", "+StelUtils::decDegToDmsStr(loc->latitude)+", "+StelUtils::decDegToDmsStr(loc->longitude);
+ 	}
  	if (location->text()!=newLocation)
+ 	{
@@ -593,12 +591,18 @@
  		if (lat >= 0)
  			pm = "N";
  		else
++		{
  			pm = "S";
++			lat *= -1;
++		}
  		latStr = QString("%1%2%3").arg(pm).arg(lat).arg(QChar(0x00B0));
--		if (lat >= 0)
++		if (lon >= 0)
  			pm = "E";
  		else
++		{
  			pm = "W";
++			lon *= -1;
++		}
  		lonStr = QString("%1%2%3").arg(pm).arg(lon).arg(QChar(0x00B0));
  		location->setToolTip(QString("%1 %2").arg(latStr).arg(lonStr));
+ 	}
 === modified file 'src/gui/locationDialogGui.ui'
 --- src/gui/locationDialogGui.ui	2014-06-16 13:43:31 +0000
 +++ src/gui/locationDialogGui.ui	2014-08-08 12:24:49 +0000
@@ -7,7 +7,7 @@
      <x>0</x>
      <y>0</y>
      <width>700</width>
--    <height>452</height>
++    <height>460</height>
     </rect>
    </property>
    <property name="styleSheet">
@@ -359,6 +359,16 @@
                </property>
               </widget>
              </item>
++            <item>
++             <widget class="QPushButton" name="resetListPushButton">
++              <property name="toolTip">
++               <string>Reset location list to show all known locations</string>
++              </property>
++              <property name="text">
++               <string>Reset Location List</string>
++              </property>
++             </widget>
++            </item>
             </layout>
            </widget>
           </item>
@@ -383,113 +393,20 @@
           <property name="bottomMargin">
            <number>0</number>
           </property>
--         <item row="2" column="0" colspan="3">
--          <widget class="QFrame" name="frame_3">
--           <property name="minimumSize">
++         <item row="1" column="2" colspan="2">
++          <spacer name="verticalSpacer">
++           <property name="orientation">
++            <enum>Qt::Vertical</enum>
++           </property>
++           <property name="sizeHint" stdset="0">
              <size>
--             <width>0</width>
--             <height>0</height>
++             <width>20</width>
++             <height>40</height>
              </size>
             </property>
--           <property name="frameShape">
--            <enum>QFrame::StyledPanel</enum>
--           </property>
--           <property name="frameShadow">
--            <enum>QFrame::Raised</enum>
--           </property>
--           <layout class="QHBoxLayout" name="horizontalLayout">
--            <property name="leftMargin">
--             <number>0</number>
--            </property>
--            <property name="topMargin">
--             <number>0</number>
--            </property>
--            <property name="rightMargin">
--             <number>0</number>
--            </property>
--            <property name="bottomMargin">
--             <number>0</number>
--            </property>
--            <item>
--             <widget class="QCheckBox" name="useAsDefaultLocationCheckBox">
--              <property name="font">
--               <font>
--                <stylestrategy>PreferDefault</stylestrategy>
--               </font>
--              </property>
--              <property name="focusPolicy">
--               <enum>Qt::NoFocus</enum>
--              </property>
--              <property name="text">
--               <string>Use as default</string>
--              </property>
--             </widget>
--            </item>
--            <item>
--             <widget class="QPushButton" name="pushButtonReturnToDefault">
--              <property name="focusPolicy">
--               <enum>Qt::NoFocus</enum>
--              </property>
--              <property name="text">
--               <string>Return to default</string>
--              </property>
--             </widget>
--            </item>
--            <item>
--             <spacer name="horizontalSpacer">
--              <property name="orientation">
--               <enum>Qt::Horizontal</enum>
--              </property>
--              <property name="sizeHint" stdset="0">
--               <size>
--                <width>40</width>
--                <height>20</height>
--               </size>
--              </property>
--             </spacer>
--            </item>
--            <item>
--             <widget class="QPushButton" name="deleteLocationFromListPushButton">
--              <property name="enabled">
--               <bool>false</bool>
--              </property>
--              <property name="minimumSize">
--               <size>
--                <width>60</width>
--                <height>0</height>
--               </size>
--              </property>
--              <property name="focusPolicy">
--               <enum>Qt::NoFocus</enum>
--              </property>
--              <property name="text">
--               <string>Delete</string>
--              </property>
--             </widget>
--            </item>
--            <item>
--             <widget class="QPushButton" name="addLocationToListPushButton">
--              <property name="enabled">
--               <bool>false</bool>
--              </property>
--              <property name="minimumSize">
--               <size>
--                <width>100</width>
--                <height>0</height>
--               </size>
--              </property>
--              <property name="focusPolicy">
--               <enum>Qt::NoFocus</enum>
--              </property>
--              <property name="text">
--               <string>Add to list</string>
--              </property>
--             </widget>
--            </item>
--           </layout>
--          </widget>
++          </spacer>
           </item>
--         <item row="0" column="0">
++         <item row="0" column="1">
            <widget class="QFrame" name="frame_4">
             <property name="minimumSize">
              <size>
@@ -603,7 +520,114 @@
             </layout>
            </widget>
           </item>
++         <item row="2" column="1" colspan="3">
++          <widget class="QFrame" name="frame_3">
++           <property name="minimumSize">
++            <size>
++             <width>0</width>
++             <height>0</height>
++            </size>
++           </property>
++           <property name="frameShape">
++            <enum>QFrame::StyledPanel</enum>
++           </property>
++           <property name="frameShadow">
++            <enum>QFrame::Raised</enum>
++           </property>
++           <layout class="QHBoxLayout" name="horizontalLayout">
++            <property name="leftMargin">
++             <number>0</number>
++            </property>
++            <property name="topMargin">
++             <number>0</number>
++            </property>
++            <property name="rightMargin">
++             <number>0</number>
++            </property>
++            <property name="bottomMargin">
++             <number>0</number>
++            </property>
++            <item>
++             <spacer name="horizontalSpacer">
++              <property name="orientation">
++               <enum>Qt::Horizontal</enum>
++              </property>
++              <property name="sizeHint" stdset="0">
++               <size>
++                <width>40</width>
++                <height>20</height>
++               </size>
++              </property>
++             </spacer>
++            </item>
++            <item>
++             <widget class="QPushButton" name="pushButtonReturnToDefault">
++              <property name="enabled">
++               <bool>false</bool>
++              </property>
++              <property name="focusPolicy">
++               <enum>Qt::NoFocus</enum>
++              </property>
++              <property name="text">
++               <string>Return to default location</string>
++              </property>
++             </widget>
++            </item>
++            <item>
++             <widget class="QPushButton" name="deleteLocationFromListPushButton">
++              <property name="enabled">
++               <bool>false</bool>
++              </property>
++              <property name="minimumSize">
++               <size>
++                <width>60</width>
++                <height>0</height>
++               </size>
++              </property>
++              <property name="focusPolicy">
++               <enum>Qt::NoFocus</enum>
++              </property>
++              <property name="text">
++               <string>Delete</string>
++              </property>
++             </widget>
++            </item>
++            <item>
++             <widget class="QPushButton" name="addLocationToListPushButton">
++              <property name="enabled">
++               <bool>false</bool>
++              </property>
++              <property name="minimumSize">
++               <size>
++                <width>100</width>
++                <height>0</height>
++               </size>
++              </property>
++              <property name="focusPolicy">
++               <enum>Qt::NoFocus</enum>
++              </property>
++              <property name="text">
++               <string>Add to list</string>
++              </property>
++             </widget>
++            </item>
++           </layout>
++          </widget>
++         </item>
           <item row="0" column="2">
++          <spacer name="horizontalSpacer_2">
++           <property name="orientation">
++            <enum>Qt::Horizontal</enum>
++           </property>
++           <property name="sizeHint" stdset="0">
++            <size>
++             <width>40</width>
++             <height>20</height>
++            </size>
++           </property>
++          </spacer>
++         </item>
++         <item row="0" column="3">
            <widget class="QFrame" name="frame_5">
             <property name="minimumSize">
              <size>
@@ -717,31 +741,19 @@
             </layout>
            </widget>
           </item>
--         <item row="1" column="1" colspan="2">
--          <spacer name="verticalSpacer">
--           <property name="orientation">
--            <enum>Qt::Vertical</enum>
--           </property>
--           <property name="sizeHint" stdset="0">
--            <size>
--             <width>20</width>
--             <height>40</height>
--            </size>
--           </property>
--          </spacer>
++         <item row="3" column="1">
++          <widget class="QCheckBox" name="useAsDefaultLocationCheckBox">
++           <property name="text">
++            <string>Use current location as default</string>
++           </property>
++          </widget>
           </item>
--         <item row="0" column="1">
--          <spacer name="horizontalSpacer_2">
--           <property name="orientation">
--            <enum>Qt::Horizontal</enum>
--           </property>
--           <property name="sizeHint" stdset="0">
--            <size>
--             <width>40</width>
--             <height>20</height>
--            </size>
--           </property>
--          </spacer>
++         <item row="3" column="3">
++          <widget class="QCheckBox" name="useIpQueryCheckBox">
++           <property name="text">
++            <string>Get location from Network</string>
++           </property>
++          </widget>
           </item>
          </layout>
         </widget>
 === modified file 'src/tests/testConversions.cpp'
 --- src/tests/testConversions.cpp	2014-06-06 18:02:00 +0000
 +++ src/tests/testConversions.cpp	2014-08-08 12:24:49 +0000
@@ -171,3 +171,44 @@
  		QVERIFY2(std::abs(angle1-angle2)<=ERROR_LIMIT, qPrintable(QString("%1rad=%2%3d%4m%5s").arg(rad).arg(s).arg(dego).arg(mino).arg(seco)));
+ 	}
+ }
++
++void TestConversions::testDDToDMS()
++{
++	QVariantList data;
++
++	data << 0. << 0 << 0 << 0.;
++	data << 10. << 10 << 0 << 0.;
++	data << -13.5 << -13 << 30 << 0.;
++	data << 30.263888889 << 30 << 15 << 50.;
++	data << -90.1 << -90 << 6 << 0.;
++	data << 128.9999 << 128 << 59 << 59.64;
++	data << 360.6 << 360 << 36 << 0.;
++	data << -180.786 << -180 << 47 << 9.6;
++	data << -0.01 << -0 << 0 << 36.;
++	data << -0.039 << -0 << 2 << 20.4;
++
++	while (data.count()>=4)
++	{
++		double angle, sec, seco, angle1, angle2;
++		int deg, min;
++		unsigned int dego, mino;
++		bool sign;
++		QString s = "+";
++		angle	= data.takeFirst().toDouble();
++		deg	= data.takeFirst().toInt();
++		min	= data.takeFirst().toInt();
++		sec	= data.takeFirst().toDouble();
++		if (angle>=0)
++			angle1 = sec+min*60+deg*3600;
++		else
++			angle1 = -1*(sec+min*60+std::abs((double)deg)*3600);
++		StelUtils::decDegToDms(angle, sign, dego, mino, seco);
++		angle2 = seco+mino*60+dego*3600;
++		if (!sign)
++		{
++			angle2 *= -1;
++			s = "-";
++		}
++		QVERIFY2(std::abs(angle1-angle2)<=ERROR_LIMIT, qPrintable(QString("%1degrees=%2%3d%4m%5s").arg(angle).arg(s).arg(dego).arg(mino).arg(seco)));
++	}
++}
 === modified file 'src/tests/testConversions.hpp'
 --- src/tests/testConversions.hpp	2014-06-07 11:39:09 +0000
 +++ src/tests/testConversions.hpp	2014-08-08 12:24:49 +0000
@@ -31,6 +31,7 @@
  	void testDMSToRad();
  	void testRadToHMS();
  	void testRadToDMS();
++	void testDDToDMS();
  };
  #endif // _TESTCONVERSIONS_HPP_