var drawTool = new DrawTool({
- mode : 'Polygon',
- symbol : {
- 'lineColor' : '#000',
- 'lineWidth' : 5
- },
- once : true
-}).addTo(map);var drawTool = new DrawTool({
mode : 'Polygon',
symbol : {
'lineColor' : '#000',
'lineWidth' : 5
},
once : true
}).addTo(map);//Register "CubicBezierCurve" mode to draw Cubic Bezier Curves.
-DrawTool.registerMode('CubicBezierCurve', {
- 'action': 'clickDblclick',
- 'create': path => new CubicBezierCurve(path),
- 'update': (path, geometry) => {
- geometry.setCoordinates(path);
- },
- 'generate': geometry => geometry
- }
+ //Register "CubicBezierCurve" mode to draw Cubic Bezier Curves.
DrawTool.registerMode('CubicBezierCurve', {
+ 'action': 'clickDblclick',
+ 'create': path => new CubicBezierCurve(path),
+ 'update': (path, geometry) => {
+ geometry.setCoordinates(path);
+ },
+ 'generate': geometry => geometry
+ }
});
@@ -2052,11 +2042,11 @@ Returns:
endDraw(paramopt)
- [source]
+ [source]
@@ -4683,11 +4673,11 @@ Events
drawvertex
- [source]
+ [source]
@@ -4970,7 +4960,7 @@ Properties:
Source:
Properties:
drawstart
- [source]
+ [source]
@@ -5274,7 +5264,7 @@ Properties:
Source:
Properties:
mousemove
- [source]
+ [source]
@@ -5603,7 +5593,7 @@ Properties:
Source:
Properties:
drawend
- [source]
+ [source]
@@ -5932,7 +5922,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/Ellipse.html b/docs/api/1.x/Ellipse.html
index 135f7eb146..105c2c5a06 100644
--- a/docs/api/1.x/Ellipse.html
+++ b/docs/api/1.x/Ellipse.html
@@ -8160,11 +8160,11 @@ Returns:
(inherited) endEdit()
- [source]
+ [source]
@@ -8243,11 +8243,11 @@ Returns:
(inherited) redoEdit()
- [source]
+ [source]
@@ -8326,11 +8326,11 @@ Returns:
(inherited) undoEdit()
- [source]
+ [source]
@@ -8409,11 +8409,11 @@ Returns:
(inherited) cancelEdit()
- [source]
+ [source]
@@ -8492,11 +8492,11 @@ Returns:
(inherited) isEditing()
- [source]
+ [source]
@@ -18890,11 +18890,11 @@ Properties:
(inherited) editstart
- [source]
+ [source]
@@ -19057,7 +19057,7 @@ Properties:
Source:
Properties:
(inherited) editend
- [source]
+ [source]
@@ -19266,7 +19266,7 @@ Properties:
Source:
Properties:
(inherited) redoedit
- [source]
+ [source]
@@ -19475,7 +19475,7 @@ Properties:
Source:
Properties:
(inherited) undoedit
- [source]
+ [source]
@@ -19684,7 +19684,7 @@ Properties:
Source:
Properties:
(inherited) canceledit
- [source]
+ [source]
@@ -19893,7 +19893,7 @@ Properties:
Source:
Properties:
(inherited) add
- [source]
+ [source]
@@ -22517,7 +22517,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/Eventable.html b/docs/api/1.x/Eventable.html
index 3ca6b28d55..ffb5fe04e8 100644
--- a/docs/api/1.x/Eventable.html
+++ b/docs/api/1.x/Eventable.html
@@ -1694,13 +1694,13 @@ Returns:
diff --git a/docs/api/1.x/Extent.html b/docs/api/1.x/Extent.html
index 165f7ccea5..f4b3dc1488 100644
--- a/docs/api/1.x/Extent.html
+++ b/docs/api/1.x/Extent.html
@@ -3247,13 +3247,13 @@ Returns:
diff --git a/docs/api/1.x/GeoJSON.html b/docs/api/1.x/GeoJSON.html
index 1c3caa1c27..78bab7c26d 100644
--- a/docs/api/1.x/GeoJSON.html
+++ b/docs/api/1.x/GeoJSON.html
@@ -352,13 +352,13 @@ Returns:
diff --git a/docs/api/1.x/Geometry.html b/docs/api/1.x/Geometry.html
index d2d5b8ba6c..a6da192654 100644
--- a/docs/api/1.x/Geometry.html
+++ b/docs/api/1.x/Geometry.html
@@ -6414,11 +6414,11 @@ Returns:
endEdit()
- [source]
+ [source]
@@ -6497,11 +6497,11 @@ Returns:
redoEdit()
- [source]
+ [source]
@@ -6580,11 +6580,11 @@ Returns:
undoEdit()
- [source]
+ [source]
@@ -6663,11 +6663,11 @@ Returns:
cancelEdit()
- [source]
+ [source]
@@ -6746,11 +6746,11 @@ Returns:
isEditing()
- [source]
+ [source]
@@ -19754,11 +19754,11 @@ Properties:
editstart
- [source]
+ [source]
@@ -19916,7 +19916,7 @@ Properties:
Source:
Properties:
editend
- [source]
+ [source]
@@ -20120,7 +20120,7 @@ Properties:
Source:
Properties:
redoedit
- [source]
+ [source]
@@ -20324,7 +20324,7 @@ Properties:
Source:
Properties:
undoedit
- [source]
+ [source]
@@ -20528,7 +20528,7 @@ Properties:
Source:
Properties:
canceledit
- [source]
+ [source]
@@ -20732,7 +20732,7 @@ Properties:
Source:
Properties:
add
- [source]
+ [source]
@@ -23301,7 +23301,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/GeometryCollection.html b/docs/api/1.x/GeometryCollection.html
index 7ffbb5e771..f96a25c8ac 100644
--- a/docs/api/1.x/GeometryCollection.html
+++ b/docs/api/1.x/GeometryCollection.html
@@ -6857,11 +6857,11 @@ Returns:
(inherited) endEdit()
- [source]
+ [source]
@@ -6940,11 +6940,11 @@ Returns:
(inherited) redoEdit()
- [source]
+ [source]
@@ -7023,11 +7023,11 @@ Returns:
(inherited) undoEdit()
- [source]
+ [source]
@@ -7106,11 +7106,11 @@ Returns:
(inherited) cancelEdit()
- [source]
+ [source]
@@ -7189,11 +7189,11 @@ Returns:
(inherited) isEditing()
- [source]
+ [source]
@@ -17587,11 +17587,11 @@ Properties:
(inherited) editstart
- [source]
+ [source]
@@ -17754,7 +17754,7 @@ Properties:
Source:
Properties:
(inherited) editend
- [source]
+ [source]
@@ -17963,7 +17963,7 @@ Properties:
Source:
Properties:
(inherited) redoedit
- [source]
+ [source]
@@ -18172,7 +18172,7 @@ Properties:
Source:
Properties:
(inherited) undoedit
- [source]
+ [source]
@@ -18381,7 +18381,7 @@ Properties:
Source:
Properties:
(inherited) canceledit
- [source]
+ [source]
@@ -18590,7 +18590,7 @@ Properties:
Source:
Properties:
(inherited) add
- [source]
+ [source]
@@ -21214,7 +21214,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/GeometryEditor.html b/docs/api/1.x/GeometryEditor.html
index 6cddf52cfd..1c21346baa 100644
--- a/docs/api/1.x/GeometryEditor.html
+++ b/docs/api/1.x/GeometryEditor.html
@@ -4639,13 +4639,13 @@
diff --git a/docs/api/1.x/GroupTileLayer.html b/docs/api/1.x/GroupTileLayer.html
index 6612c4fc2c..d102a611b5 100644
--- a/docs/api/1.x/GroupTileLayer.html
+++ b/docs/api/1.x/GroupTileLayer.html
@@ -685,7 +685,7 @@ Members
(constant) options
@@ -2267,7 +2267,7 @@ Properties
Source:
Returns:
(inherited) getTileSize()
- [source]
+ [source]
@@ -2979,11 +2979,11 @@ Returns:
(inherited) _getScreenSpaceError()
- [source]
+ [source]
@@ -2997,9 +2997,7 @@ <
- Compute tile's SSE
-from Cesium
-与cesium不同的是，我们用boundingVolume顶面的四个顶点中的最小值作为distanceToCamera
+ Compute tile's SSE
from Cesium
与cesium不同的是，我们用boundingVolume顶面的四个顶点中的最小值作为distanceToCamera
@@ -3053,11 +3051,11 @@ <
(inherited) _getCascadeTiles(z)
- [source]
+ [source]
@@ -3181,11 +3179,11 @@ Returns:
(inherited) getTileUrl(x, y, z)
- [source]
+ [source]
@@ -3355,11 +3353,11 @@ Returns:
(inherited) clear()
- [source]
+ [source]
@@ -3438,11 +3436,11 @@ Returns:
(inherited) getSpatialReference()
- [source]
+ [source]
@@ -8500,11 +8498,11 @@ Events
(inherited) clear
- [source]
+ [source]
@@ -8667,7 +8665,7 @@ Properties:
Source:
Properties:
(inherited) resourceload
- [source]
+ [source]
@@ -9369,7 +9367,7 @@ Properties:
Source:
Properties:
(inherited) canvascreate
- [source]
+ [source]
@@ -9628,7 +9626,7 @@ Properties:
Source:
Properties:
(inherited) renderstart
- [source]
+ [source]
@@ -9862,7 +9860,7 @@ Properties:
Source:
Properties:
(inherited) renderend
- [source]
+ [source]
@@ -10096,7 +10094,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/Handler.html b/docs/api/1.x/Handler.html
index f3628ae1b2..4b2e382409 100644
--- a/docs/api/1.x/Handler.html
+++ b/docs/api/1.x/Handler.html
@@ -423,13 +423,13 @@ Returns:
diff --git a/docs/api/1.x/Handlerable.html b/docs/api/1.x/Handlerable.html
index dbbb4272ef..4d23591ea6 100644
--- a/docs/api/1.x/Handlerable.html
+++ b/docs/api/1.x/Handlerable.html
@@ -95,13 +95,13 @@ Handlerable
diff --git a/docs/api/1.x/ImageLayer.html b/docs/api/1.x/ImageLayer.html
index fb10f46fba..2cb28102a0 100644
--- a/docs/api/1.x/ImageLayer.html
+++ b/docs/api/1.x/ImageLayer.html
@@ -7054,11 +7054,11 @@ Properties:
(inherited) resourceload
- [source]
+ [source]
@@ -7221,7 +7221,7 @@ Properties:
Source:
Properties:
(inherited) canvascreate
- [source]
+ [source]
@@ -7480,7 +7480,7 @@ Properties:
Source:
Properties:
(inherited) renderstart
- [source]
+ [source]
@@ -7714,7 +7714,7 @@ Properties:
Source:
Properties:
(inherited) renderend
- [source]
+ [source]
@@ -7948,7 +7948,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/JSONAble.html b/docs/api/1.x/JSONAble.html
index 730f15d10a..ffe981b1a4 100644
--- a/docs/api/1.x/JSONAble.html
+++ b/docs/api/1.x/JSONAble.html
@@ -459,13 +459,13 @@ Returns:
diff --git a/docs/api/1.x/Label.html b/docs/api/1.x/Label.html
index 6353115104..68eebdf34d 100644
--- a/docs/api/1.x/Label.html
+++ b/docs/api/1.x/Label.html
@@ -8294,11 +8294,11 @@ Returns:
(inherited) endEdit()
- [source]
+ [source]
@@ -8377,11 +8377,11 @@ Returns:
(inherited) redoEdit()
- [source]
+ [source]
@@ -8460,11 +8460,11 @@ Returns:
(inherited) undoEdit()
- [source]
+ [source]
@@ -8543,11 +8543,11 @@ Returns:
(inherited) cancelEdit()
- [source]
+ [source]
@@ -8626,11 +8626,11 @@ Returns:
(inherited) isEditing()
- [source]
+ [source]
@@ -19696,11 +19696,11 @@ Properties:
(inherited) editstart
- [source]
+ [source]
@@ -19863,7 +19863,7 @@ Properties:
Source:
Properties:
(inherited) editend
- [source]
+ [source]
@@ -20072,7 +20072,7 @@ Properties:
Source:
Properties:
(inherited) redoedit
- [source]
+ [source]
@@ -20281,7 +20281,7 @@ Properties:
Source:
Properties:
(inherited) undoedit
- [source]
+ [source]
@@ -20490,7 +20490,7 @@ Properties:
Source:
Properties:
(inherited) canceledit
- [source]
+ [source]
@@ -20699,7 +20699,7 @@ Properties:
Source:
Properties:
(inherited) add
- [source]
+ [source]
@@ -23323,7 +23323,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/Layer.html b/docs/api/1.x/Layer.html
index 2d1e9f9479..46a7e6d3e5 100644
--- a/docs/api/1.x/Layer.html
+++ b/docs/api/1.x/Layer.html
@@ -9117,11 +9117,11 @@ Properties:
resourceload
- [source]
+ [source]
@@ -9279,7 +9279,7 @@ Properties:
Source:
Properties:
canvascreate
- [source]
+ [source]
@@ -9533,7 +9533,7 @@ Properties:
Source:
Properties:
renderstart
- [source]
+ [source]
@@ -9762,7 +9762,7 @@ Properties:
Source:
Properties:
renderend
- [source]
+ [source]
@@ -9991,7 +9991,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/LineString.html b/docs/api/1.x/LineString.html
index 420739da65..a3078d929c 100644
--- a/docs/api/1.x/LineString.html
+++ b/docs/api/1.x/LineString.html
@@ -7159,11 +7159,11 @@ Returns:
(inherited) endEdit()
- [source]
+ [source]
@@ -7242,11 +7242,11 @@ Returns:
(inherited) redoEdit()
- [source]
+ [source]
@@ -7325,11 +7325,11 @@ Returns:
(inherited) undoEdit()
- [source]
+ [source]
@@ -7408,11 +7408,11 @@ Returns:
(inherited) cancelEdit()
- [source]
+ [source]
@@ -7491,11 +7491,11 @@ Returns:
(inherited) isEditing()
- [source]
+ [source]
@@ -17889,11 +17889,11 @@ Properties:
(inherited) editstart
- [source]
+ [source]
@@ -18056,7 +18056,7 @@ Properties:
Source:
Properties:
(inherited) editend
- [source]
+ [source]
@@ -18265,7 +18265,7 @@ Properties:
Source:
Properties:
(inherited) redoedit
- [source]
+ [source]
@@ -18474,7 +18474,7 @@ Properties:
Source:
Properties:
(inherited) undoedit
- [source]
+ [source]
@@ -18683,7 +18683,7 @@ Properties:
Source:
Properties:
(inherited) canceledit
- [source]
+ [source]
@@ -18892,7 +18892,7 @@ Properties:
Source:
Properties:
(inherited) add
- [source]
+ [source]
@@ -21516,7 +21516,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/Map.html b/docs/api/1.x/Map.html
index e71b993afc..b696343369 100644
--- a/docs/api/1.x/Map.html
+++ b/docs/api/1.x/Map.html
@@ -9209,11 +9209,11 @@ Returns:
sortLayers(layers)
- [source]
+ [source]
@@ -9347,11 +9347,11 @@ Returns:
toDataURL(optionsopt)
- [source]
+ [source]
@@ -9646,11 +9646,11 @@ Returns:
coordToPoint()
- [source]
+ [source]
@@ -9718,11 +9718,11 @@ coordToPointAtRes()
- [source]
+ [source]
@@ -9790,11 +9790,11 @@ pointToCoord()
- [source]
+ [source]
@@ -9862,11 +9862,11 @@ pointAtResToCoord()
- [source]
+ [source]
@@ -9934,11 +9934,11 @@ coordToViewPoint()
- [source]
+ [source]
@@ -10006,11 +10006,11 @@ viewPointToCoord()
- [source]
+ [source]
@@ -10078,11 +10078,11 @@ coordToContainerPoint()
- [source]
+ [source]
@@ -10150,11 +10150,11 @@
containerPointToCoord()
- [source]
+ [source]
@@ -10222,11 +10222,11 @@
containerPointToViewPoint(containerPoint, outopt)
- [source]
+ [source]
@@ -10379,11 +10379,11 @@ Returns:
viewPointToContainerPoint(viewPoint, outopt)
- [source]
+ [source]
@@ -10536,11 +10536,11 @@ Returns:
checkSize()
- [source]
+ [source]
@@ -10624,11 +10624,11 @@ Returns:
locate(coordinate, dx, dy)
- [source]
+ [source]
@@ -10798,11 +10798,11 @@ Returns:
getMainPanel()
- [source]
+ [source]
@@ -10877,11 +10877,11 @@ Returns:
getPanels()
- [source]
+ [source]
@@ -10956,11 +10956,11 @@ Returns:
remove()
- [source]
+ [source]
@@ -11039,11 +11039,11 @@ Returns:
isRemoved()
- [source]
+ [source]
@@ -11118,11 +11118,11 @@ Returns:
isMoving()
- [source]
+ [source]
@@ -11197,11 +11197,11 @@ Returns:
isOffscreen(box, padding)
- [source]
+ [source]
@@ -11347,11 +11347,11 @@ Returns:
getDevicePixelRatio()
- [source]
+ [source]
@@ -11426,11 +11426,11 @@ Returns:
setDevicePixelRatio(dpr)
- [source]
+ [source]
@@ -11554,11 +11554,11 @@ Returns:
offsetPlatform()
- [source]
+ [source]
@@ -11633,11 +11633,11 @@ Returns:
getViewPoint()
- [source]
+ [source]
@@ -11716,11 +11716,11 @@ Returns:
coordinateToPoint(coordinate, zoomopt, outopt)
- [source]
+ [source]
@@ -11913,11 +11913,11 @@ Returns:
coordinateToPointAtRes(coordinate, resopt, outopt)
- [source]
+ [source]
@@ -12110,11 +12110,11 @@ Returns:
pointToCoordinate(point, zoom, outopt)
- [source]
+ [source]
@@ -12305,11 +12305,11 @@ Returns:
pointAtResToCoordinate(point, res, outopt)
- [source]
+ [source]
@@ -12500,11 +12500,11 @@ Returns:
coordinateToViewPoint(coordinate, outopt)
- [source]
+ [source]
@@ -12657,11 +12657,11 @@ Returns:
viewPointToCoordinate(viewPoint, outopt)
- [source]
+ [source]
@@ -12814,11 +12814,11 @@ Returns:
coordinateToContainerPoint(zoomopt, outopt)
- [source]
+ [source]
@@ -13000,11 +13000,11 @@ Returns:
coordinatesToContainerPoints(zoomopt)
- [source]
+ [source]
@@ -13157,11 +13157,11 @@ Returns:
coordinatesToContainerPointsAtRes(resolutionopt)
- [source]
+ [source]
@@ -13314,11 +13314,11 @@ Returns:
containerPointToCoordinate(outopt)
- [source]
+ [source]
@@ -13471,11 +13471,11 @@ Returns:
containerToExtent(containerExtent)
- [source]
+ [source]
@@ -13599,11 +13599,11 @@ Returns:
distanceToPixel(xDist, yDist)
- [source]
+ [source]
@@ -13750,11 +13750,11 @@ Returns:
distanceToPoint(xDist, yDist, zoom)
- [source]
+ [source]
@@ -13920,11 +13920,11 @@ Returns:
distanceToPointAtRes(xDist, yDist, res)
- [source]
+ [source]
@@ -14090,11 +14090,11 @@ Returns:
altitudeToPoint(altitude, res, originCenteropt)
- [source]
+ [source]
@@ -14290,11 +14290,11 @@ Returns:
pixelToDistance(width, height)
- [source]
+ [source]
@@ -14441,11 +14441,11 @@ Returns:
pointToDistance(dx, dy, zoom)
- [source]
+ [source]
@@ -14615,11 +14615,11 @@ Returns:
pointAtResToDistance(dx, dy, res)
- [source]
+ [source]
@@ -14789,11 +14789,11 @@ Returns:
locateByPoint(coordinate, px, py)
- [source]
+ [source]
@@ -14963,11 +14963,11 @@ Returns:
(protected) _pointToExtent(extent2D)
- [source]
+ [source]
@@ -18159,7 +18159,13 @@ map.identify({
coordinate: [0, 0],
layers: [layer]
},
geos => {
console.log(geos);
});
map.identify({
+ coordinate: [0, 0],
+ layers: [layer]
+ },
+ geos => {
+ console.log(geos);
+ });map.identifyAtPoint({
containerPoint: [200, 300],
layers: [layer]
},
geos => {
console.log(geos);
});map.identifyAtPoint({
+ containerPoint: [200, 300],
+ layers: [layer]
+ },
+ geos => {
+ console.log(geos);
+ });layer.setStyle([
- {
- 'filter': ['==', 'count', 100],
- 'symbol': {'markerFile' : 'foo1.png'}
- },
- {
- 'filter': ['==', 'count', 200],
- 'symbol': {'markerFile' : 'foo2.png'}
- }
+ layer.setStyle([
+ {
+ 'filter': ['==', 'count', 100],
+ 'symbol': {'markerFile' : 'foo1.png'}
+ },
+ {
+ 'filter': ['==', 'count', 200],
+ 'symbol': {'markerFile' : 'foo2.png'}
+ }
]);
@@ -3955,11 +3960,11 @@ Returns:
removeStyle()
- [source]
+ [source]
@@ -9022,11 +9027,11 @@ Events
addgeo
- [source]
+ [source]
@@ -9209,7 +9214,7 @@ Properties:
Source:
Properties:
removegeo
- [source]
+ [source]
@@ -9438,7 +9443,7 @@ Properties:
Source:
Properties:
clear
- [source]
+ [source]
@@ -9642,7 +9647,7 @@ Properties:
Source:
Properties:
(inherited) resourceload
- [source]
+ [source]
@@ -10344,7 +10349,7 @@ Properties:
Source:
Properties:
(inherited) canvascreate
- [source]
+ [source]
@@ -10603,7 +10608,7 @@ Properties:
Source:
Properties:
(inherited) renderstart
- [source]
+ [source]
@@ -10837,7 +10842,7 @@ Properties:
Source:
Properties:
(inherited) renderend
- [source]
+ [source]
@@ -11071,7 +11076,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/ParticleLayer.html b/docs/api/1.x/ParticleLayer.html
index 063fb2d0c2..16343d99dc 100644
--- a/docs/api/1.x/ParticleLayer.html
+++ b/docs/api/1.x/ParticleLayer.html
@@ -9284,11 +9284,11 @@ Properties:
(inherited) resourceload
- [source]
+ [source]
@@ -9456,7 +9456,7 @@ Properties:
Source:
Properties:
(inherited) canvascreate
- [source]
+ [source]
@@ -9720,7 +9720,7 @@ Properties:
Source:
Properties:
(inherited) renderstart
- [source]
+ [source]
@@ -9959,7 +9959,7 @@ Properties:
Source:
Properties:
(inherited) renderend
- [source]
+ [source]
@@ -10198,7 +10198,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/Path.html b/docs/api/1.x/Path.html
index 9a229e5cdf..3d336aa40f 100644
--- a/docs/api/1.x/Path.html
+++ b/docs/api/1.x/Path.html
@@ -6791,11 +6791,11 @@ Returns:
(inherited) endEdit()
- [source]
+ [source]
@@ -6879,11 +6879,11 @@ Returns:
(inherited) redoEdit()
- [source]
+ [source]
@@ -6967,11 +6967,11 @@ Returns:
(inherited) undoEdit()
- [source]
+ [source]
@@ -7055,11 +7055,11 @@ Returns:
(inherited) cancelEdit()
- [source]
+ [source]
@@ -7143,11 +7143,11 @@ Returns:
(inherited) isEditing()
- [source]
+ [source]
@@ -17716,11 +17716,11 @@ Properties:
(inherited) editstart
- [source]
+ [source]
@@ -17888,7 +17888,7 @@ Properties:
Source:
Properties:
(inherited) editend
- [source]
+ [source]
@@ -18102,7 +18102,7 @@ Properties:
Source:
Properties:
(inherited) redoedit
- [source]
+ [source]
@@ -18316,7 +18316,7 @@ Properties:
Source:
Properties:
(inherited) undoedit
- [source]
+ [source]
@@ -18530,7 +18530,7 @@ Properties:
Source:
Properties:
(inherited) canceledit
- [source]
+ [source]
@@ -18744,7 +18744,7 @@ Properties:
Source:
Properties:
(inherited) add
- [source]
+ [source]
@@ -21423,7 +21423,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/Point.html b/docs/api/1.x/Point.html
index 4aa66bf29f..66961eb3a6 100644
--- a/docs/api/1.x/Point.html
+++ b/docs/api/1.x/Point.html
@@ -3184,13 +3184,13 @@ Returns:
diff --git a/docs/api/1.x/PointExtent.html b/docs/api/1.x/PointExtent.html
index e78b1bb33d..bba056922d 100644
--- a/docs/api/1.x/PointExtent.html
+++ b/docs/api/1.x/PointExtent.html
@@ -3288,13 +3288,13 @@ Returns:
diff --git a/docs/api/1.x/Polygon.html b/docs/api/1.x/Polygon.html
index 08b93cfd76..a224117b70 100644
--- a/docs/api/1.x/Polygon.html
+++ b/docs/api/1.x/Polygon.html
@@ -7331,11 +7331,11 @@ Returns:
(inherited) endEdit()
- [source]
+ [source]
@@ -7414,11 +7414,11 @@ Returns:
(inherited) redoEdit()
- [source]
+ [source]
@@ -7497,11 +7497,11 @@ Returns:
(inherited) undoEdit()
- [source]
+ [source]
@@ -7580,11 +7580,11 @@ Returns:
(inherited) cancelEdit()
- [source]
+ [source]
@@ -7663,11 +7663,11 @@ Returns:
(inherited) isEditing()
- [source]
+ [source]
@@ -18061,11 +18061,11 @@ Properties:
(inherited) editstart
- [source]
+ [source]
@@ -18228,7 +18228,7 @@ Properties:
Source:
Properties:
(inherited) editend
- [source]
+ [source]
@@ -18437,7 +18437,7 @@ Properties:
Source:
Properties:
(inherited) redoedit
- [source]
+ [source]
@@ -18646,7 +18646,7 @@ Properties:
Source:
Properties:
(inherited) undoedit
- [source]
+ [source]
@@ -18855,7 +18855,7 @@ Properties:
Source:
Properties:
(inherited) canceledit
- [source]
+ [source]
@@ -19064,7 +19064,7 @@ Properties:
Source:
Properties:
(inherited) add
- [source]
+ [source]
@@ -21688,7 +21688,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/Position.html b/docs/api/1.x/Position.html
index 0fd3670b75..3dced8d2b7 100644
--- a/docs/api/1.x/Position.html
+++ b/docs/api/1.x/Position.html
@@ -2454,13 +2454,13 @@ Returns:
diff --git a/docs/api/1.x/QuadBezierCurve.html b/docs/api/1.x/QuadBezierCurve.html
index 65cbd59c84..be07b95589 100644
--- a/docs/api/1.x/QuadBezierCurve.html
+++ b/docs/api/1.x/QuadBezierCurve.html
@@ -7334,11 +7334,11 @@ Returns:
(inherited) endEdit()
- [source]
+ [source]
@@ -7422,11 +7422,11 @@ Returns:
(inherited) redoEdit()
- [source]
+ [source]
@@ -7510,11 +7510,11 @@ Returns:
(inherited) undoEdit()
- [source]
+ [source]
@@ -7598,11 +7598,11 @@ Returns:
(inherited) cancelEdit()
- [source]
+ [source]
@@ -7686,11 +7686,11 @@ Returns:
(inherited) isEditing()
- [source]
+ [source]
@@ -18349,11 +18349,11 @@ Properties:
(inherited) editstart
- [source]
+ [source]
@@ -18521,7 +18521,7 @@ Properties:
Source:
Properties:
(inherited) editend
- [source]
+ [source]
@@ -18735,7 +18735,7 @@ Properties:
Source:
Properties:
(inherited) redoedit
- [source]
+ [source]
@@ -18949,7 +18949,7 @@ Properties:
Source:
Properties:
(inherited) undoedit
- [source]
+ [source]
@@ -19163,7 +19163,7 @@ Properties:
Source:
Properties:
(inherited) canceledit
- [source]
+ [source]
@@ -19377,7 +19377,7 @@ Properties:
Source:
Properties:
(inherited) add
- [source]
+ [source]
@@ -22056,7 +22056,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/Rectangle.html b/docs/api/1.x/Rectangle.html
index 8485d7e853..ddd2df4fb0 100644
--- a/docs/api/1.x/Rectangle.html
+++ b/docs/api/1.x/Rectangle.html
@@ -7831,11 +7831,11 @@ Returns:
(inherited) endEdit()
- [source]
+ [source]
@@ -7914,11 +7914,11 @@ Returns:
(inherited) redoEdit()
- [source]
+ [source]
@@ -7997,11 +7997,11 @@ Returns:
(inherited) undoEdit()
- [source]
+ [source]
@@ -8080,11 +8080,11 @@ Returns:
(inherited) cancelEdit()
- [source]
+ [source]
@@ -8163,11 +8163,11 @@ Returns:
(inherited) isEditing()
- [source]
+ [source]
@@ -18561,11 +18561,11 @@ Properties:
(inherited) editstart
- [source]
+ [source]
@@ -18728,7 +18728,7 @@ Properties:
Source:
Properties:
(inherited) editend
- [source]
+ [source]
@@ -18937,7 +18937,7 @@ Properties:
Source:
Properties:
(inherited) redoedit
- [source]
+ [source]
@@ -19146,7 +19146,7 @@ Properties:
Source:
Properties:
(inherited) undoedit
- [source]
+ [source]
@@ -19355,7 +19355,7 @@ Properties:
Source:
Properties:
(inherited) canceledit
- [source]
+ [source]
@@ -19564,7 +19564,7 @@ Properties:
Source:
Properties:
(inherited) add
- [source]
+ [source]
@@ -22188,7 +22188,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/Renderable.html b/docs/api/1.x/Renderable.html
index 0208479ab7..ca00f01dd0 100644
--- a/docs/api/1.x/Renderable.html
+++ b/docs/api/1.x/Renderable.html
@@ -407,13 +407,13 @@ Returns:
diff --git a/docs/api/1.x/Sector.html b/docs/api/1.x/Sector.html
index 86993cb37a..63dae5b392 100644
--- a/docs/api/1.x/Sector.html
+++ b/docs/api/1.x/Sector.html
@@ -8146,11 +8146,11 @@ Returns:
(inherited) endEdit()
- [source]
+ [source]
@@ -8229,11 +8229,11 @@ Returns:
(inherited) redoEdit()
- [source]
+ [source]
@@ -8312,11 +8312,11 @@ Returns:
(inherited) undoEdit()
- [source]
+ [source]
@@ -8395,11 +8395,11 @@ Returns:
(inherited) cancelEdit()
- [source]
+ [source]
@@ -8478,11 +8478,11 @@ Returns:
(inherited) isEditing()
- [source]
+ [source]
@@ -18876,11 +18876,11 @@ Properties:
(inherited) editstart
- [source]
+ [source]
@@ -19043,7 +19043,7 @@ Properties:
Source:
Properties:
(inherited) editend
- [source]
+ [source]
@@ -19252,7 +19252,7 @@ Properties:
Source:
Properties:
(inherited) redoedit
- [source]
+ [source]
@@ -19461,7 +19461,7 @@ Properties:
Source:
Properties:
(inherited) undoedit
- [source]
+ [source]
@@ -19670,7 +19670,7 @@ Properties:
Source:
Properties:
(inherited) canceledit
- [source]
+ [source]
@@ -19879,7 +19879,7 @@ Properties:
Source:
Properties:
(inherited) add
- [source]
+ [source]
@@ -22503,7 +22503,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/Size.html b/docs/api/1.x/Size.html
index efa10a72e7..ca1c9b8b2b 100644
--- a/docs/api/1.x/Size.html
+++ b/docs/api/1.x/Size.html
@@ -1243,13 +1243,13 @@ Returns:
diff --git a/docs/api/1.x/StringUtil.html b/docs/api/1.x/StringUtil.html
index 24b7078f4a..ff726adcc8 100644
--- a/docs/api/1.x/StringUtil.html
+++ b/docs/api/1.x/StringUtil.html
@@ -1659,13 +1659,13 @@ Returns:
diff --git a/docs/api/1.x/TextBox.html b/docs/api/1.x/TextBox.html
index 7687dfcf5c..3f0cc785f6 100644
--- a/docs/api/1.x/TextBox.html
+++ b/docs/api/1.x/TextBox.html
@@ -726,11 +726,11 @@ TextBox
new TextBox(content, coordinates, width, height, optionsopt)
- [source]
+ [source]
@@ -1140,7 +1140,7 @@ Members
(constant) options
@@ -1976,7 +1976,7 @@ Properties
Source:
Methods
getWidth()
- [source]
+ [source]
@@ -2092,11 +2092,11 @@ Returns:
setWidth(width)
- [source]
+ [source]
@@ -2209,11 +2209,11 @@ getHeight()
- [source]
+ [source]
@@ -2288,11 +2288,11 @@ Returns:
setHeight(height)
- [source]
+ [source]
@@ -2405,11 +2405,11 @@ getBoxSymbol()
- [source]
+ [source]
@@ -2488,11 +2488,11 @@ Returns:
setBoxSymbol(symbol)
- [source]
+ [source]
@@ -2605,11 +2605,11 @@ getTextStyle()
- [source]
+ [source]
@@ -2684,11 +2684,11 @@ Returns:
setTextStyle(style)
- [source]
+ [source]
@@ -8710,11 +8710,11 @@ Returns:
(inherited) endEdit()
- [source]
+ [source]
@@ -8793,11 +8793,11 @@ Returns:
(inherited) redoEdit()
- [source]
+ [source]
@@ -8876,11 +8876,11 @@ Returns:
(inherited) undoEdit()
- [source]
+ [source]
@@ -8959,11 +8959,11 @@ Returns:
(inherited) cancelEdit()
- [source]
+ [source]
@@ -9042,11 +9042,11 @@ Returns:
(inherited) isEditing()
- [source]
+ [source]
@@ -19858,11 +19858,11 @@ Properties:
(inherited) editstart
- [source]
+ [source]
@@ -20025,7 +20025,7 @@ Properties:
Source:
Properties:
(inherited) editend
- [source]
+ [source]
@@ -20234,7 +20234,7 @@ Properties:
Source:
Properties:
(inherited) redoedit
- [source]
+ [source]
@@ -20443,7 +20443,7 @@ Properties:
Source:
Properties:
(inherited) undoedit
- [source]
+ [source]
@@ -20652,7 +20652,7 @@ Properties:
Source:
Properties:
(inherited) canceledit
- [source]
+ [source]
@@ -20861,7 +20861,7 @@ Properties:
Source:
Properties:
(inherited) add
- [source]
+ [source]
@@ -23485,7 +23485,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/TextEditable.html b/docs/api/1.x/TextEditable.html
index b27901ef83..d6002b993c 100644
--- a/docs/api/1.x/TextEditable.html
+++ b/docs/api/1.x/TextEditable.html
@@ -480,13 +480,13 @@ Returns:
diff --git a/docs/api/1.x/TextMarker.html b/docs/api/1.x/TextMarker.html
index fb410fe2e5..a53999cd71 100644
--- a/docs/api/1.x/TextMarker.html
+++ b/docs/api/1.x/TextMarker.html
@@ -7611,11 +7611,11 @@ Returns:
(inherited) endEdit()
- [source]
+ [source]
@@ -7699,11 +7699,11 @@ Returns:
(inherited) redoEdit()
- [source]
+ [source]
@@ -7787,11 +7787,11 @@ Returns:
(inherited) undoEdit()
- [source]
+ [source]
@@ -7875,11 +7875,11 @@ Returns:
(inherited) cancelEdit()
- [source]
+ [source]
@@ -7963,11 +7963,11 @@ Returns:
(inherited) isEditing()
- [source]
+ [source]
@@ -19034,11 +19034,11 @@ Properties:
(inherited) editstart
- [source]
+ [source]
@@ -19206,7 +19206,7 @@ Properties:
Source:
Properties:
(inherited) editend
- [source]
+ [source]
@@ -19420,7 +19420,7 @@ Properties:
Source:
Properties:
(inherited) redoedit
- [source]
+ [source]
@@ -19634,7 +19634,7 @@ Properties:
Source:
Properties:
(inherited) undoedit
- [source]
+ [source]
@@ -19848,7 +19848,7 @@ Properties:
Source:
Properties:
(inherited) canceledit
- [source]
+ [source]
@@ -20062,7 +20062,7 @@ Properties:
Source:
Properties:
(inherited) add
- [source]
+ [source]
@@ -22741,7 +22741,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/TileLayer.html b/docs/api/1.x/TileLayer.html
index ce9f471e49..ba7999acea 100644
--- a/docs/api/1.x/TileLayer.html
+++ b/docs/api/1.x/TileLayer.html
@@ -394,11 +394,11 @@ TileLayer
new TileLayer(id, optionsopt)
- [source]
+ [source]
@@ -413,9 +413,9 @@ new Example:-->
- new TileLayer("tile",{
- urlTemplate : 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
- subdomains:['a','b','c']
+ new TileLayer("tile",{
+ urlTemplate : 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+ subdomains:['a','b','c']
})
@@ -613,7 +613,7 @@ Members
(constant) options
@@ -2195,7 +2195,7 @@ Properties
Source:
Methods
getTileSize()
- [source]
+ [source]
@@ -2311,11 +2311,11 @@ Returns:
_getScreenSpaceError()
- [source]
+ [source]
@@ -2329,9 +2329,7 @@ <
- Compute tile's SSE
-from Cesium
-与cesium不同的是，我们用boundingVolume顶面的四个顶点中的最小值作为distanceToCamera
+ Compute tile's SSE
from Cesium
与cesium不同的是，我们用boundingVolume顶面的四个顶点中的最小值作为distanceToCamera
@@ -2385,11 +2383,11 @@ <
_getCascadeTiles(z)
- [source]
+ [source]
@@ -2513,11 +2511,11 @@ Returns:
getTileUrl(x, y, z)
- [source]
+ [source]
@@ -2687,11 +2685,11 @@ Returns:
clear()
- [source]
+ [source]
@@ -2770,11 +2768,11 @@ Returns:
toJSON()
- [source]
+ [source]
@@ -2788,9 +2786,7 @@
- Export the tile layer's profile json.
-Layer's profile is a snapshot of the layer in JSON format.
-It can be used to reproduce the instance by fromJSON method
+ Export the tile layer's profile json.
Layer's profile is a snapshot of the layer in JSON format.
It can be used to reproduce the instance by fromJSON method
@@ -2855,11 +2851,11 @@ Returns:
getSpatialReference()
- [source]
+ [source]
@@ -8057,11 +8053,11 @@ Events
clear
- [source]
+ [source]
@@ -8219,7 +8215,7 @@ Properties:
Source:
Properties:
(inherited) resourceload
- [source]
+ [source]
@@ -8936,7 +8932,7 @@ Properties:
Source:
Properties:
(inherited) canvascreate
- [source]
+ [source]
@@ -9200,7 +9196,7 @@ Properties:
Source:
Properties:
(inherited) renderstart
- [source]
+ [source]
@@ -9439,7 +9435,7 @@ Properties:
Source:
Properties:
(inherited) renderend
- [source]
+ [source]
@@ -9678,7 +9674,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/TileSystem.html b/docs/api/1.x/TileSystem.html
index 3f2ee716f2..e901fbde6a 100644
--- a/docs/api/1.x/TileSystem.html
+++ b/docs/api/1.x/TileSystem.html
@@ -574,13 +574,13 @@ Returns:
diff --git a/docs/api/1.x/Transformation.html b/docs/api/1.x/Transformation.html
index 1e94cbdf73..06f331d14a 100644
--- a/docs/api/1.x/Transformation.html
+++ b/docs/api/1.x/Transformation.html
@@ -526,13 +526,13 @@ Returns:
diff --git a/docs/api/1.x/Util.html b/docs/api/1.x/Util.html
index 4b6ba8ae6a..46d87d2ea4 100644
--- a/docs/api/1.x/Util.html
+++ b/docs/api/1.x/Util.html
@@ -3416,13 +3416,13 @@ Returns:
diff --git a/docs/api/1.x/VectorLayer.html b/docs/api/1.x/VectorLayer.html
index e11d479ea2..02b9fc1234 100644
--- a/docs/api/1.x/VectorLayer.html
+++ b/docs/api/1.x/VectorLayer.html
@@ -1389,7 +1389,10 @@ Properties
- (Only for layer rendered with CanvasRenderer)
In default, for performance reason, layer will be drawn in a frame requested by RAF(RequestAnimationFrame).
Set drawImmediate to true to draw immediately.
This is necessary when layer's drawing is wrapped with another frame requested by RAF.
+ (Only for layer rendered with CanvasRenderer)
+ In default, for performance reason, layer will be drawn in a frame requested by RAF(RequestAnimationFrame).
+ Set drawImmediate to true to draw immediately.
+ This is necessary when layer's drawing is wrapped with another frame requested by RAF.
@@ -2803,11 +2806,11 @@ Returns:
(inherited) getGeometryById(id)
- [source]
+ [source]
@@ -2930,11 +2933,11 @@ Returns:
(inherited) getGeometries(filteropt, contextopt)
- [source]
+ [source]
@@ -3089,11 +3092,11 @@ Returns:
(inherited) getFirstGeometry()
- [source]
+ [source]
@@ -3172,11 +3175,11 @@ Returns:
(inherited) getLastGeometry()
- [source]
+ [source]
@@ -3255,11 +3258,11 @@ Returns:
(inherited) getCount()
- [source]
+ [source]
@@ -3338,11 +3341,11 @@ Returns:
(inherited) getExtent()
- [source]
+ [source]
@@ -3421,11 +3424,11 @@ Returns:
(inherited) forEach(fn, contextopt)
- [source]
+ [source]
@@ -3582,11 +3585,11 @@ Returns:
(inherited) filter(fn, contextopt)
- [source]
+ [source]
@@ -3743,11 +3746,11 @@ Returns:
(inherited) isEmpty()
- [source]
+ [source]
@@ -3822,11 +3825,11 @@ Returns:
(inherited) addGeometry(geometries, fitViewopt)
- [source]
+ [source]
@@ -4131,11 +4134,11 @@ Returns:
(inherited) getGeoMinZIndex()
- [source]
+ [source]
@@ -4203,11 +4206,11 @@ (inherited) getGeoMaxZIndex()
- [source]
+ [source]
@@ -4275,11 +4278,11 @@ (inherited) removeGeometry(geometries)
- [source]
+ [source]
@@ -4412,11 +4415,11 @@ Returns:
(inherited) clear()
- [source]
+ [source]
@@ -4495,11 +4498,11 @@ Returns:
(protected) (inherited) onRemoveGeometry(geometry)
- [source]
+ [source]
@@ -4612,11 +4615,11 @@ (protected)
(inherited) getStyle()
- [source]
+ [source]
@@ -4695,11 +4698,11 @@ Returns:
(inherited) setStyle(style)
- [source]
+ [source]
@@ -4713,22 +4716,23 @@
- Sets style to the layer, styling the geometries satisfying the condition with style's symbol.
Based on filter type in [mapbox-gl-js's style specification]{https://www.mapbox.com/mapbox-gl-js/style-spec/#types-filter}.
+ Sets style to the layer, styling the geometries satisfying the condition with style's symbol.
+Based on filter type in [mapbox-gl-js's style specification]{https://www.mapbox.com/mapbox-gl-js/style-spec/#types-filter}.
- layer.setStyle([
- {
- 'filter': ['==', 'count', 100],
- 'symbol': {'markerFile' : 'foo1.png'}
- },
- {
- 'filter': ['==', 'count', 200],
- 'symbol': {'markerFile' : 'foo2.png'}
- }
+ layer.setStyle([
+ {
+ 'filter': ['==', 'count', 100],
+ 'symbol': {'markerFile' : 'foo1.png'}
+ },
+ {
+ 'filter': ['==', 'count', 200],
+ 'symbol': {'markerFile' : 'foo2.png'}
+ }
]);
@@ -4847,11 +4851,11 @@ Returns:
(inherited) removeStyle()
- [source]
+ [source]
@@ -9914,11 +9918,11 @@ Events
setstyle
- [source]
+ [source]
@@ -10104,7 +10108,7 @@ Properties:
Source:
Properties:
removestyle
- [source]
+ [source]
@@ -10308,7 +10312,7 @@ Properties:
Source:
Properties:
(inherited) addgeo
- [source]
+ [source]
@@ -10542,7 +10546,7 @@ Properties:
Source:
Properties:
(inherited) removegeo
- [source]
+ [source]
@@ -10776,7 +10780,7 @@ Properties:
Source:
Properties:
(inherited) clear
- [source]
+ [source]
@@ -10985,7 +10989,7 @@ Properties:
Source:
Properties:
(inherited) resourceload
- [source]
+ [source]
@@ -11687,7 +11691,7 @@ Properties:
Source:
Properties:
(inherited) canvascreate
- [source]
+ [source]
@@ -11946,7 +11950,7 @@ Properties:
Source:
Properties:
(inherited) renderstart
- [source]
+ [source]
@@ -12180,7 +12184,7 @@ Properties:
Source:
Properties:
(inherited) renderend
- [source]
+ [source]
@@ -12414,7 +12418,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/WMSTileLayer.html b/docs/api/1.x/WMSTileLayer.html
index 2b31cae86b..295b3a9d8a 100644
--- a/docs/api/1.x/WMSTileLayer.html
+++ b/docs/api/1.x/WMSTileLayer.html
@@ -2641,11 +2641,11 @@ Returns:
(inherited) getTileSize()
- [source]
+ [source]
@@ -2720,11 +2720,11 @@ Returns:
(inherited) _getScreenSpaceError()
- [source]
+ [source]
@@ -2738,9 +2738,7 @@ <
- Compute tile's SSE
-from Cesium
-与cesium不同的是，我们用boundingVolume顶面的四个顶点中的最小值作为distanceToCamera
+ Compute tile's SSE
from Cesium
与cesium不同的是，我们用boundingVolume顶面的四个顶点中的最小值作为distanceToCamera
@@ -2794,11 +2792,11 @@ <
(inherited) _getCascadeTiles(z)
- [source]
+ [source]
@@ -2922,11 +2920,11 @@ Returns:
(inherited) getTileUrl(x, y, z)
- [source]
+ [source]
@@ -3096,11 +3094,11 @@ Returns:
(inherited) clear()
- [source]
+ [source]
@@ -3179,11 +3177,11 @@ Returns:
(inherited) getSpatialReference()
- [source]
+ [source]
@@ -8241,11 +8239,11 @@ Events
(inherited) clear
- [source]
+ [source]
@@ -8408,7 +8406,7 @@ Properties:
Source:
Properties:
(inherited) resourceload
- [source]
+ [source]
@@ -9110,7 +9108,7 @@ Properties:
Source:
Properties:
(inherited) canvascreate
- [source]
+ [source]
@@ -9369,7 +9367,7 @@ Properties:
Source:
Properties:
(inherited) renderstart
- [source]
+ [source]
@@ -9603,7 +9601,7 @@ Properties:
Source:
Properties:
(inherited) renderend
- [source]
+ [source]
@@ -9837,7 +9835,7 @@ Properties:
Source:
Properties:
diff --git a/docs/api/1.x/animation.Animation.html b/docs/api/1.x/animation.Animation.html
index 397a81b423..76e1596593 100644
--- a/docs/api/1.x/animation.Animation.html
+++ b/docs/api/1.x/animation.Animation.html
@@ -823,13 +823,13 @@ Returns:
diff --git a/docs/api/1.x/animation.Easing.html b/docs/api/1.x/animation.Easing.html
index f04c4bf8a2..3e13a7d6cc 100644
--- a/docs/api/1.x/animation.Easing.html
+++ b/docs/api/1.x/animation.Easing.html
@@ -842,13 +842,13 @@ Returns:
diff --git a/docs/api/1.x/animation.Frame.html b/docs/api/1.x/animation.Frame.html
index e7dcc4f839..b47dbc0a96 100644
--- a/docs/api/1.x/animation.Frame.html
+++ b/docs/api/1.x/animation.Frame.html
@@ -218,13 +218,13 @@ (protected) new
diff --git a/docs/api/1.x/animation.Player.html b/docs/api/1.x/animation.Player.html
index 5a7020d23b..fea13399de 100644
--- a/docs/api/1.x/animation.Player.html
+++ b/docs/api/1.x/animation.Player.html
@@ -611,13 +611,13 @@ Returns:
diff --git a/docs/api/1.x/control.Attribution.html b/docs/api/1.x/control.Attribution.html
index 6770567df6..8c96a6c7be 100644
--- a/docs/api/1.x/control.Attribution.html
+++ b/docs/api/1.x/control.Attribution.html
@@ -4427,13 +4427,13 @@ Properties:
diff --git a/docs/api/1.x/control.Control.html b/docs/api/1.x/control.Control.html
index 29f4ec6e8c..f7b14079bb 100644
--- a/docs/api/1.x/control.Control.html
+++ b/docs/api/1.x/control.Control.html
@@ -5779,13 +5779,13 @@ Properties:
diff --git a/docs/api/1.x/control.LayerSwitcher.html b/docs/api/1.x/control.LayerSwitcher.html
index e5f189584e..ff54fffe74 100644
--- a/docs/api/1.x/control.LayerSwitcher.html
+++ b/docs/api/1.x/control.LayerSwitcher.html
@@ -4623,13 +4623,13 @@ Properties:
diff --git a/docs/api/1.x/control.Overview.html b/docs/api/1.x/control.Overview.html
index fea3df200e..f4e92b4547 100644
--- a/docs/api/1.x/control.Overview.html
+++ b/docs/api/1.x/control.Overview.html
@@ -4997,13 +4997,13 @@ Properties:
diff --git a/docs/api/1.x/control.Panel.html b/docs/api/1.x/control.Panel.html
index b5ff91c5bf..75b9c69748 100644
--- a/docs/api/1.x/control.Panel.html
+++ b/docs/api/1.x/control.Panel.html
@@ -5656,13 +5656,13 @@ Properties:
diff --git a/docs/api/1.x/control.Scale.html b/docs/api/1.x/control.Scale.html
index 21b75bafd4..4a7868e0f3 100644
--- a/docs/api/1.x/control.Scale.html
+++ b/docs/api/1.x/control.Scale.html
@@ -4688,13 +4688,13 @@ Properties:
diff --git a/docs/api/1.x/control.Toolbar.html b/docs/api/1.x/control.Toolbar.html
index 238bec37b0..8569e68422 100644
--- a/docs/api/1.x/control.Toolbar.html
+++ b/docs/api/1.x/control.Toolbar.html
@@ -4630,13 +4630,13 @@ Properties:
diff --git a/docs/api/1.x/control.Zoom.html b/docs/api/1.x/control.Zoom.html
index db61a78ef5..688e4e9882 100644
--- a/docs/api/1.x/control.Zoom.html
+++ b/docs/api/1.x/control.Zoom.html
@@ -4597,13 +4597,13 @@ Properties:
diff --git a/docs/api/1.x/global.html b/docs/api/1.x/global.html
index 8b3e394401..3838af3622 100644
--- a/docs/api/1.x/global.html
+++ b/docs/api/1.x/global.html
@@ -83,13 +83,13 @@
diff --git a/docs/api/1.x/index.html b/docs/api/1.x/index.html
index c210d94262..6f5e9924da 100644
--- a/docs/api/1.x/index.html
+++ b/docs/api/1.x/index.html
@@ -27,7 +27,7 @@
- maptalks 1.0.0-rc.14
+ maptalks 1.0.0-rc.15
@@ -51,13 +51,13 @@ maptalks 1.0.0-rc.14
diff --git a/docs/api/1.x/measurer.BaiduSphere.html b/docs/api/1.x/measurer.BaiduSphere.html
index 99a365316e..3d4ee63dc9 100644
--- a/docs/api/1.x/measurer.BaiduSphere.html
+++ b/docs/api/1.x/measurer.BaiduSphere.html
@@ -1047,13 +1047,13 @@ Returns:
diff --git a/docs/api/1.x/measurer.Common.html b/docs/api/1.x/measurer.Common.html
index 4b9fb1b6f2..6e7d1c06c6 100644
--- a/docs/api/1.x/measurer.Common.html
+++ b/docs/api/1.x/measurer.Common.html
@@ -273,13 +273,13 @@ Returns:
diff --git a/docs/api/1.x/measurer.DEFAULT.html b/docs/api/1.x/measurer.DEFAULT.html
index d620097ae1..160d293e59 100644
--- a/docs/api/1.x/measurer.DEFAULT.html
+++ b/docs/api/1.x/measurer.DEFAULT.html
@@ -358,13 +358,13 @@ Returns:
diff --git a/docs/api/1.x/measurer.Identity.html b/docs/api/1.x/measurer.Identity.html
index 369cc8e6fc..5702a0e41d 100644
--- a/docs/api/1.x/measurer.Identity.html
+++ b/docs/api/1.x/measurer.Identity.html
@@ -898,13 +898,13 @@ Returns:
diff --git a/docs/api/1.x/measurer.Measurer.html b/docs/api/1.x/measurer.Measurer.html
index 1cfe364636..9c50fcc920 100644
--- a/docs/api/1.x/measurer.Measurer.html
+++ b/docs/api/1.x/measurer.Measurer.html
@@ -301,13 +301,13 @@ Returns:
diff --git a/docs/api/1.x/measurer.WGS84Sphere.html b/docs/api/1.x/measurer.WGS84Sphere.html
index 7db15aa323..305390b208 100644
--- a/docs/api/1.x/measurer.WGS84Sphere.html
+++ b/docs/api/1.x/measurer.WGS84Sphere.html
@@ -986,13 +986,13 @@ Returns:
diff --git a/docs/api/1.x/measurer.html b/docs/api/1.x/measurer.html
index 3ef0e254db..1d261522a8 100644
--- a/docs/api/1.x/measurer.html
+++ b/docs/api/1.x/measurer.html
@@ -109,13 +109,13 @@ Mixins
diff --git a/docs/api/1.x/projection.BAIDU.html b/docs/api/1.x/projection.BAIDU.html
index 9400edf362..a687062be3 100644
--- a/docs/api/1.x/projection.BAIDU.html
+++ b/docs/api/1.x/projection.BAIDU.html
@@ -1896,13 +1896,13 @@ Returns:
diff --git a/docs/api/1.x/projection.Common.html b/docs/api/1.x/projection.Common.html
index ad7d50162c..ea23cae632 100644
--- a/docs/api/1.x/projection.Common.html
+++ b/docs/api/1.x/projection.Common.html
@@ -1003,13 +1003,13 @@ Returns:
diff --git a/docs/api/1.x/projection.DEFAULT.html b/docs/api/1.x/projection.DEFAULT.html
index 1c2ad3fda7..d3f24ff87c 100644
--- a/docs/api/1.x/projection.DEFAULT.html
+++ b/docs/api/1.x/projection.DEFAULT.html
@@ -1847,13 +1847,13 @@ Returns:
diff --git a/docs/api/1.x/projection.EPSG3857.html b/docs/api/1.x/projection.EPSG3857.html
index 6553bb9475..343dcfa227 100644
--- a/docs/api/1.x/projection.EPSG3857.html
+++ b/docs/api/1.x/projection.EPSG3857.html
@@ -1835,13 +1835,13 @@ Returns:
diff --git a/docs/api/1.x/projection.EPSG4326.html b/docs/api/1.x/projection.EPSG4326.html
index 66f722325a..76246f8f5d 100644
--- a/docs/api/1.x/projection.EPSG4326.html
+++ b/docs/api/1.x/projection.EPSG4326.html
@@ -1835,13 +1835,13 @@ Returns:
diff --git a/docs/api/1.x/projection.EPSG4490.html b/docs/api/1.x/projection.EPSG4490.html
index 74a7d0b19d..62645a265e 100644
--- a/docs/api/1.x/projection.EPSG4490.html
+++ b/docs/api/1.x/projection.EPSG4490.html
@@ -951,13 +951,13 @@ Returns:
diff --git a/docs/api/1.x/projection.IDENTITY.html b/docs/api/1.x/projection.IDENTITY.html
index b14b96b34e..e82533eb34 100644
--- a/docs/api/1.x/projection.IDENTITY.html
+++ b/docs/api/1.x/projection.IDENTITY.html
@@ -1747,13 +1747,13 @@ Returns:
diff --git a/docs/api/1.x/projection.html b/docs/api/1.x/projection.html
index c476b104d7..c026669171 100644
--- a/docs/api/1.x/projection.html
+++ b/docs/api/1.x/projection.html
@@ -112,13 +112,13 @@ Mixins
diff --git a/docs/api/1.x/renderer.CanvasRenderer.html b/docs/api/1.x/renderer.CanvasRenderer.html
index 2a3a3377f2..5c42565091 100644
--- a/docs/api/1.x/renderer.CanvasRenderer.html
+++ b/docs/api/1.x/renderer.CanvasRenderer.html
@@ -327,11 +327,11 @@
(abstract, protected) new renderer.CanvasRenderer(layer)
- [source]
+ [source]
@@ -479,11 +479,11 @@ Methods
render()
- [source]
+ [source]
@@ -551,11 +551,11 @@ (abstract) checkResources()
- [source]
+ [source]
@@ -634,11 +634,11 @@ Returns:
(abstract) draw()
- [source]
+ [source]
@@ -706,11 +706,11 @@ (abstract) (abstract) drawOnInteracting(eventParam)
- [source]
+ [source]
@@ -823,11 +823,11 @@ (abstract)
needToRedraw()
- [source]
+ [source]
@@ -902,11 +902,11 @@ Returns:
onSkipDrawOnInteracting()
- [source]
+ [source]
@@ -974,11 +974,11 @@ mustRenderOnInteracting()
- [source]
+ [source]
@@ -1046,11 +1046,11 @@ setToRedraw()
- [source]
+ [source]
@@ -1118,11 +1118,11 @@ setCanvasUpdated()
- [source]
+ [source]
@@ -1190,11 +1190,11 @@ (protected) isCanvasUpdated()
- [source]
+ [source]
@@ -1269,11 +1269,11 @@ Returns:
remove()
- [source]
+ [source]
@@ -1341,11 +1341,11 @@ getMap()
- [source]
+ [source]
@@ -1420,11 +1420,11 @@ Returns:
getCanvasImage()
- [source]
+ [source]
@@ -1499,11 +1499,11 @@ Returns:
clear()
- [source]
+ [source]
@@ -1571,11 +1571,11 @@ isBlank()
- [source]
+ [source]
@@ -1650,11 +1650,11 @@ Returns:
show()
- [source]
+ [source]
@@ -1722,11 +1722,11 @@ s
hide()
- [source]
+ [source]
@@ -1794,11 +1794,11 @@ h
setZIndex()
- [source]
+ [source]
@@ -1866,11 +1866,11 @@ hitDetect(point)
- [source]
+ [source]
@@ -1990,11 +1990,11 @@ Returns:
loadResources(resourceUrls, onComplete, context)
- [source]
+ [source]
@@ -2160,11 +2160,11 @@ Returns:
createCanvas()
- [source]
+ [source]
@@ -2232,11 +2232,11 @@ resizeCanvas(canvasSize)
- [source]
+ [source]
@@ -2349,11 +2349,11 @@ clearCanvas()
- [source]
+ [source]
@@ -2421,11 +2421,11 @@ prepareCanvas()
- [source]
+ [source]
@@ -2504,11 +2504,11 @@ Returns:
getViewExtent()
- [source]
+ [source]
@@ -2587,11 +2587,11 @@ Returns:
completeRender()
- [source]
+ [source]
@@ -2659,11 +2659,11 @@ getEvents()
- [source]
+ [source]
@@ -2742,11 +2742,11 @@ Returns:
onZoomStart(param)
- [source]
+ [source]
@@ -2859,11 +2859,11 @@ onZoomEnd(param)
- [source]
+ [source]
@@ -2976,11 +2976,11 @@ onZooming(param)
- [source]
+ [source]
@@ -3093,11 +3093,11 @@ onMoveStart(param)
- [source]
+ [source]
@@ -3210,11 +3210,11 @@ onMoving(param)
- [source]
+ [source]
@@ -3327,11 +3327,11 @@ onMoveEnd(param)
- [source]
+ [source]
@@ -3444,11 +3444,11 @@ onResize(param)
- [source]
+ [source]
@@ -3561,11 +3561,11 @@ onDragRotateStart(param)
- [source]
+ [source]
@@ -3678,11 +3678,11 @@ onDragRotating(param)
- [source]
+ [source]
@@ -3795,11 +3795,11 @@ onDragRotateEnd(param)
- [source]
+ [source]
@@ -3912,11 +3912,11 @@ onSpatialReferenceChange(param)
- [source]
+ [source]
@@ -4029,11 +4029,11 @@ getDrawTime()
- [source]
+ [source]
@@ -4532,13 +4532,13 @@
diff --git a/docs/api/1.x/renderer.html b/docs/api/1.x/renderer.html
index 0295c923eb..ca0bc1e602 100644
--- a/docs/api/1.x/renderer.html
+++ b/docs/api/1.x/renderer.html
@@ -90,13 +90,13 @@ Classes
diff --git a/docs/api/1.x/ui.InfoWindow.html b/docs/api/1.x/ui.InfoWindow.html
index 5b830e96eb..4a7d1e6705 100644
--- a/docs/api/1.x/ui.InfoWindow.html
+++ b/docs/api/1.x/ui.InfoWindow.html
@@ -5642,13 +5642,13 @@ Properties:
diff --git a/docs/api/1.x/ui.Menu.html b/docs/api/1.x/ui.Menu.html
index 0f2d88668a..cdd732d402 100644
--- a/docs/api/1.x/ui.Menu.html
+++ b/docs/api/1.x/ui.Menu.html
@@ -5411,13 +5411,13 @@ Properties:
diff --git a/docs/api/1.x/ui.Menuable.html b/docs/api/1.x/ui.Menuable.html
index a6ccaeb51c..9ddd119b1b 100644
--- a/docs/api/1.x/ui.Menuable.html
+++ b/docs/api/1.x/ui.Menuable.html
@@ -896,13 +896,13 @@ Returns:
diff --git a/docs/api/1.x/ui.ToolTip.html b/docs/api/1.x/ui.ToolTip.html
index 3060955c2f..7abc384d32 100644
--- a/docs/api/1.x/ui.ToolTip.html
+++ b/docs/api/1.x/ui.ToolTip.html
@@ -5395,13 +5395,13 @@ Properties:
diff --git a/docs/api/1.x/ui.UIComponent.html b/docs/api/1.x/ui.UIComponent.html
index 00d304a165..0b3e60bb53 100644
--- a/docs/api/1.x/ui.UIComponent.html
+++ b/docs/api/1.x/ui.UIComponent.html
@@ -6366,13 +6366,13 @@ Properties:
diff --git a/docs/api/1.x/ui.UIMarker.html b/docs/api/1.x/ui.UIMarker.html
index 9dbe7d8cd8..ef3704e674 100644
--- a/docs/api/1.x/ui.UIMarker.html
+++ b/docs/api/1.x/ui.UIMarker.html
@@ -11461,13 +11461,13 @@ Properties:
diff --git a/docs/api/1.x/worker.module.exports.html b/docs/api/1.x/worker.module.exports.html
index e7dffaf54d..89c363ea3e 100644
--- a/docs/api/1.x/worker.module.exports.html
+++ b/docs/api/1.x/worker.module.exports.html
@@ -182,13 +182,13 @@ new
diff --git a/package-lock.json b/package-lock.json
index 2c7c7d56ba..1b0e390468 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "maptalks",
- "version": "1.0.0-rc.14",
+ "version": "1.0.0-rc.15",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "maptalks",
- "version": "1.0.0-rc.14",
+ "version": "1.0.0-rc.15",
"license": "BSD-3-Clause",
"dependencies": {
"@maptalks/feature-filter": "^1.0.0",
diff --git a/package.json b/package.json
index f7e2486f2f..df82c7890e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "maptalks",
- "version": "1.0.0-rc.14",
+ "version": "1.0.0-rc.15",
"description": "A light JavaScript library to create integrated 2D/3D maps.",
"license": "BSD-3-Clause",
"author": "Fu Zhen",
diff --git a/src/core/Canvas.js b/src/core/Canvas.js
index 3f6e951445..c1e8c4a8da 100644
--- a/src/core/Canvas.js
+++ b/src/core/Canvas.js
@@ -26,6 +26,9 @@ const RADIAN = Math.PI / 180;
const textOffsetY = 1;
const Canvas = {
+ getCanvas2DContext(canvas) {
+ return canvas.getContext('2d', { willReadFrequently: true });
+ },
setHitTesting(testing) {
hitTesting = testing;
},
diff --git a/src/core/util/marker.js b/src/core/util/marker.js
index ddd1fc74fe..adbac796ed 100644
--- a/src/core/util/marker.js
+++ b/src/core/util/marker.js
@@ -204,5 +204,5 @@ export const DYNAMIC_SYMBOL_PROPS = [
];
export const SIZE_SYMBOL_PROPS = [
- 'textName', 'markerType', 'markerFile', 'textHaloRadius', 'shadowBlur', 'shadowOffsetX', 'shadowOffsetY'
+ 'textName', 'markerType', 'markerFile', 'textHaloRadius', 'shadowBlur', 'shadowOffsetX', 'shadowOffsetY', 'textWrapWidth'
];
diff --git a/src/geometry/TextBox.js b/src/geometry/TextBox.js
index 007467b734..7e4250e987 100644
--- a/src/geometry/TextBox.js
+++ b/src/geometry/TextBox.js
@@ -1,6 +1,7 @@
import { extend, isNil } from '../core/util';
import { escapeSpecialChars } from '../core/util/strings';
import TextMarker from './TextMarker';
+import { isFunctionDefinition, interpolated } from '@maptalks/function-type';
/**
* @property {Object} [options=null] - textbox's options, also including options of [Marker]{@link Marker#options}
@@ -187,9 +188,30 @@ class TextBox extends TextMarker {
_refresh() {
const textStyle = this.getTextStyle() || {},
- padding = textStyle['padding'] || [12, 8],
- maxWidth = this._width - 2 * padding[0],
+ padding = textStyle['padding'] || [12, 8];
+ let maxWidth, maxHeight;
+ if (isFunctionDefinition(this._width)) {
+ maxWidth = JSON.parse(JSON.stringify(this._width));
+ const stops = maxWidth.stops;
+ if (stops) {
+ for (let i = 0; i < stops.length; i++) {
+ stops[i][1] = stops[i][1] - 2 * padding[0];
+ }
+ }
+ } else {
+ maxWidth = this._width - 2 * padding[0];
+ }
+ if (isFunctionDefinition(this._height)) {
+ maxHeight = JSON.parse(JSON.stringify(this._height));
+ const stops = maxHeight.stops;
+ if (stops) {
+ for (let i = 0; i < stops.length; i++) {
+ stops[i][1] = stops[i][1] - 2 * padding[1];
+ }
+ }
+ } else {
maxHeight = this._height - 2 * padding[1];
+ }
const symbol = extend({},
textStyle.symbol || this._getDefaultTextSymbol(),
this.options.boxSymbol || this._getDefaultBoxSymbol(),
@@ -207,31 +229,113 @@ class TextBox extends TextMarker {
symbol['textWrapWidth'] = maxWidth;
}
+ // function-type markerWidth and markerHeight doesn't support left/right horizontalAlignment and top/bottom verticalAlignment now
const hAlign = textStyle['horizontalAlignment'];
symbol['textDx'] = symbol['markerDx'] || 0;
- const offsetX = symbol['markerWidth'] / 2 - padding[0];
+ let offsetX;
+ if (isFunctionDefinition(this._width)) {
+ offsetX = JSON.parse(JSON.stringify(this._width));
+ const stops = offsetX.stops;
+ if (stops) {
+ for (let i = 0; i < stops.length; i++) {
+ stops[i][1] = stops[i][1] / 2 - padding[0];
+ if (hAlign === 'left') {
+ stops[i][1] *= -1;
+ }
+ }
+ }
+ } else {
+ offsetX = symbol['markerWidth'] / 2 - padding[0];
+ if (hAlign === 'left') {
+ offsetX *= -1;
+ }
+ }
if (hAlign === 'left') {
symbol['textHorizontalAlignment'] = 'right';
- symbol['textDx'] = symbol['textDx'] - offsetX;
+ symbol['textDx'] = offsetX;
} else if (hAlign === 'right') {
symbol['textHorizontalAlignment'] = 'left';
- symbol['textDx'] = symbol['textDx'] + offsetX;
+ symbol['textDx'] = offsetX;
}
const vAlign = textStyle['verticalAlignment'];
symbol['textDy'] = symbol['markerDy'] || 0;
- const offsetY = symbol['markerHeight'] / 2 - padding[1];
+ let offsetY;
+ if (isFunctionDefinition(this._height)) {
+ offsetY = JSON.parse(JSON.stringify(this._height));
+ const stops = offsetY.stops;
+ if (stops) {
+ for (let i = 0; i < stops.length; i++) {
+ stops[i][1] = stops[i][1] / 2 - padding[1];
+ if (vAlign === 'top') {
+ stops[i][1] *= -1;
+ }
+ }
+ }
+ } else {
+ offsetY = symbol['markerHeight'] / 2 - padding[1];
+ if (vAlign === 'top') {
+ offsetY *= -1;
+ }
+ }
if (vAlign === 'top') {
symbol['textVerticalAlignment'] = 'bottom';
- symbol['textDy'] -= offsetY;
+ symbol['textDy'] = offsetY;
} else if (vAlign === 'bottom') {
symbol['textVerticalAlignment'] = 'top';
- symbol['textDy'] += offsetY;
+ symbol['textDy'] = offsetY;
}
this._refreshing = true;
this.updateSymbol(symbol);
delete this._refreshing;
}
+
+ startEdit(opts) {
+ const symbol = this._getCompiledSymbol();
+ console.log(symbol['markerWidth']);
+ if (isFunctionDefinition(this._width)) {
+ const markerWidth = symbol['markerWidth'];
+ console.log(markerWidth);
+ this._oldWidth = this._width;
+ this.setWidth(markerWidth);
+ }
+ if (isFunctionDefinition(this._height)) {
+ const markerHeight = symbol['markerHeight'];
+ this._oldHeight = this._height;
+ this.setHeight(markerHeight);
+ }
+ super.startEdit(opts);
+ }
+
+ endEdit() {
+ const map = this.getMap();
+ const zoom = map && map.getZoom();
+ if (this._oldWidth) {
+ const markerWidth = this._width;
+ const widthFn = interpolated(this._oldWidth);
+ const oldExpectedWidth = widthFn(zoom);
+ const scale = markerWidth / oldExpectedWidth;
+ const stops = this._oldWidth.stops;
+ for (let i = 0; i < stops.length; i++) {
+ stops[i][1] *= scale;
+ }
+ this.setWidth(this._oldWidth);
+ delete this._oldWidth;
+ }
+ if (this._oldHeight) {
+ const markerHeight = this._height;
+ const heightFn = interpolated(this._oldHeight);
+ const oldExpectedHeight = heightFn(zoom);
+ const scale = markerHeight / oldExpectedHeight;
+ const stops = this._oldHeight.stops;
+ for (let i = 0; i < stops.length; i++) {
+ stops[i][1] *= scale;
+ }
+ this.setHeight(this._oldHeight);
+ delete this._oldHeight;
+ }
+ super.endEdit();
+ }
}
TextBox.mergeOptions(options);
diff --git a/src/geometry/ext/Geometry.Edit.js b/src/geometry/ext/Geometry.Edit.js
index 53a22c7e15..086f518984 100644
--- a/src/geometry/ext/Geometry.Edit.js
+++ b/src/geometry/ext/Geometry.Edit.js
@@ -17,7 +17,9 @@ Geometry.include(/** @lends Geometry.prototype */ {
if (!this.getMap() || !this.options['editable']) {
return this;
}
- this.endEdit();
+ if (this._editor) {
+ this.endEdit();
+ }
this._editor = new GeometryEditor(this, opts);
this._editor.start();
/**
diff --git a/src/layer/OverlayLayer.js b/src/layer/OverlayLayer.js
index 65cf412264..a93fefcdc1 100644
--- a/src/layer/OverlayLayer.js
+++ b/src/layer/OverlayLayer.js
@@ -19,6 +19,8 @@ const options = {
};
+const TMP_EVENTS_ARR = [];
+
/**
* @classdesc
* Base class of all the layers that can add/remove geometries.
@@ -663,6 +665,27 @@ class OverlayLayer extends Layer {
this._getRenderer().onGeometryPropertiesChange(param);
}
}
+
+ _hasGeoListeners(eventTypes) {
+ if (!eventTypes) {
+ return false;
+ }
+ if (!Array.isArray(eventTypes)) {
+ TMP_EVENTS_ARR[0] = eventTypes;
+ eventTypes = TMP_EVENTS_ARR;
+ }
+ const geos = this.getGeometries() || [];
+ for (let i = 0, len = geos.length; i < len; i++) {
+ for (let j = 0, len1 = eventTypes.length; j < len1; j++) {
+ const eventType = eventTypes[j];
+ const listens = geos[i].listens(eventType);
+ if (listens > 0) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
}
OverlayLayer.mergeOptions(options);
diff --git a/src/layer/tile/TileLayer.js b/src/layer/tile/TileLayer.js
index 265a12af88..16ed1bb6ad 100644
--- a/src/layer/tile/TileLayer.js
+++ b/src/layer/tile/TileLayer.js
@@ -20,8 +20,6 @@ import Layer from '../Layer';
import SpatialReference from '../../map/spatial-reference/SpatialReference';
import { intersectsBox } from 'frustum-intersects';
import * as vec3 from '../../core/util/vec3';
-import { registerWorkerAdapter } from '../../core/worker/Worker';
-import { imageFetchWorkerKey } from '../../core/worker/CoreWorkers';
const DEFAULT_MAXERROR = 1;
const TEMP_POINT = new Point(0, 0);
@@ -1321,50 +1319,3 @@ function distanceToRect(min, max, xyz) {
return Math.sqrt(dx * dx + dy * dy + dz * dz);
}
-const workerSource = `
-function (exports) {
- exports.onmessage = function (msg, postResponse) {
- var url = msg.data.url;
- var fetchOptions = msg.data.fetchOptions;
- requestImageOffscreen(url, function (err, data) {
- var buffers = [];
- if (data && data.data && data.data.buffer) {
- buffers.push(data.data.buffer);
- }
- postResponse(err, data, buffers);
- }, fetchOptions);
- };
-
- var offCanvas, offCtx;
- function requestImageOffscreen(url, cb, fetchOptions) {
- if (!offCanvas) {
- offCanvas = new OffscreenCanvas(2, 2);
- offCtx = offCanvas.getContext('2d');
- }
- fetch(url, fetchOptions ? fetchOptions : {})
- .then(response => response.blob())
- .then(blob => createImageBitmap(blob))
- .then(bitmap => {
- var { width, height } = bitmap;
- offCanvas.width = width;
- offCanvas.height = height;
- offCtx.drawImage(bitmap, 0, 0);
- bitmap.close();
- var imgData = offCtx.getImageData(0, 0, width, height);
- // debugger
- cb(null, { width, height, data: new Uint8Array(imgData.data) });
- }).catch(err => {
- console.warn('error when loading tile:', url);
- console.warn(err);
- cb(err);
- });
- }
-}`;
-
-function registerWorkerSource() {
- if (!Browser.decodeImageInWorker) {
- return;
- }
- registerWorkerAdapter(imageFetchWorkerKey, function () { return workerSource; });
-}
-registerWorkerSource();
diff --git a/src/layer/tile/WMSTileLayer.js b/src/layer/tile/WMSTileLayer.js
index 9a31140dae..f872bfae31 100644
--- a/src/layer/tile/WMSTileLayer.js
+++ b/src/layer/tile/WMSTileLayer.js
@@ -88,7 +88,7 @@ class WMSTileLayer extends TileLayer {
const max = tileExtent.getMax(),
min = tileExtent.getMin();
- const bbox = (this._wmsVersion >= 1.3 && this.wmsParams.crs === 'EPSG:4326' ?
+ const bbox = (this._wmsVersion >= 1.3 && (this.wmsParams.crs === 'EPSG:4326' || this.wmsParams.crs === 'EPSG:4490') ?
[min.y, min.x, max.y, max.x] :
[min.x, min.y, max.x, max.y]).join(',');
diff --git a/src/map/Map.Anim.js b/src/map/Map.Anim.js
index fe09102b1c..69c3820347 100644
--- a/src/map/Map.Anim.js
+++ b/src/map/Map.Anim.js
@@ -474,7 +474,7 @@ Map.include(/** @lends Map.prototype */{
if (!this._animPlayer) {
return;
}
- if (props['center']) {
+ if (props['center'] || props['prjCenter']) {
this.onMoveStart();
}
if (props['zoom'] && !this.isZooming()) {
diff --git a/src/map/Map.Topo.js b/src/map/Map.Topo.js
index 0c09406a5b..b82fbf411b 100644
--- a/src/map/Map.Topo.js
+++ b/src/map/Map.Topo.js
@@ -114,7 +114,8 @@ Map.include(/** @lends Map.prototype */ {
if (!isArrayHasData(reqLayers)) {
return this;
}
- const layers = [];
+ const eventTypes = opts.eventTypes;
+ let layers = [];
for (let i = 0, len = reqLayers.length; i < len; i++) {
if (isString(reqLayers[i])) {
layers.push(this.getLayer(reqLayers[i]));
@@ -122,6 +123,15 @@ Map.include(/** @lends Map.prototype */ {
layers.push(reqLayers[i]);
}
}
+ if (eventTypes) {
+ layers = layers.filter(layer => {
+ if (!layer._hasGeoListeners) {
+ return true;
+ }
+ return layer._hasGeoListeners(eventTypes);
+ });
+ }
+
const hits = [];
for (let i = layers.length - 1; i >= 0; i--) {
diff --git a/src/map/Map.js b/src/map/Map.js
index 7ab348cb48..ec195564a0 100644
--- a/src/map/Map.js
+++ b/src/map/Map.js
@@ -1181,11 +1181,14 @@ class Map extends Handlerable(Eventable(Renderable(Class))) {
if (renderer) {
renderer.setLayerCanvasUpdated();
}
- this.once('frameend', () => {
- removed.forEach(layer => {
- layer.fire('remove');
- });
+ removed.forEach(layer => {
+ layer.fire('remove');
});
+ // this.once('frameend', () => {
+ // removed.forEach(layer => {
+ // layer.fire('remove');
+ // });
+ // });
}
/**
* removelayer event, fired when removing layers.
diff --git a/src/map/handler/Map.GeometryEvents.js b/src/map/handler/Map.GeometryEvents.js
index e091babc5f..3cb15f274c 100644
--- a/src/map/handler/Map.GeometryEvents.js
+++ b/src/map/handler/Map.GeometryEvents.js
@@ -147,6 +147,11 @@ const EVENTS =
* @property {Event} domEvent - dom event
*/
+const MOUSEEVENT_ASSOCIATION_TABLE = {
+ 'mousemove': ['mousemove', 'mouseover', 'mouseout', 'mouseenter'],
+ 'touchend': ['touchend', 'click']
+};
+
class MapGeometryEventsHandler extends Handler {
addHooks() {
@@ -230,7 +235,7 @@ class MapGeometryEventsHandler extends Handler {
return;
}
-
+ const eventTypes = MOUSEEVENT_ASSOCIATION_TABLE[eventType] || [eventType];
const identifyOptions = {
'includeInternals': true,
//return only one geometry on top,
@@ -253,9 +258,10 @@ class MapGeometryEventsHandler extends Handler {
return true;
},
'count': 1,
- 'containerPoint': containerPoint,
'onlyVisible': map.options['onlyVisibleGeometryEvents'],
- 'layers': layers
+ containerPoint,
+ layers,
+ eventTypes
};
const callback = fireGeometryEvent.bind(this);
diff --git a/src/map/tool/DrawTool.js b/src/map/tool/DrawTool.js
index d152a0af86..565d0fffb0 100644
--- a/src/map/tool/DrawTool.js
+++ b/src/map/tool/DrawTool.js
@@ -210,7 +210,7 @@ class DrawTool extends MapTool {
onDisable() {
const map = this.getMap();
this._restoreMapCfg();
- this.endDraw();
+ this.endDraw({ ignoreEndEvent: true });
if (this._map) {
map.removeLayer(this._getDrawLayer());
if (this.options['autoPanAtEdge']) {
@@ -362,12 +362,13 @@ class DrawTool extends MapTool {
* @private
*/
_clickHandler(event) {
+ const map = this.getMap();
const registerMode = this._getRegisterMode();
// const coordinate = event['coordinate'];
//dbclick will trigger two click
if (this._clickCoords && this._clickCoords.length) {
const len = this._clickCoords.length;
- const prjCoord = this.getMap()._pointToPrj(event['point2d']);
+ const prjCoord = map._pointToPrj(event['point2d']);
if (this._clickCoords[len - 1].equals(prjCoord)) {
return;
}
@@ -375,20 +376,25 @@ class DrawTool extends MapTool {
if (!this._geometry) {
this._createGeometry(event);
} else {
- let prjCoord = this.getMap()._pointToPrj(event['point2d']);
- const snapTo = this._geometry.snapTo;
- //for adsorption effect
- if (snapTo && isFunction(snapTo)) {
- const containerPoint = this._geometry.snapTo(event.containerPoint) || event.containerPoint;
- prjCoord = this.getMap()._containerPointToPrj(containerPoint);
- }
+ let prjCoord = map._pointToPrj(event['point2d']);
if (!isNil(this._historyPointer)) {
this._clickCoords = this._clickCoords.slice(0, this._historyPointer);
}
+ //for snap effect
+ const snapTo = this._geometry.snapTo;
+ if (snapTo && isFunction(snapTo)) {
+ const snapResult = this._getSnapResult(snapTo, event.containerPoint);
+ prjCoord = snapResult.prjCoord;
+ this._clickCoords = this._clickCoords.concat(snapResult.effectedVertex);
+ // ensure snap won't trigger again when dblclick
+ if (this._clickCoords[this._clickCoords.length - 1].equals(prjCoord)) {
+ return;
+ }
+ }
this._clickCoords.push(prjCoord);
this._historyPointer = this._clickCoords.length;
event.drawTool = this;
- registerMode['update'](this.getMap().getProjection(), this._clickCoords, this._geometry, event);
+ registerMode['update'](map.getProjection(), this._clickCoords, this._geometry, event);
if (this.getMode() === 'point') {
this.endDraw(event);
return;
@@ -452,6 +458,17 @@ class DrawTool extends MapTool {
* @property {Event} domEvent - dom event
*/
this._fireEvent('drawstart', event);
+ // snapTo First coordinate point
+ const snapTo = this._geometry.snapTo;
+ if (snapTo && isFunction(snapTo)) {
+ const snapResult = this._getSnapResult(snapTo, event.containerPoint);
+ const map = this.getMap();
+ if (map && snapResult) {
+ const prjCoord = snapResult.prjCoord;
+ this._clickCoords = [prjCoord];
+ registerMode['update'](map.getProjection(), this._clickCoords, this._geometry, event);
+ }
+ }
}
if (mode === 'point' && event.type !== 'mousemove') {
this.endDraw(event);
@@ -476,14 +493,18 @@ class DrawTool extends MapTool {
if (!this._geometry) {
return;
}
- let containerPoint = this._getMouseContainerPoint(event);
+ const containerPoint = this._getMouseContainerPoint(event);
if (!this._isValidContainerPoint(containerPoint)) {
return;
}
- let prjCoord = this.getMap()._pointToPrj(event['point2d']);
- if (this._geometry.snapTo) {
- containerPoint = this._geometry.snapTo(containerPoint) || containerPoint;
- prjCoord = map._containerPointToPrj(containerPoint);
+ let prjCoord = map._pointToPrj(event['point2d']);
+ // for snap effect
+ let snapAdditionVertex = [];
+ const snapTo = this._geometry.snapTo;
+ if (snapTo && isFunction(snapTo)) {
+ const snapResult = this._getSnapResult(snapTo, containerPoint);
+ prjCoord = snapResult.prjCoord;
+ snapAdditionVertex = snapResult.effectedVertex;
}
const projection = map.getProjection();
event.drawTool = this;
@@ -493,7 +514,7 @@ class DrawTool extends MapTool {
if (path && path.length > 0 && prjCoord.equals(path[path.length - 1])) {
return;
}
- registerMode['update'](projection, path.concat([prjCoord]), this._geometry, event);
+ registerMode['update'](projection, path.concat(snapAdditionVertex, [prjCoord]), this._geometry, event);
} else {
//free hand mode
registerMode['update'](projection, prjCoord, this._geometry, event);
@@ -585,7 +606,9 @@ class DrawTool extends MapTool {
* @property {Point} viewPoint - view point of the event
* @property {Event} domEvent - dom event
*/
- this._fireEvent('drawend', param);
+ if (!param.ignoreEndEvent) {
+ this._fireEvent('drawend', param);
+ }
delete this._geometry;
if (this.options['once']) {
this.disable();
@@ -631,6 +654,29 @@ class DrawTool extends MapTool {
return true;
}
+ _getSnapResult(snapTo, containerPoint) {
+ const map = this.getMap();
+ const lastContainerPoints = [];
+ if (this.options.edgeAutoComplete) {
+ const lastCoord = this._clickCoords[(this._historyPointer || 1) - 1];
+ lastContainerPoints.push(map._prjToContainerPoint(lastCoord));
+ const beforeLastCoord = this._clickCoords[(this._historyPointer || 1) - 2];
+ if (beforeLastCoord) {
+ lastContainerPoints.push(map._prjToContainerPoint(beforeLastCoord));
+ }
+ }
+ const snapResult = snapTo(containerPoint, lastContainerPoints);
+ containerPoint = (snapResult.effectedVertex ? snapResult.point : snapResult) || containerPoint;
+ const prjCoord = map._containerPointToPrj(containerPoint);
+ if (snapResult.effectedVertex) {
+ snapResult.effectedVertex = snapResult.effectedVertex.map(vertex => map._containerPointToPrj(vertex));
+ }
+ return {
+ prjCoord,
+ effectedVertex: snapResult.effectedVertex || []
+ };
+ }
+
_getDrawLayer() {
const drawLayerId = INTERNAL_LAYER_PREFIX + 'drawtool';
let drawToolLayer = this._map.getLayer(drawLayerId);
diff --git a/src/renderer/geometry/Painter.js b/src/renderer/geometry/Painter.js
index 2274d48078..87178d0714 100644
--- a/src/renderer/geometry/Painter.js
+++ b/src/renderer/geometry/Painter.js
@@ -634,7 +634,7 @@ class Painter extends Class {
}
Canvas.setHitTesting(true);
testCanvas.width = testCanvas.height = 2 * tolerance;
- const ctx = testCanvas.getContext('2d');
+ const ctx = Canvas.getCanvas2DContext(testCanvas);
try {
this.paint(null, ctx, this._hitPoint);
} catch (e) {
diff --git a/src/renderer/layer/CanvasRenderer.js b/src/renderer/layer/CanvasRenderer.js
index f714a9184d..05da117d2d 100644
--- a/src/renderer/layer/CanvasRenderer.js
+++ b/src/renderer/layer/CanvasRenderer.js
@@ -6,6 +6,7 @@ import Canvas2D from '../../core/Canvas';
import Actor from '../../core/worker/Actor';
import Point from '../../geo/Point';
import { imageFetchWorkerKey } from '../../core/worker/CoreWorkers';
+import { registerWorkerAdapter } from '../../core/worker/Worker';
const EMPTY_ARRAY = [];
class ResourceWorkerConnection extends Actor {
@@ -427,7 +428,7 @@ class CanvasRenderer extends Class {
if (this.gl && this.gl.canvas === this.canvas || this.context) {
return;
}
- this.context = this.canvas.getContext('2d');
+ this.context = Canvas2D.getCanvas2DContext(this.canvas);
if (!this.context) {
return;
}
@@ -959,3 +960,51 @@ export class ResourceCache {
this.resources = {};
}
}
+
+const workerSource = `
+function (exports) {
+ exports.onmessage = function (msg, postResponse) {
+ var url = msg.data.url;
+ var fetchOptions = msg.data.fetchOptions;
+ requestImageOffscreen(url, function (err, data) {
+ var buffers = [];
+ if (data && data.data && data.data.buffer) {
+ buffers.push(data.data.buffer);
+ }
+ postResponse(err, data, buffers);
+ }, fetchOptions);
+ };
+
+ var offCanvas, offCtx;
+ function requestImageOffscreen(url, cb, fetchOptions) {
+ if (!offCanvas) {
+ offCanvas = new OffscreenCanvas(2, 2);
+ offCtx = offCanvas.getContext('2d',{willReadFrequently: true });
+ }
+ fetch(url, fetchOptions ? fetchOptions : {})
+ .then(response => response.blob())
+ .then(blob => createImageBitmap(blob))
+ .then(bitmap => {
+ var { width, height } = bitmap;
+ offCanvas.width = width;
+ offCanvas.height = height;
+ offCtx.drawImage(bitmap, 0, 0);
+ bitmap.close();
+ var imgData = offCtx.getImageData(0, 0, width, height);
+ // debugger
+ cb(null, { width, height, data: new Uint8Array(imgData.data) });
+ }).catch(err => {
+ console.warn('error when loading tile:', url);
+ console.warn(err);
+ cb(err);
+ });
+ }
+}`;
+
+function registerWorkerSource() {
+ if (!Browser.decodeImageInWorker) {
+ return;
+ }
+ registerWorkerAdapter(imageFetchWorkerKey, function () { return workerSource; });
+}
+registerWorkerSource();
diff --git a/src/renderer/map/MapCanvasRenderer.js b/src/renderer/map/MapCanvasRenderer.js
index c1ca173af0..1cf34a1bba 100644
--- a/src/renderer/map/MapCanvasRenderer.js
+++ b/src/renderer/map/MapCanvasRenderer.js
@@ -22,7 +22,6 @@ class MapCanvasRenderer extends MapRenderer {
super(map);
//container is a