diff --git a/src/main/java/osm/surveyor/task/city/DataLoader.java b/src/main/java/osm/surveyor/task/city/DataLoader.java index 9157f12..ecc741f 100644 --- a/src/main/java/osm/surveyor/task/city/DataLoader.java +++ b/src/main/java/osm/surveyor/task/city/DataLoader.java @@ -95,6 +95,7 @@ mesh.setCitycode(city.getCitycode()); mesh.setMeshcode(meshcode); mesh.setVersion(prop.getVersion()); + mesh.setSurveyYear(prop.getSurveyYear()); mesh.setPath(prop.getPath()); mesh.setPoint(geometryPoint.getPoint()); mesh.setCity(city); @@ -128,6 +129,7 @@ Citymesh meshDb = (Citymesh) meshRepository.findOne(city.getCitycode(), meshcode); if (meshDb != null) { mesh.setVersion(meshDb.getVersion()); + mesh.setSurveyYear(meshDb.getSurveyYear()); mesh.setPath(meshDb.getPath()); mesh.setLng(meshDb.getLng()); mesh.setLat(meshDb.getLat()); diff --git a/src/main/java/osm/surveyor/task/util/JsonProperties.java b/src/main/java/osm/surveyor/task/util/JsonProperties.java index 3b07b75..61ded7a 100644 --- a/src/main/java/osm/surveyor/task/util/JsonProperties.java +++ b/src/main/java/osm/surveyor/task/util/JsonProperties.java @@ -19,6 +19,7 @@ private String path; private String id; private String version; + private String surveyYear; private Long prefcode; private String prefname; private Long citycode; @@ -35,6 +36,7 @@ c1 = outStr(c1, sb, "path", this.path); c1 = outStr(c1, sb, "id", this.id); c1 = outStr(c1, sb, "version", this.version); + c1 = outStr(c1, sb, "surveyYear", this.surveyYear); c1 = out(c1, sb, "prefcode", getPrefcode()); c1 = outStr(c1, sb, "prefname", getPrefname()); sb.append("}"); @@ -62,6 +64,11 @@ this.version = node1.textValue(); } + node1 = node.get("surveyYear"); + if (node1 != null) { + this.surveyYear = node1.textValue(); + } + node1 = node.get("prefcode"); if (node1 != null) { setPrefcode(node1.longValue()); diff --git a/src/main/resources/templates/tasks.html b/src/main/resources/templates/tasks.html index e4c62cf..3a4216a 100644 --- a/src/main/resources/templates/tasks.html +++ b/src/main/resources/templates/tasks.html @@ -156,6 +156,7 @@ "
" + city.folder + "
" + "
code: " + info.meshcode + "
" + "
version: " + info.version + "
" + + "
surveyYear: " + info.surveyYear + "
" + "
status: " + info.status + "
" + "
" + info.path + "
"; element.innerHTML = descriptionHTML;