feature/webapi-mapfeatures

littlenavmap.pro

@@ -404,6 +404,7 @@ SOURCES += \
   src/webapi/abstractlnmactionscontroller.cpp \
   src/webapi/actionscontrollerindex.cpp \
   src/webapi/airportactionscontroller.cpp \
+  src/webapi/mapactionscontroller.cpp \
   src/webapi/simactionscontroller.cpp \
   src/webapi/uiactionscontroller.cpp \
   src/webapi/webapicontroller.cpp
@@ -590,6 +591,7 @@ HEADERS  += \
   src/webapi/abstractlnmactionscontroller.h \
   src/webapi/actionscontrollerindex.h \
   src/webapi/airportactionscontroller.h \
+  src/webapi/mapactionscontroller.h \
   src/webapi/simactionscontroller.h \
   src/webapi/uiactionscontroller.h \
   src/webapi/webapicontroller.h \

src/common/abstractinfobuilder.cpp

@@ -60,6 +60,18 @@ QByteArray AbstractInfoBuilder::uiinfo(UiInfoData uiInfoData) const
     return "not implemented";
 }
 
+QByteArray AbstractInfoBuilder::features(MapFeaturesData mapFeaturesData) const
+{
+  Q_UNUSED(mapFeaturesData);
+    return "not implemented";
+}
+
+QByteArray AbstractInfoBuilder::feature(MapFeaturesData mapFeaturesData) const
+{
+  Q_UNUSED(mapFeaturesData);
+    return "not implemented";
+}
+
 
 QString AbstractInfoBuilder::getHeadingsStringByMagVar(float heading, float magvar) const {
 

src/common/abstractinfobuilder.h

@@ -25,6 +25,7 @@ namespace InfoBuilderTypes {
     struct AirportInfoData;
     struct SimConnectInfoData;
     struct UiInfoData;
+    struct MapFeaturesData;
 }
 namespace atools {
     namespace sql {
@@ -39,6 +40,7 @@ using atools::geo::Pos;
 using InfoBuilderTypes::AirportInfoData;
 using InfoBuilderTypes::SimConnectInfoData;
 using InfoBuilderTypes::UiInfoData;
+using InfoBuilderTypes::MapFeaturesData;
 
 /**
  * Generic interface for LNM-specific views.
@@ -68,6 +70,20 @@ class AbstractInfoBuilder : public QObject
    */
   virtual QByteArray airport(AirportInfoData airportInfoData) const;
 
+  /**
+   * Creates a description for the provided feature list.
+   *
+   * @param airportInfoData
+   */
+  virtual QByteArray features(MapFeaturesData mapFeaturesData) const;
+
+  /**
+   * Creates a description for the provided map object.
+   *
+   * @param airportInfoData
+   */
+  virtual QByteArray feature(MapFeaturesData mapFeaturesData) const;
+
   /**
    * Creates a description for the provided simconnect data.
    *

src/common/infobuildertypes.h

@@ -72,6 +72,8 @@ namespace InfoBuilderTypes {
      */
     struct SimConnectInfoData{
         const SimConnectData* data;
+        const float windSpeed;
+        const float windDir;
     };
 
     /**
@@ -84,6 +86,17 @@ namespace InfoBuilderTypes {
         const qreal distanceWeb;
     };
 
+    /**
+     * @brief Data container for map features data
+     */
+    struct MapFeaturesData{
+        const QList<map::MapAirport> airports;
+        const QList<map::MapNdb> ndbs;
+        const QList<map::MapVor> vors;
+        const QList<map::MapMarker> markers;
+        const QList<map::MapWaypoint> waypoints;
+    };
+
 }
 
 #endif // INFOBUILDERTYPES_H

src/common/jsoninfobuilder.cpp

@@ -302,6 +302,8 @@ QByteArray JsonInfoBuilder::siminfo(SimConnectInfoData simconnectInfoData) const
            { "ground_altitude", data.getUserAircraft().getGroundAltitudeFt() },
            { "altitude_above_ground", data.getUserAircraft().getAltitudeAboveGroundFt() },
            { "heading", data.getUserAircraft().getHeadingDegMag() },
+           { "wind_direction", simconnectInfoData.windDir },
+           { "wind_speed", simconnectInfoData.windSpeed },
        };
 
     }else{
@@ -331,3 +333,223 @@ QByteArray JsonInfoBuilder::uiinfo(UiInfoData uiInfoData) const
     return json.dump().data();
 }
 
+QByteArray JsonInfoBuilder::features(MapFeaturesData mapFeaturesData) const
+{
+
+    MapFeaturesData data = mapFeaturesData;
+
+    JSON json;
+
+       json = {
+           { "airports", JSON::object() },
+           { "ndbs", JSON::object() },
+           { "vors", JSON::object() },
+           { "markers", JSON::object() },
+           { "waypoints", JSON::object() },
+       };
+
+       json["airports"].push_back({ "count", data.airports.count() });
+       json["airports"].push_back({ "result", JSON::array() });
+
+       json["ndbs"].push_back({ "count", data.ndbs.count() });
+       json["ndbs"].push_back({ "result", JSON::array() });
+
+       json["vors"].push_back({ "count", data.vors.count() });
+       json["vors"].push_back({ "result", JSON::array() });
+
+       json["markers"].push_back({ "count", data.markers.count() });
+       json["markers"].push_back({ "result", JSON::array() });
+
+       json["waypoints"].push_back({ "count", data.waypoints.count() });
+       json["waypoints"].push_back({ "result", JSON::array() });
+
+
+
+       for(int i = 0; i < data.airports.count(); ++i){
+
+           map::MapAirport airport =  data.airports[i];
+
+           json["airports"]["result"][i]["object_id"] = airport.id;
+           json["airports"]["result"][i]["type_id"] = map::AIRPORT;
+           json["airports"]["result"][i]["ident"] = qUtf8Printable(airport.ident);
+           json["airports"]["result"][i]["name"] = qUtf8Printable(airport.name);
+           json["airports"]["result"][i]["position"] = coordinatesToJSON(getCoordinates(airport.position));
+           json["airports"]["result"][i]["elevation"] =  airport.getPosition().getAltitude();
+
+//           JSON airportJson;
+
+//           airportJson = {
+//               { "ident", qUtf8Printable(airport.ident) },
+//               { "name", qUtf8Printable(airport.name)},
+//               { "position", coordinatesToJSON(getCoordinates(airport.position))},
+//               { "elevation", airport.getPosition().getAltitude() },
+//           };
+
+//           json["airports"]["result"].push_back(airportJson);
+       }
+
+       for(int i = 0; i < data.ndbs.count(); ++i){
+
+           map::MapNdb ndb =  data.ndbs[i];
+
+           json["ndbs"]["result"][i]["object_id"] = ndb.id;
+           json["ndbs"]["result"][i]["type_id"] = map::NDB;
+           json["ndbs"]["result"][i]["ident"] = qUtf8Printable(ndb.ident);
+           json["ndbs"]["result"][i]["name"] = qUtf8Printable(ndb.name);
+           json["ndbs"]["result"][i]["position"] = coordinatesToJSON(getCoordinates(ndb.position));
+           json["ndbs"]["result"][i]["elevation"] =  ndb.getPosition().getAltitude();
+
+       }
+
+       for(int i = 0; i < data.vors.count(); ++i){
+
+           map::MapVor vor =  data.vors[i];
+
+           json["vors"]["result"][i]["object_id"] = vor.id;
+           json["vors"]["result"][i]["type_id"] = map::VOR;
+           json["vors"]["result"][i]["ident"] = qUtf8Printable(vor.ident);
+           json["vors"]["result"][i]["name"] = qUtf8Printable(vor.name);
+           json["vors"]["result"][i]["position"] = coordinatesToJSON(getCoordinates(vor.position));
+           json["vors"]["result"][i]["elevation"] =  vor.getPosition().getAltitude();
+
+       }
+
+       for(int i = 0; i < data.markers.count(); ++i){
+
+           map::MapMarker marker =  data.markers[i];
+
+           json["markers"]["result"][i]["object_id"] = marker.id;
+           json["markers"]["result"][i]["type_id"] = map::MARKER;
+           json["markers"]["result"][i]["ident"] = qUtf8Printable(marker.ident);
+           json["markers"]["result"][i]["type"] = qUtf8Printable(marker.type);
+           json["markers"]["result"][i]["position"] = coordinatesToJSON(getCoordinates(marker.position));
+           json["markers"]["result"][i]["elevation"] =  marker.getPosition().getAltitude();
+
+       }
+
+       for(int i = 0; i < data.waypoints.count(); ++i){
+
+           map::MapWaypoint waypoint =  data.waypoints[i];
+
+           json["waypoints"]["result"][i]["object_id"] = waypoint.id;
+           json["waypoints"]["result"][i]["type_id"] = map::WAYPOINT;
+           json["waypoints"]["result"][i]["ident"] = qUtf8Printable(waypoint.ident);
+           json["waypoints"]["result"][i]["type"] = qUtf8Printable(waypoint.type);
+           json["waypoints"]["result"][i]["position"] = coordinatesToJSON(getCoordinates(waypoint.position));
+           json["waypoints"]["result"][i]["elevation"] =  waypoint.getPosition().getAltitude();
+
+       }
+
+    return json.dump().data();
+
+}
+
+QByteArray JsonInfoBuilder::feature(MapFeaturesData mapFeaturesData) const
+{
+
+    MapFeaturesData data = mapFeaturesData;
+
+    JSON json;
+
+       json = {
+           { "airports", JSON::object() },
+           { "ndbs", JSON::object() },
+           { "vors", JSON::object() },
+           { "markers", JSON::object() },
+           { "waypoints", JSON::object() },
+       };
+
+       json["airports"].push_back({ "count", data.airports.count() });
+       json["airports"].push_back({ "result", JSON::array() });
+
+       json["ndbs"].push_back({ "count", data.ndbs.count() });
+       json["ndbs"].push_back({ "result", JSON::array() });
+
+       json["vors"].push_back({ "count", data.vors.count() });
+       json["vors"].push_back({ "result", JSON::array() });
+
+       json["markers"].push_back({ "count", data.markers.count() });
+       json["markers"].push_back({ "result", JSON::array() });
+
+       json["waypoints"].push_back({ "count", data.waypoints.count() });
+       json["waypoints"].push_back({ "result", JSON::array() });
+
+       for(int i = 0; i < data.airports.count(); ++i){
+
+           map::MapAirport airport =  data.airports[i];
+
+           json["airports"]["result"][i]["object_id"] = airport.id;
+           json["airports"]["result"][i]["type_id"] = map::AIRPORT;
+           json["airports"]["result"][i]["ident"] = qUtf8Printable(airport.ident);
+           json["airports"]["result"][i]["name"] = qUtf8Printable(airport.name);
+           json["airports"]["result"][i]["position"] = coordinatesToJSON(getCoordinates(airport.position));
+           json["airports"]["result"][i]["elevation"] =  airport.getPosition().getAltitude();
+
+//           JSON airportJson;
+
+//           airportJson = {
+//               { "ident", qUtf8Printable(airport.ident) },
+//               { "name", qUtf8Printable(airport.name)},
+//               { "position", coordinatesToJSON(getCoordinates(airport.position))},
+//               { "elevation", airport.getPosition().getAltitude() },
+//           };
+
+//           json["airports"]["result"].push_back(airportJson);
+       }
+
+       for(int i = 0; i < data.ndbs.count(); ++i){
+
+           map::MapNdb ndb =  data.ndbs[i];
+
+           json["ndbs"]["result"][i]["object_id"] = ndb.id;
+           json["ndbs"]["result"][i]["type_id"] = map::NDB;
+           json["ndbs"]["result"][i]["ident"] = qUtf8Printable(ndb.ident);
+           json["ndbs"]["result"][i]["name"] = qUtf8Printable(ndb.name);
+           json["ndbs"]["result"][i]["position"] = coordinatesToJSON(getCoordinates(ndb.position));
+           json["ndbs"]["result"][i]["elevation"] =  ndb.getPosition().getAltitude();
+
+       }
+
+       for(int i = 0; i < data.vors.count(); ++i){
+
+           map::MapVor vor =  data.vors[i];
+
+           json["vors"]["result"][i]["object_id"] = vor.id;
+           json["vors"]["result"][i]["type_id"] = map::VOR;
+           json["vors"]["result"][i]["ident"] = qUtf8Printable(vor.ident);
+           json["vors"]["result"][i]["name"] = qUtf8Printable(vor.name);
+           json["vors"]["result"][i]["position"] = coordinatesToJSON(getCoordinates(vor.position));
+           json["vors"]["result"][i]["elevation"] =  vor.getPosition().getAltitude();
+
+       }
+
+       for(int i = 0; i < data.markers.count(); ++i){
+
+           map::MapMarker marker =  data.markers[i];
+
+           json["markers"]["result"][i]["object_id"] = marker.id;
+           json["markers"]["result"][i]["type_id"] = map::MARKER;
+           json["markers"]["result"][i]["ident"] = qUtf8Printable(marker.ident);
+           json["markers"]["result"][i]["type"] = qUtf8Printable(marker.type);
+           json["markers"]["result"][i]["position"] = coordinatesToJSON(getCoordinates(marker.position));
+           json["markers"]["result"][i]["elevation"] =  marker.getPosition().getAltitude();
+
+       }
+
+       for(int i = 0; i < data.waypoints.count(); ++i){
+
+           map::MapWaypoint waypoint =  data.waypoints[i];
+
+           json["waypoints"]["result"][i]["object_id"] = waypoint.id;
+           json["waypoints"]["result"][i]["type_id"] = map::WAYPOINT;
+           json["waypoints"]["result"][i]["ident"] = qUtf8Printable(waypoint.ident);
+           json["waypoints"]["result"][i]["type"] = qUtf8Printable(waypoint.type);
+           json["waypoints"]["result"][i]["position"] = coordinatesToJSON(getCoordinates(waypoint.position));
+           json["waypoints"]["result"][i]["elevation"] =  waypoint.getPosition().getAltitude();
+
+       }
+
+    return json.dump().data();
+
+}
+

src/common/jsoninfobuilder.h

@@ -41,6 +41,8 @@ class JsonInfoBuilder : public AbstractInfoBuilder
   QByteArray airport(AirportInfoData airportInfoData) const override;
   QByteArray siminfo(SimConnectInfoData simConnectInfoData) const override;
   QByteArray uiinfo(UiInfoData uiInfoData) const override;
+  QByteArray features(MapFeaturesData mapFeaturesData) const override;
+  QByteArray feature(MapFeaturesData mapFeaturesData) const override;
 
 private:
   JSON coordinatesToJSON(QMap<QString,float> map) const;

src/mapgui/mappaintwidget.cpp

@@ -776,7 +776,7 @@ void MapPaintWidget::showPosInternal(const atools::geo::Pos& pos, float distance
     setDistanceToMap(distanceKm, allowAdjust);
 }
 
-void MapPaintWidget::showRectStreamlined(const atools::geo::Rect& rect)
+void MapPaintWidget::showRectStreamlined(const atools::geo::Rect& rect, bool constrainDistance)
 {
   if(rect.isPoint(POS_IS_POINT_EPSILON_DEG))
     showPosNotAdjusted(rect.getTopLeft(), 0.f);
@@ -796,10 +796,12 @@ void MapPaintWidget::showRectStreamlined(const atools::geo::Rect& rect)
       // Center on rectangle
       centerRectOnMap(rect);
 
-    float distanceKm = atools::geo::nmToKm(Unit::rev(OptionData::instance().getMapZoomShowMenu(), Unit::distNmF));
+    if(constrainDistance){
+        float distanceKm = atools::geo::nmToKm(Unit::rev(OptionData::instance().getMapZoomShowMenu(), Unit::distNmF));
 
-    if(distance() < distanceKm)
-      setDistanceToMap(distanceKm);
+        if(distance() < distanceKm)
+          setDistanceToMap(distanceKm);
+    }
   }
 }