Commit 36afb4bd authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 7.2.0~beta2

parent 220a777c
......@@ -18,7 +18,7 @@ include(CheckCSourceCompiles)
set (MapServer_VERSION_MAJOR 7)
set (MapServer_VERSION_MINOR 2)
set (MapServer_VERSION_REVISION 0)
set (MapServer_VERSION_SUFFIX "-beta1")
set (MapServer_VERSION_SUFFIX "-beta2")
set(TARGET_VERSION_MAJOR ${MapServer_VERSION_MAJOR})
set(TARGET_VERSION_MINOR ${MapServer_VERSION_MINOR})
......
......@@ -12,6 +12,11 @@ For a complete change history, please see the Git log comments. For more
details about recent point releases, please see the online changelog at:
http://mapserver.org/development/changelog/
7.2.0-beta2 release (2018-6-13)
- Update beta1 release notes to remove reference to PHP7 support
- No other major changes, see detailed changelog for bug fixes
7.2.0-beta1 release (2018-5-9)
--------------------
......@@ -29,8 +34,6 @@ http://mapserver.org/development/changelog/
- Support C-style multi-line content types (#5362)
- PHP 7 MapScript Support Through SWIG (RFC117)
- Python 3.x support (#5561)
- Support Vendor-Specific OGC FILTER parameter in WMS requests (RFC118)
......
......@@ -1683,14 +1683,29 @@ int pointLayerDrawShape(mapObj *map, imageObj *image, layerObj *layer, shapeObj
{
int l, c = shape->classindex, j, i, s;
pointObj *point;
int ret = MS_FAILURE;
#ifdef USE_PROJ
if (layer->project && layer->transform == MS_TRUE)
msProjectShape(&layer->projection, &map->projection, shape);
#endif
for (l = 0; l < layer->class[c]->numlabels; l++)
if (layer->class[c]->labels[l]->angle != 0) layer->class[c]->labels[l]->angle -= map->gt.rotation_angle; /* TODO: is this right???? */
// Only take into account map rotation if the label and style angles are
// non-zero.
if( map->gt.rotation_angle )
{
for (l = 0; l < layer->class[c]->numlabels; l++)
{
if( layer->class[c]->labels[l]->angle != 0 )
layer->class[c]->labels[l]->angle -= map->gt.rotation_angle;
}
for (s = 0; s < layer->class[c]->numstyles; s++)
{
if( layer->class[c]->styles[s]->angle != 0 )
layer->class[c]->styles[s]->angle -= map->gt.rotation_angle;
}
}
for (j = 0; j < shape->numlines; j++) {
for (i = 0; i < shape->line[j].numpoints; i++) {
......@@ -1707,26 +1722,44 @@ int pointLayerDrawShape(mapObj *map, imageObj *image, layerObj *layer, shapeObj
layer->class[c]->styles[s]->minscaledenom,
layer->class[c]->styles[s]->maxscaledenom))
if(UNLIKELY(MS_FAILURE == msDrawMarkerSymbol(map, image, point, layer->class[c]->styles[s], layer->scalefactor))) {
return MS_FAILURE;
goto end;
}
}
}
if(MS_DRAW_LABELS(drawmode)) {
if (layer->labelcache) {
if (msAddLabelGroup(map, image, layer, c, shape, point, -1) != MS_SUCCESS) return (MS_FAILURE);
if (msAddLabelGroup(map, image, layer, c, shape, point, -1) != MS_SUCCESS) goto end;
} else {
for (l = 0; l < layer->class[c]->numlabels; l++)
if(msGetLabelStatus(map,layer,shape,layer->class[c]->labels[l]) == MS_ON) {
char *annotext = msShapeGetLabelAnnotation(layer,shape,layer->class[c]->labels[l]);
if(UNLIKELY(MS_FAILURE == msDrawLabel(map, image, *point, annotext, layer->class[c]->labels[l], layer->scalefactor))) {
return MS_FAILURE;
goto end;
}
}
}
}
}
}
return MS_SUCCESS;
ret = MS_SUCCESS;
end:
if( map->gt.rotation_angle )
{
for (l = 0; l < layer->class[c]->numlabels; l++)
{
if( layer->class[c]->labels[l]->angle != 0 )
layer->class[c]->labels[l]->angle += map->gt.rotation_angle;
}
for (s = 0; s < layer->class[c]->numstyles; s++)
{
if( layer->class[c]->styles[s]->angle != 0 )
layer->class[c]->styles[s]->angle += map->gt.rotation_angle;
}
}
return ret;
}
int lineLayerDrawShape(mapObj *map, imageObj *image, layerObj *layer, shapeObj *shape,
......
This diff is collapsed.
......@@ -315,10 +315,11 @@ int msMVTWriteTile( mapObj *map, int sendheaders ) {
int iLayer,retcode=MS_SUCCESS;
unsigned len;
void *buf;
const char *mvt_extent = msGetOutputFormatOption(map->outputformat, "EXTENT", "4096");
const char *mvt_buffer = msGetOutputFormatOption(map->outputformat, "EDGE_BUFFER", "10");
int buffer = MS_ABS(atoi(mvt_buffer));
VectorTile__Tile mvt_tile = VECTOR_TILE__TILE__INIT;
mvt_tile.layers = msSmallCalloc(map->numlayers,sizeof(VectorTile__Tile__Layer*));
mvt_tile.layers = msSmallCalloc(map->numlayers, sizeof(VectorTile__Tile__Layer*));
/* expand the map->extent so it goes from pixel center (MapServer) to pixel edge (OWS) */
map->extent.minx -= map->cellsize * 0.5;
......@@ -378,8 +379,8 @@ int msMVTWriteTile( mapObj *map, int sendheaders ) {
vector_tile__tile__layer__init(mvt_layer);
mvt_layer->version = 2;
mvt_layer->name = layer->name;
mvt_buffer = msGetOutputFormatOption(map->outputformat, "EXTENT", "4096");
mvt_layer->extent = MS_ABS(atoi(mvt_buffer));
mvt_layer->extent = MS_ABS(atoi(mvt_extent));
mvt_layer->has_extent = 1;
/* -------------------------------------------------------------------- */
......
......@@ -2003,7 +2003,7 @@ char *msPostGISBuildSQLWhere(layerObj *layer, rectObj *rect, long *uid, rectObj
char *strBox = 0;
char *strSRID = 0;
size_t strBoxLength = 0;
static const char *strRectTemplate = "%s && %s";
static const char *strRectTemplate = "\"%s\" && %s";
/* We see to set the SRID on the box, but to what SRID? */
strSRID = msPostGISBuildSQLSRID(layer);
......
......@@ -1878,7 +1878,9 @@ static void msWCSPrepareNamespaces20(xmlDocPtr pDoc, xmlNodePtr psRootNode, mapO
xsi_schemaLocation = msStringConcatenate(xsi_schemaLocation, " ");
if (addInspire) {
xsi_schemaLocation = msStringConcatenate(xsi_schemaLocation, MS_INSPIRE_DLS_NAMESPACE_URI " " MS_INSPIRE_DLS_SCHEMA_LOCATION);
xsi_schemaLocation = msStringConcatenate(xsi_schemaLocation, MS_INSPIRE_DLS_NAMESPACE_URI " ");
xsi_schemaLocation = msStringConcatenate(xsi_schemaLocation, msOWSGetInspireSchemasLocation(map));
xsi_schemaLocation = msStringConcatenate(xsi_schemaLocation, MS_INSPIRE_DLS_SCHEMA_LOCATION);
}
xmlNewNsProp(psRootNode, psXsiNs, BAD_CAST "schemaLocation", BAD_CAST xsi_schemaLocation);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment