Commit d8e765c8 by niuxiaolin

latest

parent 31cc275c
......@@ -41,7 +41,7 @@ import { Observable } from 'rxjs';
@Injectable()
export class DefaultService {
public basePath = 'http://localhost:8081';
public basePath = 'https://localhost';
// public basePath = 'http://192.168.19.199:8081';
// public basePath = environment.prod? 'http://localhost:8081':'http://192.168.19.199:8081';
public defaultHeaders = new HttpHeaders();
......
......@@ -168,9 +168,9 @@ export class MainComponent implements OnInit {
this.http.get<any>(this.s.basePath + "/mapLable/list").subscribe(res => {
// this.maplabes = res.data;
//加载labels
setTimeout(() => {
this.loadLabels(res.data);
}, 5000);
// setTimeout(() => {
// this.loadLabels(res.data);
// }, 5000);
});
this.http.get<any>(this.s.basePath + "/scetion/list").subscribe(res => {
this.allsecs = res.data;
......
......@@ -807,7 +807,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
container.innerHTML = "";
container.appendChild(_this.za());
opts.size && this.Ae(opts.size);
e = _this.Hb();
e = _this.getSize();
_this.width = e.width;
_this.height = e.height;
_this.offsetX = 0;
......@@ -914,7 +914,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
fa: function() {
var a = this;
a.Sn = function() {
var b = a.Hb();
var b = a.getSize();
if (a.width !== b.width || a.height !== b.height) {
var c = new P(a.width,a.height)
, e = new Q("onbeforeresize");
......@@ -956,7 +956,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
this.dispatchEvent(new Q("onzoomstartcode"))
}
},
Qc: function(a) {
setZoom: function(a) {
this.yg(a)
},
hF: function(a) {
......@@ -965,11 +965,11 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
iF: function(a) {
this.yg(this.Va - 1, a)
},
ji: function(a) {
panTo: function(a) {
a instanceof J && (this.fc = this.Pc.bi(a, this.Vb),
this.pe = J.iL(a) ? new J(a.lng,a.lat) : this.Pc.eh(this.fc, this.Vb))
},
tg: function(a, b) {
panBy: function(a, b) {
a = Math.round(a) || 0;
b = Math.round(b) || 0;
this.Wj(-a, -b)
......@@ -1007,7 +1007,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
Tf: function(a) {
a && this.dispatchEvent(new Q("onremovetilelayer",a))
},
wg: function(a) {
setMapType: function(a) {
if (this.Db !== a) {
var b = new Q("onsetmaptype");
b.o4 = this.Db;
......@@ -1025,7 +1025,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
(a === ab || a === Va) && Ta(Aa)
}
},
pf: function(a) {
setCenter: function(a) {
var b = this;
if (a instanceof J)
b.ji(a, {
......@@ -1047,7 +1047,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
})
}
},
Ed: function(a, b) {
centerAndZoom: function(a, b) {
"[object Undefined]" !== Object.prototype.toString.call(b) && (b = parseInt(b));
BMap.alog("cus.fire", "time", {
z_loadscripttime: ta - sa
......@@ -1172,16 +1172,16 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
this.bn = s,
delete this.bn)
},
Hb: function() {
getSize: function() {
return this.Kr && this.Kr instanceof P ? new P(this.Kr.width,this.Kr.height) : new P(this.Ya.clientWidth,this.Ya.clientHeight)
},
Ae: function(a) {
setSize: function(a) {
a && a instanceof P ? (this.Kr = a,
this.Ya.style.width = a.width + "px",
this.Ya.style.height = a.height + "px") : this.Kr = s
},
Bb: x("pe"),
ka: x("Va"),
getCenter: x("pe"),
getZoom: x("Va"),
zU: function() {
this.Sn()
},
......@@ -1277,7 +1277,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
k > c && (k = c);
return k
},
vs: function(a, b) {
getViewport: function(a, b) {
var c = {
center: this.Bb(),
zoom: this.ka()
......@@ -1310,7 +1310,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
zoom: f
}
},
mh: function(a, b) {
setViewport: function(a, b) {
var c;
c = a && a.center ? a : this.vs(a, b);
var b = b || {}
......@@ -1361,7 +1361,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
BMap.Wq[a](this);
this.$.gE = a
},
uE: function(a) {
setCurrentCity: function(a) {
this.Vb = Sa.ik(a);
this.$v = Sa.mK(this.Vb);
this.Db === Sa && this.Pc instanceof jb && (this.Pc.Ti = this.Vb)
......@@ -1379,7 +1379,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
getDraggingCursor: function() {
return this.U.Gd
},
Yw: function() {
highResolutionEnabled: function() {
return this.U.LV && 1.5 <= this.U.devicePixelRatio
},
eB: function(a, b) {
......@@ -1461,7 +1461,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
window.w5 = [];
window.Tt = [];
window.La = {};
var e = this.ka()
var e = this.getZoom()
, f = {};
z.extend(f, a);
window.cb = function(a) {
......@@ -4100,11 +4100,11 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
return !(a instanceof J) || this.lj() ? t : a.lng >= this.Le && a.lng <= this.Ge && a.lat >= this.Xd && a.lat <= this.Vd
},
extend: function(a) {
if (a instanceof J) {
if (a instanceof Point) {
var b = a.lng
, a = a.lat;
this.Al || (this.Al = new J(0,0));
this.ll || (this.ll = new J(0,0));
this.Al || (this.Al = new Point(0,0));
this.ll || (this.ll = new Point(0,0));
if (!this.Le || this.Le > b)
this.Al.lng = this.Le = b;
if (!this.Ge || this.Ge < b)
......@@ -7658,10 +7658,10 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
}
;
function zd(a) {
var b = a.M
var b = a.map
, c = b.oh
, e = a.Vc
, f = b.Hb()
, f = b.getSize()
, g = f.width
, f = f.height
, i = O("canvas");
......@@ -8083,7 +8083,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
;
function Dd(a, b, c) {
this.jd = a;
this.$e = b instanceof Mc ? [b] : b.slice(0);
this.$e = b instanceof TileLayer ? [b] : b.slice(0);
c = c || {};
this.m = {
r_: c.tips || "",
......@@ -8151,7 +8151,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
light: "ll",
normal: "pl"
}
, Hd = new Mc;
, Hd = new TileLayer;
Hd.RZ = p;
Hd.getTilesUrl = function(a, b, c) {
var e = a.x
......@@ -8168,7 +8168,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
tips: "\u663e\u793a\u666e\u901a\u5730\u56fe",
maxZoom: 19
})
, Id = new Mc;
, Id = new TileLayer;
Id.yN = [BMap.url.proto + BMap.url.domain.TIlE_PERSPECT_URLS[0] + "/resource/mappic/", BMap.url.proto + BMap.url.domain.TIlE_PERSPECT_URLS[1] + "/resource/mappic/", BMap.url.proto + BMap.url.domain.TIlE_PERSPECT_URLS[2] + "/resource/mappic/", BMap.url.proto + BMap.url.domain.TIlE_PERSPECT_URLS[3] + "/resource/mappic/"];
Id.getTilesUrl = function(a, b) {
var c = a.x
......@@ -8208,7 +8208,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
}[a]
}
;
var Jd = new Mc({
var Jd = new TileLayer({
Tv: p
});
Jd.getTilesUrl = function(a, b) {
......@@ -8223,7 +8223,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
maxZoom: 19,
textColor: "white"
})
, Kd = new Mc({
, Kd = new TileLayer({
transparentPng: p
});
Kd.getTilesUrl = function(a, b) {
......@@ -9652,7 +9652,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
"api" == (a || {}).hf ? Ta(Ca) : Ta(Da)
}
dc.KF = BMap.Yh("pano", "tile/");
dc.prototype = new Mc;
dc.prototype = new TileLayer;
dc.prototype.getTilesUrl = function(a, b) {
var c = dc.KF[(a.x + a.y) % dc.KF.length] + "?udt=20150114&qt=tile&styles=pl&x=" + a.x + "&y=" + a.y + "&z=" + b;
z.ga.ma && 6 >= z.ga.ma && (c += "&color_dep=32");
......@@ -10970,21 +10970,21 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
var mapPrototype = Map.prototype;
mergeAttribute(mapPrototype, {
getBounds: mapPrototype.getBounds,
getCenter: mapPrototype.Bb,
getCenter: mapPrototype.getCenter,
getMapType: mapPrototype.va,
getSize: mapPrototype.Hb,
setSize: mapPrototype.Ae,
getViewport: mapPrototype.vs,
getZoom: mapPrototype.ka,
centerAndZoom: mapPrototype.Ed,
panTo: mapPrototype.ji,
panBy: mapPrototype.tg,
setCenter: mapPrototype.pf,
setCurrentCity: mapPrototype.uE,
setMapType: mapPrototype.wg,
setViewport: mapPrototype.mh,
getSize: mapPrototype.getSize,
setSize: mapPrototype.setSize,
getViewport: mapPrototype.getViewport,
getZoom: mapPrototype.getZoom,
centerAndZoom: mapPrototype.centerAndZoom,
panTo: mapPrototype.panTo,
panBy: mapPrototype.panBy,
setCenter: mapPrototype.setCenter,
setCurrentCity: mapPrototype.setCurrentCity,
setMapType: mapPrototype.setMapType,
setViewport: mapPrototype.setViewport,
setZoom: mapPrototype.Qc,
highResolutionEnabled: mapPrototype.Yw,
highResolutionEnabled: mapPrototype.highResolutionEnabled,
zoomTo: mapPrototype.yg,
zoomIn: mapPrototype.hF,
zoomOut: mapPrototype.iF,
......@@ -11253,7 +11253,7 @@ window.BMAP_AUTHENTIC_KEY = "KhQqnL3owyAzqjr4zCGbWiiHwPFmKTD6";
BMAP_MAPTYPE_CONTROL_DROPDOWN: 1,
BMAP_MAPTYPE_CONTROL_MAP: 2
});
var Uf = Mc.prototype;
var Uf = TileLayer.prototype;
mergeAttribute(Uf, {
getMapType: Uf.va,
getCopyright: Uf.Wl,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment