@vtx/map 1.1.17 → 1.1.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/VtxMap/OlMap/Map.js
CHANGED
|
@@ -878,7 +878,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
|
|
|
878
878
|
anchor: [-drawParam.parameter.markerContentX || -15, -drawParam.parameter.markerContentY || -15],
|
|
879
879
|
anchorXUnits: 'pixels',
|
|
880
880
|
anchorYUnits: 'pixels',
|
|
881
|
-
src: drawParam.parameter.url ||
|
|
881
|
+
src: drawParam.parameter.url || require("../images/defaultMarker.png"),
|
|
882
882
|
opacity: 1,
|
|
883
883
|
scale: drawParam.parameter.scale || 1
|
|
884
884
|
})
|
|
@@ -893,7 +893,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
|
|
|
893
893
|
anchor: [-drawParam.parameter.markerContentX || -15, -drawParam.parameter.markerContentY || -15],
|
|
894
894
|
anchorXUnits: 'pixels',
|
|
895
895
|
anchorYUnits: 'pixels',
|
|
896
|
-
src: drawParam.parameter.url ||
|
|
896
|
+
src: drawParam.parameter.url || require("../images/defaultMarker.png"),
|
|
897
897
|
opacity: 1,
|
|
898
898
|
scale: drawParam.parameter.scale || 1
|
|
899
899
|
})
|
|
@@ -973,7 +973,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
|
|
|
973
973
|
id: t.drawParam.data.id,
|
|
974
974
|
longitude: lng,
|
|
975
975
|
latitude: lat,
|
|
976
|
-
url: t.drawParam.parameter.url ||
|
|
976
|
+
url: t.drawParam.parameter.url || require("../images/defaultMarker.png"),
|
|
977
977
|
config: _objectSpread({}, t.drawParam.parameter)
|
|
978
978
|
}], 'point'); //处理点返回参数
|
|
979
979
|
|
|
@@ -981,7 +981,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
|
|
|
981
981
|
id: t.drawParam.data.id,
|
|
982
982
|
attributes: {
|
|
983
983
|
id: t.drawParam.data.id,
|
|
984
|
-
url: t.drawParam.parameter.url ||
|
|
984
|
+
url: t.drawParam.parameter.url || require("../images/defaultMarker.png"),
|
|
985
985
|
config: {
|
|
986
986
|
width: t.drawParam.parameter.width || 30,
|
|
987
987
|
height: t.drawParam.parameter.height || 30
|
|
@@ -1825,7 +1825,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
|
|
|
1825
1825
|
});
|
|
1826
1826
|
t.state.gis.addOverlay(pop);
|
|
1827
1827
|
} else {
|
|
1828
|
-
// item.url ||
|
|
1828
|
+
// item.url || require("../images/defaultMarker.png"),
|
|
1829
1829
|
canvasDataURL(item.url || require("../images/defaultMarker.png"), {
|
|
1830
1830
|
width: cg.width,
|
|
1831
1831
|
height: cg.height
|
|
@@ -1889,7 +1889,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
|
|
|
1889
1889
|
anchor: [-cg.markerContentX, -cg.markerContentY],
|
|
1890
1890
|
anchorXUnits: 'pixels',
|
|
1891
1891
|
anchorYUnits: 'pixels',
|
|
1892
|
-
// src: item.url ||
|
|
1892
|
+
// src: item.url || require("../images/defaultMarker.png"),
|
|
1893
1893
|
img: myImage,
|
|
1894
1894
|
imgSize: [cg.width, cg.height],
|
|
1895
1895
|
opacity: cg.opacity,
|
|
@@ -2010,7 +2010,7 @@ var OlMap = /*#__PURE__*/function (_React$Component) {
|
|
|
2010
2010
|
anchor: [-cg.markerContentX, -cg.markerContentY],
|
|
2011
2011
|
anchorXUnits: 'pixels',
|
|
2012
2012
|
anchorYUnits: 'pixels',
|
|
2013
|
-
// src: item.url ||
|
|
2013
|
+
// src: item.url || require("../images/defaultMarker.png"),
|
|
2014
2014
|
img: myImage,
|
|
2015
2015
|
imgSize: [cg.width, cg.height],
|
|
2016
2016
|
opacity: cg.opacity,
|
|
@@ -4213,7 +4213,7 @@ var Popup = /*#__PURE__*/function (_React$Component2) {
|
|
|
4213
4213
|
function getRgbColor(color, opacity) {
|
|
4214
4214
|
var reg = /^#([0-9A-Fa-f]{3}|[0-9A-Fa-f]{6})$/;
|
|
4215
4215
|
|
|
4216
|
-
if (!reg.test(color)) {
|
|
4216
|
+
if (!reg.test(color) && typeof color !== 'string') {
|
|
4217
4217
|
return;
|
|
4218
4218
|
}
|
|
4219
4219
|
|