dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #01306
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 376: Added function for retrieving a shapefile dynamically
------------------------------------------------------------
revno: 376
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-06-16 16:40:57 +0200
message:
Added function for retrieving a shapefile dynamically
added:
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithCoordinatesAction.java
gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/pointShapefile.vm
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java
gis/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml
gis/dhis-web-mapping/src/main/resources/xwork.xml
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2009-05-20 11:38:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2009-06-16 14:40:57 +0000
@@ -126,6 +126,15 @@
}
// -------------------------------------------------------------------------
+ // Logic
+ // -------------------------------------------------------------------------
+
+ public boolean hasCoordinates()
+ {
+ return latitude != null && latitude.trim().length() > 0 && longitude != null && longitude.trim().length() > 0;
+ }
+
+ // -------------------------------------------------------------------------
// hashCode, equals and toString
// -------------------------------------------------------------------------
=== added file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithCoordinatesAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithCoordinatesAction.java 1970-01-01 00:00:00 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithCoordinatesAction.java 2009-06-16 14:40:57 +0000
@@ -0,0 +1,99 @@
+package org.hisp.dhis.mapping.action;
+
+/*
+ * Copyright (c) 2004-2007, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+
+import com.opensymphony.xwork.Action;
+
+/**
+ * @author Jan Henrik Overland
+ * @version $Id$
+ */
+public class GetOrganisationUnitsWithCoordinatesAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private OrganisationUnitService organisationUnitService;
+
+ public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
+ {
+ this.organisationUnitService = organisationUnitService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input
+ // -------------------------------------------------------------------------
+
+ private Integer level;
+
+ public void setLevel( Integer level )
+ {
+ this.level = level;
+ }
+
+ // -------------------------------------------------------------------------
+ // Output
+ // -------------------------------------------------------------------------
+
+ private List<OrganisationUnit> object;
+
+ public List<OrganisationUnit> getObject()
+ {
+ return object;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ throws Exception
+ {
+ object = new ArrayList<OrganisationUnit>( organisationUnitService.getOrganisationUnitsAtLevel( level ) );
+
+ CollectionUtils.filter( object, new Predicate()
+ {
+ public boolean evaluate( Object object )
+ {
+ return ((OrganisationUnit) object).hasCoordinates();
+ }
+ } );
+
+ return SUCCESS;
+ }
+}
=== modified file 'gis/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml'
--- gis/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml 2009-05-29 13:31:05 +0000
+++ gis/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml 2009-06-16 14:40:57 +0000
@@ -221,4 +221,13 @@
ref="org.hisp.dhis.period.PeriodService"/>
</bean>
+ <!-- Shapefile -->
+
+ <bean id="org.hisp.dhis.mapping.action.GetOrganisationUnitsWithCoordinatesAction"
+ class="org.hisp.dhis.mapping.action.GetOrganisationUnitsWithCoordinatesAction"
+ scope="prototype">
+ <property name="organisationUnitService"
+ ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
+ </bean>
+
</beans>
=== modified file 'gis/dhis-web-mapping/src/main/resources/xwork.xml'
--- gis/dhis-web-mapping/src/main/resources/xwork.xml 2009-05-29 13:31:05 +0000
+++ gis/dhis-web-mapping/src/main/resources/xwork.xml 2009-06-16 14:40:57 +0000
@@ -134,6 +134,12 @@
<action name="getPeriodsByPeriodType" class="org.hisp.dhis.mapping.action.GetPeriodsByPeriodTypeAction">
<result name="success" type="velocity-json">/dhis-web-mapping/jsonPeriods.vm</result>
</action>
+
+ <!-- Shapefile -->
+
+ <action name="getPointShapefile" class="org.hisp.dhis.mapping.action.GetOrganisationUnitsWithCoordinatesAction">
+ <result name="success" type="velocity-json">/dhis-web-mapping/pointShapefile.vm</result>
+ </action>
</package>
</xwork>
=== added file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/pointShapefile.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/pointShapefile.vm 1970-01-01 00:00:00 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/pointShapefile.vm 2009-06-16 14:40:57 +0000
@@ -0,0 +1,31 @@
+#set( $size = $object.size() )
+{
+ "type":"FeatureCollection",
+ "features":
+ [
+ #foreach ( $unit in $object )
+ {
+ "type":"Feature",
+ "id":"${unit.id}",
+ "geometry":
+ {
+ "type":"Point",
+ "coordinates":[$!{unit.longitude},$!{unit.latitude}]
+ },
+ "properties":
+ {
+ "name":"$!encoder.jsEncode( ${unit.name} )",
+ "type":"Facility"
+ }
+ }#if( $velocityCount < $size ),#end
+ #end
+ ],
+ "crs":
+ {
+ "type":"EPSG",
+ "properties":
+ {
+ "code":"4326"
+ }
+ }
+}
\ No newline at end of file
--
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.
