Skip to content

D
DA-Platform

文档服务地址：http://47.92.0.57:3000/ 周报索引地址：http://47.92.0.57:3000/s/NruNXRYmV

Commit 8cac7d6a by ren
Options

修改上传文件的bug

parent e89de876
Showing with 113 additions and 27 deletions
DAPlatform-front/package-lock.json
......@@ -376,6 +376,11 @@
"is-string": "^1.0.5"
}
},
"array-source": {
"version": "0.0.4",
"resolved": "https://registry.npm.taobao.org/array-source/download/array-source-0.0.4.tgz",
"integrity": "sha1-pSXfSoSxN20nxnfNQmqXw4gviso="
},
"array-union": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
......@@ -2211,8 +2216,7 @@
"commander": {
"version": "2.17.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
"dev": true
"integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
},
"commondir": {
"version": "1.0.1",
......@@ -4843,6 +4847,14 @@
"resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.2.tgz",
"integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw=="
},
"file-source": {
"version": "0.6.1",
"resolved": "https://registry.npm.taobao.org/file-source/download/file-source-0.6.1.tgz",
"integrity": "sha1-rhidSZN2a4Zad/g63Pm5pQTNN9w=",
"requires": {
"stream-source": "0.3"
}
},
"file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
......@@ -8145,6 +8157,15 @@
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
},
"path-source": {
"version": "0.1.3",
"resolved": "https://registry.npm.taobao.org/path-source/download/path-source-0.1.3.tgz",
"integrity": "sha1-A5B8WVSAqiWWoVqQHET3RXNuenM=",
"requires": {
"array-source": "0.0",
"file-source": "0.6"
}
},
"path-to-regexp": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
......@@ -11590,6 +11611,19 @@
}
}
},
"shapefile": {
"version": "0.6.6",
"resolved": "https://registry.npm.taobao.org/shapefile/download/shapefile-0.6.6.tgz",
"integrity": "sha1-b+4VK5+yschfaQKFtpL7aMlaX08=",
"requires": {
"array-source": "0.0",
"commander": "2",
"path-source": "0.1",
"slice-source": "0.4",
"stream-source": "0.3",
"text-encoding": "^0.6.4"
}
},
"shebang-command": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
......@@ -11664,6 +11698,11 @@
"is-fullwidth-code-point": "^2.0.0"
}
},
"slice-source": {
"version": "0.4.1",
"resolved": "https://registry.npm.taobao.org/slice-source/download/slice-source-0.4.1.tgz",
"integrity": "sha1-QKV6wDxmaLXaIA4FN44AC/KmHXk="
},
"snapdragon": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
......@@ -12090,6 +12129,11 @@
"integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
"dev": true
},
"stream-source": {
"version": "0.3.5",
"resolved": "https://registry.npm.taobao.org/stream-source/download/stream-source-0.3.5.tgz",
"integrity": "sha1-uX9S0PjqVm2wcdtnm5hUA6MeA0A="
},
"strict-uri-encode": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
......@@ -12326,6 +12370,11 @@
"inherits": "2"
}
},
"text-encoding": {
"version": "0.6.4",
"resolved": "https://registry.npm.taobao.org/text-encoding/download/text-encoding-0.6.4.tgz",
"integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk="
},
"text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
......
DAPlatform-front/package.json
......@@ -20,6 +20,7 @@
"mathjs": "^7.0.2",
"node-sass": "^4.14.1",
"qs": "^6.9.4",
"shapefile": "^0.6.6",
"vue": "^2.5.2",
"vue-router": "^3.0.1",
"vuex": "^3.4.0",
......
DAPlatform/views/imageAnnotation.py
......@@ -5,7 +5,7 @@ import zipfile
import os
import shapefile
from support import basedir
from flask import Blueprint, request, make_response, send_file
from flask import Blueprint, request, make_response, send_file, jsonify
from dao import Image, Relation
......@@ -61,16 +61,16 @@ def save_image():
# 获取图层中的每一个shp文件
def retGeoJson(relationId):
def retGeoNames(relationId):
urlList = Image.retURLList(relationId)
geoList = []
nameList = []
defaultList = [
{"name": "河流水系1-2级", "url": '1604321976.shp'}, # 河1-2
{"name": "河流水系3级", "url": '1604321548.shp'}, # 河3
# {"name": "河流水系4级", "url": '1604321993.shp'}, # 河4
{"name": "河流水系4级", "url": '1604321993.shp'}, # 河4
# {"name": "河流水系5级", "url": '1604322005.shp'}, #河5，文件太大，全部叠加后前端无法显示
{"name": "活动断裂分布", "url": '1604042749.shp'}, # 活动断裂
{"name": "全国降雨量站降雨数据", "url": '1604042339.shp'}, # 降雨量
# {"name": "活动断裂分布", "url": '1604042749.shp'}, # 活动断裂
# {"name": "全国降雨量站降雨数据", "url": '1604042339.shp'}, # 降雨量
]
allList = []
isExtended = False
......@@ -78,29 +78,65 @@ def retGeoJson(relationId):
url = item['url']
if url == "默认":
isExtended = True
urlList.remove(item)
if isExtended:
allList.extend(defaultList)
allList.extend(urlList)
for item in allList:
nameList.append(item['name'])
return nameList
# 获取图层中的每一个shp文件
def retGeoJson(all_list, index):
item = all_list[index]
url = item['url']
file_dir = os.path.join(basedir, UPLOAD_FOLDER, url)
print(file_dir)
shp = open(file_dir, 'rb')
name = item['name'].encode("utf-8").decode("latin1")
geoList = shp.read()
return geoList
# shp = shapefile.Reader(file_dir)
# fields = shp.fields[1:]
# field_names = [field[0] for field in fields]
# buffer = []
# for sr in shp.shapeRecords():
# atr = dict(zip(field_names, sr.record))
# geom = sr.shape.__geo_interface__
# buffer.append(dict(type="Feature", geometry=geom, properties=atr))
# geoList.append({"name": item['name'], "geojson": {"type": "FeatureCollection", "features": buffer}})
# 获取图层
@image.route("/layer/getGeojson", methods=["POST"])
def get_geo_list():
print("get_geo_list")
data = json.loads(request.data.decode('utf-8'))
relation_list = data['relationId']
index = data['index']
print(relation_list, index)
urlList = Image.retURLList(relation_list)
geoList = None
defaultList = [
{"name": "河流水系1-2级", "url": '1604321976.shp'}, # 河1-2
{"name": "河流水系3级", "url": '1604321548.shp'}, # 河3
{"name": "河流水系4级", "url": '1604321993.shp'}, # 河4
# {"name": "河流水系5级", "url": '1604322005.shp'}, #河5，文件太大，全部叠加后前端无法显示
# {"name": "活动断裂分布", "url": '1604042749.shp'}, # 活动断裂
# {"name": "全国降雨量站降雨数据", "url": '1604042339.shp'}, # 降雨量
]
allList = []
isExtended = False
for item in urlList:
url = item['url']
if url == "默认":
if isExtended == False:
defaultList.extend(urlList)
isExtended = True
else:
continue
file_dir = os.path.join(basedir, UPLOAD_FOLDER, url)
print(file_dir)
shp = shapefile.Reader(file_dir)
fields = shp.fields[1:]
field_names = [field[0] for field in fields]
buffer = []
for sr in shp.shapeRecords():
atr = dict(zip(field_names, sr.record))
geom = sr.shape.__geo_interface__
buffer.append(dict(type="Feature", geometry=geom, properties=atr))
geoList.append({"name": item['name'], "geojson": {"type": "FeatureCollection", "features": buffer}})
return geoList
isExtended = True
urlList.remove(item)
if isExtended:
allList.extend(defaultList)
allList.extend(urlList)
geojson = retGeoJson(allList, index)
print("geojson")
return geojson
# 获取图层
......@@ -109,10 +145,10 @@ def get_layer():
data = json.loads(request.data.decode('utf-8'))
relation_list = data['relationId']
resLayer = Image.getLayer(relation_list)
geojson = retGeoJson(relation_list)
geoNames = retGeoNames(relation_list)
layer = resLayer.data
resdata = {
'geojson': geojson,
'geoNames': geoNames,
'layerInfo': layer['layerInfo'],
'landmarkList': layer['landmarkList'],
}
......
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