Added new userpoint type lighthouse.

Increased user point size on lower map layers. Fixed wrong warning message if no active route leg present.
albar965 · Aug 26, 2019 · 675d523 · 675d523
1 parent d1bd22e
commit 675d523
Show file tree

Hide file tree

Showing 6 changed files with 343 additions and 227 deletions.
diff --git a/littlenavmap.qrc b/littlenavmap.qrc
diff --git a/resources/icons/userpoint_Lighthouse.svg b/resources/icons/userpoint_Lighthouse.svg
diff --git a/src/mappainter/mappaintlayer.cpp b/src/mappainter/mappaintlayer.cpp
@@ -216,7 +216,7 @@ void MapPaintLayer::initMapLayerSettings()
          ndbSymbolSize(24).ndbIdent().ndbInfo().
          ilsIdent().ilsInfo().
          airwayIdent().airwayInfo().airwayWaypoint().
-         userpoint().userpointInfo().userpoinSymbolSize(24).userpointMaxTextLength(30).
+         userpoint().userpointInfo().userpoinSymbolSize(28).userpointMaxTextLength(30).
          markerSymbolSize(24).markerInfo().
          airportMaxTextLength(30)).
 
@@ -228,7 +228,7 @@ void MapPaintLayer::initMapLayerSettings()
          ndbSymbolSize(24).ndbIdent().ndbInfo().
          ilsIdent().ilsInfo().
          airwayIdent().airwayInfo().airwayWaypoint().
-         userpoint().userpointInfo().userpoinSymbolSize(24).userpointMaxTextLength(30).
+         userpoint().userpointInfo().userpoinSymbolSize(28).userpointMaxTextLength(30).
          markerSymbolSize(24).markerInfo().
          airportMaxTextLength(30)).
 
@@ -242,7 +242,7 @@ void MapPaintLayer::initMapLayerSettings()
          ndbSymbolSize(24).ndbIdent().ndbInfo().
          ilsIdent().ilsInfo().
          airwayIdent().airwayInfo().airwayWaypoint().
-         userpoint().userpointInfo().userpoinSymbolSize(24).userpointMaxTextLength(30).
+         userpoint().userpointInfo().userpoinSymbolSize(28).userpointMaxTextLength(30).
          markerSymbolSize(24).markerInfo().
          airportMaxTextLength(30)).
 
@@ -255,7 +255,7 @@ void MapPaintLayer::initMapLayerSettings()
          ndbSymbolSize(24).ndbIdent().ndbInfo().
          ilsIdent().ilsInfo().
          airwayIdent().airwayInfo().airwayWaypoint().
-         userpoint().userpointInfo().userpoinSymbolSize(24).userpointMaxTextLength(20).
+         userpoint().userpointInfo().userpoinSymbolSize(26).userpointMaxTextLength(20).
          markerSymbolSize(24).markerInfo().
          airportMaxTextLength(30)).
 
@@ -268,7 +268,7 @@ void MapPaintLayer::initMapLayerSettings()
          ndbSymbolSize(22).ndbIdent().ndbInfo().
          ilsIdent().ilsInfo().
          airwayIdent().airwayWaypoint().
-         userpoint().userpointInfo().userpoinSymbolSize(24).userpointMaxTextLength(20).
+         userpoint().userpointInfo().userpoinSymbolSize(26).userpointMaxTextLength(20).
          markerSymbolSize(24).
          airportMaxTextLength(20)).
 

diff --git a/src/options/optionsdialog.cpp b/src/options/optionsdialog.cpp
@@ -174,8 +174,8 @@ OptionsDialog::OptionsDialog(QMainWindow *parentWindow)
   QTreeWidgetItem *route = addTopItem(root, tr("Flight Plan"), tr("Select display options for the flight plan line."));
   addItem<optsd::DisplayOptionsRoute>(route, displayOptItemIndexRoute, tr("Distance"), tr("Show distance along flight plan leg."), optsd::ROUTE_DISTANCE, true);
   addItem<optsd::DisplayOptionsRoute>(route, displayOptItemIndexRoute, tr("Magnetic rhumb course"), tr("Show magnetic rhumb line course at flight plan leg.\nIndicated with \"R\" if rhumb and great circle are selected."), optsd::ROUTE_MAG_COURSE_RHUMB, true);
-  addItem<optsd::DisplayOptionsRoute>(route, displayOptItemIndexRoute, tr("True rhumb course"), tr("Show true rhumb line course at flight plan leg.\nIndicated with \"R\" if rhumb and great circle are selected."), optsd::ROUTE_TRUE_COURSE_RHUMB, false);
-  addItem<optsd::DisplayOptionsRoute>(route, displayOptItemIndexRoute, tr("Magnetic great circle course"), tr("Show magnetic great circle start course at flight plan leg.\nIndicated with \"GC\" if rhumb and great circle are selected."), optsd::ROUTE_MAG_COURSE_GC, false);
+  addItem<optsd::DisplayOptionsRoute>(route, displayOptItemIndexRoute, tr("True rhumb course"), tr("Show true rhumb line course at flight plan leg.\nIndicated with \"R\" if both rhumb and great circle are selected."), optsd::ROUTE_TRUE_COURSE_RHUMB, false);
+  addItem<optsd::DisplayOptionsRoute>(route, displayOptItemIndexRoute, tr("Magnetic great circle course"), tr("Show magnetic great circle start course at flight plan leg.\nIndicated with \"GC\" if both rhumb and great circle are selected."), optsd::ROUTE_MAG_COURSE_GC, false);
   addItem<optsd::DisplayOptionsRoute>(route, displayOptItemIndexRoute, tr("True great circle course"), tr("Show true great circle start course at flight plan leg.\nIndicated with \"GC\" if rhumb and great circle are selected."), optsd::ROUTE_TRUE_COURSE_GC, false);
 
   QTreeWidgetItem *userAircraft = addTopItem(root, tr("User Aircraft"), tr("Select text labels and other options for the user aircraft."));

diff --git a/src/route/route.cpp b/src/route/route.cpp
@@ -2025,7 +2025,8 @@ void Route::getApproachRunwayEndAndIls(QVector<map::MapIls>& ils, map::MapRunway
 
 bool Route::isTooFarToFlightPlan() const
 {
-  return getDistanceToFlightPlan() > MAX_FLIGHT_PLAN_DIST_FOR_CENTER_NM;
+  return getDistanceToFlightPlan() < map::INVALID_DISTANCE_VALUE &&
+         getDistanceToFlightPlan() > MAX_FLIGHT_PLAN_DIST_FOR_CENTER_NM;
 }
 
 float Route::getDistanceToFlightPlan() const

diff --git a/src/userdata/userdataicons.cpp b/src/userdata/userdataicons.cpp
@@ -58,7 +58,8 @@ void UserdataIcons::initTranslateableTexts()
     {QLatin1Literal("DME"), tr("DME", "UserpointType")},
     {QLatin1Literal("VORTAC"), tr("VORTAC", "UserpointType")},
     {QLatin1Literal("TACAN"), tr("TACAN", "UserpointType")},
-    {QLatin1Literal("NDB"), tr("NDB", "UserpointType")}
+    {QLatin1Literal("NDB"), tr("NDB", "UserpointType")},
+    {QLatin1Literal("Lighthouse"), tr("Lighthouse", "UserpointType")}
   });
 
   translationToTypeMap = QHash<QString, QString>(
@@ -87,7 +88,8 @@ void UserdataIcons::initTranslateableTexts()
     {tr("DME", "UserpointType"), QLatin1Literal("DME")},
     {tr("VORTAC", "UserpointType"), QLatin1Literal("VORTAC")},
     {tr("TACAN", "UserpointType"), QLatin1Literal("TACAN")},
-    {tr("NDB", "UserpointType"), QLatin1Literal("NDB")}
+    {tr("NDB", "UserpointType"), QLatin1Literal("NDB")},
+    {tr("Lighthouse", "UserpointType"), QLatin1Literal("Lighthouse")}
   });
 }