Commit 56a0ab5e authored by Bas Couwenberg's avatar Bas Couwenberg

Imported Upstream version 6.4.0-beta2

parent 967f9ca4
......@@ -2,4 +2,5 @@ build
*.swp
nbproject
tags
tests/map.png
......@@ -61,7 +61,7 @@ after_success:
- echo "$TRAVIS_SECURE_ENV_VARS"
- echo "$TRAVIS_BRANCH"
- sh -c 'if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "master"; then echo "run coverage"; ./run_code_coverage_upload.sh; fi'
- coveralls --exclude renderers --exclude mapscript --exclude apache --exclude build/mapscript/mapscriptPYTHON_wrap.c --exclude shp2img.c --exclude legend.c --exclude scalebar.c --exclude msencrypt.c --exclude sortshp.c --exclude shptreevis.c --exclude shptree.c --exclude testexpr.c --exclude sym2img.c --exclude testcopy.c --exclude shptreetst.c --exclude tile4ms.c --extension .c --extension .cpp
- coveralls --exclude renderers --exclude mapscript --exclude apache --exclude build/mapscript/mapscriptJAVA_wrap.c --exclude build/mapscript/mapscriptPYTHON_wrap.c --exclude shp2img.c --exclude legend.c --exclude scalebar.c --exclude msencrypt.c --exclude sortshp.c --exclude shptreevis.c --exclude shptree.c --exclude testexpr.c --exclude sym2img.c --exclude testcopy.c --exclude shptreetst.c --exclude tile4ms.c --extension .c --extension .cpp
notifications:
email:
......
......@@ -12,7 +12,7 @@ include(CheckCSourceCompiles)
set (MapServer_VERSION_MAJOR 6)
set (MapServer_VERSION_MINOR 4)
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})
......@@ -236,6 +236,8 @@ add_executable(msencrypt msencrypt.c)
target_link_libraries(msencrypt ${MAPSERVER_LIBMAPSERVER})
add_executable(tile4ms tile4ms.c)
target_link_libraries(tile4ms ${MAPSERVER_LIBMAPSERVER})
add_executable(shptreetst shptreetst.c)
target_link_libraries(shptreetst ${MAPSERVER_LIBMAPSERVER})
find_package(PNG)
......@@ -883,7 +885,7 @@ if(USE_SDE92)
INSTALL(TARGETS msplugin_sde92 DESTINATION lib)
endif(USE_SDE92)
INSTALL(TARGETS sortshp shptree shptreevis msencrypt tile4ms shp2img mapserv mapserver RUNTIME DESTINATION bin LIBRARY DESTINATION lib)
INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv mapserver RUNTIME DESTINATION bin LIBRARY DESTINATION lib)
if(BUILD_STATIC)
INSTALL(TARGETS mapserver_static DESTINATION lib)
endif(BUILD_STATIC)
......
......@@ -15,6 +15,10 @@ For a complete change history, please see the Git log comments.
6.4 release (2013/09/xx)
---------------------------
- RFC 101: Support for Content Dependant Legend Rendering
- Add Support for librsvg as an alternative to libsvg-cairo
- RFC100: Add support for raster tile index with tiles of mixed SRS (TILESRS keyword)
- RFC94: Shape Smoothing
......
......@@ -100,9 +100,9 @@ or not.
Cmake expects these nonstandard prefixes to contain standard subdirectories, i.e.
/opt/cairo-1.18.2/include/cairo.h and /opt/cairo-1.18.2/lib/libcairo.so.
You can specify multiple prefixes on the cmake command line by separating them with
a semi-colon, e.g.
the platform specific separator (e.g. ":" on unixes), e.g.
$ cmake .. -DCMAKE_PREFIX_PATH=/opt/cairo-1.18.2;/opt/freeware
$ cmake .. -DCMAKE_PREFIX_PATH=/opt/cairo-1.18.2:/opt/freeware
3 If you're certain that the packages development headers are installed, and/or that
you pointed to a valid installation prefix, but cmake is still failing, then there's
......@@ -170,8 +170,8 @@ The following are some common CMake options not specific to MapServer itself:
- CMAKE_INSTALL_PREFIX : path where mapserver binaries and libraries should be installed. Defaults
to /usr/local on unix.
- CMAKE_PREFIX_PATH : semi-colon separted list of prefixes where dependencies will be looked for, e.g.
"-DCMAKE_PREFIX_PATH=/opt/freeware;/opt/jdk-1.5.6"
- CMAKE_PREFIX_PATH : platform-specific separator separated list of prefixes where dependencies will be looked for, e.g.
"-DCMAKE_PREFIX_PATH=/opt/freeware:/opt/jdk-1.5.6"
- CMAKE_BUILD_TYPE : Specify the build type. Usually one of 'Debug' or 'Release', e.g.
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Debug"
......
......@@ -2171,7 +2171,7 @@ static void writeLabel(FILE *stream, int indent, labelObj *label)
else writeNumber(stream, indent, "SIZE", -1, label->size);
}
writeKeyword(stream, indent, "ALIGN", label->align, MS_ALIGN_CENTER, "CENTER", MS_ALIGN_RIGHT, "RIGHT");
writeKeyword(stream, indent, "ALIGN", label->align, 2, MS_ALIGN_CENTER, "CENTER", MS_ALIGN_RIGHT, "RIGHT");
writeNumber(stream, indent, "BUFFER", 0, label->buffer);
if(label->numbindings > 0 && label->bindings[MS_LABEL_BINDING_COLOR].item)
......
This diff is collapsed.
......@@ -979,6 +979,7 @@ int msLayerGetMaxFeaturesToDraw(layerObj *layer, outputFormatObj *format)
int nMaxFeatures = -1;
const char *pszTmp = NULL;
if (layer) {
nMaxFeatures = layer->maxfeatures;
pszTmp = msLookupHashTable(&layer->metadata, "maxfeaturestodraw");
if (pszTmp)
nMaxFeatures = atoi(pszTmp);
......
......@@ -557,7 +557,7 @@ int msOWSRequestIsEnabled(mapObj *map, layerObj *layer,
return MS_FALSE;
}
if (map && check_all_layers == MS_FALSE) {
if (map && (check_all_layers == MS_FALSE || map->numlayers == 0)) {
/* then we check in the map metadata */
enable_request = msOWSLookupMetadata(&map->web.metadata, namespaces, "enable_request");
if (msOWSParseRequestMetadata(enable_request, request, &disabled))
......
......@@ -394,7 +394,7 @@ xmlNodePtr msOWSCommonOperationsMetadataOperation(xmlNsPtr psNsOws, xmlNsPtr psX
* @param version the integerized x.y.z version of OWS Common to use
* @param elname name of the element (Parameter | Constraint)
* @param name name of the Parameter
* @param values list of values (comma seperated list) or NULL if none
* @param values list of values (comma separated list) or NULL if none
*
* @return psRootNode xmlNodePtr pointer of XML construct
*
......
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum DBFFieldType {
FTString,
FTInteger,
FTDouble,
FTInvalid
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
using System;
using System.Runtime.InteropServices;
public class DBFInfo : IDisposable {
/* %typemap(csbody) SWIGTYPE */
private HandleRef swigCPtr;
protected bool swigCMemOwn;
protected object swigParentRef;
protected static object ThisOwn_true() { return null; }
protected object ThisOwn_false() { return this; }
internal DBFInfo(IntPtr cPtr, bool cMemoryOwn, object parent) {
swigCMemOwn = cMemoryOwn;
swigParentRef = parent;
swigCPtr = new HandleRef(this, cPtr);
}
internal static HandleRef getCPtr(DBFInfo obj) {
return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
}
internal static HandleRef getCPtrAndDisown(DBFInfo obj, object parent) {
if (obj != null)
{
obj.swigCMemOwn = false;
obj.swigParentRef = parent;
return obj.swigCPtr;
}
else
{
return new HandleRef(null, IntPtr.Zero);
}
}
internal static HandleRef getCPtrAndSetReference(DBFInfo obj, object parent) {
if (obj != null)
{
obj.swigParentRef = parent;
return obj.swigCPtr;
}
else
{
return new HandleRef(null, IntPtr.Zero);
}
}
/* %typemap(csfinalize) SWIGTYPE */
~DBFInfo() {
Dispose();
}
public virtual void Dispose() {
lock(this) {
if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
swigCMemOwn = false;
mapscriptPINVOKE.delete_DBFInfo(swigCPtr);
}
swigCPtr = new HandleRef(null, IntPtr.Zero);
swigParentRef = null;
GC.SuppressFinalize(this);
}
}
public override bool Equals(object obj) {
if (obj == null)
return false;
if (this.GetType() != obj.GetType())
return false;
return swigCPtr.Handle.Equals(DBFInfo.getCPtr((DBFInfo)obj).Handle);
}
public override int GetHashCode() {
return swigCPtr.Handle.GetHashCode();
}
public int nRecords {
get {
int ret = mapscriptPINVOKE.DBFInfo_nRecords_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public uint nRecordLength {
get {
uint ret = mapscriptPINVOKE.DBFInfo_nRecordLength_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public int nHeaderLength {
get {
int ret = mapscriptPINVOKE.DBFInfo_nHeaderLength_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public int nFields {
get {
int ret = mapscriptPINVOKE.DBFInfo_nFields_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public SWIGTYPE_p_int panFieldOffset {
/* %typemap(csvarout, excode=SWIGEXCODE2) SWIGTYPE *, SWIGTYPE [], SWIGTYPE (CLASS::*) */
get {
IntPtr cPtr = mapscriptPINVOKE.DBFInfo_panFieldOffset_get(swigCPtr);
SWIGTYPE_p_int ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_int(cPtr, false, ThisOwn_false());
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public SWIGTYPE_p_int panFieldSize {
/* %typemap(csvarout, excode=SWIGEXCODE2) SWIGTYPE *, SWIGTYPE [], SWIGTYPE (CLASS::*) */
get {
IntPtr cPtr = mapscriptPINVOKE.DBFInfo_panFieldSize_get(swigCPtr);
SWIGTYPE_p_int ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_int(cPtr, false, ThisOwn_false());
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public SWIGTYPE_p_int panFieldDecimals {
/* %typemap(csvarout, excode=SWIGEXCODE2) SWIGTYPE *, SWIGTYPE [], SWIGTYPE (CLASS::*) */
get {
IntPtr cPtr = mapscriptPINVOKE.DBFInfo_panFieldDecimals_get(swigCPtr);
SWIGTYPE_p_int ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_int(cPtr, false, ThisOwn_false());
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public string pachFieldType {
get {
string ret = mapscriptPINVOKE.DBFInfo_pachFieldType_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public string pszHeader {
get {
string ret = mapscriptPINVOKE.DBFInfo_pszHeader_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public int nCurrentRecord {
get {
int ret = mapscriptPINVOKE.DBFInfo_nCurrentRecord_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public int bCurrentRecordModified {
get {
int ret = mapscriptPINVOKE.DBFInfo_bCurrentRecordModified_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public string pszCurrentRecord {
get {
string ret = mapscriptPINVOKE.DBFInfo_pszCurrentRecord_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public int bNoHeader {
get {
int ret = mapscriptPINVOKE.DBFInfo_bNoHeader_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public int bUpdated {
get {
int ret = mapscriptPINVOKE.DBFInfo_bUpdated_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public string pszStringField {
get {
string ret = mapscriptPINVOKE.DBFInfo_pszStringField_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public int nStringFieldLen {
get {
int ret = mapscriptPINVOKE.DBFInfo_nStringFieldLen_get(swigCPtr);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
}
public string getFieldName(int iField) {
string ret = mapscriptPINVOKE.DBFInfo_getFieldName(swigCPtr, iField);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
public int getFieldWidth(int iField) {
int ret = mapscriptPINVOKE.DBFInfo_getFieldWidth(swigCPtr, iField);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
public int getFieldDecimals(int iField) {
int ret = mapscriptPINVOKE.DBFInfo_getFieldDecimals(swigCPtr, iField);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
public int getFieldType(int iField) {
int ret = mapscriptPINVOKE.DBFInfo_getFieldType(swigCPtr, iField);
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
public DBFInfo() : this(mapscriptPINVOKE.new_DBFInfo(), true, null) {
if (mapscriptPINVOKE.SWIGPendingException.Pending) throw mapscriptPINVOKE.SWIGPendingException.Retrieve();
}
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_ALIGN_VALUE {
MS_ALIGN_LEFT,
MS_ALIGN_CENTER,
MS_ALIGN_RIGHT
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_BITMAP_FONT_SIZES {
MS_TINY,
MS_SMALL,
MS_MEDIUM,
MS_LARGE,
MS_GIANT
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_CAPS_JOINS_AND_CORNERS {
MS_CJC_NONE,
MS_CJC_BEVEL,
MS_CJC_BUTT,
MS_CJC_MITER,
MS_CJC_ROUND,
MS_CJC_SQUARE,
MS_CJC_TRIANGLE
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_CONNECTION_TYPE {
MS_INLINE,
MS_SHAPEFILE,
MS_TILED_SHAPEFILE,
MS_SDE,
MS_OGR,
MS_UNUSED_1,
MS_POSTGIS,
MS_WMS,
MS_ORACLESPATIAL,
MS_WFS,
MS_GRATICULE,
MS_MYSQL,
MS_RASTER,
MS_PLUGIN,
MS_UNION,
MS_UVRASTER,
MS_CONTOUR
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_FILE_TYPE {
MS_FILE_MAP,
MS_FILE_SYMBOL
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_FONT_TYPE {
MS_TRUETYPE,
MS_BITMAP
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_GEOS_OPERATOR {
MS_GEOS_EQUALS,
MS_GEOS_DISJOINT,
MS_GEOS_TOUCHES,
MS_GEOS_OVERLAPS,
MS_GEOS_CROSSES,
MS_GEOS_INTERSECTS,
MS_GEOS_WITHIN,
MS_GEOS_CONTAINS,
MS_GEOS_BEYOND,
MS_GEOS_DWITHIN
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_IMAGEMODE {
MS_IMAGEMODE_PC256,
MS_IMAGEMODE_RGB,
MS_IMAGEMODE_RGBA,
MS_IMAGEMODE_INT16,
MS_IMAGEMODE_FLOAT32,
MS_IMAGEMODE_BYTE,
MS_IMAGEMODE_FEATURE,
MS_IMAGEMODE_NULL
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_JOIN_CONNECTION_TYPE {
MS_DB_XBASE,
MS_DB_CSV,
MS_DB_MYSQL,
MS_DB_ORACLE,
MS_DB_POSTGRES
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_JOIN_TYPE {
MS_JOIN_ONE_TO_ONE,
MS_JOIN_ONE_TO_MANY
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_LABEL_BINDING_ENUM {
MS_LABEL_BINDING_SIZE,
MS_LABEL_BINDING_ANGLE,
MS_LABEL_BINDING_COLOR,
MS_LABEL_BINDING_OUTLINECOLOR,
MS_LABEL_BINDING_FONT,
MS_LABEL_BINDING_PRIORITY,
MS_LABEL_BINDING_POSITION,
MS_LABEL_BINDING_SHADOWSIZEX,
MS_LABEL_BINDING_SHADOWSIZEY
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_LAYER_TYPE {
MS_LAYER_POINT,
MS_LAYER_LINE,
MS_LAYER_POLYGON,
MS_LAYER_RASTER,
MS_LAYER_ANNOTATION,
MS_LAYER_QUERY,
MS_LAYER_CIRCLE,
MS_LAYER_TILEINDEX,
MS_LAYER_CHART
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_PARSE_TYPE_ENUM {
MS_PARSE_TYPE_BOOLEAN,
MS_PARSE_TYPE_STRING,
MS_PARSE_TYPE_SHAPE
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_POSITIONS_ENUM {
MS_UL = 101,
MS_LR,
MS_UR,
MS_LL,
MS_CR,
MS_CL,
MS_UC,
MS_LC,
MS_CC,
MS_AUTO,
MS_XY,
MS_FOLLOW,
MS_NONE,
MS_AUTO2
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_QUERYMAP_STYLES {
MS_NORMAL,
MS_HILITE,
MS_SELECTED
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_QUERY_MODE {
MS_QUERY_SINGLE,
MS_QUERY_MULTIPLE
}
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 2.0.7
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
public enum MS_QUERY_TYPE {
MS_QUERY_IS_NULL,
MS_QUERY_BY_POINT,
MS_QUERY_BY_RECT,
MS_QUERY_BY_SHAPE,
MS_QUERY_BY_ATTRIBUTE,
MS_QUERY_BY_INDEX,
MS_QUERY_BY_FILTER
}
/* ----------------------------------------------------------------------------