diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/maptype.h b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/maptype.h index 2f35f5257..478ae2ae7 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/maptype.h +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/maptype.h @@ -68,6 +68,7 @@ public: GoogleLabelsKorea = 4003, GoogleHybridKorea = 4005, + Statkart_Topo2 = 5500 }; static QString StrByType(Types const & value) { diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/opmaps.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/opmaps.cpp index 8d63e30a1..7ac569c00 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/opmaps.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/opmaps.cpp @@ -174,6 +174,16 @@ QByteArray OPMaps::GetImageFrom(const MapType::Types &type, const Point &pos, co qheader.setRawHeader("Referrer", "http://www.openstreetmap.org/"); } break; + case MapType::Statkart_Topo2: + { + qheader.setRawHeader("Referrer", "http://www.norgeskart.no/"); + } + break; + case MapType::Statkart_Topo2: + { + qheader.setRawHeader("Referrer", "http://www.norgeskart.no/"); + } + break; default: break; diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp index b427d8da8..9f60361c8 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp @@ -426,6 +426,12 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c return QString("http://sigpac.magrama.es/SDG/raster/%1@3785/%2.%3.%4.img").arg(levelsForSigPacSpainMap[zoom]).arg(zoom).arg(pos.X()).arg((2 << (zoom - 1)) - pos.Y() - 1); } break; + case MapType::Statkart_Topo2: + { + + qDebug() << QString("http://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo2&zoom=%1&x=%2&y=%3").arg(zoom).arg(pos.X()).arg(pos.Y()); + return QString("http://opencache.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo2&zoom=%1&x=%2&y=%3").arg(zoom).arg(pos.X()).arg(pos.Y()); + } break; default: