Bug fixes

README.md

@@ -1,5 +1,7 @@
 vtkMap is a project wich adds VTK support for Geovisualization in 2D and 3D.
 
+It's a slippy map that can be used in C++/Qt programs.
+
 Requirements
 ------------
 * C++11

applications/examples/example.cxx

@@ -248,8 +248,8 @@ int main(int argc, char* argv[])
   }
 
   vtkNew<vtkRenderWindow> wind;
+  wind->SetMultiSamples(0); // MSAA will create interpolated pixels
   wind->AddRenderer(rend.GetPointer());
-  ;
   //wind->SetSize(1920, 1080);
   wind->SetSize(800, 600);
 

applications/examples/exampleLayers.cxx

@@ -286,8 +286,8 @@ int main(int argc, char* argv[])
   osmLayer->Delete();
 
   vtkNew<vtkRenderWindow> wind;
+  wind->SetMultiSamples(0); // MSAA will create interpolated pixels
   wind->AddRenderer(rend.GetPointer());
-  ;
   wind->SetSize(800, 600);
 
   vtkNew<vtkRenderWindowInteractor> intr;

applications/examples/markerSize.cxx

@@ -130,6 +130,7 @@ int main(int argc, char* argv[])
   osmLayer->Delete();
 
   vtkNew<vtkRenderWindow> wind;
+  wind->SetMultiSamples(0); // MSAA will create interpolated pixels
   wind->AddRenderer(rend.GetPointer());
   wind->SetSize(800, 600);
 

applications/weatherstations/qtMapCoordinatesWidget.cxx

@@ -21,12 +21,18 @@
 // ------------------------------------------------------------
 qtMapCoordinatesWidget::qtMapCoordinatesWidget(QWidget* parent)
   : QWidget(parent)
-  , Map(0)
+  , Map(nullptr)
 {
   this->UI = new Ui_qtMapCoordinatesWidget;
   this->UI->setupUi(this);
 }
 
+// ------------------------------------------------------------
+qtMapCoordinatesWidget::~qtMapCoordinatesWidget()
+{
+  delete this->UI;
+}
+
 // ------------------------------------------------------------
 void qtMapCoordinatesWidget::setCoordinates(double center[2], int zoom)
 {

applications/weatherstations/qtMapCoordinatesWidget.h

@@ -30,6 +30,7 @@ class qtMapCoordinatesWidget : public QWidget
   Q_OBJECT
 public:
   qtMapCoordinatesWidget(QWidget* parent = 0);
+  ~qtMapCoordinatesWidget() override;
 
   void setCoordinates(double center[2], int zoom);
   void getCoordinates(double center[2], int& zoom) const;

applications/weatherstations/qtWeatherStations.cxx

@@ -48,6 +48,7 @@ namespace
 // Writes input buffer to stream (last argument)
 size_t handle_curl_input(void* buffer, size_t size, size_t nmemb, void* stream)
 {
+  (void) size;
   //std::cout << "handle_input() nmemb: " << nmemb << std::endl
   //std::cout << static_cast<char *>(buffer) << std::endl;
   std::stringstream* ss = static_cast<std::stringstream*>(stream);
@@ -67,8 +68,9 @@ class MapCallback : public vtkCallbackCommand
   {
   }
 
-  virtual void Execute(vtkObject* caller, unsigned long eventId, void* data)
+  void Execute(vtkObject* caller, unsigned long eventId, void* data) override
   {
+    (void) caller;
     switch (eventId)
     {
       case vtkInteractorStyleGeoMap::SelectionCompleteEvent:
@@ -151,7 +153,7 @@ qtWeatherStations::qtWeatherStations(QWidget* parent)
   //this->resetMapCoords();
   //this->Map->SetCenter(32.2, -90.9);  // approx ERDC coords
   double centerLatLon[2] = { 42.849604, -73.758345 }; // KHQ coords
-  double zoom = 5;
+  int zoom = 5;
   this->Map->SetCenter(centerLatLon);
   this->Map->SetZoom(zoom);
   this->UI->MapCoordinatesWidget->setCoordinates(centerLatLon, zoom);
@@ -166,6 +168,7 @@ qtWeatherStations::qtWeatherStations(QWidget* parent)
   markerLayer->AddFeature(this->MapMarkers);
 
   vtkNew<vtkRenderWindow> mapRenderWindow;
+  mapRenderWindow->SetMultiSamples(0);
   mapRenderWindow->AddRenderer(this->Renderer);
   this->MapWidget->SetRenderWindow(mapRenderWindow.GetPointer());
 
@@ -219,6 +222,8 @@ qtWeatherStations::~qtWeatherStations()
   {
     this->InteractorCallback->Delete();
   }
+
+  delete this->UI;
 }
 
 // ------------------------------------------------------------
@@ -258,6 +263,17 @@ void qtWeatherStations::showStations()
   this->UI->StationText->setText("Retrieving station data.");
   // Todo is there any way to update StationText (QTextEdit) *now* ???
 
+  // remove old markers
+  // testing DeleteMarker
+  for (const auto& id : StationMap)
+  {
+    if (!this->MapMarkers->DeleteMarker(id.first))
+    {
+      std::cout << "Error: unable to delete marker "
+                << id.first << std::endl;
+    }
+  }
+  //this->MapMarkers->DeleteAllMarkers();
   this->StationMap.clear();
 
   // Request weather station data
@@ -329,10 +345,10 @@ Json::Value qtWeatherStations::RequestStationData()
   // Construct openweathermaps request
   int count = this->UI->StationCountSpinBox->value();
   const char* appId = "14cdc51cab181f8848f43497c58f1a96";
-  const char* format = "http://api.openweathermap.org/data/2.5/find"
-                       "?lat=%f&lon=%f&cnt=%d&units=imperial&APPID=%s";
   char url[256];
-  sprintf(url, format, lat, lon, count, appId);
+  snprintf(url, 256, "http://api.openweathermap.org/data/2.5/find"
+           "?lat=%f&lon=%f&cnt=%d&units=imperial&APPID=%s",
+           lat, lon, count, appId);
   std::cout << "url " << url << std::endl;
 
   // Initialize curl & send request
@@ -342,17 +358,18 @@ Json::Value qtWeatherStations::RequestStationData()
 
   std::stringstream curlStream;
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, &curlStream);
+  curl_easy_setopt(curl, CURLOPT_USERAGENT, "wsmap");
 
   //curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
   //std::cout << "Start request" << std::endl;
   // Use blocking IO for now
-  CURLcode res = curl_easy_perform(curl);
+  curl_easy_perform(curl);
   //std::cout << "Request end, return value " << res << std::endl;
   curl_easy_cleanup(curl);
 
   // Parse input string (json)
   curlStream.seekp(0L);
-  std::string curlData = curlStream.str();
+  //std::string curlData = curlStream.str();
   //std::cout << curlData << std::endl;
 
   Json::Reader reader;
@@ -381,7 +398,7 @@ std::vector<StationReport> qtWeatherStations::ParseStationData(Json::Value json)
     return stationList;
   }
 
-  for (int i = 0; i < stationListNode.size(); ++i)
+  for (int i = 0; i < int(stationListNode.size()); ++i)
   {
     StationReport station;
 
@@ -422,7 +439,7 @@ void qtWeatherStations::DisplayStationData(
   std::vector<StationReport> stationList)
 {
   std::stringstream ss;
-  for (int i = 0; i < stationList.size(); ++i)
+  for (size_t i = 0; i < stationList.size(); ++i)
   {
     StationReport station = stationList[i];
     ss << std::setw(3) << i + 1 << ". " << station.id << "  " << std::setw(20)
@@ -449,7 +466,7 @@ void qtWeatherStations::DisplayStationMarkers(
   std::vector<StationReport> stationList)
 {
   // Create map markers for each station
-  for (int i = 0; i < stationList.size(); ++i)
+  for (size_t i = 0; i < stationList.size(); ++i)
   {
     StationReport station = stationList[i];
     vtkIdType id =

core/CMakeLists.txt

@@ -65,8 +65,8 @@ target_include_directories(vtkMapCore
                              ${CMAKE_BINARY_DIR}
                              ${CMAKE_CURRENT_BINARY_DIR}
                              ${CMAKE_CURRENT_SOURCE_DIR}
-                           PRIVATE
                              ${CURL_INCLUDE_DIRS}
+                           PRIVATE
                              ${OPENGL_INCLUDE_DIRS}
                           )
 

core/Timer.h

@@ -12,7 +12,7 @@ class Timer
 
   void reset() { timestamp = std::chrono::high_resolution_clock::now(); }
 
-  template <typename Period>
+  template<typename Period>
   size_t elapsed()
   {
     const auto current = std::chrono::high_resolution_clock::now();

core/vtkFeature.cxx

@@ -61,9 +61,13 @@ vtkProp* vtkFeature::PickProp()
 }
 
 //----------------------------------------------------------------------------
-void vtkFeature::PickItems(
-  vtkRenderer* renderer, int displayCoords[4], vtkGeoMapSelection* selection)
+void vtkFeature::PickItems(vtkRenderer* renderer,
+  int displayCoords[4],
+  vtkGeoMapSelection* selection)
 {
+  (void) renderer;
+  (void) displayCoords;
+  (void) selection;
   vtkWarningMacro("vtkFeature::PickItems() called -- should be overridden in "
     << this->GetClassName());
 }

core/vtkFeature.h

@@ -78,8 +78,9 @@ class VTKMAPCORE_EXPORT vtkFeature : public vtkObject
   // Description:
   // Pick all feature items at designated display coordinates.
   // For external features to override.
-  virtual void PickItems(
-    vtkRenderer* renderer, int displayCoords[4], vtkGeoMapSelection* selection);
+  virtual void PickItems(vtkRenderer* renderer,
+    int displayCoords[4],
+    vtkGeoMapSelection* selection);
 
 protected:
   vtkFeature();

core/vtkFeatureLayer.cxx

@@ -30,7 +30,7 @@ vtkStandardNewMacro(vtkFeatureLayer);
 class vtkFeatureLayer::vtkInternal
 {
 public:
-  std::vector<vtkFeature*> Features;
+  std::vector<vtkSmartPointer<vtkFeature>> Features;
   vtkSmartPointer<vtkCollection> FeatureCollection;
 
   vtkInternal()
@@ -46,9 +46,7 @@ vtkFeatureLayer::vtkFeatureLayer()
 }
 
 //----------------------------------------------------------------------------
-vtkFeatureLayer::~vtkFeatureLayer()
-{
-}
+vtkFeatureLayer::~vtkFeatureLayer() {}
 
 //----------------------------------------------------------------------------
 void vtkFeatureLayer::PrintSelf(std::ostream& os, vtkIndent indent)
@@ -61,11 +59,11 @@ void vtkFeatureLayer::PrintSelf(std::ostream& os, vtkIndent indent)
 }
 
 //----------------------------------------------------------------------------
-void vtkFeatureLayer::Delete()
+void vtkFeatureLayer::UnRegister(vtkObjectBase* o)
 {
   if (this->GetReferenceCount() > 1)
   {
-    this->Superclass::Delete();
+    this->Superclass::UnRegister(o);
     return;
   }
 
@@ -75,20 +73,18 @@ void vtkFeatureLayer::Delete()
   for (std::size_t i = 0; i < size; ++i)
   {
     //invoke delete on each vtk class in the vector
-    vtkFeature* f = this->Impl->Features[i];
-    if (f)
+    if (this->Impl->Features[i])
     {
-      f->CleanUp();
-      f->Delete();
+      this->Impl->Features[i]->CleanUp();
     }
   }
   delete this->Impl;
 
-  this->Superclass::Delete();
+  this->Superclass::UnRegister(o);
 }
 
 //----------------------------------------------------------------------------
-void vtkFeatureLayer::AddFeature(vtkFeature* feature)
+void vtkFeatureLayer::AddFeature(vtkSmartPointer<vtkFeature> feature)
 {
   if (!feature)
   {
@@ -105,45 +101,41 @@ void vtkFeatureLayer::AddFeature(vtkFeature* feature)
     return;
   }
 
-  std::vector<vtkFeature*>::iterator itr = std::find(
+  auto itr = std::find(
     this->Impl->Features.begin(), this->Impl->Features.end(), feature);
   if (itr == this->Impl->Features.end())
   {
-    feature->Register(this);
     feature->SetLayer(this);
     this->Impl->Features.push_back(feature);
   }
 
   feature->Init();
 
   // Notify the map
-  this->Map->FeatureAdded(feature);
+  this->Map->FeatureAdded(feature.GetPointer());
 
   this->Modified();
 }
 
 //----------------------------------------------------------------------------
-void vtkFeatureLayer::RemoveFeature(vtkFeature* feature)
+void vtkFeatureLayer::RemoveFeature(vtkSmartPointer<vtkFeature> feature)
 {
   if (!feature)
   {
     return;
   }
 
-  // Notify the map first
-  this->Map->ReleaseFeature(feature);
-
-  feature->CleanUp();
-  typedef std::vector<vtkFeature*>::iterator iter;
-  iter found_iter = std::find(
+  auto found_iter = std::find(
     this->Impl->Features.begin(), this->Impl->Features.end(), feature);
+  if (found_iter != this->Impl->Features.end())
+  {
+    // Notify the map first
+    this->Map->ReleaseFeature(feature.GetPointer());
 
-  //now that we have found the feature delete it, leaving a dangling pointer
-  (*found_iter)->Delete();
+    feature->CleanUp();
 
-  //now resize the array to not hold the empty feature
-  this->Impl->Features.erase(std::remove(
-    this->Impl->Features.begin(), this->Impl->Features.end(), feature));
+    this->Impl->Features.erase(found_iter);
+  }
 }
 
 //----------------------------------------------------------------------------
@@ -152,10 +144,10 @@ vtkCollection* vtkFeatureLayer::GetFeatures()
   // The internal feature collection could be cached, but for,
   // we'll rebuild it every time.
   this->Impl->FeatureCollection->RemoveAllItems();
-  std::vector<vtkFeature*>::iterator iter = this->Impl->Features.begin();
+  auto iter = this->Impl->Features.begin();
   for (; iter != this->Impl->Features.end(); iter++)
   {
-    vtkFeature* feature = *iter;
+    vtkFeature* const feature = iter->GetPointer();
     this->Impl->FeatureCollection->AddItem(feature);
   }
   return this->Impl->FeatureCollection;

core/vtkFeatureLayer.h

@@ -32,19 +32,19 @@ class VTKMAPCORE_EXPORT vtkFeatureLayer : public vtkLayer
   vtkTypeMacro(vtkFeatureLayer, vtkLayer)
 
     // Description:
-    // Override vtkObject::Delete()
+    // Override vtkObjectBase::UnRegister(vtkObjectBase*)
     // Needed in order to delete features, which use a weak pointer to
     // to their vtkFeatureLayer instance,
-    void Delete() override;
+    void UnRegister(vtkObjectBase* o) override;
 
   // Description:
   // Add a new feature to the layer
   // Note: layer must be added to a vtkMap *before* features can be added.
-  void AddFeature(vtkFeature* feature);
+  void AddFeature(vtkSmartPointer<vtkFeature> feature);
 
   // Description:
   // Remove a feature from the layer
-  void RemoveFeature(vtkFeature* feature);
+  void RemoveFeature(vtkSmartPointer<vtkFeature> feature);
 
   // Description:
   // Return all features contained here