|
@@ -132,9 +132,6 @@ public class InvalidPropertiesFinder {
|
|
|
else
|
|
|
//图层存在则检查图层
|
|
|
checkLayer(line, layerTemplate, missingRequirementsResult, invalidTypesResult, GisSurveyImportDefine.LayerType.LINE);
|
|
|
- //检查坐标超出范围
|
|
|
- if (checkOutRanges(line))
|
|
|
- outRangesResult.add(GisSurveyThirdImportElement.create(line, GisSurveyImportDefine.LayerType.LINE));
|
|
|
}
|
|
|
|
|
|
long end = System.currentTimeMillis();
|
|
@@ -207,6 +204,15 @@ public class InvalidPropertiesFinder {
|
|
|
templateName = GisSurveyImportDefine.POINT.LAT;
|
|
|
break;
|
|
|
}
|
|
|
+ if (layerType == GisSurveyImportDefine.LayerType.LINE)
|
|
|
+ switch (propertyTemplate.getKey()) {
|
|
|
+ case GisSurveyImportDefine.TEMPLATE.UP_NODE:
|
|
|
+ templateName = GisSurveyImportDefine.LINE.UP_NO;
|
|
|
+ break;
|
|
|
+ case GisSurveyImportDefine.TEMPLATE.DOWN_NODE:
|
|
|
+ templateName = GisSurveyImportDefine.LINE.DOWN_NO;
|
|
|
+ break;
|
|
|
+ }
|
|
|
//必填不存在则存入缺少必填
|
|
|
if (!data.containsKey(templateName))
|
|
|
missingRequirementsResult.add(GisSurveyThirdImportElement.create(data,
|