dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8844
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-11-03 22:26:26 +0300
message:
  Compacting geojson facilities template
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/geojsonFacilities.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/geojsonFacilities.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/geojsonFacilities.vm	2012-10-25 12:07:10 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/geojsonFacilities.vm	2012-11-03 19:26:26 +0000
@@ -1,33 +1,6 @@
-
 #set($size=$object.size())
 #set($groupSetSize=$groupSets.size())
-{
-	"properties":{},
-	"geojson":[
-
-		#foreach($unit in $object)
-
-		{
-
-			"ty": #if(${unit.featureType}=="Point")"2"#else"1"#end,
-			"co":$!encoder.jsonEncode($!{unit.validCoordinates}),
-			"uid":"$!{unit.uid}",
-			"iid":$!{unit.id},
-			"na":"$!encoder.jsonEncode(${unit.name})",
-
-			"groupSets": {
-	
-				#foreach($set in $groupSets)
-				#set( $index = ( $velocityCount - 1 ) )
-				#set( $key = $!encoder.jsonEncode( ${set.name} ) )
-				#set( $val = $!encoder.jsonEncode( $unit.groupNames.get(${index}) ) )
-				"${key}":"${val}"
-				#if($velocityCount<$groupSetSize),#end	
-				
-				#end	
-			}
-		}#if($velocityCount<$size),#end
-		
-		#end
-	]
-}
\ No newline at end of file
+{ "properties":{},"geojson":[#foreach($unit in $object) {
+"ty": #if(${unit.featureType}=="Point")"2"#else"1"#end,"co":$!encoder.jsonEncode($!{unit.validCoordinates}),"uid":"$!{unit.uid}","iid":$!{unit.id},"na":"$!encoder.jsonEncode(${unit.name})",
+"groupSets": { #foreach($set in $groupSets)	#set( $index = ( $velocityCount - 1 ) )	#set( $key = $!encoder.jsonEncode( ${set.name} ) ) #set( $val = $!encoder.jsonEncode( $unit.groupNames.get(${index}) ) )
+"${key}":"$!{val}"#if($velocityCount<$groupSetSize),#end #end } } #if($velocityCount<$size),#end #end ] }
\ No newline at end of file