fix Sky and GeoData vrml nodes

Author: opatut

src/OpenCOVER/plugins/general/GeoData/VrmlNodeGeoData.cpp

@@ -44,7 +44,8 @@ void VrmlNodeGeoData::initFields(VrmlNodeGeoData *node, VrmlNodeType *t)
                     std::cerr << "[VrmlNodeGeoData::initFields] GeoData: invalid offsetName '" << node->d_offsetName.get() << "'." << std::endl;
                     return;
                 }
-                osg::Vec3 origin = osg::Vec3(dataset->easting, dataset->northing, dataset->altitude); }),
+                osg::Vec3 origin = osg::Vec3(dataset->easting, dataset->northing, dataset->altitude);
+                opencover::GeoData::instance()->setProjectOffset(origin); }),
         field("regions", node->d_regions, [node](auto f)
             {
         auto geoData = GeoDataLoader::instance();
@@ -59,6 +60,8 @@ void VrmlNodeGeoData::initFields(VrmlNodeGeoData *node, VrmlNodeType *t)
         } }),
         field("showTerrain", node->d_showTerrain, [node](auto f)
             { GeoDataLoader::instance()->setShowBuildings(node->d_showTerrain.get()); }),
+        field("showLabels", node->d_showLabels, [node](auto f)
+            { GeoDataLoader::instance()->setShowLabels(node->d_showLabels.get()); }),
         field("showBuildings", node->d_showBuildings, [node](auto f)
             { GeoDataLoader::instance()->setShowBuildings(node->d_showBuildings.get()); }));
 }

src/OpenCOVER/plugins/general/GeoData/VrmlNodeGeoData.h

@@ -41,6 +41,7 @@ class VrmlNodeGeoData : public VrmlNodeChild
     VrmlSFString d_offsetName;
     VrmlMFString d_regions; // list of region names (see config/plugin/GeoData.toml), include ALL_REGIONS_STRING in the list to enable all regions
     VrmlSFBool d_showTerrain;
+    VrmlSFBool d_showLabels;
     VrmlSFBool d_showBuildings;
 };
 #endif //_VRMLNODEGeoData_

src/OpenCOVER/plugins/general/Sky/Sky.cpp

@@ -54,6 +54,11 @@
 #include <PluginUtil/PluginMessageTypes.h>
 #include <filesystem>
 
+#include <vrml97/vrml/vrmlexport.h>
+#include <vrml97/vrml/VrmlNamespace.h>
+#include <vrml97/vrml/VrmlNode.h>
+#include <vrml97/vrml/VrmlNodeChild.h>
+
 #include "VrmlNodeSky.h"
 
 namespace opencover
@@ -70,6 +75,7 @@ namespace ui
 
 using namespace covise;
 using namespace opencover;
+using namespace vrml;
 
 Sky *Sky::s_instance = nullptr;
 
@@ -82,7 +88,7 @@ Sky::Sky()
 }
 bool Sky::init()
 {
-    // vrml::VrmlNamespace::addBuiltIn(vrml::VrmlNode::defineType<VrmlNodeSky>());
+    VrmlNamespace::addBuiltIn(VrmlNode::defineType<VrmlNodeSky>());
 
     geoDataMenu = dynamic_cast<ui::Menu *>(cover->ui->getByPath("Manager.GeoData"));
     if (!geoDataMenu)