PROJ6: improve performance of msOWSPrintBoundingBox() with context sharing

Author: rouault

CMakeLists.txt

@@ -259,7 +259,7 @@ mappluginlayer.c mapsymbol.c mapchart.c mapimagemap.c mappool.c maptclutf.c
 mapcluster.c mapio.c mappostgis.c maptemplate.c mapcontext.c mapjoin.c
 mappostgresql.c mapthread.c mapcopy.c maplabel.c mapprimitive.c maptile.c
 mapcpl.c maplayer.c mapproject.c maptime.c mapcrypto.c maplegend.c hittest.c
-mapprojhack.c maptree.c mapdebug.c maplexer.c mapquantization.c mapunion.c
+maptree.c mapdebug.c maplexer.c mapquantization.c mapunion.c
 mapdraw.c maplibxml2.c mapquery.c maputil.c strptime.c mapdrawgdal.c
 mapraster.c mapuvraster.c mapdummyrenderer.c mapobject.c maprasterquery.c
 mapwcs.c maperror.c mapogcfilter.c mapregex.c mapwcs11.c mapfile.c

mapcopy.c

@@ -70,6 +70,7 @@ int msCopyProjectionExtended(projectionObj *dst, projectionObj *src, char ** arg
   for(i=0 ; i< num_args; i++) {
     dst->args[dst->numargs++] = msStrdup(args[i]);
   }
+  msProjectionInheritContextFrom(dst, src);
   if (dst->numargs != 0) {
     if (msProcessProjection(dst) != MS_SUCCESS)
       return MS_FAILURE;

mapfile.c

@@ -1266,7 +1266,8 @@ int msLoadProjectionStringEPSG(projectionObj *p, const char *value)
 {
 #ifdef USE_PROJ
   assert(p);
-  msFreeProjection(p);
+
+  msFreeProjectionExceptContext(p);
 
   p->gt.need_geotransform = MS_FALSE;
 #ifdef USE_PROJ_FASTPATHS
@@ -1299,8 +1300,7 @@ int msLoadProjectionString(projectionObj *p, const char *value)
   p->gt.need_geotransform = MS_FALSE;
 
 #ifdef USE_PROJ
-  msFreeProjection(p);
-
+  msFreeProjectionExceptContext(p);
 
   /*
    * Handle new style definitions, the same as they would be given to
@@ -3570,6 +3570,12 @@ int initLayer(layerObj *layer, mapObj *map)
 
   layer->units = MS_METERS;
   if(msInitProjection(&(layer->projection)) == -1) return(-1);
+
+  if( map )
+  {
+    msProjectionInheritContextFrom(&(layer->projection), &(map->projection));
+  }
+
   layer->project = MS_TRUE;
 
   initCluster(&layer->cluster);
@@ -5925,6 +5931,8 @@ int initMap(mapObj *map)
   map->latlon.args[0] = msStrdup("proj=latlong");
   map->latlon.args[1] = msStrdup("ellps=WGS84"); /* probably want a different ellipsoid */
   if(msProcessProjection(&(map->latlon)) == -1) return(-1);
+
+  msProjectionInheritContextFrom(&(map->projection), &(map->latlon));
 #endif
 
   map->templatepattern = map->datapattern = NULL;

mapows.c

@@ -2093,6 +2093,7 @@ void msOWSProjectToWGS84(projectionObj *srcproj, rectObj *ext)
   if (srcproj->proj && !msProjIsGeographicCRS(srcproj)) {
     projectionObj wgs84;
     msInitProjection(&wgs84);
+    msProjectionInheritContextFrom(&wgs84, srcproj);
     msLoadProjectionString(&wgs84, "+proj=longlat +ellps=WGS84 +datum=WGS84");
     msProjectRect(srcproj, &wgs84, ext);
     msFreeProjection(&wgs84);
@@ -2211,6 +2212,7 @@ void msOWSPrintBoundingBox(FILE *stream, const char *tabspace,
 
       /* reproject the extents for each SRS's bounding box */
       msInitProjection(&proj);
+      msProjectionInheritContextFrom(&proj, srcproj);
       if (msLoadProjectionStringEPSG(&proj, (char *)value) == 0) {
         if (msProjectionsDiffer(srcproj, &proj) == MS_TRUE) {
           msProjectRect(srcproj, &proj, &ext);