user define api keys for Google and Azure

todo: convert to azure
google: support non ortophoto maps as these are not available in europe any more

Author: uwewoessner

src/oddlot/CMakeLists.txt

@@ -75,6 +75,7 @@ SET(ODDLOT_SOURCES
      src/gui/importsettings.cpp
      src/gui/exportsettings.cpp
 	 src/gui/lodsettings.cpp
+	 src/gui/apisettings.cpp
 	 src/data/projectdata.cpp
 	 src/data/roadsystem/roadsystem.cpp
 	 src/data/roadsystem/rsystemelement.cpp
@@ -499,6 +500,7 @@ SET(ODDLOT_MOC_HEADERS
 	src/graph/items/handles/baselanemovehandle.hpp
     src/gui/exportsettings.hpp
     src/gui/importsettings.hpp
+    src/gui/apisettings.hpp
     src/gui/lodsettings.hpp
     src/gui/oscsettings.hpp
     src/gui/osmimport.hpp
@@ -615,6 +617,7 @@ SET(ODDLOT_FORMS
          src/cover/coverconnection.ui
          src/gui/filesettings.ui
 
+	 src/gui/apisettings.ui
 	 src/gui/lodsettings.ui
 	 src/gui/tools/TrackRibbon.ui
 	 src/gui/tools/TypeRibbon.ui

src/oddlot/src/graph/editors/junctioneditor.cpp

@@ -2425,7 +2425,7 @@ JunctionEditor::mouseAction(MouseAction *mouseAction)
                                     newLaneSection = new LaneSection(0.0, false);
                                     spiralPrototype->addLaneSection(newLaneSection);
                                 }
-                                Lane::LaneType lastType = startLanes.value(0)->getLaneType();
+                                Lane::LaneType lastType = startLanes.first()->getLaneType();
 
 
                                 for (int lr = 0; lr < 2; lr++)

src/oddlot/src/graph/graphview.cpp

@@ -624,7 +624,7 @@ GraphView::loadGoogleMap()
         //system(qPrintable(XMLlocationCommand));
 
         QString tmpDir = topviewGraph_->getProjectData()->tempDir.path() + "/";
-        downloadFile(tmpDir + "location.xml", "https://maps.google.com/maps/api/geocode/xml?address=" + location + "&key=AIzaSyCvZVXlu-UfJdPUb6_66YHjyPj4qHKc_Wc");
+        downloadFile(tmpDir + "location.xml", "https://maps.google.com/maps/api/geocode/xml?address=" + location + "&key="+ APISettings::instance()->GoogleAPIKey);
 
         QString lat = "48.73964";
         QString lon = "9.09725";
@@ -695,7 +695,7 @@ GraphView::loadGoogleMap()
         QString style = "&style=feature:all|element:labels|visibility:off";
         //QString uploadPrefix = "wget -O ";
         QString uploadPrefix2 = "https://maps.googleapis.com/maps/api/staticmap?center=";
-        QString uploadPostfix = "&zoom=" + zoom + "&maptype=" + maptype + style + "&size=1200x1200&scale=2&key=AIzaSyCvZVXlu-UfJdPUb6_66YHjyPj4qHKc_Wc";
+        QString uploadPostfix = "&zoom=" + zoom + "&maptype=" + maptype + style + "&size=1200x1200&scale=2&key="+ APISettings::instance()->GoogleAPIKey;
 
 
         //this equation was calculated by calibrating the latitude offset to a variety of locations. this is the equation of the line of best fit.
@@ -842,7 +842,7 @@ GraphView::loadBingMap()
 
        // system(qPrintable(XMLlocationCommand));
 
-        downloadFile(tmpDir + "location.xml", "https://maps.google.com/maps/api/geocode/xml?address=" + location + "&key=AIzaSyCvZVXlu-UfJdPUb6_66YHjyPj4qHKc_Wc");
+        downloadFile(tmpDir + "location.xml", "https://maps.google.com/maps/api/geocode/xml?address=" + location + "&key=" + APISettings::instance()->GoogleAPIKey);
 
         QString lat = "48.73964";
         QString lon = "9.09725";
@@ -911,7 +911,7 @@ GraphView::loadBingMap()
 
         //system(qPrintable(XMLlocationCommandBing));
 
-        downloadFile("locationBing.xml", "http://dev.virtualearth.net/REST/v1/Imagery/Map/Aerial/" + lat + "," + lon + "/19?mapSize=1500,1500&mapMetadata=1&o=xml&key=AlG2vgS1nf8uEEiq4ypPUu3Be-Mr1QOWiTj_lY55b8RAVNl7h3v1Bx0nTqavOJDm");
+        downloadFile("locationBing.xml", "http://dev.virtualearth.net/REST/v1/Imagery/Map/Aerial/" + lat + "," + lon + "/19?mapSize=1500,1500&mapMetadata=1&o=xml&key=" + APISettings::instance()->BINGAPIKey);
 
 
 
@@ -1017,7 +1017,7 @@ GraphView::loadBingMap()
 
             QString uploadPrefix = "wget -O ";
             QString uploadPrefix2 = "http://dev.virtualearth.net/REST/V1/Imagery/Map/Aerial/";
-            QString uploadPostfix = "/19?mapSize=1500,1500&key=AlG2vgS1nf8uEEiq4ypPUu3Be-Mr1QOWiTj_lY55b8RAVNl7h3v1Bx0nTqavOJDm";
+            QString uploadPostfix = "/19?mapSize=1500,1500&key=" + APISettings::instance()->BINGAPIKey;
 
 
 

src/oddlot/src/gui/parameters/toolparametersettings.cpp

@@ -158,9 +158,9 @@ ToolParameterSettings::addParamUI(unsigned int paramIndex, ToolParameter *p)
             }
 
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-            connect(doubleSpinBox, QOverload<const QString &>::of(&QDoubleSpinBox::textChanged), [&name, this](const QString &text) { onEditingFinished(name); });
+            connect(doubleSpinBox, QOverload<const QString &>::of(&QDoubleSpinBox::textChanged), [name, this](const QString &text) { onEditingFinished(name); });
 #else
-            connect(doubleSpinBox, QOverload<const QString &>::of(&QDoubleSpinBox::valueChanged), [&name, this](const QString &text) { onEditingFinished(name); });
+            connect(doubleSpinBox, QOverload<const QString &>::of(&QDoubleSpinBox::valueChanged), [name, this](const QString &text) { onEditingFinished(name); });
 #endif
 
             spinBox = doubleSpinBox;

src/oddlot/src/gui/projectwidget.cpp

@@ -146,6 +146,7 @@ ProjectWidget::ProjectWidget(MainWindow *mainWindow)
     splitter->setOrientation(Qt::Vertical);
     layout->addWidget(splitter);
 
+
     // Project Handling //
     //
     projectMenuAction_ = new QAction(this); // text will be set later
@@ -237,6 +238,7 @@ ProjectWidget::ProjectWidget(MainWindow *mainWindow)
 
     projectionSettings = mainWindow->getProjectionSettings();
     lodSettings = LODSettings::instance();
+    apiSettings = APISettings::instance();
 
     oscSettings = OSCSettings::instance();
     connect(oscSettings, SIGNAL(readValidationChanged(bool)), projectData_, SLOT(changeOSCValidation(bool)));

src/oddlot/src/gui/projectwidget.hpp

@@ -23,6 +23,7 @@
 
 #include "src/gui/projectionsettings.hpp"
 #include "src/gui/lodsettings.hpp"
+#include "src/gui/apisettings.hpp"
 
 class QAction;
 
@@ -41,6 +42,7 @@ class CatalogWidget;
 class CatalogTreeWidget;
 class ProjectSettings;
 class LODSettings;
+class APISettings;
 class OSCSettings;
 
 class ToolAction;
@@ -178,6 +180,10 @@ class ProjectWidget : public QWidget
     {
         return lodSettings;
     }
+    APISettings* getAPISettings() const
+    {
+        return apiSettings;
+    }
 
     void setEditor(ODD::EditorId id);
 
@@ -191,7 +197,8 @@ class ProjectWidget : public QWidget
 
 protected:
     ProjectionSettings *projectionSettings;
-    LODSettings *lodSettings;
+    APISettings* apiSettings;
+    LODSettings* lodSettings;
     OSCSettings *oscSettings;
     std::vector<double> SlopeVector;
     std::vector<double> SVector; // S on road for each segment

src/oddlot/src/main.cpp

@@ -33,6 +33,9 @@ int main(int argc, char *argv[])
     std::cout << "\n\nStarting...\n  ODDlot: The OpenDRIVE Designer for Lanes, Objects and Tracks.\n" << std::endl;
     QApplication a(argc, argv);
     a.setAttribute(Qt::AA_MacDontSwapCtrlAndMeta);
+    a.setOrganizationName("HLRS");
+    a.setApplicationName("OddLOT");
+    a.setApplicationDisplayName("OddLOT");
     MainWindow w;
     QIcon icon(":/icons/oddlot.png");
     w.setWindowIcon(icon);

src/oddlot/src/mainwindow.cpp

@@ -107,6 +107,7 @@ MainWindow::MainWindow(QWidget *parent)
     importSettings = new ImportSettings();
     exportSettings = new ExportSettings();
     lodSettings = new LODSettings();
+    apiSettings = new APISettings(this);
     oscSettings = new OSCSettings(covisedir_ + "/share/covise/catalogs/");
 
     //---------------------------------------//
@@ -404,6 +405,7 @@ MainWindow::createFileSettings()
     fileSettings->addTab(importSettings);
     fileSettings->addTab(oscSettings);
     fileSettings->addTab(lodSettings);
+    fileSettings->addTab(apiSettings);
 #ifdef COVER_CONNECTION
     fileSettings->addTab(coverConnection);
 #endif

src/oddlot/src/mainwindow.hpp

@@ -19,6 +19,7 @@
 #include <QMainWindow>
 #include <QTreeWidgetItem>
 #include <QUndoView>
+#include <QSettings>
 
 #include <src/util/odd.hpp>
 
@@ -60,6 +61,7 @@ class COVERConnection;
 #include "src/gui/importsettings.hpp"
 #include "src/gui/exportsettings.hpp"
 #include "src/gui/lodsettings.hpp"
+#include "src/gui/apisettings.hpp"
 #include "src/gui/oscsettings.hpp"
 #include "src/cover/coverconnection.hpp"
 #include "src/gui/filesettings.hpp"
@@ -203,6 +205,8 @@ class MainWindow : public QMainWindow
     void hideParameterSettings();
 
 
+    QSettings appSettings;
+
 private:
     // Init functions //
     //
@@ -237,7 +241,8 @@ class MainWindow : public QMainWindow
     OSCSettings *oscSettings;
     ImportSettings *importSettings;
     ExportSettings *exportSettings;
-    LODSettings *lodSettings;
+    LODSettings* lodSettings;
+    APISettings* apiSettings;
 
     FileSettings *fileSettings;