Merge branch 'release/v5.0.1'

Author: pmeems

docs/AxInterop.MapWinGIS/AxMap.cs

@@ -2873,12 +2873,22 @@ public double GeodesicLength(Shape polyline)
 
         /// <summary>
         /// This event is fired when the user finishes dragging a selection box in the map control. 
-        /// The map property SendSelectBoxFinal must be set to True for this event to be fired. 
+        /// The map property SendSelectBoxFinal must be set to True for this event to be fired.
         /// </summary>
         /// <param name="left">The left boundary of the selection box in pixel coordinates.</param>
         /// <param name="right">The right boundary of the selection box in pixel coordinates.</param>
         /// <param name="bottom">The bottom boundary of the selection box in pixel coordinates.</param>
         /// <param name="top">The top boundary of the selection box in pixel coordinates.</param>
+        /// <remarks>
+        /// Prior to version 5.0, there was ambiguity as to whether or not this event was fired 
+        /// in all circumstances.  In the case of the cmZoomIn tool, this event was always fired.  
+        /// But in the case of the cmSelection tool, it was only fired in the case when no shapes 
+        /// were actually 'selected'.  If any shapes were 'selected', the SelectionChanged event 
+        /// was fired, but the SelectBoxFinal was not.  As of version 5.0, the SelectBoxFinal event 
+        /// will always be fired after dragging a rectangle, whether or not any shapes were actually 
+        /// 'selected'.
+        /// </remarks>
+        /// \new500 Modified in version 5.0
         public event _DMapEvents_SelectBoxFinalEventHandler SelectBoxFinal;
 
         /// <summary>

docs/Interop.MapWinGIS/Related Pages/Version history.cs

@@ -245,8 +245,8 @@ ALIASES                = "new48=\xrefitem newpage48 \"New API 4.8\" \"New API 4.
                          "new493=\xrefitem newpage493 \"New API 4.9.3\" \"New API 4.9.3\"" \
                          "new494=\xrefitem newpage494 \"New API 4.9.4\" \"New API 4.9.4\"" \
                          "new495=\xrefitem newpage495 \"New API 4.9.5\" \"New API 4.9.5\"" \
-                         "new500=\xrefitem newpage500 \"New API 5.0.0\" \"New API 5.0.0\"" \
-                         "removed493=\xrefitem removed493 \"Removed in 4.9.3\" \"Removed in 4.9.3\""
+                         "removed493=\xrefitem removed493 \"Removed in 4.9.3\" \"Removed in 4.9.3\"" \
+                         "new500=\xrefitem newpage500 \"New API 5.0.0\" \"New API 5.0.0\""
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding "class=itcl::class"
@@ -2475,19 +2475,19 @@ DOT_TRANSPARENT        = NO
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_MULTI_TARGETS      = YES
+DOT_MULTI_TARGETS      = NO
 
 # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
 # graphs.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-GENERATE_LEGEND        = YES
+GENERATE_LEGEND        = NO
 
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
 # files that are used to generate the various graphs.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_CLEANUP            = YES
+DOT_CLEANUP            = NO

docs/MapWinGIS.doxyfile

@@ -782,6 +782,22 @@ STDMETHODIMP CShapeEditor::put_SnapBehavior(tkLayerSelection newVal)
 	return S_OK;
 }
 
+// *******************************************************
+//		get_SnapMode()
+// *******************************************************
+STDMETHODIMP CShapeEditor::get_SnapMode(tkSnapMode* pVal)
+{
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+	*pVal = _snapMode;
+	return S_OK;
+}
+STDMETHODIMP CShapeEditor::put_SnapMode(tkSnapMode newVal)
+{
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+	_snapMode = newVal;
+	return S_OK;
+}
+
 // *******************************************************
 //		EditorState
 // *******************************************************

src/COM classes/ShapeEditor.cpp

@@ -27,6 +27,7 @@ class ATL_NO_VTABLE CShapeEditor :
 		_highlightShapes = lsAllLayers;
 		_snapTolerance = 10;
 		_snapBehavior = lsAllLayers;
+		_snapMode = smVerticesAndLines;
 		_state = esNone;
 		_mapCallback = NULL;
 		_isSubjectShape = false;
@@ -113,6 +114,8 @@ class ATL_NO_VTABLE CShapeEditor :
 	STDMETHOD(put_HighlightVertices)(tkLayerSelection newVal);
 	STDMETHOD(get_SnapBehavior)(tkLayerSelection* pVal);
 	STDMETHOD(put_SnapBehavior)(tkLayerSelection newVal);
+	STDMETHOD(get_SnapMode)(tkSnapMode* pVal);
+	STDMETHOD(put_SnapMode)(tkSnapMode newVal);
 	STDMETHOD(get_EditorState)(tkEditorState* pVal);
 	STDMETHOD(put_EditorState)(tkEditorState newVal);
 	STDMETHOD(StartEdit)(LONG LayerHandle, LONG ShapeIndex, VARIANT_BOOL* retVal);
@@ -154,6 +157,7 @@ class ATL_NO_VTABLE CShapeEditor :
 	ICallback * _globalCallback;
 	VARIANT_BOOL _visible;
 	tkLayerSelection _highlightShapes;
+	tkSnapMode _snapMode;
 	double _snapTolerance;
 	tkLayerSelection _snapBehavior;
 	EditorBase* _activeShape;

src/COM classes/ShapeEditor.h

@@ -3174,6 +3174,41 @@ STDMETHODIMP CShapefile::GetClosestVertex(double x, double y, double maxDistance
     return S_OK;
 }
 
+// *****************************************************************
+//		GetClosestSnapPosition()
+// *****************************************************************
+STDMETHODIMP CShapefile::GetClosestSnapPosition(double x, double y, double maxDistance,
+	long* shapeIndex, double* fx, double* fy, double* distance, VARIANT_BOOL* retVal)
+{
+	AFX_MANAGE_STATE(AfxGetStaticModuleState());
+
+	*retVal = VARIANT_FALSE;
+	*shapeIndex = -1;
+
+	bool result = false;
+	if (maxDistance <= 0.0)
+	{
+		// search through all shapefile
+		std::vector<long> ids;
+		for (size_t i = 0; i < _shapeData.size(); i++)
+		{
+			ids.push_back(i);
+		}
+		result = ShapefileHelper::GetClosestSnapPosition(this, x, y, maxDistance, ids, shapeIndex, *fx, *fy, *distance);
+	}
+	else
+	{
+		std::vector<long> ids;
+		Extent box(x - maxDistance, x + maxDistance, y - maxDistance, y + maxDistance);
+		if (this->SelectShapesCore(box, 0.0, SelectMode::INTERSECTION, ids, false))
+		{
+			result = ShapefileHelper::GetClosestSnapPosition(this, x, y, maxDistance, ids, shapeIndex, *fx, *fy, *distance);
+		}
+	}
+	*retVal = result ? VARIANT_TRUE : VARIANT_FALSE;
+	return S_OK;
+}
+
 // *****************************************************************
 //		HasInvalidShapes()
 // *****************************************************************

src/COM classes/Shapefile.cpp

@@ -213,6 +213,7 @@ class ATL_NO_VTABLE CShapefile :
 	STDMETHOD(EditAddShape)(IShape* shape, long* shapeIndex);
 	STDMETHOD(EditAddField)(BSTR name, FieldType type, int precision, int width, long* fieldIndex);
 	STDMETHOD(GetClosestVertex)(double x, double y, double maxDistance, long* shapeIndex, long* pointIndex, double* distance, VARIANT_BOOL* retVal);
+	STDMETHOD(GetClosestSnapPosition)(double x, double y, double maxDistance, long* shapeIndex, double* fx, double* fy, double* distance, VARIANT_BOOL* retVal);
 	STDMETHOD(get_ShapeCategory2)(long ShapeIndex, BSTR* categoryName);
 	STDMETHOD(put_ShapeCategory2)(long ShapeIndex, BSTR categoryName);
 	STDMETHOD(get_ShapeCategory3)(long ShapeIndex, IShapefileCategory** category);

src/COM classes/Shapefile.h

@@ -175,8 +175,10 @@ bool CShapefile::SelectShapesCore(Extent& extents, double Tolerance, SelectMode
 					shapeVal = i;
 				}
 
-                IShape* shape = _shapeData[shapeVal]->shape;
-                // convert querying shape to GEOS
+				// get current shape
+				CComPtr<IShape> shape = nullptr;
+				get_Shape(shapeVal, &shape);
+				// convert querying shape to GEOS
                 GEOSGeom geosShape = GeosConverter::ShapeToGeom(shape);
                 // check for containment
                 if (GeosHelper::Contains(geosShape, geosPoint))
@@ -255,9 +257,10 @@ bool CShapefile::SelectShapesCore(Extent& extents, double Tolerance, SelectMode
 
 			if( shpType2D == SHP_POLYLINE && SelectMode == INTERSECTION)
 			{
-                // get current shape
-                IShape* shape = _shapeData[shapeVal]->shape;
-                // convert shape to GEOS
+				// get current shape
+				CComPtr<IShape> shape = nullptr;
+				get_Shape(shapeVal, &shape);
+				// convert shape to GEOS
                 GEOSGeom geos = GeosConverter::ShapeToGeom(shape);
                 // see if shape intersects polygon extent
                 if (GeosHelper::Intersects(geosExtent, geos))
@@ -271,10 +274,11 @@ bool CShapefile::SelectShapesCore(Extent& extents, double Tolerance, SelectMode
 				//}		
 			}
 			else if( shpType2D == SHP_POLYGON && SelectMode == INTERSECTION)
-			{		
-                // get current shape
-                IShape* shape = _shapeData[shapeVal]->shape;
-                // convert shape to GEOS
+			{
+				// get current shape
+				CComPtr<IShape> shape = nullptr;
+				get_Shape(shapeVal, &shape);
+				// convert shape to GEOS
                 GEOSGeom geos = GeosConverter::ShapeToGeom(shape);
                 // see if shape intersects polygon extent
                 if (GeosHelper::Intersects(geosExtent, geos))

src/COM classes/Shapefile_Selection.cpp

@@ -382,10 +382,78 @@ bool ShapefileHelper::GetClosestPoint(IShapefile* sf, double x, double y, double
             shp->Release();
         }
     }
-    // dist = minDist;
+    dist = minDist;
     return minDist < maxDistance;
 }
 
+// *****************************************************************
+//		GetClosestSnapPosition()
+// *****************************************************************
+bool ShapefileHelper::GetClosestSnapPosition(IShapefile* sf, double x, double y, double maxDistance, std::vector<long>& ids,
+	long* shapeIndex, double& fx, double& fy, double& dist)
+{
+	if (!sf) return false;
+
+	VARIANT_BOOL vb;
+	double minDist = DBL_MAX;
+
+    IPoint* pnt = NULL;
+    IShape* ptShp = NULL;
+    IShape* resShp = NULL;
+
+	for (long id : ids)
+	{
+		VARIANT_BOOL visible;
+		sf->get_ShapeVisible(id, &visible);
+		if (visible == VARIANT_FALSE) continue;
+
+		IShape* shp = NULL;
+		sf->get_Shape(id, &shp);
+
+		if (shp != NULL)
+		{
+            // Create point shape
+            ComHelper::CreateShape(&ptShp);
+            ptShp->Create(SHP_POINT, &vb);
+            if (vb != VARIANT_TRUE)
+            {
+                shp->Release();
+                pnt->Release();
+                continue;
+            }
+
+            // Add point
+            ComHelper::CreatePoint(&pnt);
+            pnt->put_X(x);
+            pnt->put_Y(y);
+            long position = 0;
+            ptShp->InsertPoint(pnt, &position, &vb);
+            pnt->Release();
+
+            // Get closest points:
+            shp->ClosestPoints(ptShp , &resShp);
+            ptShp->Release();
+            shp->Release();
+
+            if (resShp != NULL) {
+                // Get the point snapped on geometry
+                double xPnt, yPnt;
+                resShp->get_XY(0, &xPnt, &yPnt, &vb);
+
+                // Check if this is allowed and/or smaller than the previous found point:
+                const double distance = sqrt(pow(x - xPnt, 2.0) + pow(y - yPnt, 2.0));
+                if (distance < minDist && distance < maxDistance) {
+                    fx = xPnt;
+                    fy = yPnt;
+                    minDist = distance;
+                }
+            }            
+		}
+	}
+	dist = minDist;
+	return minDist < maxDistance;
+}
+
 // ********************************************************************
 //		PointInPolygon()
 // ********************************************************************

src/ComHelpers/ShapefileHelper.cpp

@@ -20,6 +20,7 @@ class ShapefileHelper
 	static IShapefile* CloneSelection(IShapefile* sf);
 	static bool ShapeSelected(IShapefile* sf, int shapeIndex);
 	static bool GetClosestPoint(IShapefile* sf, double x, double y, double maxDistance, std::vector<long>& ids, long* shapeIndex, long* pointIndex, double& dist);
+	static bool GetClosestSnapPosition(IShapefile * sf, double x, double y, double maxDistance, std::vector<long>& ids, long * shapeIndex, double& fx, double& fy, double & dist);
 	static bool PointInPolygon(IShapefile* sf, long ShapeIndex, double x, double y);
 	static bool BoundsWithinPolygon(IShapefile* sf, int shapeIndex, double b_minX, double b_minY, double b_maxX, double b_maxY);
 	static bool ShapeTypeIsM(IShapefile* sf);