|
@@ -659,7 +659,7 @@ export default {
|
|
|
const token = "eyJraWQiOiI1NEIyRkFLODMzIiwidHlwIjoiSldUIiwiYWxnIjoiRVMyNTYifQ.eyJpc3MiOiJIS0YzNzJKU01LIiwiaWF0IjoxNzMzMTkxMzI2LCJvcmlnaW4iOiJvYS5wYW4tYW1lcmljYW4taW50bC5jb20ifQ.1czYQb-Nxh6n4kG9sVylQH32XawN92gBKXjn6i_SU0F2M9fpwbStM-gDRvfANEiEUDz5ogUmm_FQf9eBF8o9Zg";
|
|
|
mapkit.init({
|
|
|
libraries:'services',
|
|
|
- language: 'es',
|
|
|
+ language: 'zh-Hans',
|
|
|
authorizationCallback: function(done) {
|
|
|
done(token);
|
|
|
},
|
|
@@ -701,18 +701,16 @@ export default {
|
|
|
if (err) {
|
|
|
console.log(err);
|
|
|
}else{
|
|
|
- console.log(data);
|
|
|
listinif=data.results[0]?data.results[0]:{}
|
|
|
}
|
|
|
- console.log(listinif);
|
|
|
-
|
|
|
that.fordata.push(
|
|
|
{
|
|
|
- 'country':listinif.country?listinif.country:'',
|
|
|
- 'administrativeArea':listinif.administrativeArea?listinif.administrativeArea:'',
|
|
|
- 'locality':listinif.locality?listinif.locality:'',
|
|
|
- 'latitude':listinif.coordinate.latitude?listinif.coordinate.latitude:'',
|
|
|
- 'longitude':listinif.coordinate.longitude?listinif.coordinate.longitude:'',
|
|
|
+ 'country':JSON.stringify(listinif)!="{}"?listinif.country:'',
|
|
|
+ 'administrativeArea':JSON.stringify(listinif)!="{}"?listinif.administrativeArea:'',
|
|
|
+ 'locality':JSON.stringify(listinif)!="{}"?listinif.locality:'',
|
|
|
+ 'latitude':JSON.stringify(listinif)!="{}"?listinif.coordinate.latitude:'',
|
|
|
+ 'longitude':JSON.stringify(listinif)!="{}"?listinif.coordinate.longitude:'',
|
|
|
+ 'url':JSON.stringify(listinif)!="{}"?listinif._wpURL:'',
|
|
|
'groupName':that.mapdata[i].groupName,
|
|
|
'client':that.mapdata[i].client,
|
|
|
'statusText':that.mapdata[i].statusText,
|
|
@@ -735,7 +733,7 @@ export default {
|
|
|
'coordinate':new mapkit.Coordinate(Number(nonnull[k].latitude),Number(nonnull[k].longitude)),
|
|
|
'title':nonnull[k].country+' '+nonnull[k].administrativeArea+' '+nonnull[k].locality,
|
|
|
'phone':nonnull[k].groupName+' ('+nonnull[k].statusText+') ',
|
|
|
- 'url':'http://www.transamericapyramidcenter.com/',
|
|
|
+ 'url':nonnull[k].url,
|
|
|
}
|
|
|
)
|
|
|
|
|
@@ -768,6 +766,16 @@ export default {
|
|
|
// { coordinate: new mapkit.Coordinate(37.8184493, -122.478409), title: "Golden Gate Bridge", phone: "+1 (415) 921-5858", url: "http://www.goldengatebridge.org" },
|
|
|
// { coordinate: new mapkit.Coordinate(37.7785538, -122.514035), title: "Cliff House", phone: "+1 (415) 386-3330", url: "http://www.cliffhouse.com/" },
|
|
|
// ];
|
|
|
+ // var annotations = sanFranciscoLandmarks.map(function (landmark) {
|
|
|
+ // var annotation = new mapkit.MarkerAnnotation(landmark.coordinate, {
|
|
|
+ // callout: landmarkAnnotationCallout,
|
|
|
+ // color: "#c969e0"
|
|
|
+ // });
|
|
|
+ // annotation.landmark = landmark;
|
|
|
+ // return annotation;
|
|
|
+ // });
|
|
|
+ // this.map = new mapkit.Map("map");
|
|
|
+ // this.map.showItems(annotations);
|
|
|
|
|
|
},
|
|
|
combineAttributesByProperty(objects, property) {
|