litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

additional home page redesign changes

Browse source
This commit is contained in:
tworrall 2013-05-02 12:34:18 -04:00
parent 94e23fef67
commit af4f84759c
6 changed files with 221 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
View file

@ -62,20 +62,22 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder {
try {
geoLocations = getGeoLocations(vreq);
// String response = "{\"type\": \"FeatureCollection\",\"features\": [";
String response = "[";
String geometry = "{\"geometry\": {\"type\": \"Point\",\"coordinates\": \"\"},";
String typeProps = "\"type\": \"Feature\",\"properties\": {\"mapType\": \"\",";
String previousLabel = "";
for (Map<String, String> map: geoLocations) {
String label = map.get("label");
String html = map.get("count");
String uri = UrlBuilder.urlEncode(map.get("location"));
String uri = map.get("location");
if ( uri != null ) {
uri = UrlBuilder.urlEncode(uri);
}
Integer count = Integer.parseInt(map.get("count"));
String radius = String.valueOf(calculateRadius(count));
if ( !label.equals(previousLabel) ) {
if ( label != null && !label.equals(previousLabel) ) {
String tempStr = geometry; //+label
tempStr += typeProps //+ label
+ "\"popupContent\": \""
@ -91,7 +93,9 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder {
previousLabel = label;
}
}
response = response.substring(0, response.lastIndexOf(","));
if ( response.lastIndexOf(",") > 0 ) {
response = response.substring(0, response.lastIndexOf(","));
}
response += " ]";
log.debug(response);
return response;