From 349635937a4fd22c143cf0d468b49323aae5db69 Mon Sep 17 00:00:00 2001
From: Matija Obreza <matija.obreza@croptrust.org>
Date: Tue, 24 Oct 2017 10:18:05 +0200
Subject: [PATCH] Cleanup

- Fixed bugged JS formatted code
- Updated deprecated ObjectMapper#put call
---
 .../server/service/impl/MappingServiceImpl.java  |  8 ++++----
 .../webapp/WEB-INF/jsp/accession/details.jsp     | 16 ++++------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/genesys2/server/service/impl/MappingServiceImpl.java b/src/main/java/org/genesys2/server/service/impl/MappingServiceImpl.java
index 28f472ef4..575aec85d 100644
--- a/src/main/java/org/genesys2/server/service/impl/MappingServiceImpl.java
+++ b/src/main/java/org/genesys2/server/service/impl/MappingServiceImpl.java
@@ -108,7 +108,7 @@ public class MappingServiceImpl implements MappingService {
 		final ObjectNode geoJson = mapper.createObjectNode();
 		geoJson.put("type", "FeatureCollection");
 		final ArrayNode featuresArray = geoJson.arrayNode();
-		geoJson.put("features", featuresArray);
+		geoJson.set("features", featuresArray);
 
 		filterService.listGeo(filters, limit, new RowCallbackHandler() {
 			@Override
@@ -119,16 +119,16 @@ public class MappingServiceImpl implements MappingService {
 					feature.put("id", rs.getLong("id"));
 
 					ObjectNode geometry;
-					feature.put("geometry", geometry = feature.objectNode());
+					feature.set("geometry", geometry = feature.objectNode());
 					geometry.put("type", "Point");
 
 					ArrayNode coordArray;
-					geometry.put("coordinates", coordArray = geometry.arrayNode());
+					geometry.set("coordinates", coordArray = geometry.arrayNode());
 					coordArray.add(rs.getDouble("longitude"));
 					coordArray.add(rs.getDouble("latitude"));
 
 					ObjectNode properties;
-					feature.put("properties", properties = feature.objectNode());
+					feature.set("properties", properties = feature.objectNode());
 					properties.put("acceNumb", rs.getString("acceNumb"));
 					properties.put("instCode", rs.getString("instCode"));
 					properties.put("datum", rs.getString("datum"));
diff --git a/src/main/webapp/WEB-INF/jsp/accession/details.jsp b/src/main/webapp/WEB-INF/jsp/accession/details.jsp
index 99cf5a061..864ea93df 100644
--- a/src/main/webapp/WEB-INF/jsp/accession/details.jsp
+++ b/src/main/webapp/WEB-INF/jsp/accession/details.jsp
@@ -1076,30 +1076,22 @@
             <script type="text/javascript">
               jQuery(document).ready(function () {
                 var map = L.map('map', {scrollWheelZoom: false}).setView([
-                  $ {
-                    accessionGeo.latitude
-                  },
-                  $ {accessionGeo.longitude}
+                  ${accessionGeo.latitude}, ${accessionGeo.longitude}
                 ], 4);
                 L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}', {
                   attribution: "Tiles &copy; Esri &mdash; Esri, DeLorme, NAVTEQ",
                   maxZoom: 16
                 }).addTo(map);
                 var marker = L.marker([
-                  $ {
-                    accessionGeo.latitude
-                  },
-                  $ {accessionGeo.longitude}
+                  ${accessionGeo.latitude}, ${accessionGeo.longitude}
                 ]).addTo(map);
               });
             </script>
           </c:if>
           <c:if test="${worldclimJson ne null}">
             <script type="text/javascript">
-              var monthNames = $ {
-                jspHelper.toJson(jspHelper.monthShortNames(pageContext.response.locale))
-              };
-              var worldclim = $ {jspHelper.toJson(worldclimJson)};
+              var monthNames = ${jspHelper.toJson(jspHelper.monthShortNames(pageContext.response.locale))};
+              var worldclim = ${jspHelper.toJson(worldclimJson)};
               function arrayToData(array) {
                 var ret = [];
                 for (var i = 0; i < 12; i++) {
-- 
GitLab