|
@@ -326,8 +326,8 @@
|
|
|
.reduce((p: string[], c: { sceneList: any[] }) => p.concat(c['sceneList']), [])
|
|
.reduce((p: string[], c: { sceneList: any[] }) => p.concat(c['sceneList']), [])
|
|
|
.map((item) => {
|
|
.map((item) => {
|
|
|
const mapper = {} as any;
|
|
const mapper = {} as any;
|
|
|
- mapper.lat = Number(item.lat);
|
|
|
|
|
- mapper.lng = Number(item.lon);
|
|
|
|
|
|
|
+ mapper.lat = item.lat ? Number(item.lat) : null;
|
|
|
|
|
+ mapper.lng = item.lon ? Number(item.lon) : null;
|
|
|
mapper.title = item.title;
|
|
mapper.title = item.title;
|
|
|
item.num && (mapper.num = item.num);
|
|
item.num && (mapper.num = item.num);
|
|
|
item.id && (mapper.id = item.id);
|
|
item.id && (mapper.id = item.id);
|
|
@@ -335,13 +335,19 @@
|
|
|
return mapper;
|
|
return mapper;
|
|
|
});
|
|
});
|
|
|
console.log('list', list);
|
|
console.log('list', list);
|
|
|
- return list;
|
|
|
|
|
|
|
+ if (list.length === 0) {
|
|
|
|
|
+ const project = getMarkerData(data);
|
|
|
|
|
+ console.log('project', project);
|
|
|
|
|
+ return project;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return list;
|
|
|
|
|
+ }
|
|
|
};
|
|
};
|
|
|
const getMarkerData = (data) => {
|
|
const getMarkerData = (data) => {
|
|
|
return data.map((item) => {
|
|
return data.map((item) => {
|
|
|
const mapper = {} as any;
|
|
const mapper = {} as any;
|
|
|
- mapper.lat = Number(item.lat);
|
|
|
|
|
- mapper.lng = Number(item.lon);
|
|
|
|
|
|
|
+ mapper.lat = item.lat ? Number(item.lat) : null;
|
|
|
|
|
+ mapper.lng = item.lon ? Number(item.lon) : null;
|
|
|
mapper.title = item.title;
|
|
mapper.title = item.title;
|
|
|
item.num && (mapper.num = item.num);
|
|
item.num && (mapper.num = item.num);
|
|
|
item.id && (mapper.id = item.id);
|
|
item.id && (mapper.id = item.id);
|