fix stamen basemap

GeoDaCenter · Aug 17, 2023 · d58fa23 · d58fa23
1 parent 8095b6d
commit d58fa23
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,10 @@ BuildTools/macosx/build/
 BuildTools/macosx/GeoDa.xcodeproj/
 BuildTools/macosx/GeoDa.xcodeproj/xcuserdata/
 BuildTools/macosx/GeoDa-leopard.xcodeproj/
+BuildTools/reactgeoda
+BuildTools/node_modules
+
+build/
 
 *.dmg
 *.mode1v3

diff --git a/Explore/Basemap.cpp b/Explore/Basemap.cpp
@@ -42,6 +42,8 @@
 #include <ogr_spatialref.h>
 
 #include <curl/curl.h>
+#include "../GdaConst.h"
+#include "../GeneralWxUtils.h"
 #include "../ShapeOperations/OGRDataAdapter.h"
 #include "Basemap.h"
 
@@ -156,8 +158,6 @@ XYFraction::XYFraction(double _x, double _y)
     yfrac = modf(_y, &yint);
 }
 
-const char *Basemap::USER_AGENT = "GeoDa 1.14 contact spatial@uchiago.edu";
-
 Basemap::Basemap(BasemapItem& _basemap_item,
                  Screen* _screen,
                  MapLayer* _map,
@@ -612,6 +612,21 @@ size_t curlCallback(void *ptr, size_t size, size_t nmemb, void* userdata)
     return written;
 }
 
+wxString Basemap::GetUserAgent(const wxString& url)
+{
+    if (url.Find("openstreetmap") != wxNOT_FOUND) {
+        return GdaConst::gda_basemap_osm_useragent;
+    }
+    if (GeneralWxUtils::isWindows()) {
+        return GdaConst::gda_basemap_win_useragent;
+    } else if (GeneralWxUtils::isMac()) {
+        return GdaConst::gda_basemap_mac_useragent;
+    } else {
+        return GdaConst::gda_basemap_linux_useragent;
+    }
+
+}
+
 wxString Basemap::GetContentType()
 {
     wxString url = GetTileUrl(16, 11); // guerry
@@ -621,7 +636,8 @@ wxString Basemap::GetContentType()
     if(curl) {
         curl_easy_setopt(curl, CURLOPT_URL, url.ToUTF8().data());
         curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2);
-        curl_easy_setopt(curl, CURLOPT_USERAGENT, Basemap::USER_AGENT);
+        curl_easy_setopt(curl, CURLOPT_USERAGENT, GetUserAgent(url).ToUTF8().data());
+        curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
         curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 1L);
@@ -670,10 +686,10 @@ void Basemap::DownloadTile(int x, int y)
             if (fp) {
                 curl_easy_setopt(image, CURLOPT_URL, url.ToUTF8().data());
                 curl_easy_setopt(image, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2);
-                curl_easy_setopt(image, CURLOPT_USERAGENT, Basemap::USER_AGENT);
+                curl_easy_setopt(image, CURLOPT_USERAGENT, GetUserAgent(url).ToUTF8().data());
                 curl_easy_setopt(image, CURLOPT_WRITEFUNCTION, curlCallback);
                 curl_easy_setopt(image, CURLOPT_WRITEDATA, fp);
-                //curl_easy_setopt(image, CURLOPT_FOLLOWLOCATION, 1);
+                curl_easy_setopt(image, CURLOPT_FOLLOWLOCATION, 1);
                 curl_easy_setopt(image, CURLOPT_SSL_VERIFYHOST, 0);
                 curl_easy_setopt(image, CURLOPT_SSL_VERIFYPEER, 0);
                 curl_easy_setopt(image, CURLOPT_CONNECTTIMEOUT, 1L);

diff --git a/Explore/Basemap.h b/Explore/Basemap.h
@@ -235,11 +235,11 @@ namespace Gda {
                     east = _e;
                     south = _s;
                 }
-                OGRSpatialReference* s1 = poCT->GetTargetCS();
-                OGRSpatialReference* s2 = poCT->GetSourceCS();
+                const OGRSpatialReference* s1 = poCT->GetTargetCS();
+                const OGRSpatialReference* s2 = poCT->GetSourceCS();
 #ifdef __PROJ6__
-                s1->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-                s2->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+                const_cast<OGRSpatialReference*>(s1)->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+                const_cast<OGRSpatialReference*>(s2)->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
 #endif
                 poCT_rev = OGRCreateCoordinateTransformation(s1, s2);
             }
@@ -327,20 +327,20 @@ namespace Gda {
             poCT_rev = NULL;
             if (other) {
                 if (other->poCT) {
-                    OGRSpatialReference* s1 = other->poCT->GetSourceCS();
-                    OGRSpatialReference* s2 = other->poCT->GetTargetCS();
+                    const OGRSpatialReference* s1 = other->poCT->GetSourceCS();
+                    const OGRSpatialReference* s2 = other->poCT->GetTargetCS();
 #ifdef __PROJ6__
-                    s1->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-                    s2->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+                    const_cast<OGRSpatialReference*>(s1)->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+                    const_cast<OGRSpatialReference*>(s2)->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
 #endif
                     poCT = OGRCreateCoordinateTransformation(s1, s2);
                 }
                 if (other->poCT_rev) {
-                    OGRSpatialReference* s1 = other->poCT_rev->GetSourceCS();
-                    OGRSpatialReference* s2 = other->poCT_rev->GetTargetCS();
+                    const OGRSpatialReference* s1 = other->poCT_rev->GetSourceCS();
+                    const OGRSpatialReference* s2 = other->poCT_rev->GetTargetCS();
 #ifdef __PROJ6__
-                    s1->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-                    s2->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+                    const_cast<OGRSpatialReference*>(s1)->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+                    const_cast<OGRSpatialReference*>(s2)->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
 #endif
                     poCT_rev = OGRCreateCoordinateTransformation(s1, s2);
                 }
@@ -377,7 +377,6 @@ namespace Gda {
                 double scale_factor = 1.0);
         ~Basemap();
 
-        static const char* USER_AGENT;
         OGRCoordinateTransformation *poCT;
         BasemapItem basemap_item;
         wxString basemapName;
@@ -439,6 +438,7 @@ namespace Gda {
 
         void CleanCache();
         wxString GetContentType();
+        wxString GetUserAgent(const wxString& url);
     };
 
 }

diff --git a/GdaConst.cpp b/GdaConst.cpp
@@ -395,6 +395,10 @@ wxString GdaConst::gda_basemap_sources =
 "\nOther (China).GaoDe,http://webst{s}.is.autonavi.com/appmaptile?style=8&x={x}&y={y}&z={z}"
 "\nOther (China).GaoDe(Satellite),http://webst{s}.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}"
 ;
+const wxString GdaConst::gda_basemap_osm_useragent = "GeoDa 1.14 contact spatial@uchiago.edu";
+const wxString GdaConst::gda_basemap_win_useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36";
+const wxString GdaConst::gda_basemap_mac_useragent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36";
+const wxString GdaConst::gda_basemap_linux_useragent = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36";
 
 const wxString GdaConst::gda_lbl_not_sig = _("Not Significant");
 const wxString GdaConst::gda_lbl_undefined = _("Undefined");

diff --git a/GdaConst.h b/GdaConst.h
@@ -413,6 +413,12 @@ class GdaConst {
 	static const int ShpHeaderSize = 50; // size of the header record in Shapefile
 	static const int ShpObjIdLen = 20;    // length of the ID of shape object
 
+    // Basemap
+    static const wxString gda_basemap_osm_useragent;
+    static const wxString gda_basemap_win_useragent;
+    static const wxString gda_basemap_mac_useragent;
+    static const wxString gda_basemap_linux_useragent;
+
     static wxCursor zoomInCursor;
     static wxCursor zoomOutCursor;