[Git][debian-gis-team/mapserver][upstream] New upstream version 8.0.0~rc2

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / mapserver


Commits:
7fd58f3e by Bas Couwenberg at 2022-09-05T16:27:14+02:00
New upstream version 8.0.0~rc2
- - - - -


4 changed files:

- CMakeLists.txt
- HISTORY.TXT
- mappostgis.cpp
- mapwms.cpp


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -17,7 +17,7 @@ include(CheckCSourceCompiles)
 set (MapServer_VERSION_MAJOR 8)
 set (MapServer_VERSION_MINOR 0)
 set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-rc1")
+set (MapServer_VERSION_SUFFIX "-rc2")
 
 # Set C++ version
 # Make CMAKE_CXX_STANDARD available as cache option overridable by user


=====================================
HISTORY.TXT
=====================================
@@ -12,6 +12,13 @@ For a complete change history, please see the Git log comments.  For more
 details about recent point releases, please see the online changelog at:
 https://mapserver.org/development/changelog/
 
+8.0.0-rc2 release (2022-09-05)
+------------------------------
+
+- fix !BOX! token not working for a PostGIS connection (#6601)
+
+- check if a LAYER has a NAME, before including it in a GROUP (#6603)
+
 8.0.0-rc1 release (2022-08-19)
 ------------------------------
 


=====================================
mappostgis.cpp
=====================================
@@ -1801,6 +1801,10 @@ static std::string msPostGISBuildSQLSRID(layerObj *layer)
 static std::string msPostGISReplaceBoxToken(layerObj *layer, const rectObj *rect, const char *fromsource)
 {
   std::string result(fromsource);
+  
+  if( layer->debug > 1 ) {
+    msDebug("msPostGISReplaceBoxToken called.\n");
+  }  
 
   if ( strstr(fromsource, BOXTOKEN) && rect ) {
     char *strBox = nullptr;
@@ -1901,7 +1905,7 @@ static std::string msPostGISBuildSQLWhere(layerObj *layer, const rectObj *rect,
         // If the SRID is known, we can safely use ST_Intersects()
         // otherwise if find_srid() would return 0, ST_Intersects() would not
         // work at all, which breaks the msautotest/query/query_postgis.map
-        // tests, releated to bdry_counpy2 layer that has no SRID
+        // tests, related to bdry_counpy2 layer that has no SRID
         if( layerinfo->version >= 20500 )
         {
             strRect = "ST_Intersects(\"";
@@ -2051,6 +2055,11 @@ static std::string msPostGISBuildSQLWhere(layerObj *layer, const rectObj *rect,
     strWhere += std::to_string(layer->startindex-1);
   }
 
+  if (strWhere.empty()) {
+      // return all records
+      strWhere = "true";
+  }
+
   return strWhere;
 }
 


=====================================
mapwms.cpp
=====================================
@@ -539,8 +539,10 @@ void msWMSPrepareNestedGroups(mapObj* map, int /* nVersion */, char*** nestedGro
  } 
  /* Iterate through layers to find out whether they are in any of the nested groups */
  for (int i = 0; i < map->numlayers; i++) {
-    if( uniqgroups.find(msStringToLower(std::string(GET_LAYER(map, i)->name))) != uniqgroups.end() ) {
-        isUsedInNestedGroup[i] = 1;
+    if (GET_LAYER(map, i)->name) {
+        if( uniqgroups.find(msStringToLower(std::string(GET_LAYER(map, i)->name))) != uniqgroups.end() ) {
+            isUsedInNestedGroup[i] = 1;
+        }
     }
   }
 }



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/commit/7fd58f3ec0ff061e1f4f23eceb7f5cb76692fe60

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/commit/7fd58f3ec0ff061e1f4f23eceb7f5cb76692fe60
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220905/2c0d33aa/attachment-0001.htm>