cd-mapgis 1.0.75 → 1.0.77

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cd-mapgis",
3
- "version": "1.0.75",
3
+ "version": "1.0.77",
4
4
  "main": "./src/index.js",
5
5
  "types": "./src/index.d.ts",
6
6
  "type": "module",
package/src/OM.js CHANGED
@@ -227,9 +227,9 @@ export default class OM {
227
227
  }
228
228
  }
229
229
  //再加载geoServer接口图层
230
- if (p.server) {
231
- let url = p.server.url ? p.server.url : "/api/getPushLayer";
232
- let res = await OM.post(url, p.server.data);
230
+ let pushLayerParam = (p.server && p.server.data) ? p.server.data : {};
231
+ let res = await OM.post("/map/getPushLayer", pushLayerParam);
232
+ if (res != null && res.data != null) {
233
233
  let d = res.data;
234
234
  let layerInfos = d.layerInfos;
235
235
  let wmsUrl = InnerUtil.getGeoServerUrl(d.wmsUrl, geoLayerUrl);
package/src/StyleUtil.js CHANGED
@@ -21,6 +21,15 @@ export default class StyleUtil {
21
21
  }),
22
22
  fill: new Fill({
23
23
  color: 'rgba(0, 0, 0, 0)' // 透明填充
24
+ }),
25
+ image: new Circle({
26
+ radius: 5,
27
+ stroke: new Stroke({
28
+ color: 'rgba(0, 0, 0, 0.7)'
29
+ }),
30
+ fill: new Fill({
31
+ color: 'rgba(255, 255, 255, 0.2)'
32
+ })
24
33
  })
25
34
  });
26
35
  }
@@ -86,8 +95,8 @@ export default class StyleUtil {
86
95
  anchorXUnits: 'fraction',
87
96
  anchorYUnits: 'pixels',
88
97
  offsetOrigin: 'top-right',
89
- scale:p.scale ?? 0.5,
90
- offset:p.offset ?? [0,10],
98
+ scale: p.scale ?? 0.5,
99
+ offset: p.offset ?? [0, 10],
91
100
  // offset:[0,10],
92
101
  //图标缩放比例
93
102
  //scale:0.5,
@@ -156,7 +165,7 @@ export default class StyleUtil {
156
165
  });
157
166
  if (p.text) {
158
167
  styleParam.text = StyleUtil.getText(p.text);
159
- }
168
+ }
160
169
  return new Style(styleParam);
161
170
  }
162
171
  /**
@@ -181,6 +190,15 @@ export default class StyleUtil {
181
190
  color: lineColor,
182
191
  width: lineWidth
183
192
  });
193
+ styleParam.image = new Circle({
194
+ radius: 5,
195
+ stroke: new Stroke({
196
+ color: 'rgba(0, 0, 0, 0.7)'
197
+ }),
198
+ fill: new Fill({
199
+ color: 'rgba(255, 255, 255, 0.2)'
200
+ })
201
+ });
184
202
  if (p.img) {
185
203
  styleParam.image = StyleUtil.getIcon(p.img);
186
204
  }